facter 1.6.0 → 1.6.1

data/spec/unit/util/loader_spec.rb

@@ -280,4 +280,12 @@ describe Facter::Util::Loader do
             @loader.load_all
         end
     end
+
+    it "should load facts on the facter search path only once" do
+        facterlibdir = File.expand_path(File.dirname(__FILE__) + '../../../fixtures/unit/util/loader')
+        with_env 'FACTERLIB' => facterlibdir do
+            Facter::Util::Loader.new.load_all
+            Facter.value(:nosuchfact).should be_nil
+        end
+    end
 end

data/spec/unit/util/macaddress_spec.rb

@@ -4,7 +4,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'facter/util/macaddress'
 
-describe "Darwin" do
+describe "standardized MAC address" do
+  it "should have zeroes added if missing" do
+    Facter::Util::Macaddress::standardize("0:ab:cd:e:12:3").should == "00:ab:cd:0e:12:03"
+  end
+  
+  it "should be identical if each octet already has two digits" do
+    Facter::Util::Macaddress::standardize("00:ab:cd:0e:12:03").should == "00:ab:cd:0e:12:03"
+  end
+end
+
+describe "Darwin", :unless => Facter.value(:operatingsystem) == 'windows' do
   test_cases = [
     # version,           iface, real macaddress,     fallback macaddress
     ["9.8.0",            'en0', "00:17:f2:06:e4:2e", "00:17:f2:06:e4:2e"],
@@ -66,3 +76,20 @@ describe "Darwin" do
     end
   end
 end
+
+describe "Windows" do
+  it "should return the first macaddress" do
+    Facter.fact(:kernel).stubs(:value).returns("windows")
+
+    nic = stubs 'nic'
+    nic.stubs(:MacAddress).returns("00:0C:29:0C:9E:9F")
+
+    nic2 = stubs 'nic'
+    nic2.stubs(:MacAddress).returns("00:0C:29:0C:9E:AF")
+
+    require 'facter/util/wmi'
+    Facter::Util::WMI.stubs(:execquery).with("select MACAddress from Win32_NetworkAdapterConfiguration where IPEnabled = True").returns([nic, nic2])
+
+    Facter.fact(:macaddress).value.should == "00:0C:29:0C:9E:9F"
+  end
+end

data/spec/unit/util/manufacturer_spec.rb

@@ -129,4 +129,25 @@ Handle 0x001F
         find_product_name("FreeBSD").should == find_product_name("SunOS")
     end
 
+    it "should find information on Windows" do
+        Facter.fact(:kernel).stubs(:value).returns("windows")
+        require 'facter/util/wmi'
+
+        bios = stubs 'bios'
+        bios.stubs(:Manufacturer).returns("Phoenix Technologies LTD")
+        bios.stubs(:Serialnumber).returns("56 4d 40 2b 4d 81 94 d6-e6 c5 56 a4 56 0c 9e 9f")
+
+        product = stubs 'product'
+        product.stubs(:Name).returns("VMware Virtual Platform")
+
+        wmi = stubs 'wmi'
+        wmi.stubs(:ExecQuery).with("select * from Win32_Bios").returns([bios])
+        wmi.stubs(:ExecQuery).with("select * from Win32_Bios").returns([bios])
+        wmi.stubs(:ExecQuery).with("select * from Win32_ComputerSystemProduct").returns([product])
+
+        Facter::Util::WMI.stubs(:connect).returns(wmi)
+        Facter.value(:manufacturer).should == "Phoenix Technologies LTD"
+        Facter.value(:serialnumber).should == "56 4d 40 2b 4d 81 94 d6-e6 c5 56 a4 56 0c 9e 9f"
+        Facter.value(:productname).should == "VMware Virtual Platform"
+    end
 end

data/spec/unit/util/resolution_spec.rb

@@ -34,6 +34,7 @@ describe Facter::Util::Resolution do
     end
 
     it "should default to nil for interpreter" do
+        Facter.expects(:warnonce).with("The 'Facter::Util::Resolution.interpreter' method is deprecated and will be removed in a future version.")
         Facter::Util::Resolution.new("yay").interpreter.should be_nil
     end
 
@@ -45,13 +46,25 @@ describe Facter::Util::Resolution do
 
     describe "when setting the code" do
         before do
+            Facter.stubs(:warnonce)
             @resolve = Facter::Util::Resolution.new("yay")
         end
 
-        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/bar"
+        it "should deprecate the interpreter argument to 'setcode'" do
+            Facter.expects(:warnonce).with("The interpreter parameter to 'setcode' is deprecated and will be removed in a future version.")
+            @resolve.setcode "foo", "bar"
+            @resolve.interpreter.should == "bar"
+        end
+
+        it "should deprecate the interpreter= method" do
+            Facter.expects(:warnonce).with("The 'Facter::Util::Resolution.interpreter=' method is deprecated and will be removed in a future version.")
+            @resolve.interpreter = "baz"
+            @resolve.interpreter.should == "baz"
+        end
+
+        it "should deprecate the interpreter method" do
+            Facter.expects(:warnonce).with("The 'Facter::Util::Resolution.interpreter' method is deprecated and will be removed in a future version.")
+            @resolve.interpreter
         end
 
         it "should set the code to any provided string" do
@@ -95,12 +108,11 @@ describe Facter::Util::Resolution do
             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
+
+                it "should return the result of executing the code" do
                     @resolve.setcode "/bin/foo"
-                    Facter::Util::Resolution.expects(:exec).once.with("/bin/foo", "cmd.exe").returns "yup"
+                    Facter::Util::Resolution.expects(:exec).once.with("/bin/foo").returns "yup"
 
                     @resolve.value.should == "yup"
                 end
@@ -115,12 +127,11 @@ describe Facter::Util::Resolution do
             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
+
+                it "should return the result of executing the code" do
                     @resolve.setcode "/bin/foo"
-                    Facter::Util::Resolution.expects(:exec).once.with("/bin/foo", "/bin/sh").returns "yup"
+                    Facter::Util::Resolution.expects(:exec).once.with("/bin/foo").returns "yup"
 
                     @resolve.value.should == "yup"
                 end
@@ -276,8 +287,9 @@ describe Facter::Util::Resolution do
 
     # It's not possible, AFAICT, to mock %x{}, so I can't really test this bit.
     describe "when executing code" 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)
+        it "should deprecate the interpreter parameter" do
+            Facter.expects(:warnonce).with("The interpreter parameter to 'exec' is deprecated and will be removed in a future version.")
+            Facter::Util::Resolution.exec("/something", "/bin/perl")
         end
 
         it "should execute the binary" do

data/spec/unit/util/uptime_spec.rb

@@ -6,7 +6,7 @@ require 'facter/util/uptime'
 
 describe Facter::Util::Uptime do
 
-  describe ".get_uptime_seconds_unix" do
+  describe ".get_uptime_seconds_unix", :unless => Facter.value(:operatingsystem) == 'windows' do
     describe "when /proc/uptime is available" do
       before do
         uptime_file = File.join(SPECDIR, "fixtures", "uptime", "ubuntu_proc_uptime")
@@ -75,4 +75,10 @@ describe Facter::Util::Uptime do
       end
     end
   end
+
+  describe ".get_uptime_seconds_win", :if => Facter.value(:operatingsystem) == 'windows' do
+    it "should return a postive value" do
+      Facter::Util::Uptime.get_uptime_seconds_win.should > 0
+    end
+  end
 end

data/spec/unit/util/wmi_spec.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'facter/util/wmi'
+
+describe Facter::Util::WMI do
+  let(:connection) { stub 'connection' }
+
+  it "should default to localhost" do
+    Facter::Util::WMI.wmi_resource_uri.should == "winmgmts:{impersonationLevel=impersonate}!//./root/cimv2"
+  end
+
+  it "should execute the query on the connection" do
+    Facter::Util::WMI.stubs(:connect).returns(connection)
+    connection.stubs(:execquery).with("select * from Win32_OperatingSystem")
+
+    Facter::Util::WMI.execquery("select * from Win32_OperatingSystem")
+  end
+end

data/spec/unit/virtual_spec.rb

@@ -72,7 +72,7 @@ describe "Virtual fact" do
   describe "on Linux" do
 
       before do
-        FileTest.expects(:exists?).with("/usr/lib/vmware/bin/vmware-vmx").returns false
+        Facter::Util::Resolution.expects(:exec).with("vmware -v").returns false
         Facter.fact(:operatingsystem).stubs(:value).returns(true)
         Facter.fact(:architecture).stubs(:value).returns(true)
       end
@@ -108,6 +108,19 @@ describe "Virtual fact" do
           Facter.fact(:virtual).value.should == "vmware"
       end
 
+      it "should be xenhvm with Xen HVM vendor name from lspci" do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)")
+          Facter.fact(:virtual).value.should == "xenhvm"
+      end
+
+      it "should be xenhvm with Xen HVM vendor name from dmidecode" do
+          Facter.fact(:kernel).stubs(:value).returns("Linux")
+          Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
+          Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns("System Information\nManufacturer: Xen\nProduct Name: HVM domU")
+          Facter.fact(:virtual).value.should == "xenhvm"
+      end
+
       it "should be parallels with Parallels vendor name from dmidecode" do
           Facter.fact(:kernel).stubs(:value).returns("Linux")
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
@@ -124,11 +137,15 @@ describe "Virtual fact" do
 
   end
   describe "on Solaris" do
+      before(:each) do
+          Facter::Util::Resolution.expects(:exec).with("vmware -v").returns false
+      end
+
       it "should be vmware with VMWare vendor name from prtdiag" do
           Facter.fact(:kernel).stubs(:value).returns("SunOS")
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
-          Facter::Util::Resolution.stubs(:exec).with('prtdiag', '/bin/sh').returns("System Configuration: VMware, Inc. VMware Virtual Platform")
+          Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: VMware, Inc. VMware Virtual Platform")
           Facter.fact(:virtual).value.should == "vmware"
       end
 
@@ -136,7 +153,7 @@ describe "Virtual fact" do
           Facter.fact(:kernel).stubs(:value).returns("SunOS")
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
-          Facter::Util::Resolution.stubs(:exec).with('prtdiag', '/bin/sh').returns("System Configuration: Parallels Virtual Platform")
+          Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: Parallels Virtual Platform")
           Facter.fact(:virtual).value.should == "parallels"
       end
 
@@ -144,7 +161,7 @@ describe "Virtual fact" do
           Facter.fact(:kernel).stubs(:value).returns("SunOS")
           Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
           Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
-          Facter::Util::Resolution.stubs(:exec).with('prtdiag', '/bin/sh').returns("System Configuration: innotek GmbH VirtualBox")
+          Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: innotek GmbH VirtualBox")
           Facter.fact(:virtual).value.should == "virtualbox"
       end
   end
@@ -164,6 +181,12 @@ describe "is_virtual fact" do
        Facter.fact(:is_virtual).value.should == "false"
     end
 
+    it "should be true when running on xenhvm" do
+       Facter.fact(:kernel).stubs(:value).returns("Linux")
+       Facter.fact(:virtual).stubs(:value).returns("xenhvm")
+       Facter.fact(:is_virtual).value.should == "true"
+    end
+
     it "should be false when running on physical" do
        Facter.fact(:kernel).stubs(:value).returns("Linux")
        Facter.fact(:virtual).stubs(:value).returns("physical")
@@ -182,7 +205,7 @@ describe "is_virtual fact" do
         Facter.fact(:is_virtual).value.should == "true"
     end
 
-    it "should be true when running on openvz" do
+    it "should be true when running on openvzve" do
         Facter.fact(:kernel).stubs(:value).returns("Linux")
         Facter.fact(:virtual).stubs(:value).returns("openvzve")
         Facter.fact(:is_virtual).value.should == "true"
@@ -214,6 +237,7 @@ describe "is_virtual fact" do
 
     it "should be true when running on S390" do
         Facter.fact(:architecture).stubs(:value).returns("s390x")
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
         Facter.fact(:virtual).stubs(:value).returns("zlinux")
         Facter.fact(:is_virtual).value.should == "true"
     end
@@ -223,4 +247,16 @@ describe "is_virtual fact" do
         Facter.fact(:virtual).stubs(:value).returns("parallels")
         Facter.fact(:is_virtual).value.should == "true"
     end
+
+    it "should be false on vmware_server" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        Facter.fact(:virtual).stubs(:value).returns("vmware_server")
+        Facter.fact(:is_virtual).value.should == "false"
+    end
+
+    it "should be false on openvz host nodes" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        Facter.fact(:virtual).stubs(:value).returns("openvzhn")
+        Facter.fact(:is_virtual).value.should == "false"
+    end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -07:00
-default_executable: 
+date: 2011-09-28 00:00:00 Z
 dependencies: []
 
 description: 
@@ -29,6 +28,7 @@ extra_rdoc_files: []
 
 files: 
 - CHANGELOG
+- CONTRIBUTING.md
 - INSTALL
 - LICENSE
 - Rakefile
@@ -38,6 +38,7 @@ files:
 - lib/facter/application.rb
 - lib/facter/architecture.rb
 - lib/facter/arp.rb
+- lib/facter/augeasversion.rb
 - lib/facter/Cfkey.rb
 - lib/facter/domain.rb
 - lib/facter/ec2.rb
@@ -81,6 +82,7 @@ files:
 - lib/facter/uptime_hours.rb
 - lib/facter/uptime_seconds.rb
 - lib/facter/util/collection.rb
+- lib/facter/util/config.rb
 - lib/facter/util/confine.rb
 - lib/facter/util/fact.rb
 - lib/facter/util/ip.rb
@@ -98,6 +100,7 @@ files:
 - lib/facter/util/values.rb
 - lib/facter/util/virtual.rb
 - lib/facter/util/vlans.rb
+- lib/facter/util/wmi.rb
 - lib/facter/util/xendomains.rb
 - lib/facter/virtual.rb
 - lib/facter/vlans.rb
@@ -134,6 +137,7 @@ files:
 - spec/fixtures/ifconfig/sunos_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/ubuntu_7_04
 - spec/fixtures/ifconfig/ubuntu_7_04_eth0
+- spec/fixtures/netsh/windows_netsh_addresses_with_multiple_interfaces
 - spec/fixtures/netstat/centos_5_5
 - spec/fixtures/netstat/darwin_10_3_0
 - spec/fixtures/netstat/darwin_10_6_4
@@ -143,6 +147,7 @@ files:
 - spec/fixtures/netstat/open_solaris_10
 - spec/fixtures/netstat/open_solaris_b132
 - spec/fixtures/netstat/ubuntu_7_04
+- spec/fixtures/unit/util/loader/nosuchfact.rb
 - spec/fixtures/uptime/kstat_boot_time
 - spec/fixtures/uptime/sysctl_kern_boottime_big_endian
 - spec/fixtures/uptime/sysctl_kern_boottime_little_endian
@@ -153,7 +158,6 @@ files:
 - spec/fixtures/virtual/proc_self_status/vserver_2_3/guest
 - spec/fixtures/virtual/proc_self_status/vserver_2_3/host
 - spec/integration/facter_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
 - spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
@@ -170,15 +174,22 @@ files:
 - spec/unit/data/selinux_sestatus
 - spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces
 - spec/unit/data/solaris_ifconfig_single_interface
+- spec/unit/data/windows_netsh_all_interfaces
+- spec/unit/data/windows_netsh_single_interface
+- spec/unit/data/windows_netsh_single_interface6
 - spec/unit/data/xendomains
+- spec/unit/domain_spec.rb
 - spec/unit/facter_spec.rb
+- spec/unit/hostname_spec.rb
 - spec/unit/id_spec.rb
 - spec/unit/interfaces_spec.rb
 - spec/unit/ipaddress6_spec.rb
+- spec/unit/macaddress_spec.rb
 - spec/unit/memory_spec.rb
 - spec/unit/operatingsystem_spec.rb
 - spec/unit/operatingsystemrelease_spec.rb
 - spec/unit/physicalprocessorcount_spec.rb
+- spec/unit/processor_spec.rb
 - spec/unit/selinux_spec.rb
 - spec/unit/uptime_spec.rb
 - spec/unit/util/collection_spec.rb
@@ -193,9 +204,9 @@ files:
 - spec/unit/util/uptime_spec.rb
 - spec/unit/util/virtual_spec.rb
 - spec/unit/util/vlans_spec.rb
+- spec/unit/util/wmi_spec.rb
 - spec/unit/util/xendomains_spec.rb
 - spec/unit/virtual_spec.rb
-has_rdoc: true
 homepage: http://puppetlabs.com
 licenses: []
 
@@ -229,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facter
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Facter, a system inventory tool

data/spec/spec.opts

@@ -1,5 +0,0 @@
---format
-s
---colour
---loadby
-mtime