facter 1.6.14 → 1.6.15.rc1

data/spec/fixtures/unit/util/ec2/solaris8_arp_a_not_ec2.out

@@ -0,0 +1,7 @@
+Net to Media Table: IPv4
+Device   IP Address               Mask      Flags   Phys Addr  
+------ -------------------- --------------- ----- --------------- 
+dnet0  pecan                255.255.255.255       08:00:20:05:21:33 
+dnet0  horseshoe            255.255.255.255       00:00:0c:e0:80:b1 
+dnet0  crab                 255.255.255.255  SP   08:00:20:22:fd:51
+dnet0  BASE-ADDRESS.MCAST.NET 240.0.0.0      SM   01:00:5e:00:00:00

data/spec/fixtures/unit/util/ip/linux_get_single_interface_eth0

@@ -0,0 +1,10 @@
+eth0      Link encap:Ethernet  HWaddr 00:0c:29:52:15:e9  
+          inet addr:172.16.15.133  Bcast:172.16.15.255  Mask:255.255.255.0
+          inet6 addr: fe80::20c:29ff:fe52:15e9/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:173 errors:173 dropped:0 overruns:0 frame:0
+          TX packets:208 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:40970 (40.0 KB)  TX bytes:24760 (24.1 KB)
+          Interrupt:16 Base address:0x2024 
+

data/spec/fixtures/unit/util/ip/linux_get_single_interface_lo

@@ -0,0 +1,9 @@
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:1630 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:1630 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:81500 (79.5 KB)  TX bytes:81500 (79.5 KB)
+

data/spec/unit/ec2_spec.rb

@@ -28,11 +28,6 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/foo").
         at_least_once.returns(StringIO.new("bar"))
 
-      # No user-data
-      Object.any_instance.expects(:open).
-        with("#{api_prefix}/2008-02-01/user-data/").
-        at_least_once.returns(StringIO.new(""))
-
       Facter.collection.loader.load(:ec2)
       Facter.fact(:ec2_foo).value.should == "bar"
     end
@@ -46,11 +41,6 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/foo").
         at_least_once.returns(StringIO.new("bar\nbaz"))
 
-      # No user-data
-      Object.any_instance.expects(:open).
-        with("#{api_prefix}/2008-02-01/user-data/").
-        at_least_once.returns(StringIO.new(""))
-
       Facter.collection.loader.load(:ec2)
       Facter.fact(:ec2_foo).value.should == "bar,baz"
     end
@@ -68,11 +58,6 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/foo/bar").
         at_least_once.returns(StringIO.new("baz"))
 
-      # No user-data
-      Object.any_instance.expects(:open).
-        with("#{api_prefix}/2008-02-01/user-data/").
-        at_least_once.returns(StringIO.new(""))
-
       Facter.collection.loader.load(:ec2)
       Facter.fact(:ec2_foo_bar).value.should == "baz"
     end
@@ -83,7 +68,7 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").
         at_least_once.returns(StringIO.new(""))
 
-      Object.any_instance.expects(:open).
+      Facter::Util::Resolution.any_instance.expects(:open).
         with("#{api_prefix}/2008-02-01/user-data/").
         at_least_once.returns(StringIO.new("test"))
 
@@ -109,7 +94,7 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").\
         at_least_once.returns(StringIO.new(""))
 
-      Object.any_instance.expects(:open).\
+      Facter::Util::Resolution.any_instance.expects(:open).\
         with("#{api_prefix}/2008-02-01/user-data/").\
         at_least_once.returns(StringIO.new("test"))
 
@@ -137,7 +122,7 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").\
         at_least_once.returns(StringIO.new(""))
 
-      Object.any_instance.expects(:open).\
+      Facter::Util::Resolution.any_instance.expects(:open).\
         with("#{api_prefix}/2008-02-01/user-data/").\
         at_least_once.returns(StringIO.new("test"))
 
@@ -146,6 +131,25 @@ describe "ec2 facts" do
 
       Facter.fact(:ec2_userdata).value.should == ["test"]
     end
+
+    it "should return nil if open fails" do
+      Facter.expects(:warn).with('Could not retrieve ec2 metadata: host unreachable').twice
+      Facter::Util::Resolution.any_instance.stubs(:warn) # do not pollute test output
+
+      Object.any_instance.expects(:open).
+        with("#{api_prefix}/2008-02-01/meta-data/").
+        at_least_once.raises(RuntimeError, 'host unreachable')
+
+      Facter::Util::Resolution.any_instance.expects(:open).
+        with("#{api_prefix}/2008-02-01/user-data/").
+        at_least_once.raises(RuntimeError, 'host unreachable')
+
+      # Force a fact load
+      Facter.collection.loader.load(:ec2)
+
+      Facter.fact(:ec2_userdata).value.should be_nil
+    end
+
   end
 
   describe "when api connect test fails" do

data/spec/unit/processor_spec.rb

@@ -309,4 +309,100 @@ describe "processorX facts" do
       end
     end
   end
+
+  describe "on HP-UX" do
+    def self.machinfo_examples
+      examples = []
+      examples << [File.read(fixtures('hpux','machinfo','ia64-rx2620')), "Intel(R) Itanium 2 processor"]
+      examples << [File.read(fixtures('hpux','machinfo','ia64-rx6600')), "Intel(R) Itanium 2 9100 series processor (1.59 GHz, 18 MB)"]
+      examples << [File.read(fixtures('hpux','machinfo','ia64-rx8640')), "Intel(R) Itanium 2 9100 series"]
+      examples << [File.read(fixtures('hpux','machinfo','hppa-rp4440')), "PA-RISC 8800 processor (1000 MHz, 64 MB)"]
+      examples
+    end
+
+    let(:ioscan) do
+      "Class       I  H/W Path  Driver    S/W State H/W Type  Description\n" +
+      "===================================================================\n" +
+      "processor   0  0/120     processor CLAIMED   PROCESSOR Processor\n" +
+      "processor   1  0/123     processor CLAIMED   PROCESSOR Processor\n"
+    end
+
+    describe "when machinfo is available" do
+      machinfo_examples.each_with_index do |example, i|
+        machinfo_example, expected_cpu = example
+        context "machinfo example ##{i}" do
+          before :each do
+            Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+            Facter::Util::Processor.stubs(:ioscan).returns(ioscan)
+            Facter::Util::Processor.stubs(:machinfo).returns(machinfo_example)
+            Facter.collection.loader.load(:processor)
+          end
+
+          %w{ 0 1 }.each do |j|
+            it "should find #{expected_cpu}" do
+              Facter.value("processor#{j}").should == expected_cpu
+            end
+          end
+        end
+      end
+    end
+
+    def self.model_and_getconf_examples
+      examples = []
+      examples << ["9000/800/L3000-5x",     "sched.models_present", "unistd.h_present", "532", "616",       "PA-RISC 8600 processor"]
+      examples << ["9000/800/L3000-5x",     "",                     "unistd.h_present", "532", "616",       "HP PA-RISC2.0 CHIP TYPE #616"]
+      examples << ["9000/800/L3000-5x",     "",                     "",                 "532", "616",       "CPU v532 CHIP TYPE #616"]
+      examples << ["ia64 hp server rx2660", "sched.models_present", "unistd.h_present", "768", "536936708", "IA-64 archrev 0 CHIP TYPE #536936708"]
+      examples << ["ia64 hp server rx2660", "",                     "unistd.h_present", "768", "536936708", "IA-64 archrev 0 CHIP TYPE #536936708"]
+      examples << ["ia64 hp server rx2660", "",                     "",                 "768", "536936708", "CPU v768 CHIP TYPE #536936708"]
+      examples
+    end
+
+    sched_models = File.readlines(fixtures('hpux','sched.models'))
+    unistd_h     = File.readlines(fixtures('hpux','unistd.h'))
+
+    describe "when machinfo is not available" do
+      model_and_getconf_examples.each_with_index do |example, i|
+        model_example, sm, unistd, getconf_cpu_ver, getconf_chip_type, expected_cpu = example
+        context "and model and getconf example ##{i}" do
+          before :each do
+            Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+            Facter::Util::Processor.stubs(:ioscan).returns(ioscan)
+            Facter::Util::Processor.stubs(:getconf_cpu_version).returns(getconf_cpu_ver)
+            Facter::Util::Processor.stubs(:getconf_cpu_chip_type).returns(getconf_chip_type)
+            Facter::Util::Processor.stubs(:machinfo).returns(nil)
+            Facter::Util::Processor.stubs(:model).returns(model_example)
+          end
+
+          if unistd == "unistd.h_present" then
+            before :each do
+              Facter::Util::Processor.stubs(:read_unistd_h).returns(unistd_h)
+            end
+          else
+            before :each do
+              Facter::Util::Processor.stubs(:read_unistd_h).returns(nil)
+            end
+          end
+
+          if sm == "sched.models_present" then
+            before :each do
+              Facter::Util::Processor.stubs(:read_sched_models).returns(sched_models)
+              Facter.collection.loader.load(:processor)
+            end
+          else
+            before :each do
+              Facter::Util::Processor.stubs(:read_sched_models).returns(nil)
+              Facter.collection.loader.load(:processor)
+            end
+          end
+
+          %w{ 0 1 }.each do |j|
+            it "should find #{expected_cpu}" do
+              Facter.value("processor#{j}").should == expected_cpu
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/spec/unit/util/ec2_spec.rb

@@ -57,6 +57,21 @@ describe Facter::Util::EC2 do
         Facter::Util::EC2.has_ec2_arp?.should == false
       end
     end
+
+    describe "on solaris" do
+      before :each do
+        Facter.stubs(:value).with(:kernel).returns("SunOS")
+      end
+
+      it "should fail if arp table does not contain fe:ff:ff:ff:ff:ff" do
+        ec2arp = my_fixture_read("solaris8_arp_a_not_ec2.out")
+
+        Facter::Util::Resolution.expects(:exec).with("arp -a").
+          at_least_once.returns(ec2arp)
+
+        Facter::Util::EC2.has_ec2_arp?.should == false
+      end
+    end
   end
 
   describe "is_euca_mac? method" do
@@ -110,41 +125,29 @@ describe Facter::Util::EC2 do
   describe "can_connect? method" do
     it "returns true if api responds" do
       # Return something upon connecting to the root
-      Module.any_instance.expects(:open).with("#{api_prefix}:80/").\
+      Module.any_instance.expects(:open).with("#{api_prefix}:80/").
         at_least_once.returns("2008-02-01\nlatest")
 
-      Facter::Util::EC2.can_connect?.should == true
+      Facter::Util::EC2.can_connect?.should be_true
     end
 
     describe "when connection times out" do
-      before :each do
+      it "should return false" do
         # Emulate a timeout when connecting by throwing an exception
-        Module.any_instance.expects(:open).with("#{api_prefix}:80/").\
-          at_least_once.raises(Timeout::Error)
-      end
+        Module.any_instance.expects(:open).with("#{api_prefix}:80/").
+          at_least_once.raises(RuntimeError)
 
-      it "should not raise exception" do
-        expect { Facter::Util::EC2.can_connect? }.to_not raise_error
-      end
-
-      it "should return false" do
-        Facter::Util::EC2.can_connect?.should == false
+        Facter::Util::EC2.can_connect?.should be_false
       end
     end
 
     describe "when connection is refused" do
-      before :each do
+      it "should return false" do
         # Emulate a connection refused
-        Module.any_instance.expects(:open).with("#{api_prefix}:80/").\
+        Module.any_instance.expects(:open).with("#{api_prefix}:80/").
           at_least_once.raises(Errno::ECONNREFUSED)
-      end
 
-      it "should not raise exception" do
-        expect { Facter::Util::EC2.can_connect? }.to_not raise_error
-      end
-
-      it "should return false" do
-        Facter::Util::EC2.can_connect?.should == false
+        Facter::Util::EC2.can_connect?.should be_false
       end
     end
   end

data/spec/unit/util/ip_spec.rb

@@ -261,6 +261,37 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_arp_value("eth0").should == "00:00:0c:9f:f0:04"
   end
 
+  it "should return mtu information on Linux" do
+    linux_ifconfig = my_fixture_read("linux_ifconfig_all_with_single_interface")
+    Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig)
+    Facter::Util::IP.stubs(:get_single_interface_output).with("eth0").
+      returns(my_fixture_read("linux_get_single_interface_eth0"))
+    Facter::Util::IP.stubs(:get_single_interface_output).with("lo").
+      returns(my_fixture_read("linux_get_single_interface_lo"))
+    Facter.stubs(:value).with(:kernel).returns("Linux")
+
+    Facter::Util::IP.get_interface_value("eth0", "mtu").should == "1500"
+    Facter::Util::IP.get_interface_value("lo", "mtu").should == "16436"
+  end
+
+  it "should return mtu information on Darwin" do
+    darwin_ifconfig_interface = my_fixture_read("darwin_ifconfig_single_interface")
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(darwin_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("Darwin")
+
+    Facter::Util::IP.get_interface_value("en1", "mtu").should == "1500"
+  end
+
+  it "should return mtu information for Solaris" do
+    solaris_ifconfig_interface = my_fixture_read("solaris_ifconfig_single_interface")
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+    Facter::Util::IP.get_interface_value("e1000g0", "mtu").should == "1500"
+  end
+
   describe "on Windows" do
     before :each do
       Facter.stubs(:value).with(:kernel).returns("windows")

metadata

@@ -1,23 +1,34 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: facter
-version: !ruby/object:Gem::Version
-  version: 1.6.14
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 3742991977
+  prerelease: 7
+  segments: 
+  - 1
+  - 6
+  - 15
+  - rc
+  - 1
+  version: 1.6.15.rc1
 platform: ruby
-authors:
+authors: 
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+
+date: 2012-11-21 00:00:00 Z
 dependencies: []
+
 description: You can prove anything with facts!
 email: info@puppetlabs.com
-executables:
+executables: 
 - facter
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -138,6 +149,12 @@ files:
 - spec/fixtures/cpuinfo/panda-armel
 - spec/fixtures/cpuinfo/ppc64
 - spec/fixtures/cpuinfo/sparc
+- spec/fixtures/hpux/machinfo/hppa-rp4440
+- spec/fixtures/hpux/machinfo/ia64-rx2620
+- spec/fixtures/hpux/machinfo/ia64-rx6600
+- spec/fixtures/hpux/machinfo/ia64-rx8640
+- spec/fixtures/hpux/sched.models
+- spec/fixtures/hpux/unistd.h
 - spec/fixtures/ifconfig/bsd_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/centos_5_5
 - spec/fixtures/ifconfig/centos_5_5_eth0
@@ -181,6 +198,7 @@ files:
 - spec/fixtures/unit/util/ec2/centos-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-not-ec2.out
+- spec/fixtures/unit/util/ec2/solaris8_arp_a_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
@@ -189,7 +207,9 @@ files:
 - 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_get_single_interface_eth0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_ib0
+- spec/fixtures/unit/util/ip/linux_get_single_interface_lo
 - spec/fixtures/unit/util/ip/linux_ifconfig_all_with_single_interface
 - spec/fixtures/unit/util/ip/linux_ifconfig_ib0
 - spec/fixtures/unit/util/ip/Mac_OS_X_10.5.5_ifconfig
@@ -272,29 +292,40 @@ files:
 - spec/watchr.rb
 homepage: https://github.com/puppetlabs/facter
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Facter, a system inventory tool
-test_files:
+test_files: 
 - spec/fixtures/cpuinfo/amd64dual
 - spec/fixtures/cpuinfo/amd64quad
 - spec/fixtures/cpuinfo/amd64solo
@@ -304,6 +335,12 @@ test_files:
 - spec/fixtures/cpuinfo/panda-armel
 - spec/fixtures/cpuinfo/ppc64
 - spec/fixtures/cpuinfo/sparc
+- spec/fixtures/hpux/machinfo/hppa-rp4440
+- spec/fixtures/hpux/machinfo/ia64-rx2620
+- spec/fixtures/hpux/machinfo/ia64-rx6600
+- spec/fixtures/hpux/machinfo/ia64-rx8640
+- spec/fixtures/hpux/sched.models
+- spec/fixtures/hpux/unistd.h
 - spec/fixtures/ifconfig/bsd_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/centos_5_5
 - spec/fixtures/ifconfig/centos_5_5_eth0
@@ -347,6 +384,7 @@ test_files:
 - spec/fixtures/unit/util/ec2/centos-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-not-ec2.out
+- spec/fixtures/unit/util/ec2/solaris8_arp_a_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
@@ -355,7 +393,9 @@ test_files:
 - 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_get_single_interface_eth0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_ib0
+- spec/fixtures/unit/util/ip/linux_get_single_interface_lo
 - spec/fixtures/unit/util/ip/linux_ifconfig_all_with_single_interface
 - spec/fixtures/unit/util/ip/linux_ifconfig_ib0
 - spec/fixtures/unit/util/ip/Mac_OS_X_10.5.5_ifconfig