facter 1.5.7 → 1.5.8

data/spec/unit/util/resolution.rb

@@ -44,9 +44,10 @@ describe Facter::Util::Resolution do
             @resolve = Facter::Util::Resolution.new("yay")
         end
 
-        it "should default to /bin/sh as the interpreter if a string is provided" do
+        it "should default to the detected interpreter if a string is provided" do
+            Facter::Util::Resolution::INTERPRETER = "/bin/bar"
             @resolve.setcode "foo"
-            @resolve.interpreter.should == "/bin/sh"
+            @resolve.interpreter.should == "/bin/bar"
         end
 
         it "should set the code to any provided string" do
@@ -87,17 +88,44 @@ describe Facter::Util::Resolution do
         end
 
         describe "and the code is a string" do
-            it "should return the result of executing the code with the interpreter" do
-                @resolve.setcode "/bin/foo"
-                Facter::Util::Resolution.expects(:exec).with("/bin/foo", "/bin/sh").returns "yup"
-
-                @resolve.value.should == "yup"
+            describe "on windows" do
+                before do
+                    Facter::Util::Resolution::WINDOWS = true
+                    Facter::Util::Resolution::INTERPRETER = "cmd.exe"
+                end
+                
+                it "should return the result of executing the code with the interpreter" do
+                    @resolve.setcode "/bin/foo"
+                    Facter::Util::Resolution.expects(:exec).once.with("/bin/foo", "cmd.exe").returns "yup"
+
+                    @resolve.value.should == "yup"
+                end
+
+                it "should return nil if the value is an empty string" do
+                    @resolve.setcode "/bin/foo"
+                    Facter::Util::Resolution.expects(:exec).once.returns ""
+                    @resolve.value.should be_nil
+                end
             end
 
-            it "should return nil if the value is an empty string" do
-                @resolve.setcode "/bin/foo"
-                Facter::Util::Resolution.stubs(:exec).returns ""
-                @resolve.value.should be_nil
+            describe "on non-windows systems" do
+                before do
+                    Facter::Util::Resolution::WINDOWS = false
+                    Facter::Util::Resolution::INTERPRETER = "/bin/sh"
+                end
+                
+                it "should return the result of executing the code with the interpreter" do
+                    @resolve.setcode "/bin/foo"
+                    Facter::Util::Resolution.expects(:exec).once.with("/bin/foo", "/bin/sh").returns "yup"
+
+                    @resolve.value.should == "yup"
+                end
+
+                it "should return nil if the value is an empty string" do
+                    @resolve.setcode "/bin/foo"
+                    Facter::Util::Resolution.expects(:exec).once.returns ""
+                    @resolve.value.should be_nil
+                end
             end
         end
 
@@ -136,6 +164,7 @@ describe Facter::Util::Resolution do
                 @resolve.expects(:warn)
                 @resolve.timeout = 0.1
                 @resolve.setcode { sleep 2; raise "This is a test" }
+                Thread.expects(:new).yields
 
                 @resolve.value.should be_nil
             end
@@ -232,5 +261,9 @@ describe Facter::Util::Resolution do
         it "should fail if any interpreter other than /bin/sh is requested" do
             lambda { Facter::Util::Resolution.exec("/something", "/bin/perl") }.should raise_error(ArgumentError)
         end
+
+        it "should execute the binary" do
+            Facter::Util::Resolution.exec("echo foo").should == "foo"
+        end
     end
 end

data/spec/unit/util/uptime.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'facter/util/uptime'
+
+describe Facter::Util::Uptime do
+
+  describe ".get_uptime_seconds_unix" do
+    context "when /proc/uptime is available" do
+      before do
+        uptime_file = File.join(SPECDIR, "fixtures", "uptime", "ubuntu_proc_uptime")
+        Facter::Util::Uptime.stubs(:uptime_file).returns(uptime_file)
+      end
+
+      it "should return the uptime in seconds as an integer" do
+        Facter::Util::Uptime.get_uptime_seconds_unix.should == 5097686
+      end
+
+    end
+
+    it "should use sysctl kern.boottime when /proc/uptime not available" do
+      nonexistent_file = '/non/existent/file'
+      File.exists?(nonexistent_file).should == false
+      Facter::Util::Uptime.stubs(:uptime_file).returns(nonexistent_file)
+      sysctl_output_file = File.join(SPECDIR, 'fixtures', 'uptime', 'sysctl_kern_boottime') # Aug 01 14:13:47 -0700 2010
+      Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat #{sysctl_output_file}")
+      Time.stubs(:now).returns Time.parse("Aug 01 15:13:47 -0700 2010") # one hour later
+      Facter::Util::Uptime.get_uptime_seconds_unix.should == 60 * 60
+    end
+
+    it "should use who -b when neither /proc/uptime nor sysctl kern.boottime is available" do
+      nonexistent_file = '/non/existent/file'
+      File.exists?(nonexistent_file).should == false
+      Facter::Util::Uptime.stubs(:uptime_file).returns(nonexistent_file)
+      Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat #{nonexistent_file}")
+      who_b_output_file = File.join(SPECDIR, 'fixtures', 'uptime', 'who_b_boottime') # Aug 1 14:13
+      Facter::Util::Uptime.stubs(:uptime_who_cmd).returns("cat #{who_b_output_file}")
+      Time.stubs(:now).returns Time.parse("Aug 01 15:13") # one hour later
+      Facter::Util::Uptime.get_uptime_seconds_unix.should == 60 * 60
+    end
+
+    it "should return nil when none of /proc/uptime, sysctl kern.boottime, or who -b is available" do
+      nonexistent_file = '/non/existent/file'
+      File.exists?(nonexistent_file).should == false
+      Facter::Util::Uptime.stubs(:uptime_file).returns(nonexistent_file)
+      Facter::Util::Uptime.stubs(:uptime_sysctl_cmd).returns("cat #{nonexistent_file}")
+      Facter::Util::Uptime.stubs(:uptime_who_cmd).returns("cat #{nonexistent_file}")
+      Facter::Util::Uptime.get_uptime_seconds_unix.should == nil
+    end
+  end
+
+end

data/spec/unit/util/virtual.rb

@@ -8,7 +8,7 @@ describe Facter::Util::Virtual do
         Facter.clear
     end
     it "should detect openvz" do
-        FileTest.stubs(:exists?).with("/proc/vz/veinfo").returns(true)
+        FileTest.stubs(:directory?).with("/proc/vz").returns(true)
         Facter::Util::Virtual.should be_openvz
     end
 
@@ -93,4 +93,27 @@ describe Facter::Util::Virtual do
         FileTest.expects(:exists?).with("/proc/xen").returns(false)
         Facter::Util::Virtual.should_not be_xen
     end
+
+    it "should detect kvm" do
+        FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(true)
+        File.stubs(:read).with("/proc/cpuinfo").returns("model name : QEMU Virtual CPU version 0.9.1\n")
+        Facter::Util::Virtual.should be_kvm
+    end
+
+    it "should detect kvm on FreeBSD" do
+        Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+        Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns("QEMU Virtual CPU version 0.12.4")
+        Facter::Util::Virtual.should be_kvm
+    end
+
+    it "should identify FreeBSD jail when in jail" do
+        Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n security.jail.jailed").returns("1")
+        Facter::Util::Virtual.should be_jail
+    end
+
+    it "should not identify FreeBSD jail when not in jail" do
+        Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n security.jail.jailed").returns("0")
+        Facter::Util::Virtual.should_not be_jail
+    end
+
 end

data/spec/unit/util/vlans.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'facter/util/vlans'
+
+describe Facter::Util::Vlans do
+    it "should return a list of vlans on Linux" do
+        sample_output_file = File.dirname(__FILE__) + '/../data/linux_vlan_config'
+        linux_vlanconfig = File.new(sample_output_file).read();
+        Facter::Util::Vlans.stubs(:get_vlan_config).returns(linux_vlanconfig)
+        Facter::Util::Vlans.get_vlans().should == %{400,300,200,100}
+    end
+end

data/spec/unit/virtual.rb

@@ -17,6 +17,13 @@ describe "Virtual fact" do
       Facter.fact(:virtual).value.should == "zone"
   end
 
+  it "should be jail on FreeBSD when a jail in kvm" do
+      Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+      Facter::Util::Virtual.stubs(:jail?).returns(true)
+      Facter::Util::Virtual.stubs(:kvm?).returns(true)
+      Facter.fact(:virtual).value.should == "jail"
+  end
+
 end
 
 describe "is_virtual fact" do
@@ -48,4 +55,17 @@ describe "is_virtual fact" do
         Facter.fact(:virtual).stubs(:value).returns("openvzve")
         Facter.fact(:is_virtual).value.should == true
     end
+
+    it "should be true when running on kvm" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        Facter.fact(:virtual).stubs(:value).returns("kvm")
+        Facter.fact(:is_virtual).value.should == true
+    end
+
+    it "should be true when running in jail" do
+        Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+        Facter.fact(:virtual).stubs(:value).returns("jail")
+        Facter.fact(:is_virtual).value.should == true
+    end
+
 end

metadata

@@ -1,20 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  version: 1.5.7
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 8
+  version: 1.5.8
 platform: ruby
 authors: 
-- Reductive Labs
+- Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 +10:00
+date: 2010-08-28 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
 description: 
-email: puppet@reductivelabs.com
+email: info@puppetlabs.com
 executables: 
 - facter
 extensions: []
@@ -22,116 +28,128 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- COPYING
-- Rakefile
-- ChangeLog
-- CHANGELOG
-- README
-- LICENSE
 - README.rst
+- COPYING
 - INSTALL
+- CHANGELOG
+- Rakefile
 - TODO
+- LICENSE
+- README
 - install.rb
 - bin/facter
-- lib/facter.rb
-- lib/facter
+- lib/facter/path.rb
+- lib/facter/operatingsystemrelease.rb
+- lib/facter/macosx.rb
+- lib/facter/selinux.rb
+- lib/facter/physicalprocessorcount.rb
+- lib/facter/fqdn.rb
+- lib/facter/ec2.rb
+- lib/facter/rubyversion.rb
+- lib/facter/manufacturer.rb
+- lib/facter/iphostnumber.rb
+- lib/facter/architecture.rb
+- lib/facter/id.rb
+- lib/facter/kernelmajversion.rb
+- lib/facter/uptime_days.rb
+- lib/facter/netmask.rb
 - lib/facter/hardwaremodel.rb
-- lib/facter/uptime.rb
-- lib/facter/lsbmajdistrelease.rb
-- lib/facter/macaddress.rb
-- lib/facter/processor.rb
+- lib/facter/Cfkey.rb
+- lib/facter/virtual.rb
+- lib/facter/kernelrelease.rb
+- lib/facter/network.rb
+- lib/facter/uptime_hours.rb
 - lib/facter/operatingsystem.rb
-- lib/facter/operatingsystemrelease.rb
+- lib/facter/lsbmajdistrelease.rb
+- lib/facter/puppetversion.rb
+- lib/facter/rubysitedir.rb
 - lib/facter/uniqueid.rb
+- lib/facter/processor.rb
+- lib/facter/macaddress.rb
+- lib/facter/facterversion.rb
+- lib/facter/vlans.rb
+- lib/facter/kernelversion.rb
+- lib/facter/ssh.rb
+- lib/facter/interfaces.rb
+- lib/facter/hardwareisa.rb
+- lib/facter/timezone.rb
+- lib/facter/ps.rb
+- lib/facter/uptime_seconds.rb
+- lib/facter/lsb.rb
+- lib/facter/uptime.rb
+- lib/facter/memory.rb
+- lib/facter/hostname.rb
 - lib/facter/kernel.rb
-- lib/facter/rubyversion.rb
-- lib/facter/network.rb
-- lib/facter/path.rb
-- lib/facter/util
-- lib/facter/util/loader.rb
-- lib/facter/util/uptime.rb
-- lib/facter/util/confine.rb
-- lib/facter/util/fact.rb
-- lib/facter/util/ip.rb
-- lib/facter/util/values.rb
+- lib/facter/domain.rb
+- lib/facter/ipaddress.rb
 - lib/facter/util/macosx.rb
-- lib/facter/util/netmask.rb
-- lib/facter/util/resolution.rb
-- lib/facter/util/plist.rb
-- lib/facter/util/memory.rb
-- lib/facter/util/plist
 - lib/facter/util/plist/generator.rb
 - lib/facter/util/plist/parser.rb
 - lib/facter/util/manufacturer.rb
+- lib/facter/util/netmask.rb
+- lib/facter/util/plist.rb
 - lib/facter/util/virtual.rb
+- lib/facter/util/ip.rb
+- lib/facter/util/resolution.rb
+- lib/facter/util/values.rb
+- lib/facter/util/vlans.rb
+- lib/facter/util/loader.rb
 - lib/facter/util/collection.rb
-- lib/facter/interfaces.rb
-- lib/facter/macosx.rb
-- lib/facter/hostname.rb
-- lib/facter/ssh.rb
-- lib/facter/netmask.rb
-- lib/facter/timezone.rb
-- lib/facter/physicalprocessorcount.rb
-- lib/facter/facterversion.rb
-- lib/facter/architecture.rb
-- lib/facter/kernelmajversion.rb
-- lib/facter/kernelversion.rb
-- lib/facter/domain.rb
-- lib/facter/fqdn.rb
-- lib/facter/ipaddress.rb
-- lib/facter/rubysitedir.rb
-- lib/facter/memory.rb
-- lib/facter/puppetversion.rb
-- lib/facter/id.rb
-- lib/facter/hardwareisa.rb
-- lib/facter/iphostnumber.rb
-- lib/facter/ec2.rb
-- lib/facter/selinux.rb
-- lib/facter/lsb.rb
-- lib/facter/manufacturer.rb
-- lib/facter/Cfkey.rb
-- lib/facter/virtual.rb
-- lib/facter/ps.rb
-- lib/facter/kernelrelease.rb
-- conf/redhat
-- conf/redhat/facter.spec
-- conf/solaris
+- lib/facter/util/uptime.rb
+- lib/facter/util/confine.rb
+- lib/facter/util/memory.rb
+- lib/facter/util/fact.rb
+- lib/facter.rb
 - conf/solaris/pkginfo
-- conf/osx
+- conf/osx/preflight
 - conf/osx/createpackage.sh
 - conf/osx/PackageInfo.plist
-- conf/osx/preflight
+- conf/redhat/facter.spec
 - etc/facter.conf
+- spec/fixtures/uptime/who_b_boottime
+- spec/fixtures/uptime/ubuntu_proc_uptime
+- spec/fixtures/uptime/sysctl_kern_boottime
 - spec/Rakefile
-- spec/integration
-- spec/integration/facter.rb
-- spec/spec.opts
 - spec/spec_helper.rb
-- spec/unit
-- spec/unit/facter.rb
-- spec/unit/operatingsystem.rb
-- spec/unit/util
-- spec/unit/util/loader.rb
-- spec/unit/util/confine.rb
-- spec/unit/util/fact.rb
-- spec/unit/util/ip.rb
-- spec/unit/util/macosx.rb
-- spec/unit/util/resolution.rb
-- spec/unit/util/virtual.rb
-- spec/unit/util/collection.rb
-- spec/unit/interfaces.rb
-- spec/unit/data
-- spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
-- spec/unit/data/linux_ifconfig_all_with_single_interface
+- spec/spec.opts
+- spec/unit/data/Mac_OS_X_10.5.5_ifconfig
 - spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
+- spec/unit/data/linux_vlan_config
+- spec/unit/data/linux_ifconfig_all_with_single_interface
+- spec/unit/data/darwin_ifconfig_single_interface
 - spec/unit/data/solaris_ifconfig_single_interface
+- spec/unit/data/opensolaris_smbios
+- spec/unit/data/freebsd_dmidecode
+- spec/unit/data/hpux_netstat_all_interfaces
+- spec/unit/data/hpux_ifconfig_single_interface
+- spec/unit/data/linux_dmidecode_with_spaces
+- spec/unit/data/hpux_ifconfig
+- spec/unit/data/hpux_netscan
 - spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces
-- spec/unit/data/darwin_ifconfig_single_interface
-- spec/unit/data/Mac_OS_X_10.5.5_ifconfig
+- spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
+- spec/unit/operatingsystemrelease.rb
 - spec/unit/selinux.rb
 - spec/unit/virtual.rb
+- spec/unit/operatingsystem.rb
+- spec/unit/interfaces.rb
+- spec/unit/uptime.rb
+- spec/unit/facter.rb
+- spec/unit/util/macosx.rb
+- spec/unit/util/manufacturer.rb
+- spec/unit/util/virtual.rb
+- spec/unit/util/ip.rb
+- spec/unit/util/resolution.rb
+- spec/unit/util/vlans.rb
+- spec/unit/util/loader.rb
+- spec/unit/util/collection.rb
+- spec/unit/util/uptime.rb
+- spec/unit/util/confine.rb
+- spec/unit/util/fact.rb
+- spec/integration/facter.rb
 has_rdoc: true
-homepage: http://reductivelabs.com
+homepage: http://puppetlabs.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -142,23 +160,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: facter
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Facter, a system inventory tool
 test_files: []