facter 1.7.0.rc1 → 1.7.0.rc2

data/Gemfile

@@ -26,6 +26,7 @@ platform :mswin, :mingw do
   gem "win32-dir", "~> 0.3.7"
   gem "windows-api", "~> 0.4.1"
   gem "windows-pr", "~> 1.2.1"
+  gem "win32console", "~> 1.3.2"
 end
 
 if File.exists? "#{__FILE__}.local"

data/lib/facter/ipaddress6.rb

@@ -21,6 +21,8 @@
 # Used the ipaddress fact that is already part of
 # Facter as a template.
 
+require 'facter/util/ip'
+
 def get_address_after_token(output, token, return_first=false)
   ip = nil
 

data/lib/facter/util/solaris_zones.rb

@@ -103,7 +103,12 @@ module Util
     #
     # @api private
     def parse!
-      rows = @zoneadm_output.split("\n").collect { |line| line.split(':') }
+      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 = []
+      end
 
       @zone_hash = rows.inject({}) do |memo, fields|
         zone = fields[1].intern

data/lib/facter/util/virtual.rb

@@ -3,8 +3,23 @@ module Facter::Util::Virtual
   # virt_what is a delegating helper method intended to make it easier to stub
   # the system call without affecting other calls to
   # Facter::Util::Resolution.exec
+  #
+  # Per https://bugzilla.redhat.com/show_bug.cgi?id=719611 when run as a
+  # non-root user the virt-what command may emit an error message on stdout,
+  # and later versions of virt-what may emit this message on stderr. This
+  # method ensures stderr is redirected and that error messages are stripped
+  # from stdout.
   def self.virt_what(command = "virt-what")
-    Facter::Util::Resolution.exec command
+    command = Facter::Util::Resolution.which(command)
+    return unless command
+
+    if Facter.value(:kernel) == 'windows'
+      redirected_cmd = "#{command} 2>NUL"
+    else
+      redirected_cmd = "#{command} 2>/dev/null"
+    end
+    output = Facter::Util::Resolution.exec redirected_cmd
+    output.gsub(/^virt-what: .*$/, '') if output
   end
 
   ##
@@ -47,6 +62,9 @@ module Facter::Util::Virtual
   def self.vserver?
     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)
+    end
     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.7.0-rc1'
+    FACTERVERSION = '1.7.0-rc2'
   end
 
   ##

data/lib/facter/virtual.rb

@@ -206,20 +206,21 @@ Facter.add("virtual") do
   has_weight 500
 
   setcode do
-    output = Facter::Util::Virtual.virt_what
-    case output
-    when 'linux_vserver'
-      Facter::Util::Virtual.vserver_type
-    when /xen-hvm/i
-      'xenhvm'
-    when /xen-dom0/i
-      'xen0'
-    when /xen-domU/i
-      'xenu'
-    when /ibm_systemz/i
-      'zlinux'
-    else
-      output.to_s.split("\n").last
+    if output = Facter::Util::Virtual.virt_what
+      case output
+      when 'linux_vserver'
+        Facter::Util::Virtual.vserver_type
+      when /xen-hvm/i
+        'xenhvm'
+      when /xen-dom0/i
+        'xen0'
+      when /xen-domU/i
+        'xenu'
+      when /ibm_systemz/i
+        'zlinux'
+      else
+        output.to_s.split("\n").last
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -20,6 +20,13 @@ end
 RSpec.configure do |config|
   config.mock_with :mocha
 
+  if Facter::Util::Config.is_windows?
+    require 'win32console'
+    config.output_stream = $stdout
+    config.error_stream = $stderr
+    config.formatters.each { |f| f.instance_variable_set(:@output, $stdout) }
+  end
+
   config.before :each do
     # Ensure that we don't accidentally cache facts and environment
     # between test cases.

data/spec/unit/util/loader_spec.rb

@@ -321,12 +321,11 @@ describe Facter::Util::Loader do
     end
 
     it "should load all facts from the environment" do
-      Facter.expects(:add).with('one')
-      Facter.expects(:add).with('two')
-
       Facter::Util::Resolution.with_env "facter_one" => "yayness", "facter_two" => "boo" do
         @loader.load_all
       end
+      Facter.value(:one).should == 'yayness'
+      Facter.value(:two).should == 'boo'
     end
 
     it "should only load all facts one time" do

data/spec/unit/util/macaddress_spec.rb

@@ -18,7 +18,7 @@ describe "standardized MAC address" do
   end
 end
 
-describe "Darwin", :unless => Facter.value(:operatingsystem) == 'windows' do
+describe "Darwin", :unless => Facter::Util::Config.is_windows? do
   test_cases = [
     # version,           iface, real macaddress,     fallback macaddress
     ["9.8.0",            'en0', "00:17:f2:06:e4:2e", "00:17:f2:06:e4:2e"],

data/spec/unit/util/macosx_spec.rb

@@ -42,8 +42,10 @@ describe Facter::Util::Macosx do
   end
 
   it 'should fail when trying to read invalid XML' do
-    expect { Facter::Util::Macosx.intern_xml('<bad}|%-->xml<--->') }.to \
-      raise_error(RuntimeError, /A plist file could not be properly read by Facter::Util::CFPropertyList/)
+    STDERR.stubs(:<<)
+    expect {
+      Facter::Util::Macosx.intern_xml('<bad}|%-->xml<--->')
+    }.to raise_error(RuntimeError, /A plist file could not be properly read by Facter::Util::CFPropertyList/)
   end
 
   describe "when collecting profiler data" do

data/spec/unit/util/uptime_spec.rb

@@ -5,7 +5,7 @@ require 'facter/util/uptime'
 
 describe Facter::Util::Uptime do
 
-  describe ".get_uptime_seconds_unix", :unless => Facter.value(:operatingsystem) == 'windows' do
+  describe ".get_uptime_seconds_unix", :unless => Facter::Util::Config.is_windows? do
     describe "when /proc/uptime is available" do
       before do
         uptime_file = my_fixture("ubuntu_proc_uptime")
@@ -118,7 +118,7 @@ describe Facter::Util::Uptime do
     end
   end
 
-  describe ".get_uptime_seconds_win", :if => Facter.value(:operatingsystem) == 'windows' do
+  describe ".get_uptime_seconds_win", :if => Facter::Util::Config.is_windows? do
     it "should return a postive value" do
       Facter::Util::Uptime.get_uptime_seconds_win.should > 0
     end

data/spec/unit/util/virtual_spec.rb

@@ -58,6 +58,14 @@ describe Facter::Util::Virtual do
     Facter::Util::Virtual.should_not be_zone
   end
 
+  it "(#14522) handles the unencoded binary data in /proc/self/status on Solaris" do
+    Facter.fact(:osfamily).stubs(:value).returns("Solaris")
+    File.stubs(:open).with('/proc/self/status', 'rb').returns(solaris_proc_self_status)
+    FileTest.stubs(:exists?).with('/proc/self/status').returns(true)
+
+    Facter::Util::Virtual.vserver?.should eq(false)
+  end
+
   it "should not detect vserver if no self status" do
     FileTest.stubs(:exists?).with("/proc/self/status").returns(false)
     Facter::Util::Virtual.should_not be_vserver
@@ -235,4 +243,38 @@ describe Facter::Util::Virtual do
 
     Facter::Util::Virtual.should_not be_virtualbox
   end
+
+  let :solaris_proc_self_status do
+    sample_data = my_fixture_read('solaris10_proc_self_status1')
+    mockfile = mock('File')
+    mockfile.stubs(:read).returns(sample_data)
+    mockfile
+  end
+
+  shared_examples_for "virt-what" do |kernel, path, null_device|
+    Facter.fact(:kernel).stubs(:value).returns(kernel)
+    Facter::Util::Resolution.expects(:which).with("virt-what").returns(path)
+    Facter::Util::Resolution.expects(:exec).with("#{path} 2>#{null_device}")
+    Facter::Util::Virtual.virt_what
+  end
+
+  context "on linux" do
+    it_should_behave_like "virt-what", "linux", "/usr/bin/virt-what", "/dev/null"
+
+    it "should strip out warnings on stdout from virt-what" do
+      virt_what_warning = "virt-what: this script must be run as root"
+      Facter.fact(:kernel).stubs(:value).returns('linux')
+      Facter::Util::Resolution.expects(:which).with('virt-what').returns "/usr/bin/virt-what"
+      Facter::Util::Resolution.expects(:exec).with('/usr/bin/virt-what 2>/dev/null').returns virt_what_warning
+      Facter::Util::Virtual.virt_what.should_not match /^virt-what: /
+    end
+  end
+
+  context "on unix" do
+    it_should_behave_like "virt-what", "unix", "/usr/bin/virt-what", "/dev/null"
+  end
+
+  context "on windows" do
+    it_should_behave_like "virt-what", "windows", 'c:\windows\system32\virt-what', "NUL"
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 1394194789
+  hash: 3969496243
   prerelease: 6
   segments: 
   - 1
   - 7
   - 0
   - rc
-  - 1
-  version: 1.7.0.rc1
+  - 2
+  version: 1.7.0.rc2
 platform: ruby
 authors: 
 - Puppet Labs
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-01 00:00:00 Z
+date: 2013-04-08 00:00:00 Z
 dependencies: []
 
 description: You can prove anything with facts!
@@ -210,6 +210,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/solaris10_proc_self_status1
 - spec/fixtures/unit/util/loader/nosuchfact.rb
 - spec/fixtures/unit/util/processor/solaris-i86pc
 - spec/fixtures/unit/util/processor/x86-pentium2
@@ -458,6 +459,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/solaris10_proc_self_status1
 - spec/fixtures/unit/util/loader/nosuchfact.rb
 - spec/fixtures/unit/util/processor/solaris-i86pc
 - spec/fixtures/unit/util/processor/x86-pentium2