facter 1.6.7 → 1.6.8

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.6.8
+===
+b86fe4c (#12831) Add rspec tests to have_which method in Resolution
+70be957 (#12831) Fix recursion on first kernel fact resolution
+
 1.6.7
 ===
 ab9e26c Updating CHANGELOG and lib/facter.rb for Facter 1.6.7rc1

data/lib/facter.rb

@@ -25,7 +25,7 @@ module Facter
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.7'
+  FACTERVERSION = '1.6.8'
   # = Facter
   # Functions as a hash of 'facts' you might care about about your
   # system, such as mac address, IP address, Video card, etc.

data/lib/facter/util/resolution.rb

@@ -15,11 +15,11 @@ class Facter::Util::Resolution
 
   def self.have_which
     if ! defined?(@have_which) or @have_which.nil?
-      if Facter.value(:kernel) == 'windows'
+      if Facter::Util::Config.is_windows?
         @have_which = false
       else
         %x{which which >/dev/null 2>&1}
-        @have_which = ($? == 0)
+        @have_which = $?.success?
       end
     end
     @have_which

data/spec/unit/util/resolution_spec.rb

@@ -295,4 +295,38 @@ describe Facter::Util::Resolution do
       Facter::Util::Resolution.exec("echo foo").should == "foo"
     end
   end
+
+  describe "have_which" do
+    before :each do
+      Facter::Util::Resolution.instance_variable_set(:@have_which, nil)
+
+      # we do not execute anything in the following test cases itself
+      # but we rely on $? to be an instance of Process::Status. So
+      # just execute anything here to make sure that $? is not nil
+      %x{echo foo}
+    end
+
+    it "on windows should always return false" do
+      Facter::Util::Config.stubs(:is_windows?).returns(true)
+      Facter::Util::Resolution.expects(:`).
+        with('which which >/dev/null 2>&1').never
+      Facter::Util::Resolution.have_which.should == false
+    end
+
+    it "on other platforms than windows should return true if which exists" do
+      Facter::Util::Config.stubs(:is_windows?).returns(false)
+      Facter::Util::Resolution.expects(:`).
+        with('which which >/dev/null 2>&1').returns('')
+      Process::Status.any_instance.stubs(:success?).returns true
+      Facter::Util::Resolution.have_which.should == true
+    end
+
+    it "on other platforms than windows should return false if which returns non-zero exit code" do
+      Facter::Util::Config.stubs(:is_windows?).returns(false)
+      Facter::Util::Resolution.expects(:`).
+        with('which which >/dev/null 2>&1').returns('')
+      Process::Status.any_instance.stubs(:success?).returns false
+      Facter::Util::Resolution.have_which.should == false
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 6
-  - 7
-  version: 1.6.7
+  - 8
+  version: 1.6.8
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: []
 
 description: You can prove anything with facts!
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facter
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Facter, a system inventory tool