facter 1.6.17 → 1.6.18.rc1

data/Gemfile

@@ -1,14 +1,20 @@
-source :rubygems
+source "https://rubygems.org"
 
-gemspec
+group :development do
+  gem 'watchr'
+end
 
-group(:development, :test) do
-  gem "rspec", "~> 2.10.0", :require => false
-  gem "mocha", "~> 0.10.5", :require => false
+group :development, :test do
+  gem 'rake'
+  gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__), :require => false
+  gem 'rspec', "~> 2.11.0", :require => false
+  gem 'mocha', "~> 0.10.5", :require => false
+  gem 'json', "~> 1.7", :require => false
+  gem 'puppetlabs_spec_helper', :require => false
 end
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
 
-# vim:filetype=ruby
+# vim:ft=ruby

data/README.md

@@ -11,12 +11,14 @@ See `bin/facter` for an example of the interface.
 Running Facter
 --------------
 
-Run the `facter` binary on the command for a full list of facts supported on your host.
+Run the `facter` binary on the command for a full list of facts supported on
+your host.
 
 Adding your own facts
 ---------------------
 
-See the [Adding Facts](http://docs.puppetlabs.com/guides/custom_facts.html) page for details of how to add your own custom facts to Facter.
+See the [Adding Facts](http://docs.puppetlabs.com/guides/custom_facts.html)
+page for details of how to add your own custom facts to Facter.
 
 Further Information
 -------------------

data/ext/build_defaults.yaml

@@ -2,15 +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-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.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-5-i386 pl-5-x86_64 pl-6-i386 pl-6-x86_64 fedora-16-i386 fedora-16-x86_64 fedora-17-i386 fedora-17-x86_64'
-rc_mocks: 'pl-5-i386-dev pl-5-x86_64-dev pl-6-i386-dev pl-6-x86_64-dev fedora-16-i386-dev fedora-16-x86_64-dev fedora-17-i386-dev fedora-17-x86_64-dev'
+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'
 yum_host: 'burji.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/lib/facter/application.rb

@@ -67,6 +67,11 @@ module Facter
 
     private
 
+    # Parses the given argument array destructively to return an options hash
+    # (and possibly perform side effects such as changing settings).
+    #
+    # @param [Array<String>] argv command line arguments
+    # @return [Hash] options hash
     def self.parse(argv)
       options = {}
       OptionParser.new do |opts|
@@ -95,7 +100,7 @@ module Facter
             exit(1)
           end
         end
-      end.parse!
+      end.parse!(argv)
 
       options
     rescue OptionParser::InvalidOption => e

data/lib/facter/ipaddress.rb

@@ -28,7 +28,7 @@ Facter.add(:ipaddress) do
   confine :kernel => :linux
   setcode do
     ip = nil
-    if output = Facter::Util::IP.get_ifconfig
+    if output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
       regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
       if match = regexp.match(output)
         match[1] unless /^127/.match(match[1])
@@ -41,7 +41,7 @@ Facter.add(:ipaddress) do
   confine :kernel => %w{FreeBSD OpenBSD Darwin DragonFly}
   setcode do
     ip = nil
-    output = %x{/sbin/ifconfig}
+    output = Facter::Util::IP.exec_ifconfig
 
     output.split(/^\S/).each { |str|
       if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
@@ -61,7 +61,7 @@ Facter.add(:ipaddress) do
   confine :kernel => %w{NetBSD SunOS}
   setcode do
     ip = nil
-    output = %x{/sbin/ifconfig -a}
+    output = Facter::Util::IP.exec_ifconfig(["-a"])
 
     output.split(/^\S/).each { |str|
       if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
@@ -81,7 +81,7 @@ Facter.add(:ipaddress) do
   confine :kernel => %w{AIX}
   setcode do
     ip = nil
-    output = %x{/usr/sbin/ifconfig -a}
+    output = Facter::Util::IP.exec_ifconfig(["-a"])
 
     output.split(/^\S/).each { |str|
       if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/

data/lib/facter/ipaddress6.rb

@@ -38,7 +38,7 @@ end
 Facter.add(:ipaddress6) do
   confine :kernel => :linux
   setcode do
-    output = Facter::Util::Resolution.exec('/sbin/ifconfig 2>/dev/null')
+    output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
 
     get_address_after_token(output, 'inet6 addr:')
   end
@@ -47,7 +47,7 @@ end
 Facter.add(:ipaddress6) do
   confine :kernel => %w{SunOS}
   setcode do
-    output = Facter::Util::Resolution.exec('/usr/sbin/ifconfig -a')
+    output = Facter::Util::IP.exec_ifconfig(["-a"])
 
     get_address_after_token(output, 'inet6')
   end
@@ -56,7 +56,7 @@ end
 Facter.add(:ipaddress6) do
   confine :kernel => %w{Darwin FreeBSD OpenBSD}
   setcode do
-    output = Facter::Util::Resolution.exec('/sbin/ifconfig -a')
+    output = Facter::Util::IP.exec_ifconfig(["-a"])
 
     get_address_after_token(output, 'inet6', true)
   end

data/lib/facter/iphostnumber.rb

@@ -19,7 +19,7 @@ Facter.add(:iphostnumber) do
   confine :kernel => :darwin, :kernelrelease => "R6"
   setcode do
     ether = nil
-    output = %x{/sbin/ifconfig}
+    output = Facter::Util::IP.exec_ifconfig
 
     output =~ /HWaddr (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
     ether = $1

data/lib/facter/macaddress.rb

@@ -8,6 +8,7 @@
 #
 
 require 'facter/util/macaddress'
+require 'facter/util/ip'
 
 Facter.add(:macaddress) do
   confine :kernel => 'Linux'
@@ -26,7 +27,8 @@ Facter.add(:macaddress) do
   confine :kernel => 'Linux'
   setcode do
     ether = []
-    output = Facter::Util::Resolution.exec("/sbin/ifconfig -a 2>/dev/null")
+    output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"])
+
     output.each_line do |s|
       ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
     end
@@ -38,7 +40,7 @@ Facter.add(:macaddress) do
   confine :kernel => %w{SunOS GNU/kFreeBSD}
   setcode do
     ether = []
-    output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")
+    output = Facter::Util::IP.exec_ifconfig(["-a"])
     output.each_line do |s|
       ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
     end
@@ -62,7 +64,7 @@ Facter.add(:macaddress) do
   confine :operatingsystem => %w{FreeBSD OpenBSD DragonFly}
   setcode do
     ether = []
-    output = Facter::Util::Resolution.exec("/sbin/ifconfig")
+    output = Facter::Util::IP.exec_ifconfig
     output.each_line do |s|
       if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
         ether.push($1)
@@ -82,7 +84,7 @@ Facter.add(:macaddress) do
   setcode do
     ether = []
     ip = nil
-    output = %x{/usr/sbin/ifconfig -a}
+    output = Facter::Util::IP.exec_ifconfig(["-a"])
     output.each_line do |str|
       if str =~ /([a-z]+\d+): flags=/
         devname = $1

data/lib/facter/util/ip.rb

@@ -77,9 +77,9 @@ module Facter::Util::IP
   def self.get_all_interface_output
     case Facter.value(:kernel)
     when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
-      output = %x{/sbin/ifconfig -a 2>/dev/null}
+      output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"])
     when 'SunOS'
-      output = %x{/usr/sbin/ifconfig -a}
+      output = Facter::Util::IP.exec_ifconfig(["-a"])
     when 'HP-UX'
       # (#17487)[https://projects.puppetlabs.com/issues/17487]
       # Handle NIC bonding where asterisks and virtual NICs are printed.
@@ -96,14 +96,22 @@ module Facter::Util::IP
     output
   end
 
+
   ##
-  # get_ifconfig simply delegates to the ifconfig command.
+  # exec_ifconfig uses the ifconfig command
   #
-  # @return [String] the output of `/sbin/ifconfig 2>/dev/null` or nil
+  # @return [String] the output of `ifconfig #{arguments} 2>/dev/null` or nil
+  def self.exec_ifconfig(additional_arguments=[])
+    Facter::Util::Resolution.exec("#{self.get_ifconfig} #{additional_arguments.join(' ')}")
+  end
+  ##
+  # get_ifconfig looks up the ifconfig binary
+  #
+  # @return [String] path to the ifconfig binary
   def self.get_ifconfig
-    Facter::Util::Resolution.exec("/sbin/ifconfig 2>/dev/null")
+    common_paths=["/bin/ifconfig","/sbin/ifconfig","/usr/sbin/ifconfig"]
+    common_paths.select{|path| File.executable?(path)}.first
   end
-
   ##
   # hpux_netstat_in is a delegate method that allows us to stub netstat -in
   # without stubbing exec.
@@ -125,7 +133,7 @@ module Facter::Util::IP
   end
 
   def self.ifconfig_interface(interface)
-    %x{/sbin/ifconfig #{interface} 2>/dev/null}
+    output = Facter::Util::IP.exec_ifconfig([interface,"2>/dev/null"])
   end
 
   def self.get_single_interface_output(interface)
@@ -142,7 +150,7 @@ module Facter::Util::IP
         output = ifconfig_output
       end
     when 'SunOS'
-      output = %x{/usr/sbin/ifconfig #{interface}}
+      output = Facter::Util::IP.exec_ifconfig([interface])
     when 'HP-UX'
        mac = ""
        ifc = hpux_ifconfig_interface(interface)
@@ -154,7 +162,7 @@ module Facter::Util::IP
   end
 
   def self.hpux_ifconfig_interface(interface)
-    Facter::Util::Resolution.exec("/usr/sbin/ifconfig #{interface}")
+    Facter::Util::IP.exec_ifconfig([interface])
   end
 
   def self.hpux_lanscan

data/lib/facter/util/netmask.rb

@@ -7,25 +7,25 @@ module Facter::NetMask
     case Facter.value(:kernel)
     when 'Linux'
       ops = {
-        :ifconfig => '/sbin/ifconfig 2>/dev/null',
+        :ifconfig_opts => ['2>/dev/null'],
         :regex => %r{\s+ inet\saddr: #{Facter.ipaddress} .*? Mask: (#{ipregex})}x,
         :munge => nil,
       }
     when 'SunOS'
       ops = {
-        :ifconfig => '/usr/sbin/ifconfig -a',
+        :ifconfig_opts => ['-a'],
         :regex => %r{\s+ inet \s #{Facter.ipaddress} \s netmask \s (\w{8})}x,
         :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
       }
     when 'FreeBSD','NetBSD','OpenBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
       ops = {
-        :ifconfig => '/sbin/ifconfig -a',
+        :ifconfig_opts => ['-a'],
         :regex => %r{\s+ inet \s #{Facter.ipaddress} \s netmask \s 0x(\w{8})}x,
         :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
       }
     end
 
-    %x{#{ops[:ifconfig]}}.split(/\n/).collect do |line|
+    Facter::Util::IP.exec_ifconfig(ops[:ifconfig_opts]).split(/\n/).collect do |line|
       matches = line.match(ops[:regex])
       if !matches.nil?
         if ops[:munge].nil?

data/lib/facter/util/virtual.rb

@@ -46,7 +46,7 @@ module Facter::Util::Virtual
 
   def self.vserver?
     return false unless FileTest.exists?("/proc/self/status")
-    txt = File.read("/proc/self/status")
+    txt = File.open("/proc/self/status", "rb").read
     return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
     return false
   end

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '1.6.17'
+    FACTERVERSION = '1.6.18-rc1'
   end
 
   def self.version

data/spec/unit/application_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'facter/application'
+
+describe Facter::Application do
+  describe '.parse' do
+    it 'returns an empty hash when given no options' do
+      Facter::Application.parse([]).should == {}
+      Facter::Application.parse(['architecture', 'kernel']).should == {}
+    end
+
+    [:yaml, :json, :trace].each do |option_key|
+      it "sets options[:#{option_key}] when given --#{option_key}" do
+        options = Facter::Application.parse(["--#{option_key}"])
+        options[option_key].should be_true
+      end
+    end
+
+    [['-y', :yaml], ['-j', :json]].each do |option, key|
+      it "sets options[:#{key}] when given #{option}" do
+        options = Facter::Application.parse([option])
+        options[key].should be_true
+      end
+    end
+
+    ['-d', '--debug'].each do |option|
+      it "enables debugging when given #{option}" do
+        Facter.debugging(false)
+        Facter::Application.parse([option])
+        Facter.should be_debugging
+        Facter.debugging(false)
+      end
+    end
+
+    ['-t', '--timing'].each do |option|
+      it "enables timing when given #{option}" do
+        Facter.timing(false)
+        Facter::Application.parse([option])
+        Facter.should be_timing
+        Facter.timing(false)
+      end
+    end
+
+    ['-p', '--puppet'].each do |option|
+      it "calls load_puppet when given #{option}" do
+        Facter::Application.expects(:load_puppet)
+        Facter::Application.parse([option])
+      end
+    end
+
+    it 'mutates argv so that non-option arguments are left' do
+      argv = ['-y', '--trace', 'uptime', 'virtual']
+      Facter::Application.parse(argv)
+      argv.should == ['uptime', 'virtual']
+    end
+  end
+end

data/spec/unit/ipaddress6_spec.rb

@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 
 require 'spec_helper'
+require 'facter/util/ip'
 
 def ifconfig_fixture(filename)
   File.read(fixtures('ifconfig', filename))
@@ -17,7 +18,8 @@ describe "IPv6 address fact" do
 
   it "should return ipaddress6 information for Darwin" do
     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Darwin')
-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+    Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
+    Facter::Util::IP.stubs(:exec_ifconfig).with(["-a"]).
       returns(ifconfig_fixture('darwin_ifconfig_all_with_multiple_interfaces'))
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:223:32ff:fed5:ee34"
@@ -25,7 +27,8 @@ describe "IPv6 address fact" do
 
   it "should return ipaddress6 information for Linux" do
     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Linux')
-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig 2>/dev/null').
+    Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
+    Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
@@ -33,7 +36,8 @@ describe "IPv6 address fact" do
 
   it "should return ipaddress6 information for Solaris" do
     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('SunOS')
-    Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/ifconfig -a').
+    Facter::Util::IP.stubs(:get_ifconfig).returns("/usr/sbin/ifconfig")
+    Facter::Util::IP.stubs(:exec_ifconfig).with(["-a"]).
       returns(ifconfig_fixture('sunos_ifconfig_all_with_multiple_interfaces'))
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:203:baff:fe27:a7c"

data/spec/unit/ipaddress_spec.rb

@@ -5,7 +5,7 @@ require 'facter/util/ip'
 
 shared_examples_for "ifconfig output" do |platform, address, fixture|
   it "correctly on #{platform}" do
-    Facter::Util::IP.stubs(:get_ifconfig).returns(my_fixture_read(fixture))
+    Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
     subject.value.should == address
   end
 end

data/spec/unit/macaddress_spec.rb

@@ -1,6 +1,8 @@
 #! /usr/bin/env ruby
 
 require 'spec_helper'
+require 'facter/util/ip'
+
 
 def ifconfig_fixture(filename)
   File.read(fixtures('ifconfig', filename))
@@ -19,17 +21,18 @@ describe "macaddress fact" do
     before :each do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
       Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+      Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
     end
 
     it "should return the macaddress of the first interface" do
-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
+      Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
         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 2>/dev/null').
+      Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
         returns(ifconfig_fixture('linux_ifconfig_no_mac'))
 
       proc { Facter.value(:macaddress) }.should_not raise_error
@@ -38,7 +41,7 @@ describe "macaddress fact" do
 
     # 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 2>/dev/null').
+      Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
         returns(ifconfig_fixture('linux_ifconfig_venet'))
 
       proc { Facter.value(:macaddress) }.should_not raise_error
@@ -49,7 +52,8 @@ describe "macaddress fact" do
   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').
+      Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
+      Facter::Util::IP.stubs(:exec_ifconfig).
         returns(ifconfig_fixture('bsd_ifconfig_all_with_multiple_interfaces'))
 
       Facter.value(:macaddress).should == "00:0b:db:93:09:67"