Changed 'timeout' option to 'limit'

This was done to avoid a possible variable scoping issue
that was occuring on some AIX systems.

6 files changed, 13 insertions, 11 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b67b214..f591b42 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 ?:
+    Changed 'timeout' option to 'limit' to avoid scope issue
+
     Fixes #1376 - Display memory facts for AIX
 
     Fixes #1334 - Forced Facter to use LANG=C
diff --git a/lib/facter/kernelrelease.rb b/lib/facter/kernelrelease.rb
index 0f8a643..07b65b5 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, :timeout => 5) do
+Facter.add(:kernelrelease, :limit => 5) do
     confine :kernel => :aix
     setcode 'oslevel -s'
 end
diff --git a/lib/facter/puppetversion.rb b/lib/facter/puppetversion.rb
index 16510c8..d16250c 100644
--- a/lib/facter/puppetversion.rb
+++ b/lib/facter/puppetversion.rb
@@ -1,4 +1,4 @@
-Facter.add(:puppetversion, :timeout => 1.5) do
+Facter.add(:puppetversion, :limit => 1.5) do
     setcode {
         begin
             require 'puppet'
diff --git a/lib/facter/util/resolution.rb b/lib/facter/util/resolution.rb
index e5936bd..bc9fdec 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, :timeout
+    attr_accessor :interpreter, :code, :name, :limit
 
     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
-        @timeout = 0.5
+        @limit = 0.5
     end
 
     # Return the number of confines.
@@ -100,7 +100,7 @@ class Facter::Util::Resolution
     def value
         result = nil
         begin
-            Timeout.timeout(timeout) do
+            Timeout.timeout(limit) do
                 if @code.is_a?(Proc)
                     result = @code.call()
                 else
diff --git a/spec/unit/util/collection.rb b/spec/unit/util/collection.rb
index 7585a52..a526ed3 100755
--- a/spec/unit/util/collection.rb
+++ b/spec/unit/util/collection.rb
@@ -64,7 +64,7 @@ describe Facter::Util::Collection do
             resolve = Facter::Util::Resolution.new(:myname) {}
             fact.expects(:add).returns resolve
 
-            @coll.add(:myname, :timeout => "myval") {}
+            @coll.add(:myname, :limit => "myval") {}
         end
 
         it "should not pass fact-specific options to resolutions" do
@@ -75,9 +75,9 @@ describe Facter::Util::Collection do
             fact.expects(:add).returns resolve
 
             fact.expects(:ldapname=).with("foo")
-            resolve.expects(:timeout=).with("myval")
+            resolve.expects(:limit=).with("myval")
 
-            @coll.add(:myname, :timeout => "myval", :ldapname => "foo") {}
+            @coll.add(:myname, :limit => "myval", :ldapname => "foo") {}
         end
 
         it "should fail if invalid options are provided" do
diff --git a/spec/unit/util/resolution.rb b/spec/unit/util/resolution.rb
index e546713..462bf17 100755
--- a/spec/unit/util/resolution.rb
+++ b/spec/unit/util/resolution.rb
@@ -18,11 +18,11 @@ describe Facter::Util::Resolution do
     end
 
     it "should support a timeout value" do
-        Facter::Util::Resolution.new("yay").should respond_to(:timeout=)
+        Facter::Util::Resolution.new("yay").should respond_to(:limit=)
     end
 
     it "should default to a timeout of 0.5 seconds" do
-        Facter::Util::Resolution.new("yay").timeout.should == 0.5
+        Facter::Util::Resolution.new("yay").limit.should == 0.5
     end
 
     describe "when setting the code" do
@@ -93,7 +93,7 @@ describe Facter::Util::Resolution do
 
             it "should timeout after the provided timeout" do
                 @resolve.expects(:warn)
-                @resolve.timeout = 0.1
+                @resolve.limit = 0.1
                 @resolve.setcode { sleep 2; raise "This is a test" }
 
                 @resolve.value.should be_nil