facter 1.6.4 → 1.6.5

data/lib/facter/util/fact.rb

@@ -33,17 +33,22 @@ class Facter::Util::Fact
   def add(&block)
     raise ArgumentError, "You must pass a block to Fact<instance>.add" unless block_given?
 
-    resolve = Facter::Util::Resolution.new(@name)
+    begin
+      resolve = Facter::Util::Resolution.new(@name)
 
-    resolve.instance_eval(&block)
+      resolve.instance_eval(&block)
 
-    @resolves << resolve
+      @resolves << resolve
 
-    # Immediately sort the resolutions, so that we always have
-    # a sorted list for looking up values.
-    @resolves.sort! { |a, b| b.weight <=> a.weight }
+      # Immediately sort the resolutions, so that we always have
+      # a sorted list for looking up values.
+      @resolves.sort! { |a, b| b.weight <=> a.weight }
 
-    return resolve
+      resolve
+    rescue => e
+      Facter.warn "Unable to add resolve for #{@name}: #{e}"
+      nil
+    end
   end
 
   # Flush any cached values.

data/lib/facter/util/monkey_patches.rb

@@ -0,0 +1,7 @@
+# This provides an alias for RbConfig to Config for versions of Ruby older then
+# version 1.8.5. This allows us to use RbConfig in place of the older Config in
+# our code and still be compatible with at least Ruby 1.8.1.
+require 'rbconfig'
+unless defined? ::RbConfig
+  ::RbConfig = ::Config
+end

data/lib/facter/util/uptime.rb

@@ -27,7 +27,7 @@ module Facter::Util::Uptime
 
   def self.uptime_sysctl
     if output = Facter::Util::Resolution.exec("#{uptime_sysctl_cmd} 2>/dev/null")
-      compute_uptime(Time.at(output.unpack('L').first))
+      compute_uptime(Time.at(output.match(/\d+/)[0].to_i))
     end
   end
 
@@ -52,7 +52,7 @@ module Facter::Util::Uptime
   end
 
   def self.uptime_sysctl_cmd
-    'sysctl -b kern.boottime'
+    'sysctl -n kern.boottime'
   end
 
   def self.uptime_kstat_cmd

data/lib/facter/util/virtual.rb

@@ -55,7 +55,7 @@ module Facter::Util::Virtual
   def self.kvm?
      txt = if FileTest.exists?("/proc/cpuinfo")
        File.read("/proc/cpuinfo")
-     elsif Facter.value(:kernel)=="FreeBSD"
+     elsif ["FreeBSD", "OpenBSD"].include? Facter.value(:kernel)
        Facter::Util::Resolution.exec("/sbin/sysctl -n hw.model")
      end
      (txt =~ /QEMU Virtual CPU/) ? true : false

data/lib/facter/virtual.rb

@@ -52,7 +52,7 @@ Facter.add("virtual") do
 
   setcode do
 
-    if Facter.value(:operatingsystem) == "Solaris" and Facter::Util::Virtual.zone?
+    if Facter.value(:kernel) == "SunOS" and Facter::Util::Virtual.zone?
       result = "zone"
     end
 
@@ -131,6 +131,16 @@ Facter.add("virtual") do
               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
 

data/spec/fixtures/unit/util/ec2/linux-arp-ec2.out

@@ -0,0 +1 @@
+? (10.240.93.1) at fe:ff:ff:ff:ff:ff [ether] on eth0

data/spec/fixtures/unit/util/ec2/linux-arp-not-ec2.out

@@ -0,0 +1,5 @@
+? (46.4.106.97) at 00:26:88:75:c1:17 [ether] on eth0
+? (10.1.2.14) at 02:00:0a:01:02:0e [ether] on virbr1
+? (10.1.2.12) at 02:00:0a:01:02:0c [ether] on virbr1
+? (10.1.2.11) at 02:00:0a:01:02:0b [ether] on virbr1
+? (10.1.2.200) at 02:00:0a:01:02:0e [ether] on virbr1

data/spec/fixtures/unit/util/ec2/windows-2008-arp-a-not-ec2.out

@@ -0,0 +1,6 @@
+
+Interface: 192.168.5.4 --- 0xd
+  Internet Address      Physical Address      Type
+  192.168.5.1           c8-02-14-0c-5d-18     dynamic   
+  192.168.5.255         ff-ff-ff-ff-ff-ff     static    
+  255.255.255.255       ff-ff-ff-ff-ff-ff     static    

data/spec/fixtures/unit/util/ec2/windows-2008-arp-a.out

@@ -0,0 +1,10 @@
+
+Interface: 10.32.123.54 --- 0xd
+  Internet Address      Physical Address      Type
+  10.32.120.163         fe-ff-ff-ff-ff-ff     dynamic   
+  10.32.122.1           fe-ff-ff-ff-ff-ff     dynamic   
+  10.32.123.255         ff-ff-ff-ff-ff-ff     static    
+  169.254.169.254       fe-ff-ff-ff-ff-ff     dynamic   
+  224.0.0.22            01-00-5e-00-00-16     static    
+  224.0.0.252           01-00-5e-00-00-fc     static    
+  255.255.255.255       ff-ff-ff-ff-ff-ff     static    

data/spec/fixtures/unit/util/uptime/sysctl_kern_boottime_darwin

@@ -0,0 +1 @@
+{ sec = 1320011547, usec = 0 } Sun Oct 30 21:52:27 2011

data/spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd

@@ -0,0 +1 @@
+1323465106

data/spec/integration/facter_spec.rb

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Facter do
   before do

data/spec/puppetlabs_spec/files.rb

@@ -0,0 +1,57 @@
+require 'fileutils'
+require 'tempfile'
+require 'pathname'
+
+# A support module for testing files.
+module PuppetlabsSpec::Files
+  # This code exists only to support tests that run as root, pretty much.
+  # Once they have finally been eliminated this can all go... --daniel 2011-04-08
+  def self.in_tmp(path)
+    tempdir = Dir.tmpdir
+
+    Pathname.new(path).ascend do |dir|
+      return true if File.identical?(tempdir, dir)
+    end
+
+    false
+  end
+
+  def self.cleanup
+    $global_tempfiles ||= []
+    while path = $global_tempfiles.pop do
+      fail "Not deleting tmpfile #{path} outside regular tmpdir" unless in_tmp(path)
+
+      begin
+        FileUtils.rm_r path, :secure => true
+      rescue Errno::ENOENT
+        # nothing to do
+      end
+    end
+  end
+
+  def make_absolute(path)
+    path = File.expand_path(path)
+    path[0] = 'c' if Puppet.features.microsoft_windows?
+    path
+  end
+
+  def tmpfilename(name)
+    # Generate a temporary file, just for the name...
+    source = Tempfile.new(name)
+    path = source.path
+    source.close!
+
+    # ...record it for cleanup,
+    $global_tempfiles ||= []
+    $global_tempfiles << File.expand_path(path)
+
+    # ...and bam.
+    path
+  end
+
+  def tmpdir(name)
+    path = tmpfilename(name)
+    FileUtils.mkdir_p(path)
+    path
+  end
+end

data/spec/puppetlabs_spec/fixtures.rb

@@ -0,0 +1,49 @@
+# This module provides some helper methods to assist with fixtures. It's
+# methods are designed to help when you have a conforming fixture layout so we
+# get project consistency.
+module PuppetlabsSpec::Fixtures
+
+  # Returns the joined path of the global FIXTURE_DIR plus any path given to it
+  def fixtures(*rest)
+    File.join(PuppetlabsSpec::FIXTURE_DIR, *rest)
+  end
+
+  # Returns the path to your relative fixture dir. So if your spec test is
+  # <project>/spec/unit/facter/foo_spec.rb then your relative dir will be
+  # <project>/spec/fixture/unit/facter/foo
+  def my_fixture_dir
+    callers = caller
+    while line = callers.shift do
+      next unless found = line.match(%r{/spec/(.*)_spec\.rb:})
+      return fixtures(found[1])
+    end
+    fail "sorry, I couldn't work out your path from the caller stack!"
+  end
+
+  # Given a name, returns the full path of a file from your relative fixture
+  # dir as returned by my_fixture_dir.
+  def my_fixture(name)
+    file = File.join(my_fixture_dir, name)
+    unless File.readable? file then
+      fail "fixture '#{name}' for #{my_fixture_dir} is not readable"
+    end
+    return file
+  end
+
+  # Return the contents of the file using read when given a name. Uses
+  # my_fixture to work out the relative path.
+  def my_fixture_read(name)
+    File.read(my_fixture(name))
+  end
+
+  # Provides a block mechanism for iterating across the files in your fixture
+  # area.
+  def my_fixtures(glob = '*', flags = 0)
+    files = Dir.glob(File.join(my_fixture_dir, glob), flags)
+    unless files.length > 0 then
+      fail "fixture '#{glob}' for #{my_fixture_dir} had no files!"
+    end
+    block_given? and files.each do |file| yield file end
+    files
+  end
+end

data/spec/puppetlabs_spec/matchers.rb

@@ -0,0 +1,87 @@
+require 'stringio'
+
+########################################################################
+# Backward compatibility for Jenkins outdated environment.
+module RSpec
+  module Matchers
+    module BlockAliases
+      alias_method :to,     :should      unless method_defined? :to
+      alias_method :to_not, :should_not  unless method_defined? :to_not
+      alias_method :not_to, :should_not  unless method_defined? :not_to
+    end
+  end
+end
+
+
+########################################################################
+# Custom matchers...
+RSpec::Matchers.define :have_matching_element do |expected|
+  match do |actual|
+    actual.any? { |item| item =~ expected }
+  end
+end
+
+
+RSpec::Matchers.define :exit_with do |expected|
+  actual = nil
+  match do |block|
+    begin
+      block.call
+    rescue SystemExit => e
+      actual = e.status
+    end
+    actual and actual == expected
+  end
+  failure_message_for_should do |block|
+    "expected exit with code #{expected} but " +
+      (actual.nil? ? " exit was not called" : "we exited with #{actual} instead")
+  end
+  failure_message_for_should_not do |block|
+    "expected that exit would not be called with #{expected}"
+  end
+  description do
+    "expect exit with #{expected}"
+  end
+end
+
+
+RSpec::Matchers.define :have_printed do |expected|
+  match do |block|
+    $stderr = $stdout = StringIO.new
+
+    begin
+      block.call
+    ensure
+      $stdout.rewind
+      @actual = $stdout.read
+
+      $stdout = STDOUT
+      $stderr = STDERR
+    end
+
+    if @actual then
+      case expected
+      when String
+        @actual.include? expected
+      when Regexp
+        expected.match @actual
+      else
+        raise ArgumentError, "No idea how to match a #{@actual.class.name}"
+      end
+    end
+  end
+
+  failure_message_for_should do |actual|
+    if actual.nil? then
+      "expected #{expected.inspect}, but nothing was printed"
+    else
+      "expected #{expected.inspect} to be printed; got:\n#{actual}"
+    end
+  end
+
+  description do
+    "expect #{expected.inspect} to be printed"
+  end
+
+  diffable
+end

data/spec/puppetlabs_spec_helper.rb

@@ -0,0 +1,25 @@
+# Define the main module namespace for use by the helper modules
+module PuppetlabsSpec
+  # FIXTURE_DIR represents the standard locations of all fixture data. Normally
+  # this represents <project>/spec/fixtures. This will be used by the fixtures
+  # library to find relative fixture data.
+  FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), \
+    "fixtures") unless defined?(FIXTURE_DIR)
+end
+
+# Require all necessary helper libraries so they can be used later
+require 'puppetlabs_spec/files'
+require 'puppetlabs_spec/fixtures'
+require 'puppetlabs_spec/matchers'
+
+RSpec.configure do |config|
+  # Include PuppetlabsSpec helpers so they can be called at convenience
+  config.extend PuppetlabsSpec::Files
+  config.extend PuppetlabsSpec::Fixtures
+  config.include PuppetlabsSpec::Fixtures
+
+  # This will cleanup any files that were created with tmpdir or tmpfile
+  config.after :each do
+    PuppetlabsSpec::Files.cleanup
+  end
+end

data/spec/spec_helper.rb

@@ -1,37 +1,34 @@
+# Add the projects lib directory to our load path so we can require libraries
+# within it easily.
 dir = File.expand_path(File.dirname(__FILE__))
 
 SPECDIR = dir
-
-def fixture_data(file)
-  File.read(File.join(SPECDIR, "fixtures", file))
-end
-
-
-$LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/../lib")
 
 require 'rubygems'
 require 'mocha'
 require 'rspec'
 require 'facter'
-
-# load any monkey-patches
-Dir["#{dir}/monkey_patches/*.rb"].map { |file| require file }
+require 'fileutils'
+require 'puppetlabs_spec_helper'
 
 RSpec.configure do |config|
   config.mock_with :mocha
 
-  # Ensure that we don't accidentally cache facts and environment
-  # between test cases.
   config.before :each do
+    # Ensure that we don't accidentally cache facts and environment
+    # between test cases.
     Facter::Util::Loader.any_instance.stubs(:load_all)
     Facter.clear
     Facter.clear_messages
+
+    # Store any environment variables away to be restored later
     @old_env = {}
     ENV.each_key {|k| @old_env[k] = ENV[k]}
   end
 
   config.after :each do
+    # Restore environment variables after execution of each test
     @old_env.each_pair {|k, v| ENV[k] = v}
     to_remove = ENV.keys.reject {|key| @old_env.include? key }
     to_remove.each {|key| ENV.delete key }