Moving the version and ruby facts to a separate file.

2 files changed, 27 insertions, 28 deletions

diff --git a/lib/facter.rb b/lib/facter.rb
index 91588d3..783bb83 100644
--- a/lib/facter.rb
+++ b/lib/facter.rb
@@ -177,34 +177,6 @@ module Facter
 
     # Load all of the default facts, and then everything from disk.
     def self.loadfacts
-        Facter.add(:facterversion) do
-            setcode { FACTERVERSION.to_s }
-        end
-
-        Facter.add(:rubyversion) do
-            setcode { RUBY_VERSION.to_s }
-        end
-
-        Facter.add(:puppetversion) do
-            setcode {
-                begin
-                    require 'puppet'
-                    Puppet::PUPPETVERSION.to_s
-                rescue LoadError
-                    nil
-                end
-            }
-        end
-
-        Facter.add :rubysitedir do
-            setcode do
-                version = RUBY_VERSION.to_s.sub(/\.\d+$/, '')
-                $:.find do |dir|
-                    dir =~ /#{File.join("site_ruby", version)}$/
-                end
-            end
-        end
-
         collection.load_all
     end
 
diff --git a/lib/facter/core.rb b/lib/facter/core.rb
new file mode 100644
index 0000000..0c5fdd5
--- /dev/null
+++ b/lib/facter/core.rb
@@ -0,0 +1,27 @@
+Facter.add(:facterversion) do
+    setcode { Facter::FACTERVERSION.to_s }
+end
+
+Facter.add(:rubyversion) do
+    setcode { RUBY_VERSION.to_s }
+end
+
+Facter.add(:puppetversion) do
+    setcode {
+        begin
+            require 'puppet'
+            Puppet::PUPPETVERSION.to_s
+        rescue LoadError
+            nil
+        end
+    }
+end
+
+Facter.add :rubysitedir do
+    setcode do
+        version = RUBY_VERSION.to_s.sub(/\.\d+$/, '')
+        $:.find do |dir|
+            dir =~ /#{File.join("site_ruby", version)}$/
+        end
+    end
+end