facter 1.5.2 → 1.5.3

data/spec/unit/util/collection.rb

@@ -114,7 +114,7 @@ describe Facter::Util::Collection do
         it "should be case-insensitive" do
             @coll.fact("yayness").should equal(@fact)
         end
-        
+
         it "should treat strings and symbols equivalently" do
             @coll.fact(:yayness).should equal(@fact)
         end
@@ -156,7 +156,7 @@ describe Facter::Util::Collection do
         it "should be case-insensitive" do
             @coll.value("yayness").should_not be_nil
         end
-        
+
         it "should treat strings and symbols equivalently" do
             @coll.value(:yayness).should_not be_nil
         end

data/spec/unit/util/ip.rb

@@ -4,37 +4,93 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'facter/util/ip'
 
-describe Facter::IPAddress do
+describe Facter::Util::IP do
+    [:freebsd, :linux, :netbsd, :openbsd, :sunos, :darwin].each do |platform|
+        it "should be supported on #{platform}" do
+            Facter::Util::IP.supported_platforms.should be_include(platform)
+        end
+    end
 
     it "should return a list of interfaces" do
-       Facter::IPAddress.should respond_to(:get_interfaces)
+        Facter::Util::IP.should respond_to(:get_interfaces)
     end
 
     it "should return an empty list of interfaces on an unknown kernel" do
         Facter.stubs(:value).returns("UnknownKernel")
-        Facter::IPAddress.get_interfaces().should == []
+        Facter::Util::IP.get_interfaces().should == []
     end
 
     it "should return a list with a single interface on Linux with a single interface" do
         sample_output_file = File.dirname(__FILE__) + '/../data/linux_ifconfig_all_with_single_interface'
         linux_ifconfig = File.new(sample_output_file).read()
-        Facter::IPAddress.stubs(:get_all_interface_output).returns(linux_ifconfig)
-        Facter::IPAddress.get_interfaces().should == ["eth0"]
+        Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig)
+        Facter::Util::IP.get_interfaces().should == ["eth0"]
     end
 
+
     it "should return a value for a specific interface" do
-       Facter::IPAddress.should respond_to(:get_interface_value)
+        Facter::Util::IP.should respond_to(:get_interface_value)
+    end
+
+    it "should not return interface information for unsupported platforms" do
+        Facter.stubs(:value).with(:kernel).returns("bleah")
+        Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == []
+    end
+
+    it "should return interface information for directly supported platforms" do
+        sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
+        solaris_ifconfig_interface = File.new(sample_output_file).read()
+
+        Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+        Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+        Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
+    end
+
+    it "should return interface information for platforms supported via an alias" do
+        sample_output_file = File.dirname(__FILE__) + "/../data/6.0-STABLE_FreeBSD_ifconfig"
+        ifconfig_interface = File.new(sample_output_file).read()
+
+        Facter::Util::IP.expects(:get_single_interface_output).with("fxp0").returns(ifconfig_interface)
+        Facter.stubs(:value).with(:kernel).returns("FreeBSD")
+
+        Facter::Util::IP.get_interface_value("fxp0", "macaddress").should == "00:0e:0c:68:67:7c"
+    end
+
+    it "should return interface information for OS X" do
+        sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig"
+        ifconfig_interface = File.new(sample_output_file).read()
+
+        Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(ifconfig_interface)
+        Facter.stubs(:value).with(:kernel).returns("Darwin")
+
+        Facter::Util::IP.get_interface_value("en1", "macaddress").should == "00:1b:63:ae:02:66"
     end
 
     it "should return a human readable netmask on Solaris" do
         sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
         solaris_ifconfig_interface = File.new(sample_output_file).read()
 
-        Facter::IPAddress.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+        Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
         Facter.stubs(:value).with(:kernel).returns("SunOS")
 
-        Facter::IPAddress.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
+        Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
     end
 
-end
+    it "should return a human readable netmask on Darwin" do
+        sample_output_file = File.dirname(__FILE__) + "/../data/darwin_ifconfig_single_interface"
 
+        darwin_ifconfig_interface = File.new(sample_output_file).read()
+
+        Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(darwin_ifconfig_interface)
+        Facter.stubs(:value).with(:kernel).returns("Darwin")
+
+        Facter::Util::IP.get_interface_value("en1", "netmask").should == "255.255.255.0"
+    end
+
+    [:freebsd, :netbsd, :openbsd, :sunos, :darwin].each do |platform|
+        it "should require conversion from hex on #{platform}" do
+            Facter::Util::IP.convert_from_hex?(platform).should == true
+        end
+    end
+end

data/spec/unit/util/loader.rb

@@ -83,7 +83,7 @@ describe Facter::Util::Loader do
                 @loader.load(:testing)
             end
         end
-        
+
         it "should load any files in the search path with names matching the fact name" do
             @loader.expects(:search_path).returns %w{/one/dir /two/dir}
             FileTest.stubs(:exist?).returns false

data/spec/unit/util/macosx.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'facter/util/macosx'
+
+describe Facter::Util::Macosx do
+    it "should be able to retrieve profiler data as xml for a given data field" do
+        Facter::Util::Resolution.expects(:exec).with("/usr/sbin/system_profiler -xml foo").returns "yay"
+        Facter::Util::Macosx.profiler_xml("foo").should == "yay"
+    end
+
+    it "should use PList to convert xml to data structures" do
+        Plist.expects(:parse_xml).with("foo").returns "bar"
+
+        Facter::Util::Macosx.intern_xml("foo").should == "bar"
+    end
+
+    describe "when collecting profiler data" do
+        it "should return the first value in the '_items' hash in the first value of the results of the system_profiler data, with the '_name' field removed, if the profiler returns data" do
+            @result = [
+                '_items' => [
+                    {'_name' => "foo", "yay" => "bar"}
+                ]
+            ]
+            Facter::Util::Macosx.expects(:profiler_xml).with("foo").returns "eh"
+            Facter::Util::Macosx.expects(:intern_xml).with("eh").returns @result
+            Facter::Util::Macosx.profiler_data("foo").should == {"yay" => "bar"}
+        end
+
+        it "should return nil if an exception is thrown during parsing of xml" do
+            Facter::Util::Macosx.expects(:profiler_xml).with("foo").returns "eh"
+            Facter::Util::Macosx.expects(:intern_xml).with("eh").raises "boo!"
+            Facter::Util::Macosx.profiler_data("foo").should be_nil
+        end
+    end
+
+    it "should return the profiler data for 'SPHardwareDataType' as the hardware information" do
+        Facter::Util::Macosx.expects(:profiler_data).with("SPHardwareDataType").returns "eh"
+        Facter::Util::Macosx.hardware_overview.should == "eh"
+    end
+
+    it "should return the profiler data for 'SPSoftwareDataType' as the os information" do
+        Facter::Util::Macosx.expects(:profiler_data).with("SPSoftwareDataType").returns "eh"
+        Facter::Util::Macosx.os_overview.should == "eh"
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Luke Kanies
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +02:00
+date: 2009-01-28 00:00:00 +01:00
 default_executable: facter
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - bin/facter
 - lib/facter.rb
 - lib/facter/lsb.rb
+- lib/facter/network.rb
 - lib/facter/processor.rb
 - lib/facter/id.rb
 - lib/facter/operatingsystem.rb
@@ -42,6 +43,7 @@ files:
 - lib/facter/uniqueid.rb
 - lib/facter/memory.rb
 - lib/facter/hardwareisa.rb
+- lib/facter/uptime.rb
 - lib/facter/facterversion.rb
 - lib/facter/ps.rb
 - lib/facter/rubysitedir.rb
@@ -51,6 +53,7 @@ files:
 - lib/facter/Cfkey.rb
 - lib/facter/lsbmajdistrelease.rb
 - lib/facter/hardwaremodel.rb
+- lib/facter/interfaces.rb
 - lib/facter/kernelversion.rb
 - lib/facter/macaddress.rb
 - lib/facter/util/resolution.rb
@@ -59,6 +62,7 @@ files:
 - lib/facter/util/loader.rb
 - lib/facter/util/memory.rb
 - lib/facter/util/fact.rb
+- lib/facter/util/uptime.rb
 - lib/facter/util/plist.rb
 - lib/facter/util/macosx.rb
 - lib/facter/util/ip.rb
@@ -75,20 +79,24 @@ files:
 - lib/facter/virtual.rb
 - lib/facter/manufacturer.rb
 - lib/facter/kernel.rb
-- lib/facter/ipmess.rb
 - lib/facter/netmask.rb
 - spec/spec.opts
 - spec/unit
 - spec/unit/facter.rb
 - spec/unit/data
+- spec/unit/data/Mac_OS_X_10.5.5_ifconfig
+- spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
 - spec/unit/data/solaris_ifconfig_single_interface
 - spec/unit/data/linux_ifconfig_all_with_single_interface
+- spec/unit/data/darwin_ifconfig_single_interface
+- spec/unit/interfaces.rb
 - spec/unit/util
 - spec/unit/util/resolution.rb
 - spec/unit/util/collection.rb
 - spec/unit/util/confine.rb
 - spec/unit/util/loader.rb
 - spec/unit/util/fact.rb
+- spec/unit/util/macosx.rb
 - spec/unit/util/ip.rb
 - spec/integration
 - spec/integration/facter.rb
@@ -127,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facter
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Facter collects Operating system facts.

data/lib/facter/ipmess.rb

@@ -1,46 +0,0 @@
-# ipmess.rb
-# Try to get additional Facts about the machine's network interfaces
-#
-# Original concept Copyright (C) 2007 psychedelys <psychedelys@gmail.com>
-# Update and *BSD support (C) 2007 James Turnbull <james@lovedthanlost.net>
-# 
-
-require 'facter/util/ip'
-
-Facter.add(:interfaces) do
-    confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
-    setcode do
-        Facter::IPAddress.get_interfaces.join(",")
-    end
-end
-
-case Facter.value(:kernel) 
- when 'SunOS', 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
-  Facter::IPAddress.get_interfaces.each do |interface|
-    mi = interface.gsub('/:|\./', '_')
-
-    Facter.add("ipaddress_" + mi) do
-        confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
-        setcode do
-            label = 'ipaddress'
-            Facter::IPAddress.get_interface_value(interface, label)
-        end
-    end
-
-    Facter.add("macaddress_" + mi) do
-        confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
-        setcode do
-            label = 'macaddress'
-            Facter::IPAddress.get_interface_value(interface, label) 
-        end
-    end
-
-    Facter.add("netmask_" + mi) do
-        confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
-        setcode do
-            label = 'netmask'
-            Facter::IPAddress.get_interface_value(interface, label)
-        end
-    end
- end
-end