facter 2.0.1.rc1 → 2.0.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d91c7a71d4cc61bb1f50ab005c54eb09b938691
-  data.tar.gz: 624a61aa2493e96ffa71b8a0b9a0c258eec84d49
+  metadata.gz: d199e09642d31db53de5a1c0b30d8c52dd21e59b
+  data.tar.gz: d5b98ff29d794725423191c8ebbbcadf518ef7ba
 SHA512:
-  metadata.gz: 0364c8c7f7238493331a2e33ba53e6104dcba79a1c8f63f83b76714c86bc67a82e5ac5bfe651f767ee553d96366be8684beb8e4055de43d6e661a5f3e20878ba
-  data.tar.gz: 0261cc7fe89129ccde61c5b42eaac43f74e3532c5f761d0ebb88f0305b4e838d0a069dba636c39651a34e7d7f5442128024f1ef6b04ae2cce91c5dfeee7d65ab
+  metadata.gz: c5f37318a479dc3e4962b252d0ad1c3ab83706937efa55c2b66d2b944dfa6a3814ff278b2737eb1feb47d65cd294820f2969a492c95fd1a7898a6ec84be8e164
+  data.tar.gz: b81e27242129a9375fa59ee6e03bcc243bb1d1818ca3c3b6402d922d103df153976bbc93fbc844546c4fe8f32f19f88e2f2541c91a303df118f9f5cf2ae1897c

data/Gemfile

@@ -1,8 +1,4 @@
-if gem_source = ENV['GEM_SOURCE']
-  source gem_source
-else
-  source "https://rubygems.org"
-end
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 # C Ruby (MRI) or Rubinius, but NOT Windows
 platforms :ruby do

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-precise-i386.cow base-precise-amd64.cow base-quantal-i386.cow base-quantal-amd64.cow base-raring-i386.cow base-raring-amd64.cow base-saucy-i386.cow base-saucy-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-saucy-i386.cow base-saucy-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-trusty-i386.cow base-trusty-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-el-7-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/lib/facter/core/execution.rb

@@ -89,12 +89,24 @@ module Facter
       # executing the code.
       #
       # @param code [String] the program to run
-      # @return [String] the output of the program or the empty string on error
+      # @param options [Hash]
+      #
+      # @option options [Object] :on_fail How to behave when the command could
+      #   not be run. Specifying :raise will raise an error, anything else will
+      #   return that object on failure. Default is :raise.
+      #
+      # @raise [Facter::Core::Execution::ExecutionFailure] If the command does
+      #   not exist or could not be executed.
+      #
+      # @return [String] the output of the program, or the value of :on_fail if
+      #   command execution failed and :on_fail was specified.
       #
       # @api public
-      def exec(command)
-        @@impl.exec(command)
+      def exec(command, options = {})
+        @@impl.exec(command, options)
       end
+
+      class ExecutionFailure < StandardError; end
     end
   end
 end

data/lib/facter/core/execution/base.rb

@@ -27,31 +27,39 @@ class Facter::Core::Execution::Base
     rv
   end
 
-  def exec(code)
+  def exec(command, options = {})
+
+    on_fail = options.fetch(:on_fail, :raise)
 
     ## Set LANG to force i18n to C for the duration of this exec; this ensures that any code that parses the
     ## output of the command can expect it to be in a consistent / predictable format / locale
     with_env "LANG" => "C" do
 
-      if expanded_code = expand_command(code)
-        # if we can find the binary, we'll run the command with the expanded path to the binary
-        code = expanded_code
-      else
-        return ''
+      expanded_command = expand_command(command)
+
+      if expanded_command.nil?
+        if on_fail == :raise
+          raise Facter::Core::Execution::ExecutionFailure.new, "Could not execute '#{command}': command not found"
+        else
+          return on_fail
+        end
       end
 
       out = ''
 
       begin
         wait_for_child = true
-        out = %x{#{code}}.chomp
+        out = %x{#{expanded_command}}.chomp
         wait_for_child = false
       rescue => detail
-        Facter.warn(detail.message)
-        return ''
+        if on_fail == :raise
+          raise Facter::Core::Execution::ExecutionFailure.new, "Failed while executing '#{expanded_command}': #{detail.message}"
+        else
+          return on_fail
+        end
       ensure
         if wait_for_child
-          # We need to ensure that if this code exits early then any spawned
+          # We need to ensure that if this command exits early then any spawned
           # children will be reaped. Process execution is frequently
           # terminated using Timeout.timeout but since the timeout isn't in
           # this scope we can't rescue the raised exception. The best that

data/lib/facter/domain.rb

@@ -41,11 +41,11 @@ Facter.add(:domain) do
                          basic_hostname
                        end
 
-    if name = Facter::Core::Execution.exec(hostname_command) \
+    if name = Facter::Core::Execution.exec(hostname_command, :on_fail => nil) \
       and name =~ /.*?\.(.+$)/
 
       return_value = $1
-    elsif Facter.value(:kernel) != "windows" and domain = Facter::Core::Execution.exec('dnsdomainname 2> /dev/null') \
+    elsif Facter.value(:kernel) != "windows" and domain = Facter::Core::Execution.exec('dnsdomainname 2> /dev/null', :on_fail => nil) \
       and domain =~ /.+/
 
       return_value = domain

data/lib/facter/hostname.rb

@@ -27,7 +27,5 @@ end
 
 Facter.add(:hostname) do
   confine :kernel => :darwin, :kernelrelease => "R7"
-  setcode do
-    Facter::Core::Execution.exec('/usr/sbin/scutil --get LocalHostName')
-  end
+  setcode '/usr/sbin/scutil --get LocalHostName'
 end

data/lib/facter/ldom.rb

@@ -1,4 +1,4 @@
-if Facter.value(:kernel) == 'SunOS'
+if Facter.value(:kernel) == 'SunOS' and Facter::Core::Execution.which('virtinfo')
   virtinfo = Facter::Core::Execution.exec('virtinfo -ap')
 
   # Convert virtinfo parseable output format to array of arrays.

data/lib/facter/lsbdistcodename.rb

@@ -12,7 +12,5 @@
 
 Facter.add(:lsbdistcodename) do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-  setcode do
-    Facter::Core::Execution.exec('lsb_release -c -s 2>/dev/null')
-  end
+  setcode 'lsb_release -c -s 2>/dev/null'
 end

data/lib/facter/lsbdistdescription.rb

@@ -12,6 +12,10 @@
 
 Facter.add(:lsbdistdescription) do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  confine do
+    Facter::Core::Execution.which("lsb_release")
+  end
+
   setcode do
     if output = Facter::Core::Execution.exec('lsb_release -d -s 2>/dev/null')
       # the output may be quoted (at least it is on gentoo)

data/lib/facter/lsbdistid.rb

@@ -12,7 +12,5 @@
 
 Facter.add(:lsbdistid) do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-  setcode do
-    Facter::Core::Execution.exec('lsb_release -i -s 2>/dev/null')
-  end
+  setcode 'lsb_release -i -s 2>/dev/null'
 end

data/lib/facter/lsbdistrelease.rb

@@ -12,7 +12,5 @@
 
 Facter.add(:lsbdistrelease) do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-  setcode do
-    Facter::Core::Execution.exec('lsb_release -r -s 2>/dev/null')
-  end
+  setcode 'lsb_release -r -s 2>/dev/null'
 end

data/lib/facter/lsbrelease.rb

@@ -12,7 +12,5 @@
 
 Facter.add(:lsbrelease) do
   confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-  setcode do
-    Facter::Core::Execution.exec('lsb_release -v -s 2>/dev/null')
-  end
+  setcode 'lsb_release -v -s 2>/dev/null'
 end

data/lib/facter/physicalprocessorcount.rb

@@ -66,19 +66,17 @@ end
 Facter.add('physicalprocessorcount') do
   confine :kernel => :sunos
 
+  # (#16526) The -p flag was not added until Solaris 8.  Our intent is to
+  # split the kernel release fact value on the dot, take the second element,
+  # and disable the -p flag for values < 8 when.
   setcode do
-    # (#16526) The -p flag was not added until Solaris 8.  Our intent is to
-    # split the kernel release fact value on the dot, take the second element,
-    # and disable the -p flag for values < 8 when.
     kernelrelease = Facter.value(:kernelrelease)
     (major_version, minor_version) = kernelrelease.split(".").map { |str| str.to_i }
-    cmd = "/usr/sbin/psrinfo"
-    result = nil
     if (major_version > 5) or (major_version == 5 and minor_version >= 8) then
-      result = Facter::Core::Execution.exec("#{cmd} -p")
+      Facter::Core::Execution.exec("/usr/sbin/psrinfo -p")
     else
-      output = Facter::Core::Execution.exec(cmd)
-      result = output.split("\n").length.to_s
+      output = Facter::Core::Execution.exec("/usr/sbin/psrinfo")
+      output.split("\n").length.to_s
     end
   end
 end

data/lib/facter/processor.rb

@@ -90,23 +90,12 @@ end
 
 Facter.add("Processor") do
   confine :kernel => :openbsd
-  setcode do
-    Facter::Core::Execution.exec("uname -p")
-  end
-end
-
-Facter.add("ProcessorCount") do
-  confine :kernel => :openbsd
-  setcode do
-    Facter::Core::Execution.exec("sysctl -n hw.ncpu")
-  end
+  setcode "uname -p"
 end
 
 Facter.add("ProcessorCount") do
   confine :kernel => :Darwin
-  setcode do
-    Facter::Core::Execution.exec("sysctl -n hw.ncpu")
-  end
+  setcode "sysctl -n hw.ncpu"
 end
 
 if Facter.value(:kernel) == "windows"
@@ -149,16 +138,12 @@ end
 
 Facter.add("Processor") do
   confine :kernel => [:dragonfly,:freebsd]
-  setcode do
-    Facter::Core::Execution.exec("sysctl -n hw.model")
-  end
+  setcode "sysctl -n hw.model"
 end
 
 Facter.add("ProcessorCount") do
-  confine :kernel => [:dragonfly,:freebsd]
-  setcode do
-    Facter::Core::Execution.exec("sysctl -n hw.ncpu")
-  end
+  confine :kernel => [:dragonfly,:freebsd,:openbsd]
+  setcode "sysctl -n hw.ncpu"
 end
 
 Facter.add("ProcessorCount") do

data/lib/facter/util/manufacturer.rb

@@ -54,9 +54,7 @@ module Facter::Manufacturer
     name.each do |sysctlkey,facterkey|
       Facter.add(facterkey) do
         confine :kernel => [:openbsd, :darwin]
-        setcode do
-          Facter::Core::Execution.exec("sysctl -n #{sysctlkey} 2>/dev/null")
-        end
+        setcode "sysctl -n #{sysctlkey} 2>/dev/null"
       end
     end
   end
@@ -80,9 +78,7 @@ module Facter::Manufacturer
     end
 
     Facter.add('serialnumber') do
-      setcode do
-        Facter::Core::Execution.exec("/usr/sbin/sneep")
-      end
+      setcode "/usr/sbin/sneep"
     end
   end
 

data/lib/facter/util/resolution.rb

@@ -128,8 +128,12 @@ class Facter::Util::Resolution
   def setcode(string = nil, &block)
     if string
       @code = Proc.new do
-        output = Facter::Core::Execution.exec(string)
-        output.empty? ? nil : output
+        output = Facter::Core::Execution.exec(string, :on_fail => nil)
+        if output.nil? or output.empty?
+          nil
+        else
+          output
+        end
       end
     elsif block_given?
       @code = block

data/lib/facter/util/solaris_zones.rb

@@ -93,7 +93,7 @@ module Util
     #
     # @return [Hash] the parsed output of the zoneadm command
     def refresh
-      @zoneadm_output = Facter::Core::Execution.exec(zoneadm_cmd)
+      @zoneadm_output = Facter::Core::Execution.exec(zoneadm_cmd, {:on_fail => nil})
       parse!
     end
 
@@ -103,11 +103,11 @@ module Util
     #
     # @api private
     def parse!
-      if @zoneadm_output.empty?
+      if @zoneadm_output
+        rows = @zoneadm_output.split("\n").collect { |line| line.split(':') }
+      else
         Facter.debug "Cannot parse zone facts, #{zoneadm_cmd} returned no output"
         rows = []
-      else
-        rows = @zoneadm_output.split("\n").collect { |line| line.split(':') }
       end
 
       @zone_hash = rows.inject({}) do |memo, fields|

data/lib/facter/util/uptime.rb

@@ -28,16 +28,16 @@ module Facter::Util::Uptime
   end
 
   def self.uptime_sysctl
-    output = Facter::Core::Execution.exec("#{uptime_sysctl_cmd} 2>/dev/null")
-    if not output.empty?
+    output = Facter::Core::Execution.exec("#{uptime_sysctl_cmd} 2>/dev/null", :on_fail => nil)
+    if output
       compute_uptime(Time.at(output.match(/\d+/)[0].to_i))
     end
   end
 
   def self.uptime_executable
-    output = Facter::Core::Execution.exec("#{uptime_executable_cmd} 2>/dev/null")
+    output = Facter::Core::Execution.exec("#{uptime_executable_cmd} 2>/dev/null", :on_fail => nil)
 
-    if not output.empty?
+    if output
       up=0
       if output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+):(\d+)/
         # Regexp handles Solaris, AIX, HP-UX, and Tru64.

data/lib/facter/util/vlans.rb

@@ -2,23 +2,20 @@
 #
 module Facter::Util::Vlans
   def self.get_vlan_config
-    output = ""
-      if File.exists?('/proc/net/vlan/config') and File.readable?('/proc/net/vlan/config')
-        output = File.open('/proc/net/vlan/config').read
-      end
-    output
+    if File.exist?('/proc/net/vlan/config') and File.readable?('/proc/net/vlan/config')
+      File.read('/proc/net/vlan/config')
+    end
   end
 
   def self.get_vlans
-    vlans = Array.new
-    if self.get_vlan_config
-      self.get_vlan_config.each_line do |line|
-        if line =~ /^([0-9A-Za-z]+)\.([0-9]+) /
-          vlans.insert(-1, $~[2]) if $~[2]
+    if (config = self.get_vlan_config)
+      vlans = []
+      config.each_line do |line|
+        if (match = line.match(/^([0-9A-Za-z]+)\.([0-9]+) /))
+          vlans << match[2] if match[2]
         end
       end
+      vlans.join(',') unless vlans.empty?
     end
-
-    vlans.join(',')
   end
 end

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.0.1-rc1'
+    FACTERVERSION = '2.0.1-rc2'
   end
 
   # Returns the running version of Facter.

data/lib/facter/virtual.rb

@@ -144,15 +144,23 @@ Facter.add("virtual") do
       next "ovirt"      if lines.any? {|l| l =~ /Product Name: oVirt Node/ }
     end
 
+    # Default to 'physical'
+    next 'physical'
+  end
+end
+
+Facter.add("virtual") do
+  confine do
+    Facter::Core::Execution.which('vmware')
+  end
+
+  setcode do
     # Sample output of vmware -v `VMware Server 1.0.5 build-80187`
     output = Facter::Core::Execution.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/util/vlans/centos-5-no-vlans

@@ -0,0 +1,2 @@
+VLAN Dev name	 | VLAN ID
+Name-Type: VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD

data/spec/unit/core/execution/base_spec.rb

@@ -77,18 +77,31 @@ describe Facter::Core::Execution::Base do
       subject.exec('foo')
     end
 
-    it "returns an empty string when the command could not be expanded" do
-      subject.expects(:expand_command).with('foo').returns nil
-      expect(subject.exec('foo')).to be_empty
+    describe "and the command is not present" do
+      it "raises an error when the :on_fail behavior is :raise" do
+        subject.expects(:expand_command).with('foo').returns nil
+        expect { subject.exec('foo') }.to raise_error(Facter::Core::Execution::ExecutionFailure)
+      end
+
+      it "returns the given value when :on_fail is set to a value" do
+        subject.expects(:expand_command).with('foo').returns nil
+        expect(subject.exec('foo', :on_fail => nil)).to be_nil
+      end
     end
 
-    it "logs a warning and returns an empty string when the command execution fails" do
-      subject.expects(:`).with("/bin/foo").raises "kaboom!"
-      Facter.expects(:warn).with("kaboom!")
+    describe "when command execution fails" do
+      before do
+        subject.expects(:`).with("/bin/foo").raises "kaboom!"
+        subject.expects(:expand_command).with('foo').returns '/bin/foo'
+      end
 
-      subject.expects(:expand_command).with('foo').returns '/bin/foo'
+      it "raises an error when the :on_fail behavior is :raise" do
+        expect { subject.exec('foo') }.to raise_error(Facter::Core::Execution::ExecutionFailure)
+      end
 
-      expect(subject.exec("foo")).to be_empty
+      it "returns the given value when :on_fail is set to a value" do
+        expect(subject.exec('foo', :on_fail => nil)).to be_nil
+      end
     end
 
     it "launches a thread to wait on children if the command was interrupted" do
@@ -99,7 +112,7 @@ describe Facter::Core::Execution::Base do
       Thread.expects(:new).yields
       Process.expects(:waitall).once
 
-      subject.exec("foo")
+      subject.exec("foo", :on_fail => nil)
     end
 
     it "returns the output of the command" do

data/spec/unit/core/execution_spec.rb

@@ -31,7 +31,7 @@ describe Facter::Core::Execution do
   end
 
   it "delegates #exec to the implementation" do
-    impl.expects(:exec).with('waffles')
+    impl.expects(:exec).with('waffles', {})
     subject.exec('waffles')
   end
 end

data/spec/unit/domain_spec.rb

@@ -24,11 +24,11 @@ describe "Domain name facts" do
       let(:dnsdomain_command) { "dnsdomainname 2> /dev/null" }
 
       def the_hostname_is(value)
-        Facter::Core::Execution.stubs(:exec).with(hostname_command).returns(value)
+        Facter::Core::Execution.stubs(:exec).with(hostname_command, {:on_fail => nil}).returns(value)
       end
 
       def the_dnsdomainname_is(value)
-        Facter::Core::Execution.stubs(:exec).with(dnsdomain_command).returns(value)
+        Facter::Core::Execution.stubs(:exec).with(dnsdomain_command, {:on_fail => nil}).returns(value)
       end
 
       before do
@@ -197,7 +197,7 @@ describe "Domain name facts" do
         it "should return nil" do
           expects_dnsdomains([nil])
 
-          Facter::Core::Execution.stubs(:exec).with(hostname_command).returns('sometest')
+          Facter::Core::Execution.stubs(:exec).with(hostname_command, {:on_fail => nil}).returns('sometest')
           FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(false)
 
           Facter.fact(:domain).value.should be_nil
@@ -288,8 +288,8 @@ describe "Domain name facts" do
 
         describe scenario[:scenario] do
           before(:each) do
-            Facter::Core::Execution.stubs(:exec).with("hostname -f 2> /dev/null").returns(scenario[:hostname])
-            Facter::Core::Execution.stubs(:exec).with("dnsdomainname 2> /dev/null").returns(scenario[:dnsdomainname])
+            Facter::Core::Execution.stubs(:exec).with("hostname -f 2> /dev/null", {:on_fail => nil}).returns(scenario[:hostname])
+            Facter::Core::Execution.stubs(:exec).with("dnsdomainname 2> /dev/null", {:on_fail => nil}).returns(scenario[:dnsdomainname])
             resolv_conf_contains(
               "search #{scenario[:resolve_search]}",
               "domain #{scenario[:resolve_domain]}"

data/spec/unit/hardwareisa_spec.rb

@@ -6,35 +6,35 @@ require 'facter'
 describe "Hardwareisa fact" do
   it "should match uname -p on Linux" do
     Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Inky")
+    Facter::Core::Execution.stubs(:exec).with("uname -p", anything).returns("Inky")
 
     Facter.fact(:hardwareisa).value.should == "Inky"
   end
 
   it "should match uname -p on Darwin" do
     Facter.fact(:kernel).stubs(:value).returns("Darwin")
-    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Blinky")
+    Facter::Core::Execution.stubs(:exec).with("uname -p", anything).returns("Blinky")
 
     Facter.fact(:hardwareisa).value.should == "Blinky"
   end
 
   it "should match uname -p on SunOS" do
     Facter.fact(:kernel).stubs(:value).returns("SunOS")
-    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Pinky")
+    Facter::Core::Execution.stubs(:exec).with("uname -p", anything).returns("Pinky")
 
     Facter.fact(:hardwareisa).value.should == "Pinky"
   end
 
   it "should match uname -p on FreeBSD" do
     Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-    Facter::Core::Execution.stubs(:exec).with("uname -p").returns("Clyde")
+    Facter::Core::Execution.stubs(:exec).with("uname -p", anything).returns("Clyde")
 
     Facter.fact(:hardwareisa).value.should == "Clyde"
   end
 
   it "should match uname -m on HP-UX" do
     Facter.fact(:kernel).stubs(:value).returns("HP-UX")
-    Facter::Core::Execution.stubs(:exec).with("uname -m").returns("Pac-Man")
+    Facter::Core::Execution.stubs(:exec).with("uname -m", anything).returns("Pac-Man")
 
     Facter.fact(:hardwareisa).value.should == "Pac-Man"
   end

data/spec/unit/hardwaremodel_spec.rb

@@ -6,7 +6,7 @@ require 'facter'
 describe "Hardwaremodel fact" do
   it "should match uname -m by default" do
     Facter.fact(:kernel).stubs(:value).returns("Darwin")
-    Facter::Core::Execution.stubs(:exec).with("uname -m").returns("Inky")
+    Facter::Core::Execution.stubs(:exec).with("uname -m", anything).returns("Inky")
 
     Facter.fact(:hardwaremodel).value.should == "Inky"
   end
@@ -23,7 +23,7 @@ describe "Hardwaremodel fact" do
       Facter::Util::WMI.expects(:execquery).returns([cpu])
 
       Facter.fact(:hardwaremodel).value.should == "i486"
-    end    
+    end
 
     it "should detect i686" do
       cpu = mock('cpu', :Architecture => 0, :Level => 6)

data/spec/unit/hostname_spec.rb

@@ -33,7 +33,7 @@ describe "Hostname facts" do
     end
 
     it "should use scutil to get the hostname" do
-      Facter::Core::Execution.expects(:exec).with('/usr/sbin/scutil --get LocalHostName').returns("host1")
+      Facter::Core::Execution.expects(:exec).with('/usr/sbin/scutil --get LocalHostName', anything).returns("host1")
       Facter.fact(:hostname).value.should == "host1"
     end
   end

data/spec/unit/id_spec.rb

@@ -12,7 +12,7 @@ describe "id fact" do
       it "should return the current user" do
         given_a_configuration_of(:is_windows => k == 'windows')
         Facter.fact(:kernel).stubs(:value).returns(k)
-        Facter::Core::Execution.expects(:exec).once.with('whoami').returns 'bar'
+        Facter::Core::Execution.expects(:exec).once.with('whoami', anything).returns 'bar'
 
         Facter.fact(:id).value.should == 'bar'
       end
@@ -22,7 +22,7 @@ describe "id fact" do
   it "should return the current user on Solaris" do
     given_a_configuration_of(:is_windows => false)
     Facter::Core::Execution.stubs(:exec).with('uname -s').returns('SunOS')
-    Facter::Core::Execution.expects(:exec).once.with('/usr/xpg4/bin/id -un').returns 'bar'
+    Facter::Core::Execution.expects(:exec).once.with('/usr/xpg4/bin/id -un', anything).returns 'bar'
 
     Facter.fact(:id).value.should == 'bar'
   end

data/spec/unit/kernelrelease_spec.rb

@@ -2,52 +2,52 @@
 
 require 'spec_helper'
 
-describe "Kernel release fact" do 
+describe "Kernel release fact" do
 
-  describe "on Windows" do 
-    before do 
+  describe "on Windows" do
+    before do
       Facter.fact(:kernel).stubs(:value).returns("windows")
       require 'facter/util/wmi'
       version = stubs 'version'
       version.stubs(:Version).returns("test_kernel")
       Facter::Util::WMI.stubs(:execquery).with("SELECT Version from Win32_OperatingSystem").returns([version])
     end
-    
-    it "should return the kernel release" do 
+
+    it "should return the kernel release" do
       Facter.fact(:kernelrelease).value.should == "test_kernel"
-    end 
-  end 
+    end
+  end
 
-  describe "on AIX" do 
-    before do 
+  describe "on AIX" do
+    before do
       Facter.fact(:kernel).stubs(:value).returns("aix")
-      Facter::Core::Execution.stubs(:exec).with('oslevel -s').returns("test_kernel")
-    end 
-    
-    it "should return the kernel release" do 
+      Facter::Core::Execution.stubs(:exec).with('oslevel -s', anything).returns("test_kernel")
+    end
+
+    it "should return the kernel release" do
       Facter.fact(:kernelrelease).value.should == "test_kernel"
-    end 
-  end 
+    end
+  end
 
   describe "on HP-UX" do
     before do
-      Facter.fact(:kernel).stubs(:value).returns("hp-ux") 
+      Facter.fact(:kernel).stubs(:value).returns("hp-ux")
       Facter::Core::Execution.stubs(:exec).with('uname -r').returns("B.11.31")
-    end 
-    
+    end
+
     it "should remove preceding letters" do
       Facter.fact(:kernelrelease).value.should == "11.31"
-    end 
-  end 
+    end
+  end
 
-  describe "on everything else" do 
+  describe "on everything else" do
     before do
       Facter.fact(:kernel).stubs(:value).returns("linux")
-      Facter::Core::Execution.stubs(:exec).with('uname -r').returns("test_kernel")
-    end 
-    
+      Facter::Core::Execution.stubs(:exec).with('uname -r', anything).returns("test_kernel")
+    end
+
     it "should return the kernel release" do
       Facter.fact(:kernelrelease).value.should == "test_kernel"
-    end   
-  end   
-end 
+    end
+  end
+end

data/spec/unit/kernelversion_spec.rb

@@ -3,29 +3,29 @@
 require 'spec_helper'
 
 describe "Kernel version fact" do
-  
+
   describe "on Solaris/Sun OS" do
     before do
       Facter.fact(:kernel).stubs(:value).returns('sunos')
-      Facter::Core::Execution.stubs(:exec).with('uname -v').returns("1.234.5")
-    end 
-    
-    it "should return the kernel version using 'uname -v'" do 
+      Facter::Core::Execution.stubs(:exec).with('uname -v', anything).returns("1.234.5")
+    end
+
+    it "should return the kernel version using 'uname -v'" do
       Facter.fact(:kernelversion).value.should == "1.234.5"
-    end 
+    end
   end
-  
+
   describe "on everything else" do
-    before do 
+    before do
       Facter.fact(:kernel).stubs(:value).returns('linux')
       Facter.fact(:kernelrelease).stubs(:value).returns('1.23.4-56')
-    end 
-    
-    it "should return the kernel version using kernel release" do 
+    end
+
+    it "should return the kernel version using kernel release" do
       Facter.fact(:kernelversion).value.should == "1.23.4"
-    end 
+    end
   end
-end 
+end
 
 
 

data/spec/unit/ldom_spec.rb

@@ -15,6 +15,7 @@ describe "ldom fact" do
     before :each do
       # For virtinfo documentation:
       # http://docs.oracle.com/cd/E23824_01/html/821-1462/virtinfo-1m.html
+      Facter::Core::Execution.stubs(:which).with("virtinfo").returns 'virtinfo'
       Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").
         returns(ldom_fixtures('ldom_v1'))
       Facter.collection.internal_loader.load(:ldom)
@@ -63,7 +64,7 @@ describe "ldom fact" do
 
   describe "when running on non ldom hardware" do
     before :each do
-      Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").returns(nil)
+      Facter::Core::Execution.stubs(:which).with("virtinfo").returns(nil)
       Facter.collection.internal_loader.load(:ldom)
     end
 

data/spec/unit/lsbdistcodename_spec.rb

@@ -10,14 +10,14 @@ describe "lsbdistcodename fact" do
         Facter.fact(:kernel).stubs(:value).returns kernel
       end
 
-      it "should return the codename through lsb_release -c -s 2>/dev/null" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -c -s 2>/dev/null').returns 'n/a'
-        Facter.fact(:lsbdistcodename).value.should == 'n/a'
+      it "returns the codename through lsb_release -c -s 2>/dev/null" do
+        Facter::Core::Execution.impl.stubs(:exec).with('lsb_release -c -s 2>/dev/null', anything).returns 'n/a'
+        expect(Facter.fact(:lsbdistcodename).value).to eq 'n/a'
       end
 
-      it "should return nil if lsb_release is not installed" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -c -s 2>/dev/null').returns nil
-        Facter.fact(:lsbdistcodename).value.should be_nil
+      it "returns nil if lsb_release is not installed" do
+        Facter::Core::Execution.impl.stubs(:expand_command).with('lsb_release -c -s 2>/dev/null').returns nil
+        expect(Facter.fact(:lsbdistcodename).value).to be_nil
       end
     end
   end

data/spec/unit/lsbdistdescription_spec.rb

@@ -10,16 +10,16 @@ describe "lsbdistdescription fact" do
         Facter.fact(:kernel).stubs(:value).returns kernel
       end
 
-      it "should return the description through lsb_release -d -s 2>/dev/null" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -d -s 2>/dev/null').returns '"Gentoo Base System release 2.1"'
-        Facter.fact(:lsbdistdescription).value.should == 'Gentoo Base System release 2.1'
+      it "returns the description through lsb_release -d -s 2>/dev/null" do
+        Facter::Core::Execution.stubs(:which).with('lsb_release').returns '/usr/bin/lsb_release'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -d -s 2>/dev/null', anything).returns '"Gentoo Base System release 2.1"'
+        expect(Facter.fact(:lsbdistdescription).value).to eq 'Gentoo Base System release 2.1'
       end
 
-      it "should return nil if lsb_release is not installed" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -d -s 2>/dev/null').returns nil
-        Facter.fact(:lsbdistdescription).value.should be_nil
+      it "returns nil if lsb_release is not installed" do
+        Facter::Core::Execution.stubs(:which).with('lsb_release').returns nil
+        expect(Facter.fact(:lsbdistdescription).value).to be_nil
       end
     end
   end
-
 end

data/spec/unit/lsbdistid_spec.rb

@@ -10,14 +10,14 @@ describe "lsbdistid fact" do
         Facter.fact(:kernel).stubs(:value).returns kernel
       end
 
-      it "should return the id through lsb_release -i -s 2>/dev/null" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -i -s 2>/dev/null').returns 'Gentoo'
-        Facter.fact(:lsbdistid).value.should == 'Gentoo'
+      it "returns the id through lsb_release -i -s 2>/dev/null" do
+        Facter::Core::Execution.impl.stubs(:exec).with('lsb_release -i -s 2>/dev/null', anything).returns 'Gentoo'
+        expect(Facter.fact(:lsbdistid).value).to eq 'Gentoo'
       end
 
-      it "should return nil if lsb_release is not installed 2>/dev/null" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -i -s 2>/dev/null').returns nil
-        Facter.fact(:lsbdistid).value.should be_nil
+      it "returns nil if lsb_release is not installed" do
+        Facter::Core::Execution.impl.stubs(:expand_command).with('lsb_release -i -s 2>/dev/null').returns nil
+        expect(Facter.fact(:lsbdistid).value).to be_nil
       end
     end
   end

data/spec/unit/lsbdistrelease_spec.rb

@@ -11,12 +11,12 @@ describe "lsbdistrelease fact" do
       end
 
       it "should return the release through lsb_release -r -s 2>/dev/null" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -r -s 2>/dev/null').returns '2.1'
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -r -s 2>/dev/null', anything).returns '2.1'
         Facter.fact(:lsbdistrelease).value.should == '2.1'
       end
 
       it "should return nil if lsb_release is not installed" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -r -s 2>/dev/null').returns nil
+        Facter::Core::Execution.stubs(:exec).with('lsb_release -r -s 2>/dev/null', anything).returns nil
         Facter.fact(:lsbdistrelease).value.should be_nil
       end
     end

data/spec/unit/lsbrelease_spec.rb

@@ -10,14 +10,14 @@ describe "lsbrelease fact" do
         Facter.fact(:kernel).stubs(:value).returns kernel
       end
 
-      it "should return the release through lsb_release -v -s 2>/dev/null" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -v -s 2>/dev/null').returns 'n/a'
-        Facter.fact(:lsbrelease).value.should == 'n/a'
+      it "returns the release through lsb_release -v -s 2>/dev/null" do
+        Facter::Core::Execution.impl.stubs(:exec).with('lsb_release -v -s 2>/dev/null', anything).returns 'n/a'
+        expect(Facter.fact(:lsbrelease).value).to eq 'n/a'
       end
 
-      it "should return nil if lsb_release is not installed" do
-        Facter::Core::Execution.stubs(:exec).with('lsb_release -v -s 2>/dev/null').returns nil
-        Facter.fact(:lsbrelease).value.should be_nil
+      it "returns nil if lsb_release is not installed" do
+        Facter::Core::Execution.impl.stubs(:expand_command).with('lsb_release -v -s 2>/dev/null').returns nil
+        expect(Facter.fact(:lsbrelease).value).to be_nil
       end
     end
   end

data/spec/unit/processor_spec.rb

@@ -185,35 +185,35 @@ describe "Processor facts" do
 
     it "should be 2 on dual-processor Darwin box" do
       Facter.fact(:kernel).stubs(:value).returns("Darwin")
-      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
+      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu", anything).returns('2')
 
       Facter.fact(:processorcount).value.should == "2"
     end
 
     it "should be 2 on dual-processor OpenBSD box" do
       Facter.fact(:kernel).stubs(:value).returns("OpenBSD")
-      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
+      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu", anything).returns('2')
 
       Facter.fact(:processorcount).value.should == "2"
     end
 
     it "should be 2 on dual-processor FreeBSD box" do
       Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
+      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu", anything).returns('2')
 
       Facter.fact(:processorcount).value.should == "2"
     end
 
     it "should print the correct CPU Model on FreeBSD" do
       Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.model").returns('SomeVendor CPU 3GHz')
+      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.model", anything).returns('SomeVendor CPU 3GHz')
 
       Facter.fact(:processor).value.should == "SomeVendor CPU 3GHz"
     end
 
     it "should be 2 on dual-processor DragonFly box" do
       Facter.fact(:kernel).stubs(:value).returns("DragonFly")
-      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu").returns('2')
+      Facter::Core::Execution.stubs(:exec).with("sysctl -n hw.ncpu", anything).returns('2')
 
       Facter.fact(:processorcount).value.should == "2"
     end

data/spec/unit/uniqueid_spec.rb

@@ -6,21 +6,21 @@ require 'facter'
 describe "Uniqueid fact" do
   it "should match hostid on Solaris" do
     Facter.fact(:kernel).stubs(:value).returns("SunOS")
-    Facter::Core::Execution.stubs(:exec).with("hostid").returns("Larry")
+    Facter::Core::Execution.stubs(:exec).with("hostid", anything).returns("Larry")
 
     Facter.fact(:uniqueid).value.should == "Larry"
   end
 
   it "should match hostid on Linux" do
     Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter::Core::Execution.stubs(:exec).with("hostid").returns("Curly")
+    Facter::Core::Execution.stubs(:exec).with("hostid", anything).returns("Curly")
 
     Facter.fact(:uniqueid).value.should == "Curly"
   end
 
   it "should match hostid on AIX" do
     Facter.fact(:kernel).stubs(:value).returns("AIX")
-    Facter::Core::Execution.stubs(:exec).with("hostid").returns("Moe")
+    Facter::Core::Execution.stubs(:exec).with("hostid", anything).returns("Moe")
 
     Facter.fact(:uniqueid).value.should == "Moe"
   end

data/spec/unit/util/ip_spec.rb

@@ -401,10 +401,13 @@ describe Facter::Util::IP do
 
   describe "exec_ifconfig" do
     it "uses get_ifconfig" do
+      Facter::Core::Execution.stubs(:exec)
+
       Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig").once
 
       Facter::Util::IP.exec_ifconfig
     end
+
     it "support additional arguments" do
       Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
 
@@ -412,6 +415,7 @@ describe Facter::Util::IP do
 
       Facter::Util::IP.exec_ifconfig(["-a"])
     end
+
     it "joins multiple arguments correctly" do
       Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
 

data/spec/unit/util/resolution_spec.rb

@@ -74,7 +74,7 @@ describe Facter::Util::Resolution do
     describe "and the code is a string" do
       it "returns the result of executing the code" do
         resolution.setcode "/bin/foo"
-        Facter::Core::Execution.expects(:exec).once.with("/bin/foo").returns "yup"
+        Facter::Core::Execution.expects(:exec).once.with("/bin/foo", anything).returns "yup"
 
         expect(resolution.value).to eq "yup"
       end

data/spec/unit/util/solaris_zones_spec.rb

@@ -47,7 +47,7 @@ describe Facter::Util::SolarisZones do
 
   describe '#refresh' do
     it 'executes the zoneadm_cmd' do
-      Facter::Core::Execution.expects(:exec).with(subject.zoneadm_cmd).returns(zone_list)
+      Facter::Core::Execution.expects(:exec).with(subject.zoneadm_cmd, {:on_fail => nil}).returns(zone_list)
       subject.refresh
     end
   end
@@ -112,7 +112,7 @@ describe Facter::Util::SolarisZones do
 
   def given_initial_zone_facts
     Facter::Core::Execution.stubs(:exec).
-      with(subject.zoneadm_cmd).
+      with(subject.zoneadm_cmd, {:on_fail => nil}).
       returns(zone_list)
     described_class.add_facts
   end

data/spec/unit/util/uptime_spec.rb

@@ -99,14 +99,14 @@ describe Facter::Util::Uptime do
 
           test_cases.each do |uptime, expected|
             it "should return #{expected} for #{uptime}" do
-              Facter::Core::Execution.stubs(:exec).with('uptime 2>/dev/null').returns(uptime)
+              Facter::Core::Execution.stubs(:exec).with('uptime 2>/dev/null', {:on_fail => nil}).returns(uptime)
               Facter.fact(:uptime_seconds).value.should == expected
             end
           end
 
           describe "nor is 'uptime' command" do
             before :each do
-              Facter::Util::Uptime.stubs(:uptime_executable_cmd).returns("cat \"#{@nonexistent_file}\"")
+              Facter::Core::Execution.stubs(:exec).with('uptime 2>/dev/null', {:on_fail => nil}).returns(nil)
             end
 
             it "should return nil" do

data/spec/unit/util/vlans_spec.rb

@@ -4,9 +4,39 @@ require 'spec_helper'
 require 'facter/util/vlans'
 
 describe Facter::Util::Vlans do
-  it "should return a list of vlans on Linux" do
-    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}
+  let(:vlan_file) { "/proc/net/vlan/config" }
+
+  describe "reading the vlan configuration" do
+    it "uses the contents of /proc/net/vlan/config" do
+      File.expects(:exist?).with(vlan_file).returns true
+      File.expects(:readable?).with(vlan_file).returns true
+      File.expects(:read).with(vlan_file).returns "vlan contents here"
+
+      expect(Facter::Util::Vlans.get_vlan_config).to eq "vlan contents here"
+    end
+
+    it "returns nil when /proc/net/vlan/config is absent" do
+      File.expects(:exist?).with(vlan_file).returns false
+      expect(Facter::Util::Vlans.get_vlan_config).to be_nil
+    end
+  end
+
+  describe "parsing the vlan configuration" do
+    let(:vlan_content) { my_fixture_read("linux_vlan_config") }
+
+    it "returns a list of vlans on Linux when vlans are configured" do
+      Facter::Util::Vlans.stubs(:get_vlan_config).returns(vlan_content)
+      expect(Facter::Util::Vlans.get_vlans()).to eq %{400,300,200,100}
+    end
+
+    it "returns nil when no vlans are configured" do
+      Facter::Util::Vlans.stubs(:get_vlan_config).returns(nil)
+      expect(Facter::Util::Vlans.get_vlans()).to be_nil
+    end
+
+    it "returns nil when only the vlan header is returned" do
+      Facter::Util::Vlans.stubs(:get_vlan_config).returns(my_fixture_read("centos-5-no-vlans"))
+      expect(Facter::Util::Vlans.get_vlans()).to be_nil
+    end
   end
 end

data/spec/unit/zonename_spec.rb

@@ -7,7 +7,7 @@ describe "zonename fact" do
 
   it "should return global zone" do
     Facter.fact(:kernel).stubs(:value).returns("SunOS")
-    Facter::Core::Execution.stubs(:exec).with("zonename").returns('global')
+    Facter::Core::Execution.stubs(:exec).with("zonename", anything).returns('global')
 
     Facter.fact(:zonename).value.should == "global"
   end

data/spec/unit/zones_spec.rb

@@ -10,7 +10,7 @@ describe "on Solaris" do
 -:local:configured:/::native:shared
 -:zoneA:stopped:/::native:shared
     EOF
-    Facter::Core::Execution.stubs(:exec).with('/usr/sbin/zoneadm list -cp').returns(zone_list)
+    Facter::Core::Execution.stubs(:exec).with('/usr/sbin/zoneadm list -cp', {:on_fail => nil}).returns(zone_list)
     Facter.collection.internal_loader.load(:zones)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 2.0.1.rc1
+  version: 2.0.1.rc2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies: []
 description: You can prove anything with facts!
 email: info@puppetlabs.com
@@ -286,6 +286,7 @@ files:
 - spec/fixtures/unit/util/uptime/ubuntu_proc_uptime
 - spec/fixtures/unit/util/virtual/invalid_unicode_dmi_entries
 - spec/fixtures/unit/util/virtual/solaris10_proc_self_status1
+- spec/fixtures/unit/util/vlans/centos-5-no-vlans
 - spec/fixtures/unit/util/vlans/linux_vlan_config
 - spec/fixtures/unit/util/xendomains/xendomains
 - spec/fixtures/unit/virtual/sysfs_dmi_entries_raw.txt
@@ -550,6 +551,7 @@ test_files:
 - spec/fixtures/unit/util/uptime/ubuntu_proc_uptime
 - spec/fixtures/unit/util/virtual/invalid_unicode_dmi_entries
 - spec/fixtures/unit/util/virtual/solaris10_proc_self_status1
+- spec/fixtures/unit/util/vlans/centos-5-no-vlans
 - spec/fixtures/unit/util/vlans/linux_vlan_config
 - spec/fixtures/unit/util/xendomains/xendomains
 - spec/fixtures/unit/virtual/sysfs_dmi_entries_raw.txt