facter 1.6.6 → 1.6.7

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.6.7
+===
+ab9e26c Updating CHANGELOG and lib/facter.rb for Facter 1.6.7rc1
+bdbf332 (#12720) Add Solaris CPU info to 'processorN' fact.
+a7f5924 (#12813) Redirect lspci output to /dev/null
+6ec2863 (#12669) Preserve timestamps when installing files
+
 1.6.6
 ===
 e046144 Updated CHANGELOG for 1.6.6rc2

data/install.rb

@@ -103,7 +103,7 @@ def do_libs(libs, strip = 'lib/')
     op = File.dirname(olf)
     FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
     FileUtils.chmod(0755, op)
-    FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
+    FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
   end
 end
 
@@ -114,7 +114,7 @@ def do_man(man, strip = 'man/')
     om = File.dirname(omf)
     FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
     FileUtils.chmod(0755, om)
-    FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
+    FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
     gzip = %x{which gzip}
     gzip.chomp!
     %x{#{gzip} -f #{omf}}
@@ -400,12 +400,12 @@ def install_binfile(from, op_file, target)
     installed_wrapper = false
 
     if File.exists?("#{from}.bat")
-      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
       installed_wrapper = true
     end
 
     if File.exists?("#{from}.cmd")
-      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
+      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
       installed_wrapper = true
     end
 
@@ -419,13 +419,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
 "%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%facter" %*
 EOS
       File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
-      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
 
       tmp_file2.unlink
       installed_wrapper = true
     end
   end
-  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :verbose => true)
+  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
   tmp_file.unlink
 end
 

data/lib/facter.rb

@@ -25,7 +25,7 @@ module Facter
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.6'
+  FACTERVERSION = '1.6.7'
   # = 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/processor.rb

@@ -5,7 +5,8 @@
 #
 # Resolution:
 #   On Linux and kFreeBSD, parse '/proc/cpuinfo' for each processor.
-#   On AIX, parse the output of 'lsdev' for it's processor section.
+#   On AIX, parse the output of 'lsdev' for its processor section.
+#   On Solaris, parse the output of 'kstat' for each processor.
 #   On OpenBSD, use 'uname -p' and the sysctl variable for 'hw.ncpu' for CPU
 #   count.
 #
@@ -81,6 +82,7 @@ end
 ## (but we need them inside the Facter.add block above for tests on processorcount to work)
 processor_list = Facter::Util::Processor.enum_cpuinfo
 processor_list_aix = Facter::Util::Processor.enum_lsdev
+processor_list_sunos = Facter::Util::Processor.enum_kstat
 
 if processor_list.length != 0
   processor_list.each_with_index do |desc, i|
@@ -100,6 +102,15 @@ elsif processor_list_aix.length != 0
       end
     end
   end
+elsif processor_list_sunos.length != 0
+  processor_list_sunos.each_with_index do |desc, i|
+    Facter.add("Processor#{i}") do
+      confine :kernel => [ :sunos ]
+      setcode do
+        desc
+      end
+    end
+  end
 end
 
 if Facter.value(:kernel) == "windows"

data/lib/facter/util/processor.rb

@@ -85,4 +85,23 @@ module Facter::Util::Processor
     end
     processor_list
   end
+
+  def self.enum_kstat
+    processor_num = -1
+    processor_list = []
+    Thread::exclusive do
+      kstat = Facter::Util::Resolution.exec('/usr/bin/kstat cpu_info')
+      if kstat
+        kstat.each_line do |l|
+          if l =~ /cpu_info(\d+)/
+            processor_num = $1.to_i
+          elsif l =~ /brand\s+(.*)\s*$/
+            processor_list[processor_num] = $1 unless processor_num == -1
+            processor_num = -1
+          end
+        end
+      end
+    end
+    processor_list
+  end
 end

data/lib/facter/virtual.rb

@@ -89,7 +89,7 @@ Facter.add("virtual") do
     end
 
     if result == "physical"
-      output = Facter::Util::Resolution.exec('lspci')
+      output = Facter::Util::Resolution.exec('lspci 2>/dev/null')
       if not output.nil?
         output.each_line do |p|
           # --- look for the vmware video card to determine if it is virtual => vmware.

data/spec/fixtures/unit/util/processor/solaris-i86pc

@@ -0,0 +1,28 @@
+module: cpu_info                        instance: 0     
+name:   cpu_info0                       class:    misc
+        brand                           Intel(r) Core(tm) i5 CPU       M 450  @ 2.40GHz
+        cache_id                        0
+        chip_id                         0
+        clock_MHz                       2375
+        clog_id                         0
+        core_id                         0
+        cpu_type                        i386
+        crtime                          70.899819526
+        current_clock_Hz                2374891267
+        current_cstate                  0
+        family                          6
+        fpu_type                        i387 compatible
+        implementation                  x86 (GenuineIntel family 6 model 37 step 5 clock 2375 MHz)
+        model                           37
+        ncore_per_chip                  1
+        ncpu_per_chip                   1
+        pg_id                           -1
+        pkg_core_id                     0
+        snaptime                        2279.514858392
+        state                           on-line
+        state_begin                     1329488796
+        stepping                        5
+        supported_frequencies_Hz        2374891267
+        supported_max_cstates           1
+        vendor_id                       GenuineIntel
+

data/spec/fixtures/unit/util/processor/solaris-sun4u

@@ -0,0 +1,151 @@
+module: cpu_info                        instance: 0
+name:   cpu_info0                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         0
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          92.5418505
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           1
+        snaptime                        15277456.9660361
+        state                           on-line
+        state_begin                     1314212380
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 1
+name:   cpu_info1                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         0
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3416172
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           1
+        snaptime                        15277456.9667477
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 2
+name:   cpu_info2                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         2
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3433262
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           4
+        snaptime                        15277456.9671387
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 3
+name:   cpu_info3                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         2
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3449653
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           4
+        snaptime                        15277456.9675197
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 4
+name:   cpu_info4                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         4
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3465648
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           5
+        snaptime                        15277456.9678953
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 5
+name:   cpu_info5                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         4
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3481605
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           5
+        snaptime                        15277456.968269
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 6
+name:   cpu_info6                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         6
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3497654
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           6
+        snaptime                        15277456.9686422
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000
+
+module: cpu_info                        instance: 7
+name:   cpu_info7                       class:    misc
+        brand                           SPARC64-VII
+        chip_id                         1024
+        clock_MHz                       2520
+        core_id                         6
+        cpu_fru                         hc:///component=/MBU_A
+        cpu_type                        sparcv9
+        crtime                          93.3513776
+        current_clock_Hz                2520000000
+        device_ID                       175931055444225
+        fpu_type                        sparcv9
+        implementation                  SPARC64-VII (portid 1024 impl 0x7 ver 0x91 clock 2520 MHz)
+        pg_id                           6
+        snaptime                        15277456.9690115
+        state                           on-line
+        state_begin                     1314212381
+        supported_frequencies_Hz        2520000000

data/spec/unit/util/processor_spec.rb

@@ -43,7 +43,7 @@ describe Facter::Util::Processor do
     Facter.fact(:architecture).stubs(:value).returns("amd64")
     File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
     File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64quad"))
-    
+
     Facter::Util::Processor.enum_cpuinfo[0].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
     Facter::Util::Processor.enum_cpuinfo[1].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
     Facter::Util::Processor.enum_cpuinfo[2].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
@@ -57,4 +57,27 @@ describe Facter::Util::Processor do
 
     Facter::Util::Processor.enum_lsdev[0].should == "PowerPC_POWER3"
   end
+
+  it "should get the processor description on Solaris (x86)" do
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+    Facter.fact(:architecture).stubs(:value).returns("i86pc")
+    Facter::Util::Resolution.stubs(:exec).with("/usr/bin/kstat cpu_info").returns(my_fixture_read("solaris-i86pc"))
+
+    Facter::Util::Processor.enum_kstat[0].should == "Intel(r) Core(tm) i5 CPU       M 450  @ 2.40GHz"
+  end
+
+  it "should get the processor description on Solaris (SPARC64)" do
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+    Facter.fact(:architecture).stubs(:value).returns("sun4u")
+    Facter::Util::Resolution.stubs(:exec).with("/usr/bin/kstat cpu_info").returns(my_fixture_read("solaris-sun4u"))
+
+    Facter::Util::Processor.enum_kstat[0].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[1].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[2].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[3].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[4].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[5].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[6].should == "SPARC64-VII"
+    Facter::Util::Processor.enum_kstat[7].should == "SPARC64-VII"
+  end
 end

data/spec/unit/virtual_spec.rb

@@ -81,33 +81,33 @@ describe "Virtual fact" do
     Facter.fact(:architecture).stubs(:value).returns(true)
     end
 
-    it "should be parallels with Parallels vendor id from lspci" do
+    it "should be parallels with Parallels vendor id from lspci 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0 VGA compatible controller: Unknown device 1ab8:4005")
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("01:00.0 VGA compatible controller: Unknown device 1ab8:4005")
       Facter.fact(:virtual).value.should == "parallels"
     end
 
-    it "should be parallels with Parallels vendor name from lspci" do
+    it "should be parallels with Parallels vendor name from lspci 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0 VGA compatible controller: Parallels Display Adapter")
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("01:00.0 VGA compatible controller: Parallels Display Adapter")
       Facter.fact(:virtual).value.should == "parallels"
     end
 
-    it "should be vmware with VMware vendor name from lspci" do
+    it "should be vmware with VMware vendor name from lspci 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter")
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter")
       Facter.fact(:virtual).value.should == "vmware"
     end
 
-    it "should be virtualbox with VirtualBox vendor name from lspci" do
+    it "should be virtualbox with VirtualBox vendor name from lspci 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter")
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter")
       Facter.fact(:virtual).value.should == "virtualbox"
     end
 
     it "should be vmware with VMWare 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('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns("On Board Device 1 Information\nType: Video\nStatus: Disabled\nDescription: VMware SVGA II")
       Facter.fact(:virtual).value.should == "vmware"
     end
@@ -131,42 +131,42 @@ describe "Virtual fact" do
       Facter.fact(:virtual).value.should == "xenu"
     end
 
-    it "should be xenhvm with Xen HVM vendor name from lspci" do
+    it "should be xenhvm with Xen HVM vendor name from lspci 2>/dev/null" 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::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').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('lspci 2>/dev/null').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)
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns("On Board Device Information\nType: Video\nStatus: Disabled\nDescription: Parallels Video Adapter")
       Facter.fact(:virtual).value.should == "parallels"
     end
 
     it "should be virtualbox with VirtualBox 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('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns("BIOS Information\nVendor: innotek GmbH\nVersion: VirtualBox\n\nSystem Information\nManufacturer: innotek GmbH\nProduct Name: VirtualBox\nFamily: Virtual Machine")
       Facter.fact(:virtual).value.should == "virtualbox"
     end
 
-    it "should be hyperv with Microsoft vendor name from lspci" do
+    it "should be hyperv with Microsoft vendor name from lspci 2>/dev/null" do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns("00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA")
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA")
       Facter.fact(:virtual).value.should == "hyperv"
     end
 
     it "should be hyperv with Microsoft 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('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns("System Information\nManufacturer: Microsoft Corporation\nProduct Name: Virtual Machine")
       Facter.fact(:virtual).value.should == "hyperv"
     end
@@ -180,7 +180,7 @@ describe "Virtual fact" do
     it "should be vmware with VMWare vendor name from prtdiag" do
       Facter.fact(:kernel).stubs(:value).returns("SunOS")
       Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: VMware, Inc. VMware Virtual Platform")
       Facter.fact(:virtual).value.should == "vmware"
@@ -189,7 +189,7 @@ describe "Virtual fact" do
     it "should be parallels with Parallels vendor name from prtdiag" do
       Facter.fact(:kernel).stubs(:value).returns("SunOS")
       Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: Parallels Virtual Platform")
       Facter.fact(:virtual).value.should == "parallels"
@@ -198,7 +198,7 @@ describe "Virtual fact" do
     it "should be virtualbox with VirtualBox vendor name from prtdiag" do
       Facter.fact(:kernel).stubs(:value).returns("SunOS")
       Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: innotek GmbH VirtualBox")
       Facter.fact(:virtual).value.should == "virtualbox"
@@ -210,7 +210,7 @@ describe "Virtual fact" do
       Facter::Util::Resolution.stubs(:exec).with("vmware -v").returns false
       Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
       Facter.fact(:hardwaremodel).stubs(:value).returns(nil)
-      Facter::Util::Resolution.stubs(:exec).with('lspci').returns(nil)
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns(nil)
       Facter::Util::Resolution.stubs(:exec).with('dmidecode').returns(nil)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 6
-  - 6
-  version: 1.6.6
+  - 7
+  version: 1.6.7
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 Z
+date: 2012-03-29 00:00:00 Z
 dependencies: []
 
 description: You can prove anything with facts!
@@ -189,6 +189,8 @@ files:
 - spec/fixtures/unit/util/manufacturer/opensolaris_smbios
 - spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag
 - spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag
+- spec/fixtures/unit/util/processor/solaris-i86pc
+- spec/fixtures/unit/util/processor/solaris-sun4u
 - spec/fixtures/unit/util/uptime/kstat_boot_time
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_darwin
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd
@@ -277,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facter
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Facter, a system inventory tool