facter 1.6.4 → 1.6.5

data/spec/unit/util/virtual_spec.rb

@@ -1,5 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/virtual'
 
 describe Facter::Util::Virtual do
@@ -79,7 +80,7 @@ describe Facter::Util::Virtual do
     Facter::Util::Virtual.should_not be_vserver
   end
 
-  fixture_path = File.join(SPECDIR, 'fixtures', 'virtual', 'proc_self_status')
+  fixture_path = fixtures('virtual', 'proc_self_status')
 
   test_cases = [
     [File.join(fixture_path, 'vserver_2_1', 'guest'), true, 'vserver 2.1 guest'],
@@ -149,6 +150,13 @@ describe Facter::Util::Virtual do
     Facter::Util::Virtual.should be_kvm
   end
 
+  it "should detect kvm on OpenBSD" do
+    FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(false)
+    Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
+    Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns('QEMU Virtual CPU version (cpu64-rhel6) ("AuthenticAMD" 686-class, 512KB L2 cache)')
+    Facter::Util::Virtual.should be_kvm
+  end
+
   it "should identify FreeBSD jail when in jail" do
     Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
     Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n security.jail.jailed").returns("1")

data/spec/unit/util/vlans_spec.rb

@@ -1,13 +1,11 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require '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();
+    linux_vlanconfig = my_fixture_read("linux_vlan_config")
     Facter::Util::Vlans.stubs(:get_vlan_config).returns(linux_vlanconfig)
     Facter::Util::Vlans.get_vlans().should == %{400,300,200,100}
   end

data/spec/unit/util/wmi_spec.rb

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/wmi'
 
 describe Facter::Util::WMI do

data/spec/unit/util/xendomains_spec.rb

@@ -1,14 +1,12 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+#!/usr/bin/env rspec
 
+require 'spec_helper'
 require 'facter/util/xendomains'
 
 describe Facter::Util::Xendomains do
   describe ".get_domains" do
     it "should return a list of running Xen Domains on Xen0" do
-      sample_output_file = File.dirname(__FILE__) + '/../data/xendomains'
-      xen0_domains = File.read(sample_output_file)
+      xen0_domains = my_fixture_read("xendomains")
       Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains)
       Facter::Util::Xendomains.get_domains.should == %{web01,mailserver}
     end

data/spec/unit/virtual_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+#!/usr/bin/env rspec
 
-require 'facter'
+require 'spec_helper'
 require 'facter/util/virtual'
 require 'facter/util/macosx'
 
@@ -112,6 +112,25 @@ describe "Virtual fact" do
       Facter.fact(:virtual).value.should == "vmware"
     end
 
+    it "should be xen0 with xen dom0 files in /proc" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+      Facter.fact(:hardwaremodel).stubs(:value).returns("i386")
+      Facter::Util::Virtual.expects(:xen?).returns(true)
+      FileTest.expects(:exists?).with("/proc/xen/xsd_kva").returns(true)
+      Facter.fact(:virtual).value.should == "xen0"
+    end
+
+    it "should be xenu with xen domU files in /proc" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+      Facter.fact(:hardwaremodel).stubs(:value).returns("i386")
+      Facter::Util::Virtual.expects(:xen?).returns(true)
+      FileTest.expects(:exists?).with("/proc/xen/xsd_kva").returns(false)
+      FileTest.expects(:exists?).with("/proc/xen/capabilities").returns(true)
+      Facter.fact(:virtual).value.should == "xenu"
+    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)")
@@ -184,24 +203,35 @@ describe "Virtual fact" do
       Facter::Util::Resolution.stubs(:exec).with('prtdiag').returns("System Configuration: innotek GmbH VirtualBox")
       Facter.fact(:virtual).value.should == "virtualbox"
     end
+  end
 
-    it "should be xen0 with xen dom0 files in /proc" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
-      Facter.fact(:hardwaremodel).stubs(:value).returns("i386")
-      Facter::Util::Virtual.expects(:xen?).returns(true)
-      FileTest.expects(:exists?).with("/proc/xen/xsd_kva").returns(true)
-      Facter.fact(:virtual).value.should == "xen0"
+  describe "on OpenBSD" do
+    before 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('dmidecode').returns(nil)
     end
-    
-    it "should be xenu with xen domU files in /proc" do
-      Facter.fact(:kernel).stubs(:value).returns("Linux")
-      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
-      Facter.fact(:hardwaremodel).stubs(:value).returns("i386")
-      Facter::Util::Virtual.expects(:xen?).returns(true)
-      FileTest.expects(:exists?).with("/proc/xen/xsd_kva").returns(false)
-      FileTest.expects(:exists?).with("/proc/xen/capabilities").returns(true)
-      Facter.fact(:virtual).value.should == "xenu"
+
+    it "should be parallels with Parallels product name from sysctl" do
+      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("Parallels Virtual Platform")
+      Facter.fact(:virtual).value.should == "parallels"
+    end
+
+    it "should be vmware with VMware product name from sysctl" do
+      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("VMware Virtual Platform")
+      Facter.fact(:virtual).value.should == "vmware"
+    end
+
+    it "should be virtualbox with VirtualBox product name from sysctl" do
+      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("VirtualBox")
+      Facter.fact(:virtual).value.should == "virtualbox"
+    end
+
+    it "should be xenhvm with Xen HVM product name from sysctl" do
+      Facter::Util::Resolution.stubs(:exec).with('sysctl -n hw.product 2>/dev/null').returns("HVM domU")
+      Facter.fact(:virtual).value.should == "xenhvm"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 6
-  - 4
-  version: 1.6.4
+  - 5
+  version: 1.6.5
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-07 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: []
 
 description: 
@@ -85,6 +85,7 @@ files:
 - lib/facter/util/collection.rb
 - lib/facter/util/config.rb
 - lib/facter/util/confine.rb
+- lib/facter/util/ec2.rb
 - lib/facter/util/fact.rb
 - lib/facter/util/ip.rb
 - lib/facter/util/loader.rb
@@ -92,6 +93,7 @@ files:
 - lib/facter/util/macosx.rb
 - lib/facter/util/manufacturer.rb
 - lib/facter/util/memory.rb
+- lib/facter/util/monkey_patches.rb
 - lib/facter/util/netmask.rb
 - lib/facter/util/plist/generator.rb
 - lib/facter/util/plist/parser.rb
@@ -162,46 +164,57 @@ files:
 - spec/fixtures/netstat/ubuntu_7_04
 - spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info
 - spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info
+- spec/fixtures/unit/selinux/selinux_sestatus
+- spec/fixtures/unit/util/ec2/linux-arp-ec2.out
+- spec/fixtures/unit/util/ec2/linux-arp-not-ec2.out
+- spec/fixtures/unit/util/ec2/windows-2008-arp-a-not-ec2.out
+- spec/fixtures/unit/util/ec2/windows-2008-arp-a.out
+- spec/fixtures/unit/util/ip/6.0-STABLE_FreeBSD_ifconfig
+- spec/fixtures/unit/util/ip/darwin_ifconfig_all_with_multiple_interfaces
+- spec/fixtures/unit/util/ip/darwin_ifconfig_single_interface
+- spec/fixtures/unit/util/ip/debian_kfreebsd_ifconfig
+- spec/fixtures/unit/util/ip/hpux_ifconfig_single_interface
+- spec/fixtures/unit/util/ip/hpux_netstat_all_interfaces
+- spec/fixtures/unit/util/ip/linux_ifconfig_all_with_single_interface
+- spec/fixtures/unit/util/ip/Mac_OS_X_10.5.5_ifconfig
+- spec/fixtures/unit/util/ip/solaris_ifconfig_all_with_multiple_interfaces
+- spec/fixtures/unit/util/ip/solaris_ifconfig_single_interface
+- spec/fixtures/unit/util/ip/windows_netsh_all_interfaces
+- spec/fixtures/unit/util/ip/windows_netsh_single_interface
+- spec/fixtures/unit/util/ip/windows_netsh_single_interface6
 - spec/fixtures/unit/util/loader/nosuchfact.rb
+- spec/fixtures/unit/util/manufacturer/freebsd_dmidecode
+- spec/fixtures/unit/util/manufacturer/linux_dmidecode_with_spaces
+- 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/uptime/kstat_boot_time
-- spec/fixtures/uptime/sysctl_kern_boottime_big_endian
-- spec/fixtures/uptime/sysctl_kern_boottime_little_endian
-- spec/fixtures/uptime/ubuntu_proc_uptime
-- spec/fixtures/uptime/who_b_boottime
+- 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
+- spec/fixtures/unit/util/uptime/ubuntu_proc_uptime
+- spec/fixtures/unit/util/uptime/who_b_boottime
+- spec/fixtures/unit/util/vlans/linux_vlan_config
+- spec/fixtures/unit/util/xendomains/xendomains
 - spec/fixtures/virtual/proc_self_status/vserver_2_1/guest
 - spec/fixtures/virtual/proc_self_status/vserver_2_1/host
 - 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/puppetlabs_spec/files.rb
+- spec/puppetlabs_spec/fixtures.rb
+- spec/puppetlabs_spec/matchers.rb
+- spec/puppetlabs_spec_helper.rb
 - spec/spec_helper.rb
 - spec/unit/architecture_spec.rb
-- spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
-- spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
-- spec/unit/data/darwin_ifconfig_single_interface
-- spec/unit/data/debian_kfreebsd_ifconfig
-- spec/unit/data/freebsd_dmidecode
-- spec/unit/data/hpux_ifconfig_single_interface
-- spec/unit/data/hpux_netstat_all_interfaces
-- spec/unit/data/linux_dmidecode_with_spaces
-- spec/unit/data/linux_ifconfig_all_with_single_interface
-- spec/unit/data/linux_vlan_config
-- spec/unit/data/Mac_OS_X_10.5.5_ifconfig
-- spec/unit/data/opensolaris_smbios
-- 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/ec2_spec.rb
 - spec/unit/facter_spec.rb
+- spec/unit/hardwareisa_spec.rb
 - spec/unit/hostname_spec.rb
 - spec/unit/id_spec.rb
 - spec/unit/interfaces_spec.rb
 - spec/unit/ipaddress6_spec.rb
+- spec/unit/lsbmajdistrelease_spec.rb
 - spec/unit/macaddress_spec.rb
 - spec/unit/memory_spec.rb
 - spec/unit/operatingsystem_spec.rb
@@ -209,9 +222,12 @@ files:
 - spec/unit/physicalprocessorcount_spec.rb
 - spec/unit/processor_spec.rb
 - spec/unit/selinux_spec.rb
+- spec/unit/uniqueid_spec.rb
 - spec/unit/uptime_spec.rb
 - spec/unit/util/collection_spec.rb
+- spec/unit/util/config_spec.rb
 - spec/unit/util/confine_spec.rb
+- spec/unit/util/ec2_spec.rb
 - spec/unit/util/fact_spec.rb
 - spec/unit/util/ip_spec.rb
 - spec/unit/util/loader_spec.rb