Retaining 'timeout' as the settor, but using 'limit' as the getter.

I don't like using Fact.add(:fact, :limit => 5), so I
added a little extra code to allow us to continue using
':timeout => 5', but use 'limit' for retrieving the value,
to avoid the conflict Steve Hajducko is seeing.

3 files changed, 11 insertions, 4 deletions

diff --git a/lib/facter/kernelrelease.rb b/lib/facter/kernelrelease.rb
index 07b65b5..0f8a643 100644
--- a/lib/facter/kernelrelease.rb
+++ b/lib/facter/kernelrelease.rb
@@ -2,7 +2,7 @@ Facter.add(:kernelrelease) do
     setcode 'uname -r'
 end
 
-Facter.add(:kernelrelease, :limit => 5) do
+Facter.add(:kernelrelease, :timeout => 5) do
     confine :kernel => :aix
     setcode 'oslevel -s'
 end
diff --git a/lib/facter/puppetversion.rb b/lib/facter/puppetversion.rb
index d16250c..16510c8 100644
--- a/lib/facter/puppetversion.rb
+++ b/lib/facter/puppetversion.rb
@@ -1,4 +1,4 @@
-Facter.add(:puppetversion, :limit => 1.5) do
+Facter.add(:puppetversion, :timeout => 1.5) do
     setcode {
         begin
             require 'puppet'
diff --git a/lib/facter/util/resolution.rb b/lib/facter/util/resolution.rb
index bc9fdec..cc8c842 100644
--- a/lib/facter/util/resolution.rb
+++ b/lib/facter/util/resolution.rb
@@ -8,7 +8,7 @@ require 'facter/util/confine'
 require 'timeout'
 
 class Facter::Util::Resolution
-    attr_accessor :interpreter, :code, :name, :limit
+    attr_accessor :interpreter, :code, :name, :timeout
 
     def self.have_which
         if ! defined?(@have_which) or @have_which.nil?
@@ -62,7 +62,7 @@ class Facter::Util::Resolution
         @name = name
         @confines = []
         @value = nil
-        @limit = 0.5
+        @timeout = 0.5
     end
 
     # Return the number of confines.
@@ -70,6 +70,13 @@ class Facter::Util::Resolution
         @confines.length
     end
 
+    # We need this as a getter for 'timeout', because some versions
+    # of ruby seem to already have a 'timeout' method and we can't
+    # seem to override the instance methods, somehow.
+    def limit
+        @timeout
+    end
+
     # Set our code for returning a value.
     def setcode(string = nil, interp = nil, &block)
         if string