facter 1.7.1 → 1.7.2.rc1

data/Rakefile

@@ -6,7 +6,10 @@ require 'facter/version'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
+require 'rake'
+
 begin
+  load File.join(File.dirname(__FILE__), 'ext', 'packaging', 'packaging.rake')
   require 'rubygems'
   require 'rspec'
   require 'rspec/core/rake_task'
@@ -14,10 +17,7 @@ begin
 rescue LoadError
 end
 
-require 'rake'
-
 Dir['tasks/**/*.rake'].each { |t| load t }
-Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
 
 build_defs_file = 'ext/build_defaults.yaml'
 if File.exist?(build_defs_file)

data/ext/build_defaults.yaml

@@ -2,14 +2,14 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-oneiric-i386.cow base-oneiric-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-quantal-i386.cow base-quantal-amd64.cow base-sid-i386.cow base-sid-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-stable-i386.cow base-stable-amd64.cow base-testing-i386.cow base-testing-amd64.cow base-unstable-i386.cow base-unstable-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
+cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-quantal-i386.cow base-quantal-amd64.cow base-raring-i386.cow base-raring-amd64.cow base-sid-i386.cow base-sid-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-stable-i386.cow base-stable-amd64.cow base-testing-i386.cow base-testing-amd64.cow base-unstable-i386.cow base-unstable-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-fedora-16-i386 pl-fedora-16-x86_64 pl-fedora-17-i386 pl-fedora-17-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-fedora-17-i386 pl-fedora-17-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64'
 yum_host: 'burji.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/lib/facter/domain.rb

@@ -23,21 +23,26 @@ Facter.add(:domain) do
     # Get the domain from various sources; the order of these
     # steps is important
 
-    # In some OS 'hostname -f' will change the hostname to '-f' 
-    # We know that Solaris and HP-UX exhibit this behavior 
-    # On good OS, 'hostname -f' will return the FQDN which is preferable 
-    # Due to dangerous behavior of 'hostname -f' on old OS, we will explicitly opt-in 
+    # In some OS 'hostname -f' will change the hostname to '-f'
+    # We know that Solaris and HP-UX exhibit this behavior
+    # On good OS, 'hostname -f' will return the FQDN which is preferable
+    # Due to dangerous behavior of 'hostname -f' on old OS, we will explicitly opt-in
     # 'hostname -f' --hkenney May 9, 2012
-    hostname_command = 'hostname'
+    basic_hostname = 'hostname 2> /dev/null'
+    full_hostname = 'hostname -f 2> /dev/null'
     can_do_hostname_f = Regexp.union /Linux/i, /FreeBSD/i, /Darwin/i
-    hostname_command = 'hostname -f' if Facter.value(:kernel) =~ can_do_hostname_f
 
-       
+    hostname_command = if Facter.value(:kernel) =~ can_do_hostname_f
+                         full_hostname
+                       else
+                         basic_hostname
+                       end
+
     if name = Facter::Util::Resolution.exec(hostname_command) \
       and name =~ /.*?\.(.+$)/
 
       return_value = $1
-    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') \
+    elsif domain = Facter::Util::Resolution.exec('dnsdomainname 2> /dev/null') \
       and domain =~ /.+/
 
       return_value = domain

data/lib/facter/ipaddress.rb

@@ -28,10 +28,14 @@ Facter.add(:ipaddress) do
   confine :kernel => :linux
   setcode do
     ip = nil
-    if output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
+    output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
+    if output
       regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-      if match = regexp.match(output)
-        match[1] unless /^127/.match(match[1])
+      output.split("\n").each do |line|
+        match = regexp.match(line)
+        if match
+          break match[1] unless /^127/.match(match[1])
+        end
       end
     end
   end

data/lib/facter/util/file_read.rb

@@ -27,6 +27,10 @@ module FileRead
     Facter.debug "Could not read #{path}: #{detail.message}"
     nil
   end
+
+  def self.read_binary(path)
+    File.open(path, "rb") { |contents| contents.read }
+  end
 end
 end
 end

data/lib/facter/util/ip.rb

@@ -8,7 +8,7 @@ module Facter::Util::IP
       :ipaddress  => /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
       :ipaddress6 => /inet6 (?:addr: )?((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
       :macaddress => /(?:ether|HWaddr)\s+((\w{1,2}:){5,}\w{1,2})/,
-      :netmask  => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :netmask  => /(?:Mask:|netmask )([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
       :mtu  => /MTU:(\d+)/
     },
     :bsd   => {

data/lib/facter/util/netmask.rb

@@ -8,7 +8,7 @@ module Facter::NetMask
     when 'Linux'
       ops = {
         :ifconfig_opts => ['2>/dev/null'],
-        :regex => %r{\s+ inet\saddr: #{Facter.ipaddress} .*? Mask: (#{ipregex})}x,
+        :regex => %r{#{Facter.ipaddress}.*?(?:Mask:|netmask)\s*(#{ipregex})}x,
         :munge => nil,
       }
     when 'SunOS'

data/lib/facter/util/resolution.rb

@@ -169,7 +169,7 @@ class Facter::Util::Resolution
 
       begin
         out = %x{#{code}}.chomp
-        Facter.warnonce 'Using Facter::Util::Resolution.exec with a shell built-in is deprecated. Most built-ins can be replaced with native ruby commands. If you really have to run a built-in, pass "cmd /c your_builtin" as a command' unless expanded_code
+        Facter.warnonce "Using Facter::Util::Resolution.exec with a shell built-in is deprecated. Most built-ins can be replaced with native ruby commands. If you really have to run a built-in, pass \"cmd /c your_builtin\" as a command (command responsible for this message was \"#{code}\")" unless expanded_code
       rescue Errno::ENOENT => detail
         # command not found on Windows
         return nil

data/lib/facter/util/virtual.rb

@@ -1,3 +1,5 @@
+require 'facter/util/file_read'
+
 module Facter::Util::Virtual
   ##
   # virt_what is a delegating helper method intended to make it easier to stub
@@ -63,7 +65,8 @@ module Facter::Util::Virtual
     return false unless FileTest.exists?("/proc/self/status")
     txt = File.open("/proc/self/status", "rb").read
     if txt.respond_to?(:encode!)
-      txt.encode!('UTF-8', 'UTF-8', :invalid => :replace)
+      txt.encode!('UTF-16', 'UTF-8', :invalid => :replace)
+      txt.encode!('UTF-8', 'UTF-16')
     end
     return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
     return false
@@ -142,7 +145,7 @@ module Facter::Util::Virtual
   # @return [String] or nil if the path does not exist
   def self.read_sysfs_dmi_entries(path="/sys/firmware/dmi/entries/1-0/raw")
     if File.exists?(path)
-      File.read(path)
+      Facter::Util::FileRead.read_binary(path)
     end
   end
 end

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '1.7.1'
+    FACTERVERSION = '1.7.2-rc1'
   end
 
   ##

data/lib/facter/virtual.rb

@@ -44,129 +44,116 @@ Facter.add("virtual") do
   end
 end
 
-
 Facter.add("virtual") do
-  confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX GNU/kFreeBSD}
-
-  result = "physical"
+  confine :kernel => ["FreeBSD", "GNU/kFreeBSD"]
 
   setcode do
+    "jail" if Facter::Util::Virtual.jail?
+  end
+end
 
-    if Facter.value(:kernel) == "SunOS" and Facter::Util::Virtual.zone?
-      result = "zone"
-    end
-
-    if Facter.value(:kernel)=="HP-UX"
-      result = "hpvm" if Facter::Util::Virtual.hpvm?
-    end
-
-    if Facter.value(:architecture)=="s390x"
-      result = "zlinux" if Facter::Util::Virtual.zlinux?
-    end
-
-    if Facter::Util::Virtual.openvz?
-      result = Facter::Util::Virtual.openvz_type()
-    end
+Facter.add("virtual") do
+  confine :kernel => 'SunOS'
 
-    if Facter::Util::Virtual.vserver?
-      result = Facter::Util::Virtual.vserver_type()
+  setcode do
+    next "zone" if Facter::Util::Virtual.zone?
+
+    resolver = Facter::Util::Resolution.new('prtdiag')
+    resolver.timeout = 6
+    resolver.setcode('prtdiag')
+    output = resolver.value
+    if output
+      lines = output.split("\n")
+      next "parallels"  if lines.any? {|l| l =~ /Parallels/ }
+      next "vmware"     if lines.any? {|l| l =~ /VM[wW]are/ }
+      next "virtualbox" if lines.any? {|l| l =~ /VirtualBox/ }
+      next "xenhvm"     if lines.any? {|l| l =~ /HVM domU/ }
     end
+  end
+end
 
-    if Facter::Util::Virtual.xen?
-      if FileTest.exists?("/dev/xen/evtchn")
-        result = "xen0"
-      elsif FileTest.exists?("/proc/xen")
-        result = "xenu"
-      end
-    end
+Facter.add("virtual") do
+  confine :kernel => 'HP-UX'
 
-    if Facter::Util::Virtual.virtualbox?
-      result = "virtualbox"
-    end
+  setcode do
+    "hpvm" if Facter::Util::Virtual.hpvm?
+  end
+end
 
-    if Facter::Util::Virtual.kvm?
-      result = Facter::Util::Virtual.kvm_type()
-    end
+Facter.add("virtual") do
+  confine :architecture => 's390x'
 
-    if ["FreeBSD", "GNU/kFreeBSD"].include? Facter.value(:kernel)
-      result = "jail" if Facter::Util::Virtual.jail?
-    end
+  setcode do
+    "zlinux" if Facter::Util::Virtual.zlinux?
+  end
+end
 
-    if Facter::Util::Virtual.rhev?
-      result = "rhev"
-    end
+Facter.add("virtual") do
+  confine :kernel => 'OpenBSD'
 
-    if Facter::Util::Virtual.ovirt?
-      result = "ovirt"
+  setcode do
+    output = Facter::Util::Resolution.exec('sysctl -n hw.product 2>/dev/null')
+    if output
+      lines = output.split("\n")
+      next "parallels"  if lines.any? {|l| l =~ /Parallels/ }
+      next "vmware"     if lines.any? {|l| l =~ /VMware/ }
+      next "virtualbox" if lines.any? {|l| l =~ /VirtualBox/ }
+      next "xenhvm"     if lines.any? {|l| l =~ /HVM domU/ }
     end
+  end
+end
 
-    if result == "physical"
-      output = Facter::Util::Virtual.lspci
-      if not output.nil?
-        output.each_line do |p|
-          # --- look for the vmware video card to determine if it is virtual => vmware.
-          # ---   00:0f.0 VGA compatible controller: VMware Inc [VMware SVGA II] PCI Display Adapter
-          result = "vmware" if p =~ /VM[wW]are/
-          # --- look for virtualbox video card to determine if it is virtual => virtualbox.
-          # ---   00:02.0 VGA compatible controller: InnoTek Systemberatung GmbH VirtualBox Graphics Adapter
-          result = "virtualbox" if p =~ /VirtualBox/
-          # --- look for pci vendor id used by Parallels video card
-          # ---   01:00.0 VGA compatible controller: Unknown device 1ab8:4005
-          result = "parallels" if p =~ /1ab8:|[Pp]arallels/
-          # --- look for pci vendor id used by Xen HVM device
-          # ---   00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)
-          result = "xenhvm" if p =~ /XenSource/
-          # --- look for Hyper-V video card
-          # ---   00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA
-          result = "hyperv" if p =~ /Microsoft Corporation Hyper-V/
-          # --- look for gmetrics for GCE
-          # --- 00:05.0 Class 8007: Google, Inc. Device 6442
-          result = "gce" if p =~ /Class 8007: Google, Inc/
-        end
-      else
-        output = Facter::Util::Resolution.exec('dmidecode')
-        if not output.nil?
-          output.each_line do |pd|
-            result = "parallels" if pd =~ /Parallels/
-            result = "vmware" if pd =~ /VMware/
-            result = "virtualbox" if pd =~ /VirtualBox/
-            result = "xenhvm" if pd =~ /HVM domU/
-            result = "hyperv" if pd =~ /Product Name: Virtual Machine/
-            result = "rhev" if pd =~ /Product Name: RHEV Hypervisor/
-            result = "ovirt" if pd =~ /Product Name: oVirt Node/
-          end
-        elsif Facter.value(:kernel) == 'SunOS'
-          res = Facter::Util::Resolution.new('prtdiag')
-          res.timeout = 6
-          res.setcode('prtdiag')
-          output = res.value
-          if not output.nil?
-            output.each_line do |pd|
-              result = "parallels" if pd =~ /Parallels/
-              result = "vmware" if pd =~ /VMware/
-              result = "virtualbox" if pd =~ /VirtualBox/
-              result = "xenhvm" if pd =~ /HVM domU/
-            end
-          end
-        elsif Facter.value(:kernel) == 'OpenBSD'
-          output = Facter::Util::Resolution.exec('sysctl -n hw.product 2>/dev/null')
-          if not output.nil?
-            output.each_line do |pd|
-              result = "parallels" if pd =~ /Parallels/
-              result = "vmware" if pd =~ /VMware/
-              result = "virtualbox" if pd =~ /VirtualBox/
-              result = "xenhvm" if pd =~ /HVM domU/
-            end
-          end
-        end
-      end
+Facter.add("virtual") do
+  confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX GNU/kFreeBSD}
 
-      if output = Facter::Util::Resolution.exec("vmware -v")
-        result = output.sub(/(\S+)\s+(\S+).*/) { | text | "#{$1}_#{$2}"}.downcase
-      end
-    end
+  setcode do
+    next Facter::Util::Virtual.openvz_type if Facter::Util::Virtual.openvz?
+    next Facter::Util::Virtual.vserver_type if Facter::Util::Virtual.vserver?
 
-    result
+    if Facter::Util::Virtual.xen?
+      next "xen0" if FileTest.exists?("/dev/xen/evtchn")
+      next "xenu" if FileTest.exists?("/proc/xen")
+    end
+
+    next "virtualbox" if Facter::Util::Virtual.virtualbox?
+    next Facter::Util::Virtual.kvm_type if Facter::Util::Virtual.kvm?
+    next "rhev" if Facter::Util::Virtual.rhev?
+    next "ovirt" if Facter::Util::Virtual.ovirt?
+
+    # Parse lspci
+    output = Facter::Util::Virtual.lspci
+    if output
+      lines = output.split("\n")
+      next "vmware"     if lines.any? {|l| l =~ /VM[wW]are/ }
+      next "virtualbox" if lines.any? {|l| l =~ /VirtualBox/ }
+      next "parallels"  if lines.any? {|l| l =~ /1ab8:|[Pp]arallels/ }
+      next "xenhvm"     if lines.any? {|l| l =~ /XenSource/ }
+      next "hyperv"     if lines.any? {|l| l =~ /Microsoft Corporation Hyper-V/ }
+      next "gce"        if lines.any? {|l| l =~ /Class 8007: Google, Inc/ }
+    end
+
+    # Parse dmidecode
+    output = Facter::Util::Resolution.exec('dmidecode')
+    if output
+      lines = output.split("\n")
+      next "parallels"  if lines.any? {|l| l =~ /Parallels/ }
+      next "vmware"     if lines.any? {|l| l =~ /VMware/ }
+      next "virtualbox" if lines.any? {|l| l =~ /VirtualBox/ }
+      next "xenhvm"     if lines.any? {|l| l =~ /HVM domU/ }
+      next "hyperv"     if lines.any? {|l| l =~ /Product Name: Virtual Machine/ }
+      next "rhev"       if lines.any? {|l| l =~ /Product Name: RHEV Hypervisor/ }
+      next "ovirt"      if lines.any? {|l| l =~ /Product Name: oVirt Node/ }
+    end
+
+    # Sample output of vmware -v `VMware Server 1.0.5 build-80187`
+    output = Facter::Util::Resolution.exec("vmware -v")
+    if output
+      mdata = output.match /(\S+)\s+(\S+)/
+      next "#{mdata[1]}_#{mdata[2]}".downcase if mdata
+    end
+
+    # Default to 'physical'
+    next 'physical'
   end
 end
 

data/spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt

@@ -0,0 +1,19 @@
+em1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 131.252.209.153  netmask 255.255.255.0  broadcast 192.168.76.255
+        inet6 2610:10:20:209:212:3fff:febe:2201  prefixlen 128  scopeid 0x0<global>
+        inet6 fe80::221:ccff:fe4b:297d  prefixlen 64  scopeid 0x20<link>
+        ether 00:21:cc:4b:29:7d  txqueuelen 1000  (Ethernet)
+        RX packets 27222144  bytes 31247414760 (29.1 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 10259038  bytes 7784519352 (7.2 GiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+        device interrupt 20  memory 0xd2600000-d2620000  
+
+lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 16436
+        inet 127.0.0.1  netmask 255.0.0.0
+        inet6 ::1  prefixlen 128  scopeid 0x10<host>
+        loop  txqueuelen 0  (Local Loopback)
+        RX packets 257371  bytes 37104110 (35.3 MiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 257371  bytes 37104110 (35.3 MiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

data/spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.em1

@@ -0,0 +1,10 @@
+em1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 131.252.209.153  netmask 255.255.255.0  broadcast 192.168.76.255
+        inet6 2610:10:20:209:212:3fff:febe:2201  prefixlen 128  scopeid 0x0<global>
+        inet6 fe80::221:ccff:fe4b:297d  prefixlen 64  scopeid 0x20<link>
+        ether 00:21:cc:4b:29:7d  txqueuelen 1000  (Ethernet)
+        RX packets 27222144  bytes 31247414760 (29.1 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 10259038  bytes 7784519352 (7.2 GiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+        device interrupt 20  memory 0xd2600000-d2620000  

data/spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.lo

@@ -0,0 +1,8 @@
+lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 16436
+        inet 127.0.0.1  netmask 255.0.0.0
+        inet6 ::1  prefixlen 128  scopeid 0x10<host>
+        loop  txqueuelen 0  (Local Loopback)
+        RX packets 257371  bytes 37104110 (35.3 MiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 257371  bytes 37104110 (35.3 MiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

data/spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt

@@ -0,0 +1,20 @@
+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:9031461 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:9031461 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:3205490447 (2.9 GiB)  TX bytes:3205490447 (2.9 GiB)
+
+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:38161277 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:24601924 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:3847964603 (3.5 GiB)  TX bytes:5770630041 (5.3 GiB)
+
+venet0:1  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+          inet addr:10.0.222.20  P-t-P:10.0.222.20  Bcast:10.0.222.20  Mask:255.255.255.255
+          UP BROADCAST POINTOPOINT RUNNING NOARP  MTU:1500  Metric:1

data/spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt

@@ -0,0 +1,19 @@
+em1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 131.252.209.153  netmask 255.255.255.0  broadcast 192.168.76.255
+        inet6 2610:10:20:209:212:3fff:febe:2201  prefixlen 128  scopeid 0x0<global>
+        inet6 fe80::221:ccff:fe4b:297d  prefixlen 64  scopeid 0x20<link>
+        ether 00:21:cc:4b:29:7d  txqueuelen 1000  (Ethernet)
+        RX packets 27222144  bytes 31247414760 (29.1 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 10259038  bytes 7784519352 (7.2 GiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+        device interrupt 20  memory 0xd2600000-d2620000  
+
+lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 16436
+        inet 127.0.0.1  netmask 255.0.0.0
+        inet6 ::1  prefixlen 128  scopeid 0x10<host>
+        loop  txqueuelen 0  (Local Loopback)
+        RX packets 257371  bytes 37104110 (35.3 MiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 257371  bytes 37104110 (35.3 MiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

data/spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt

@@ -0,0 +1,16 @@
+eth0      Link encap:Ethernet  HWaddr 42:01:0a:57:50:6e  
+          inet addr:10.87.80.110  Bcast:10.87.80.110  Mask:255.255.255.255
+          UP BROADCAST RUNNING MULTICAST  MTU:1460  Metric:1
+          RX packets:1609444 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:1479569 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:673812693 (673.8 MB)  TX bytes:221186872 (221.1 MB)
+
+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:5435415 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:5435415 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:734540224 (734.5 MB)  TX bytes:734540224 (734.5 MB)
+

data/spec/shared_formats/parses.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.alias_it_should_behave_like_to :example_behavior_for, "parses"
+end

data/spec/unit/domain_spec.rb

@@ -1,97 +1,101 @@
 #! /usr/bin/env ruby
 
 require 'spec_helper'
+require 'stringio'
 
 describe "Domain name facts" do
 
-  { :linux => {:kernel => "Linux", :hostname_command => "hostname -f"},
-    :solaris => {:kernel => "SunOS", :hostname_command => "hostname"},
-    :darwin => {:kernel => "Darwin", :hostname_command => "hostname -f"},
-    :freebsd => {:kernel => "FreeBSD", :hostname_command => "hostname -f"},
-    :hpux => {:kernel => "HP-UX", :hostname_command => "hostname"},
-  }.each do |key, nested_hash|
+  def resolv_conf_contains(*lines)
+    file_handle = StringIO.new(lines.join("\n"))
+    FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
+    File.stubs(:open).with("/etc/resolv.conf").yields(file_handle)
+  end
+
+  [
+    { :kernel => "Linux", :hostname_command => "hostname -f 2> /dev/null" },
+    { :kernel => "SunOS", :hostname_command => "hostname 2> /dev/null" },
+    { :kernel => "Darwin", :hostname_command => "hostname -f 2> /dev/null" },
+    { :kernel => "FreeBSD", :hostname_command => "hostname -f 2> /dev/null" },
+    { :kernel => "HP-UX", :hostname_command => "hostname 2> /dev/null" },
+  ].each do |scenario|
+
+    describe "on #{scenario[:kernel]}" do
+      let(:hostname_command) { scenario[:hostname_command] }
+      let(:dnsdomain_command) { "dnsdomainname 2> /dev/null" }
+
+      def the_hostname_is(value)
+        Facter::Util::Resolution.stubs(:exec).with(hostname_command).returns(value)
+      end
+
+      def the_dnsdomainname_is(value)
+        Facter::Util::Resolution.stubs(:exec).with(dnsdomain_command).returns(value)
+      end
 
-    describe "on #{key}" do
       before do
-        Facter.fact(:kernel).stubs(:value).returns(nested_hash[:kernel])
-        FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
+        Facter.fact(:kernel).stubs(:value).returns(scenario[:kernel])
       end
-      
-      let :hostname_command do 
-        nested_hash[:hostname_command]
-      end 
-      
+
       it "should use the hostname binary" do
-        Facter::Util::Resolution.expects(:exec).with(hostname_command).returns "test.example.com"
+        the_hostname_is("test.example.com")
+
         Facter.fact(:domain).value.should == "example.com"
       end
-      
+
       it "should fall back to the dnsdomainname binary" do
-        Facter::Util::Resolution.expects(:exec).with(hostname_command).returns("myhost")
-        Facter::Util::Resolution.expects(:exec).with("dnsdomainname").returns("example.com")
+        the_hostname_is("myhost")
+        the_dnsdomainname_is("example.com")
+
         Facter.fact(:domain).value.should == "example.com"
       end
-      
-      
+
       it "should fall back to /etc/resolv.conf" do
-        Facter::Util::Resolution.expects(:exec).with(hostname_command).at_least_once.returns("myhost")
-        Facter::Util::Resolution.expects(:exec).with("dnsdomainname").at_least_once.returns("")
-        File.expects(:open).with('/etc/resolv.conf').at_least_once
-        Facter.fact(:domain).value
-      end
-      
-      it "should attempt to resolve facts in a specific order" do
-        seq = sequence('domain')
-        Facter::Util::Resolution.stubs(:exec).with(hostname_command).in_sequence(seq).at_least_once
-        Facter::Util::Resolution.stubs(:exec).with("dnsdomainname").in_sequence(seq).at_least_once
-        File.expects(:open).with('/etc/resolv.conf').in_sequence(seq).at_least_once
-        Facter.fact(:domain).value
+        the_hostname_is("myhost")
+        the_dnsdomainname_is("")
+
+        resolv_conf_contains("domain testing.com")
+
+        Facter.fact(:domain).value.should == "testing.com"
       end
-      
-      describe "Top level domain" do 
+
+      describe "Top level domain" do
         it "should find the domain name" do
-          Facter::Util::Resolution.expects(:exec).with(hostname_command).returns "ns01.tld"
-          Facter::Util::Resolution.expects(:exec).with("dnsdomainname").never
-          File.expects(:exists?).with('/etc/resolv.conf').never
-          Facter.fact(:domain).value.should == "tld" 
-        end  
-      end 
-      
+          the_hostname_is("ns01.tld")
+
+          Facter.fact(:domain).value.should == "tld"
+        end
+      end
+
       describe "when using /etc/resolv.conf" do
         before do
-          Facter::Util::Resolution.stubs(:exec).with(hostname_command)
-          Facter::Util::Resolution.stubs(:exec).with("dnsdomainname")
-          @mock_file = mock()
-          File.stubs(:open).with("/etc/resolv.conf").yields(@mock_file)
+          the_hostname_is("")
+          the_dnsdomainname_is("")
         end
-        
+
         it "should use the domain field over the search field" do
-          lines = [
-                   "nameserver 4.2.2.1",
-                   "search example.org",
-                   "domain example.com",
-                  ]
-          @mock_file.expects(:each).multiple_yields(*lines)
+          resolv_conf_contains(
+            "nameserver 4.2.2.1",
+            "search example.org",
+            "domain example.com"
+          )
+
           Facter.fact(:domain).value.should == 'example.com'
         end
 
         it "should fall back to the search field" do
-          lines = [
-                   "nameserver 4.2.2.1",
-                   "search example.org",
-                  ]
-          @mock_file.expects(:each).multiple_yields(*lines)
+          resolv_conf_contains(
+            "nameserver 4.2.2.1",
+            "search example.org"
+          )
+
           Facter.fact(:domain).value.should == 'example.org'
         end
-        
+
         it "should use the first domain in the search field" do
-          lines = [
-                   "search example.org example.net",
-                  ]
-          @mock_file.expects(:each).multiple_yields(*lines)
+          resolv_conf_contains("search example.org example.net")
+
           Facter.fact(:domain).value.should == 'example.org'
         end
-        
+
         # Test permutations of domain and search, where 'domain' can be a value of
         # the search keyword and the domain keyword
         # and also where 'search' can be a value of the search keyword and the
@@ -107,29 +111,27 @@ describe "Domain name facts" do
         # Why someone would have their machines named 'www.domain' or 'www.search', I
         # don't know, but we'll at least handle it properly
         [
-         ["domain domain", "domain"],
-         ["domain search", "search"],
-         ["search domain", "domain"],
-         ["search search", "search"],
-         ["search domain notdomain", "domain"],
-         [["#search notdomain","search search"], "search"],
-         [["# search notdomain","search search"], "search"],
-         [["#domain notdomain","domain domain"], "domain"],
-         [["# domain notdomain","domain domain"], "domain"],
+         [["domain domain"], "domain"],
+         [["domain search"], "search"],
+         [["search domain"], "domain"],
+         [["search search"], "search"],
+         [["search domain notdomain"], "domain"],
+         [["#search notdomain", "search search"], "search"],
+         [["# search notdomain", "search search"], "search"],
+         [["#domain notdomain", "domain domain"], "domain"],
+         [["# domain notdomain", "domain domain"], "domain"],
         ].each do |tuple|
-          field  = tuple[0]
+          conf  = tuple[0]
           expect = tuple[1]
-          it "should return #{expect} from \"#{field}\"" do
-            lines = [
-                     field
-                    ].flatten
-            @mock_file.expects(:each).multiple_yields(*lines)
+          it "should return #{expect} from \"#{conf}\"" do
+            resolv_conf_contains(*conf)
+
             Facter.fact(:domain).value.should == expect
           end
         end
       end
     end
-  end 
+  end
 
   describe "on Windows" do
     before(:each) do
@@ -173,35 +175,35 @@ describe "Domain name facts" do
     end
   end
 
-  describe "with trailing dots" do 
-    describe "on Windows" do 
+  describe "with trailing dots" do
+    describe "on Windows" do
       before do
         Facter.fact(:kernel).stubs(:value).returns("windows")
         require 'facter/util/registry'
         require 'facter/util/wmi'
       end
- 
+
       [{:registry => 'testdomain.', :wmi => '', :expect => 'testdomain'},
        {:registry => '', :wmi => 'testdomain.', :expect => 'testdomain'},
       ].each do |scenario|
 
-        describe "scenarios" do 
+        describe "scenarios" do
           before(:each) do
             Facter::Util::Registry.stubs(:hklm_read).returns(scenario[:registry])
             nic = stubs 'nic'
             nic.stubs(:DNSDomain).returns(scenario[:wmi])
             Facter::Util::WMI.stubs(:execquery).with("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").returns([nic])
           end
- 
+
           it "should return #{scenario[:expect]}" do
             Facter.fact(:domain).value.should == scenario[:expect]
           end
- 
+
           it "should remove trailing dots"  do
             Facter.fact(:domain).value.should_not =~ /\.$/
           end
-        end 
-      end 
+        end
+      end
     end
 
     describe "on everything else" do
@@ -210,24 +212,57 @@ describe "Domain name facts" do
         FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
       end
 
-      [{:hostname => 'host.testdomain.', :dnsdomainname => '', :resolve_domain => '', :resolve_search => '', :expect => 'testdomain'},
-       {:hostname => '', :dnsdomainname => 'testdomain.', :resolve_domain => '', :resolve_search => '', :expect => 'testdomain'},
-       {:hostname => '', :dnsdomainname => '', :resolve_domain => 'testdomain.', :resolve_search => '', :expect => 'testdomain'},
-       {:hostname => '', :dnsdomainname => '', :resolve_domain => '', :resolve_search => 'testdomain.', :expect => 'testdomain'}, 
-       {:hostname => '', :dnsdomainname => '', :resolve_domain => '', :resolve_search => '', :expect => nil}
+      [
+        {
+          :scenario => 'when there is only a hostname',
+          :hostname => 'host.testdomain.',
+          :dnsdomainname => '',
+          :resolve_domain => '',
+          :resolve_search => '',
+          :expect => 'testdomain'
+        },
+        {
+          :scenario => 'when there is only a domain name',
+          :hostname => '',
+          :dnsdomainname => 'testdomain.',
+          :resolve_domain => '',
+          :resolve_search => '',
+          :expect => 'testdomain'
+        },
+        {
+          :scenario => 'when there is only a resolve domain',
+          :hostname => '',
+          :dnsdomainname => '',
+          :resolve_domain => 'testdomain.',
+          :resolve_search => '',
+          :expect => 'testdomain'
+        },
+        {
+          :scenario => 'when there is only a resolve search',
+          :hostname => '',
+          :dnsdomainname => '',
+          :resolve_domain => '',
+          :resolve_search => 'testdomain.',
+          :expect => 'testdomain'
+        },
+        {
+          :scenario => 'when there is no information available',
+          :hostname => '',
+          :dnsdomainname => '',
+          :resolve_domain => '',
+          :resolve_search => '',
+          :expect => nil
+        }
       ].each do |scenario|
 
-        describe "scenarios" do
-          before(:each) do 
-            Facter::Util::Resolution.stubs(:exec).with("hostname -f").returns(scenario[:hostname])
-            Facter::Util::Resolution.stubs(:exec).with("dnsdomainname").returns(scenario[:dnsdomainname])
-            @mock_file = mock()
-            File.stubs(:open).with("/etc/resolv.conf").yields(@mock_file)
-            lines = [
-                     "search #{scenario[:resolve_search]}",
-                     "domain #{scenario[:resolve_domain]}",
-                    ]
-            @mock_file.stubs(:each).multiple_yields(*lines)
+        describe scenario[:scenario] do
+          before(:each) do
+            Facter::Util::Resolution.stubs(:exec).with("hostname -f 2> /dev/null").returns(scenario[:hostname])
+            Facter::Util::Resolution.stubs(:exec).with("dnsdomainname 2> /dev/null").returns(scenario[:dnsdomainname])
+            resolv_conf_contains(
+              "search #{scenario[:resolve_search]}",
+              "domain #{scenario[:resolve_domain]}"
+            )
           end
 
           it "should remove trailing dots" do
@@ -238,7 +273,7 @@ describe "Domain name facts" do
             Facter.fact(:domain).value.should == scenario[:expect]
           end
         end
-      end      
+      end
     end
   end
 end

data/spec/unit/interfaces_spec.rb

@@ -1,8 +1,21 @@
 #! /usr/bin/env ruby
 
 require 'spec_helper'
+require 'shared_formats/parses'
 require 'facter/util/ip'
 
+shared_examples_for "netmask_* from ifconfig output" do |platform, interface, address, fixture|
+  it "correctly on #{platform} interface #{interface}" do
+    Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
+    Facter::Util::IP.stubs(:get_output_for_interface_and_label).
+      returns(my_fixture_read("#{fixture}.#{interface}"))
+    Facter.collection.internal_loader.load(:interfaces)
+
+    fact = Facter.fact("netmask_#{interface}".intern)
+    fact.value.should eq(address)
+  end
+end
+
 describe "Per Interface IP facts" do
   it "should replace the ':' in an interface list with '_'" do
     # So we look supported
@@ -19,3 +32,16 @@ describe "Per Interface IP facts" do
     Facter.fact(:interfaces).value.should == %{Local_Area_Connection,Loopback__Pseudo_Interface____1_}
   end
 end
+
+describe "Netmask handling on Linux" do
+  before :each do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+  end
+
+  example_behavior_for "netmask_* from ifconfig output",
+    "Archlinux (net-tools 1.60)", "em1",
+    "255.255.255.0", "ifconfig_net_tools_1.60.txt"
+  example_behavior_for "netmask_* from ifconfig output",
+    "Archlinux (net-tools 1.60)", "lo",
+    "255.0.0.0", "ifconfig_net_tools_1.60.txt"
+end

data/spec/unit/ipaddress_spec.rb

@@ -28,5 +28,9 @@ describe "The ipaddress fact" do
       "Ubuntu 12.04", "10.87.80.110", "ifconfig_ubuntu_1204.txt"
     example_behavior_for "ifconfig output",
       "Fedora 17", "131.252.209.153", "ifconfig_net_tools_1.60.txt"
+    example_behavior_for "ifconfig output",
+      "Linux with multiple loopback addresses",
+      "10.0.222.20",
+      "ifconfig_multiple_127_addresses.txt"
   end
 end

data/spec/unit/netmask_spec.rb

@@ -0,0 +1,29 @@
+#! /usr/bin/env ruby
+
+require 'spec_helper'
+require 'shared_formats/parses'
+require 'facter/util/ip'
+
+shared_examples_for "netmask from ifconfig output" do |platform, address, fixture|
+  it "correctly on #{platform}" do
+    Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
+    Facter.collection.internal_loader.load(:netmask)
+
+    Facter.fact(:netmask).value.should eq(address)
+  end
+end
+
+describe "netmask fact" do
+  before :each do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+  end
+
+  context "on Linux" do
+    example_behavior_for "netmask from ifconfig output",
+      "Archlinux (net-tools 1.60)", "255.255.255.0",
+      "ifconfig_net_tools_1.60.txt"
+    example_behavior_for "netmask from ifconfig output",
+      "Ubuntu 12.04", "255.255.255.255",
+      "ifconfig_ubuntu_1204.txt"
+  end
+end

data/spec/unit/util/resolution_spec.rb

@@ -685,7 +685,7 @@ describe Facter::Util::Resolution do
         it "should try to run the command and return output of a shell-builtin" do
           Facter::Util::Resolution.expects(:expand_command).with(%q{echo foo}).returns nil
           Facter::Util::Resolution.expects(:`).with(%q{echo foo}).returns 'foo'
-          Facter.expects(:warnonce).with('Using Facter::Util::Resolution.exec with a shell built-in is deprecated. Most built-ins can be replaced with native ruby commands. If you really have to run a built-in, pass "cmd /c your_builtin" as a command')
+          Facter.expects(:warnonce).with 'Using Facter::Util::Resolution.exec with a shell built-in is deprecated. Most built-ins can be replaced with native ruby commands. If you really have to run a built-in, pass "cmd /c your_builtin" as a command (command responsible for this message was "echo foo")'
           Facter::Util::Resolution.exec(%q{echo foo}).should == 'foo'
         end
         it "should try to run the command and return nil if not shell-builtin" do

data/spec/unit/util/virtual_spec.rb

@@ -147,6 +147,15 @@ describe Facter::Util::Virtual do
     end
   end
 
+  it "reads dmi entries as ascii data" do
+    entries_file = my_fixture('invalid_unicode_dmi_entries')
+    expected_contents = 'Virtual'
+
+    entries = Facter::Util::Virtual.read_sysfs_dmi_entries(entries_file)
+
+    entries.should =~ /#{expected_contents}/
+  end
+
   it "should identify vserver_host when /proc/virtual exists" do
     Facter::Util::Virtual.expects(:vserver?).returns(true)
     FileTest.stubs(:exists?).with("/proc/virtual").returns(true)

data/spec/unit/virtual_spec.rb

@@ -205,6 +205,12 @@ describe "Virtual fact" do
         end
       end
     end
+
+    it "(#20236) is vmware when dmidecode contains vmware and lspci returns insufficient information" do
+      Facter::Util::Resolution.stubs(:exec).with('lspci 2>/dev/null').returns("garbage\ninformation\n")
+      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 eq("vmware")
+    end
   end
 
   describe "on Solaris" do
@@ -272,6 +278,7 @@ describe "Virtual fact" do
     require 'facter/util/wmi'
     before do
       Facter.fact(:kernel).stubs(:value).returns("windows")
+      Facter.fact(:architecture).stubs(:value).returns("x64")
     end
 
     it "should be kvm with KVM model name from Win32_ComputerSystem" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 1.7.1
-  prerelease: 
+  version: 1.7.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies: []
 description: You can prove anything with facts!
 email: info@puppetlabs.com
@@ -199,6 +199,7 @@ files:
 - 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/linux-arp-ec2.out
+- spec/fixtures/unit/util/virtual/invalid_unicode_dmi_entries
 - spec/fixtures/unit/util/virtual/solaris10_proc_self_status1
 - spec/fixtures/unit/util/loader/nosuchfact.rb
 - spec/fixtures/unit/util/processor/solaris-i86pc
@@ -245,8 +246,12 @@ files:
 - spec/fixtures/unit/util/uptime/kstat_boot_time
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_darwin
+- spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.lo
+- spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.em1
 - spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
 - spec/fixtures/unit/virtual/sysfs_dmi_entries_raw.txt
 - spec/fixtures/unit/zfs_version/freebsd_9.0
 - spec/fixtures/unit/zfs_version/freebsd_8.2
@@ -254,6 +259,8 @@ files:
 - spec/fixtures/unit/zfs_version/solaris_10
 - spec/fixtures/unit/zfs_version/linux-fuse_0.6.9
 - spec/fixtures/unit/filesystems/linux
+- spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
+- spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
 - spec/fixtures/unit/zpool_version/freebsd_9.0
 - spec/fixtures/unit/zpool_version/freebsd_8.2
 - spec/fixtures/unit/zpool_version/solaris_11
@@ -299,6 +306,7 @@ files:
 - spec/fixtures/netstat/darwin_9_8_0
 - spec/fixtures/netstat/open_solaris_b132
 - spec/fixtures/netstat/ubuntu_7_04
+- spec/shared_formats/parses.rb
 - spec/unit/util/parser_spec.rb
 - spec/unit/util/virtual_spec.rb
 - spec/unit/util/monkey_patches_spec.rb
@@ -347,6 +355,7 @@ files:
 - spec/unit/interfaces_spec.rb
 - spec/unit/zpool_version_spec.rb
 - spec/unit/memory_spec.rb
+- spec/unit/netmask_spec.rb
 - spec/unit/lsbdistid_spec.rb
 - spec/unit/zonename_spec.rb
 - spec/unit/uniqueid_spec.rb
@@ -382,9 +391,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -437,6 +446,7 @@ test_files:
 - 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/linux-arp-ec2.out
+- spec/fixtures/unit/util/virtual/invalid_unicode_dmi_entries
 - spec/fixtures/unit/util/virtual/solaris10_proc_self_status1
 - spec/fixtures/unit/util/loader/nosuchfact.rb
 - spec/fixtures/unit/util/processor/solaris-i86pc
@@ -483,8 +493,12 @@ test_files:
 - spec/fixtures/unit/util/uptime/kstat_boot_time
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_darwin
+- spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.lo
+- spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/interfaces/ifconfig_net_tools_1.60.txt.em1
 - spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
 - spec/fixtures/unit/virtual/sysfs_dmi_entries_raw.txt
 - spec/fixtures/unit/zfs_version/freebsd_9.0
 - spec/fixtures/unit/zfs_version/freebsd_8.2
@@ -492,6 +506,8 @@ test_files:
 - spec/fixtures/unit/zfs_version/solaris_10
 - spec/fixtures/unit/zfs_version/linux-fuse_0.6.9
 - spec/fixtures/unit/filesystems/linux
+- spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
+- spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
 - spec/fixtures/unit/zpool_version/freebsd_9.0
 - spec/fixtures/unit/zpool_version/freebsd_8.2
 - spec/fixtures/unit/zpool_version/solaris_11
@@ -537,6 +553,7 @@ test_files:
 - spec/fixtures/netstat/darwin_9_8_0
 - spec/fixtures/netstat/open_solaris_b132
 - spec/fixtures/netstat/ubuntu_7_04
+- spec/shared_formats/parses.rb
 - spec/unit/util/parser_spec.rb
 - spec/unit/util/virtual_spec.rb
 - spec/unit/util/monkey_patches_spec.rb
@@ -585,6 +602,7 @@ test_files:
 - spec/unit/interfaces_spec.rb
 - spec/unit/zpool_version_spec.rb
 - spec/unit/memory_spec.rb
+- spec/unit/netmask_spec.rb
 - spec/unit/lsbdistid_spec.rb
 - spec/unit/zonename_spec.rb
 - spec/unit/uniqueid_spec.rb