facter 1.6.3 → 1.6.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.6.4
+===
+6406c8f (##11041) Add dmidecode as a requirement for rpm
+ed81492 (#10444) Add identification of system boards to Facter
+bdbb2da (#10885) Malformed facter.bat when ruby dir contains backreferences
+0bad18b (#10490) Handle case where no macaddress can be found
+
 1.6.3
 ===
 b2a66a9 (#7038) Validate prtdiag output in manufacturer

data/conf/redhat/facter.spec

@@ -2,11 +2,11 @@
 
 %define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
-%global _ver 1.6.3
+%global _ver 1.6.4
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.3
+Version: 1.6.4
 Release: 0.1rc1%{?dist}
 License: Apache 2.0
 Group: System Environment/Base
@@ -21,6 +21,7 @@ BuildArch: noarch
 
 Requires: ruby >= 1.8.1
 Requires: which
+Requires: dmidecode
 %if %has_ruby_abi
 Requires: ruby(abi) = 1.8
 %endif
@@ -53,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 30 2011 Matthaus Litteken <matthaus@puppetlabs.com> - 1.6.4-0.1rc1
+- 1.6.4 rc1
+
 * Mon Oct 31 2011 Michael Stahnke <stahnma@puppetlabs.com> - 1.6.3-0.1rc1
 - 1.6.3 rc1
 

data/install.rb

@@ -418,9 +418,17 @@ def install_binfile(from, op_file, target)
     if not installed_wrapper
       tmp_file2 = File.join(tmp_dir, '_tmp_wrapper')
       cwn = File.join(Config::CONFIG['bindir'], op_file)
-      cwv = CMD_WRAPPER.gsub('<ruby>', ruby.gsub(%r{/}) { "\\" }).gsub!('<command>', cwn.gsub(%r{/}) { "\\" } )
-
-      File.open(tmp_file2, "wb") { |cw| cw.puts cwv }
+      cwv = <<-EOS
+@echo off
+if "%OS%"=="Windows_NT" goto WinNT
+#{ruby} -x "#{cwn}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto done
+:WinNT
+#{ruby} -x "#{cwn}" %*
+goto done
+:done
+EOS
+      File.open(tmp_file2, "w") { |cw| cw.puts cwv }
       FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
 
       File.unlink(tmp_file2)
@@ -431,17 +439,6 @@ def install_binfile(from, op_file, target)
   File.unlink(tmp_file)
 end
 
-CMD_WRAPPER = <<-EOS
-@echo off
-if "%OS%"=="Windows_NT" goto WinNT
-<ruby> -x "<command>" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-:WinNT
-<ruby> -x "<command>" %*
-goto done
-:done
-EOS
-
 check_prereqs
 prepare_installation
 

data/lib/facter.rb

@@ -24,7 +24,7 @@ module Facter
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.3'
+  FACTERVERSION = '1.6.4'
   # = 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/manufacturer.rb

@@ -42,6 +42,11 @@ elsif Facter.value(:kernel) == "windows"
   Facter::Manufacturer.win32_find_system_info(win32_keys)
 else
   query = {
+    '[Bb]ase [Bb]oard [Ii]nformation' => [
+      { 'Manufacturer:'    => 'boardmanufacturer' },
+      { 'Product(?: Name)?:' => 'boardproductname' },
+      { 'Serial Number:'   => 'boardserialnumber' }
+    ],
     '[Ss]ystem [Ii]nformation' => [
       { 'Manufacturer:'    => 'manufacturer' },
       { 'Product(?: Name)?:' => 'productname' },

data/lib/facter/util/macaddress.rb

@@ -3,6 +3,7 @@
 module Facter::Util::Macaddress
 
   def self.standardize(macaddress)
+    return nil unless macaddress
     macaddress.split(":").map{|x| "0#{x}"[-2..-1]}.join(":")
   end
 

data/spec/fixtures/ifconfig/linux_ifconfig_no_mac

@@ -0,0 +1,8 @@
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+

data/spec/fixtures/ifconfig/linux_ifconfig_venet

@@ -0,0 +1,24 @@
+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:334 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:334 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:16700 (16.7 KB)  TX bytes:16700 (16.7 KB)
+
+venet0    Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:127.0.0.1  P-t-P:127.0.0.1  Bcast:0.0.0.0  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1
+          RX packets:7622207 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:8183436 errors:0 dropped:1 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:2102750761 (2.1 GB)  TX bytes:2795213667 (2.7 GB)
+
+venet0:0  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:XXX.XXX.XXX.XX1  P-t-P:XXX.XXX.XXX.XX1  Bcast:0.0.0.0  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1
+
+venet0:1  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:XXX.XXX.XXX.XX2  P-t-P:XXX.XXX.XXX.XX2  Bcast:0.0.0.0  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1

data/spec/unit/facter_spec.rb

@@ -120,7 +120,9 @@ describe Facter do
 
   # #33 Make sure we only get one mac address
   it "should only return one mac address" do
-    Facter.value(:macaddress).should_not be_include(" ")
+    if macaddress = Facter.value(:macaddress)
+      macaddress.should_not be_include(" ")
+    end
   end
 
   it "should have a method for registering directories to search" do

data/spec/unit/macaddress_spec.rb

@@ -18,21 +18,45 @@ describe "macaddress fact" do
     Facter::Util::Config.stubs(:is_windows?).returns(false)
   end
 
-  it "should return macaddress information for Linux" do
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
-      returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
-
-    Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+  describe "when run on Linux" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+    end
+
+    it "should return the macaddress of the first interface" do
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+        returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+
+      Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+    end
+
+    it "should return nil when no macaddress can be found" do
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+        returns(ifconfig_fixture('linux_ifconfig_no_mac'))
+
+      proc { Facter.value(:macaddress) }.should_not raise_error
+      Facter.value(:macaddress).should be_nil
+    end
+
+    # some interfaces dont have a real mac addresses (like venet inside a container)
+    it "should return nil when no interface has a real macaddress" do
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+        returns(ifconfig_fixture('linux_ifconfig_venet'))
+
+      proc { Facter.value(:macaddress) }.should_not raise_error
+      Facter.value(:macaddress).should be_nil
+    end
   end
 
-  it "should return macaddress information for BSD" do
-    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig').
-      returns(ifconfig_fixture('bsd_ifconfig_all_with_multiple_interfaces'))
+  describe "when run on BSD" do
+    it "should return macaddress information" do
+      Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig').
+        returns(ifconfig_fixture('bsd_ifconfig_all_with_multiple_interfaces'))
 
-    Facter.value(:macaddress).should == "00:0b:db:93:09:67"
+      Facter.value(:macaddress).should == "00:0b:db:93:09:67"
+    end
   end
 
 end

data/spec/unit/util/macaddress_spec.rb

@@ -8,10 +8,15 @@ 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
+
+  it "should be nil if input is nil" do
+    proc { result = Facter::Util::Macaddress.standardize(nil) }.should_not raise_error
+    Facter::Util::Macaddress.standardize(nil).should be_nil
+  end
 end
 
 describe "Darwin", :unless => Facter.value(:operatingsystem) == 'windows' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-12-07 00:00:00 Z
 dependencies: []
 
 description: 
@@ -143,6 +143,8 @@ files:
 - spec/fixtures/ifconfig/fedora_8_eth0
 - spec/fixtures/ifconfig/freebsd_6_0
 - spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces
+- spec/fixtures/ifconfig/linux_ifconfig_no_mac
+- spec/fixtures/ifconfig/linux_ifconfig_venet
 - spec/fixtures/ifconfig/open_solaris_10
 - spec/fixtures/ifconfig/open_solaris_b132
 - spec/fixtures/ifconfig/sunos_ifconfig_all_with_multiple_interfaces