facter 1.5.7 → 1.5.8

data/lib/facter/util/manufacturer.rb

@@ -2,8 +2,8 @@
 # Support methods for manufacturer specific facts
 
 module Facter::Manufacturer
-    def self.dmi_find_system_info(name)
-        splitstr="Handle"
+
+    def self.get_dmi_table()
         case Facter.value(:kernel)
         when 'Linux'
             return nil unless FileTest.exists?("/usr/sbin/dmidecode")
@@ -19,18 +19,24 @@ module Facter::Manufacturer
             output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
         when 'SunOS'
             return nil unless FileTest.exists?("/usr/sbin/smbios")
-            splitstr="ID    SIZE TYPE"
-            output=%x{/usr/sbin/smbios 2>/dev/null}
 
+            output=%x{/usr/sbin/smbios 2>/dev/null}
         else
-            return
+            output=nil
         end
+        return output
+    end
+
+    def self.dmi_find_system_info(name)
+        splitstr=  Facter.value(:kernel) ==  'SunOS' ? "ID    SIZE TYPE" : /^Handle/
+        output = self.get_dmi_table()
+        return if output.nil?
         name.each_pair do |key,v|
             v.each do |v2|
                 v2.each_pair do |value,facterkey|
                     output.split(splitstr).each do |line|
-                        if line =~ /#{key}/ and ( line =~ /#{value} 0x\d+ \(([-\w].*)\)\n*./ or line =~ /#{value} ([-\w].*)\n*./ )
-                            result = $1
+                        if line =~ /#{key}/ and line =~ /\n\s+#{value} (.+)\n/
+                            result = $1.strip
                             Facter.add(facterkey) do
                                 confine :kernel => [ :linux, :freebsd, :netbsd, :sunos ]
                                 setcode do

data/lib/facter/util/resolution.rb

@@ -11,9 +11,13 @@ require 'rbconfig'
 class Facter::Util::Resolution
     attr_accessor :interpreter, :code, :name, :timeout
 
+    WINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
+
+    INTERPRETER = WINDOWS ? 'cmd.exe' : '/bin/sh'
+
     def self.have_which
         if ! defined?(@have_which) or @have_which.nil?
-            if Config::CONFIG['host_os'] =~ /mswin/
+            if Facter.value(:kernel) == 'windows'
                 @have_which = false
             else
                 %x{which which >/dev/null 2>&1}
@@ -23,31 +27,50 @@ class Facter::Util::Resolution
         @have_which
     end
 
-    # Execute a chunk of code.
-    def self.exec(code, interpreter = "/bin/sh")
-        raise ArgumentError, "non-sh interpreters are not currently supported" unless interpreter == "/bin/sh"
-        binary = code.split(/\s+/).shift
-
-        if have_which
+    # Execute a program and return the output of that program.
+    #
+    # Returns nil if the program can't be found, or if there is a problem
+    # executing the code.
+    #
+    def self.exec(code, interpreter = INTERPRETER)
+        raise ArgumentError, "invalid interpreter" unless interpreter == INTERPRETER
+
+        # Try to guess whether the specified code can be executed by looking at the
+        # first word. If it cannot be found on the PATH defer on resolving the fact
+        # by returning nil.
+        # This only fails on shell built-ins, most of which are masked by stuff in 
+        # /bin or of dubious value anyways. In the worst case, "sh -c 'builtin'" can
+        # be used to work around this limitation
+        #
+        # Windows' %x{} throws Errno::ENOENT when the command is not found, so we 
+        # can skip the check there. This is good, since builtins cannot be found 
+        # elsewhere.
+        if have_which and !WINDOWS
             path = nil
-            if binary !~ /^\//
+            binary = code.split.first
+            if code =~ /^\//
+                path = binary
+            else
                 path = %x{which #{binary} 2>/dev/null}.chomp
                 # we don't have the binary necessary
                 return nil if path == "" or path.match(/Command not found\./)
-            else
-                path = binary
             end
 
             return nil unless FileTest.exists?(path)
         end
 
         out = nil
+
         begin
             out = %x{#{code}}.chomp
+        rescue Errno::ENOENT => detail
+            # command not found on Windows
+            return nil
         rescue => detail
             $stderr.puts detail
             return nil
         end
+
         if out == ""
             return nil
         else
@@ -86,7 +109,7 @@ class Facter::Util::Resolution
     def setcode(string = nil, interp = nil, &block)
         if string
             @code = string
-            @interpreter = interp || "/bin/sh"
+            @interpreter = interp || INTERPRETER
         else
             unless block_given?
                 raise ArgumentError, "You must pass either code or a block"

data/lib/facter/util/uptime.rb

@@ -1,32 +1,54 @@
+require 'time'
+
 # A module to gather uptime facts
 #
 module Facter::Util::Uptime
-    def self.get_uptime_simple
-        time = Facter::Util::Resolution.exec('uptime')
-        if time =~ /up\s*(\d+\s\w+)/
-            $1
-        elsif time =~ /up\s*(\d+:\d+)/
-            $1 + " hours"
-        else
-            "unknown"
+    def self.get_uptime_seconds_unix
+        uptime_proc_uptime or uptime_sysctl or uptime_who_dash_b
+    end
+
+    def self.get_uptime_seconds_win
+      require 'win32ole'
+      wmi = WIN32OLE.connect("winmgmts://")
+      query = wmi.ExecQuery("select * from Win32_OperatingSystem")
+      last_boot = ""
+      query.each { |x| last_boot = x.LastBootupTime}
+      self.compute_uptime(Time.parse(last_boot.split('.').first)) 
+    end
+
+    private
+
+    def self.uptime_proc_uptime
+        if output = Facter::Util::Resolution.exec("/bin/cat #{uptime_file} 2>/dev/null")
+            output.chomp.split(" ").first.to_i
+        end
+    end
+
+    def self.uptime_sysctl
+        if output = Facter::Util::Resolution.exec("#{uptime_sysctl_cmd} 2>/dev/null")
+            compute_uptime(Time.at(output.unpack('L').first))
+        end
+    end
+
+    def self.uptime_who_dash_b
+        if output = Facter::Util::Resolution.exec("#{uptime_who_cmd} 2>/dev/null")
+            compute_uptime(Time.parse(output))
         end
     end
 
-    def self.get_uptime
-        r = IO.popen("/bin/cat /proc/uptime")
-        uptime, idletime = r.readline.split(" ")        
-        r.close
-        uptime_seconds = uptime.to_i
+    def self.compute_uptime(time)
+        (Time.now - time).to_i
+    end
+
+    def self.uptime_file
+        "/proc/uptime"
+    end
+
+    def self.uptime_sysctl_cmd
+        'sysctl -b kern.boottime'
     end
 
-    def self.get_uptime_period(seconds, label)
-        case label
-        when 'days'
-            value = seconds / 86400
-        when 'hours'
-            value = seconds / 3600
-        when 'seconds'
-            seconds
-        end     
+    def self.uptime_who_cmd
+        'who -b'
     end
-end   
+end

data/lib/facter/util/virtual.rb

@@ -1,6 +1,6 @@
 module Facter::Util::Virtual
     def self.openvz?
-        FileTest.exists?("/proc/vz/veinfo")
+        FileTest.directory?("/proc/vz")
     end
 
     def self.openvz_type
@@ -13,6 +13,7 @@ module Facter::Util::Virtual
     end
 
     def self.zone?
+        return true if FileTest.directory?("/.SUNWnative")
         z = Facter::Util::Resolution.exec("/sbin/zonename")
         return false unless z
         return z.chomp != 'global'
@@ -40,4 +41,25 @@ module Facter::Util::Virtual
             FileTest.exists?(f)
         end
     end
+
+    def self.kvm?
+       txt = if FileTest.exists?("/proc/cpuinfo")
+           File.read("/proc/cpuinfo")
+       elsif Facter.value(:kernel)=="FreeBSD"
+           Facter::Util::Resolution.exec("/sbin/sysctl -n hw.model")
+       end
+       (txt =~ /QEMU Virtual CPU/) ? true : false
+    end
+
+    def self.kvm_type
+      # TODO Tell the difference between kvm and qemu
+      # Can't work out a way to do this at the moment that doesn't
+      # require a special binary
+      "kvm"
+    end
+
+    def self.jail?
+        Facter::Util::Resolution.exec("/sbin/sysctl -n security.jail.jailed") == "1"
+    end
+
 end

data/lib/facter/util/vlans.rb

@@ -0,0 +1,24 @@
+# A module to gather vlan facts
+#
+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
+    end
+
+    def self.get_vlans
+        vlans = Array.new
+        if self.get_vlan_config
+            self.get_vlan_config.each do |line|
+                if line =~ /^([0-9A-Za-z]+)\.([0-9]+) /
+                    vlans.insert(-1, $~[2]) if $~[2]
+                end
+            end
+        end
+
+        vlans.join(',')
+    end
+end   

data/lib/facter/virtual.rb

@@ -25,15 +25,23 @@ Facter.add("virtual") do
             if FileTest.exists?("/sys/bus/xen")
                 result = "xenu"
             end
-        
+
             if FileTest.exists?("/proc/xen/capabilities")
-                txt = File.read("/proc/xen/capabilities")
+                txt = Facter::Util::Resolution.exec("cat /proc/xen/capabilities")
                 if txt =~ /control_d/i
                     result = "xen0"
                 end
             end
         end
 
+        if Facter::Util::Virtual.kvm?
+            result = Facter::Util::Virtual.kvm_type()
+        end
+
+        if Facter.value(:kernel)=="FreeBSD"
+            result = "jail" if Facter::Util::Virtual.jail?
+        end
+
         if result == "physical"
             output = Facter::Util::Resolution.exec('lspci')
             if not output.nil?
@@ -72,7 +80,7 @@ Facter.add("is_virtual") do
 
     setcode do
         case Facter.value(:virtual)
-        when "xenu", "openvzve", "vmware"
+        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail"
             true
         else 
             false

data/lib/facter/vlans.rb

@@ -0,0 +1,8 @@
+require 'facter/util/vlans'
+    
+    Facter.add("vlans") do
+        confine :kernel => :linux
+        setcode do
+            Facter::Util::Vlans.get_vlans
+        end
+    end

data/spec/fixtures/uptime/ubuntu_proc_uptime

@@ -0,0 +1 @@
+5097686.63 40756306.43

data/spec/fixtures/uptime/who_b_boottime

@@ -0,0 +1 @@
+reboot   ~        Aug  1 14:13 

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 dir = File.expand_path(File.dirname(__FILE__))
 
+SPECDIR = dir
+
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/../lib")
 

data/spec/unit/data/freebsd_dmidecode

@@ -0,0 +1,42 @@
+# dmidecode 2.10
+SMBIOS 2.5 present.
+5 structures occupying 352 bytes.
+Table at 0x000E1000.
+
+Handle 0x0000, DMI type 0, 20 bytes
+BIOS Information
+	Vendor: innotek GmbH
+	Version: VirtualBox
+	Release Date: 12/01/2006
+	Address: 0xE0000
+	Runtime Size: 128 kB
+	ROM Size: 128 kB
+	Characteristics:
+		ISA is supported
+		PCI is supported
+		Boot from CD is supported
+		Selectable boot is supported
+		8042 keyboard services are supported (int 9h)
+		CGA/mono video services are supported (int 10h)
+		ACPI is supported
+
+Handle 0x0001, DMI type 1, 27 bytes
+System Information
+	Manufacturer: innotek GmbH
+	Product Name: VirtualBox
+	Version: 1.2
+	Serial Number: 0
+	UUID: 3BD58031-AE9E-4F06-8A57-941942861939
+	Wake-up Type: Power Switch
+	SKU Number: Not Specified
+	Family: Virtual Machine
+
+Handle 0x0003, DMI type 126, 13 bytes
+Inactive
+
+Handle 0x0002, DMI type 126, 7 bytes
+Inactive
+
+Handle 0xFEFF, DMI type 127, 147 bytes
+End Of Table
+

data/spec/unit/data/hpux_ifconfig

@@ -0,0 +1,3 @@
+lan0: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+	inet 168.24.80.71 netmask ffffff00 broadcast 168.24.80.255
+00:13:21:BD:9C:B7

data/spec/unit/data/hpux_ifconfig_single_interface

@@ -0,0 +1,3 @@
+lan0: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+	inet 168.24.80.71 netmask ffffff00 broadcast 168.24.80.255
+00:13:21:BD:9C:B7

data/spec/unit/data/hpux_netscan

@@ -0,0 +1,4 @@
+Hardware Station        Crd Hdw   Net-Interface  NM  MAC       HP-DLPI DLPI
+Path     Address        In# State NamePPA        ID  Type      Support Mjr#
+0/1/2/0  0x001321BD9CB7 0    UP    lan0 snap0       1    ETHER       Yes     119
+0/6/1/0  0x001321BDACDB 1    UP    lan1 snap1       2    ETHER       Yes     119

data/spec/unit/data/hpux_netstat_all_interfaces

@@ -0,0 +1,6 @@
+Name      Mtu  Network         Address         Ipkts   Ierrs Opkts   Oerrs Coll
+lan1      1500 15.12.0.0       host1.default.com 
+                                               572527659 0     1129421249 0     0   
+lan0      1500 172.54.85.0     host2.default.com 
+                                               519222647 0     329127145 0     0   
+lo0       4136 loopback        localhost       14281117 0     14281125 0     0 

data/spec/unit/data/linux_dmidecode_with_spaces

@@ -0,0 +1,60 @@
+# dmidecode 2.2
+SMBIOS 2.3 present.
+32 structures occupying 994 bytes.
+Table at 0x000F0800.
+Handle 0x0000
+        DMI type 0, 20 bytes.
+        BIOS Information
+                Vendor: Award Software International, Inc.
+                Version: 6.00 PG
+                Release Date: 01/03/2003
+                Address: 0xE0000
+                Runtime Size: 128 kB
+                ROM Size: 256 kB
+                Characteristics:
+                        ISA is supported
+                        PCI is supported
+                        PNP is supported
+                        APM is supported
+                        BIOS is upgradeable
+                        BIOS shadowing is allowed
+                        ESCD support is available
+                        Boot from CD is supported
+                        Selectable boot is supported
+                        BIOS ROM is socketed
+                        EDD is supported
+                        5.25"/360 KB floppy services are supported (int 13h)
+                        5.25"/1.2 MB floppy services are supported (int 13h)
+                        3.5"/720 KB floppy services are supported (int 13h)
+                        3.5"/2.88 MB floppy services are supported (int 13h)
+                        Print screen service is supported (int 5h)
+                        8042 keyboard services are supported (int 9h)
+                        Serial services are supported (int 14h)
+                        Printer services are supported (int 17h)
+                        CGA/mono video services are supported (int 10h)
+                        ACPI is supported
+                        USB legacy is supported
+                        AGP is supported
+                        LS-120 boot is supported
+                        ATAPI Zip drive boot is supported
+Handle 0x0001
+        DMI type 1, 25 bytes.
+        System Information
+                Manufacturer: MICRO-STAR INTERNATIONAL CO., LTD
+                Product Name: MS-6754 
+                Version:  
+                Serial Number:  
+                UUID: Not Present
+                Wake-up Type: Power Switch
+Handle 0x0002
+    DMI type 2, 8 bytes.
+    Base Board Information
+        Manufacturer: MICRO-STAR INTERNATIONAL CO., LTD
+        Product Name: MS-6754
+        Version:  
+        Serial Number:  
+
+Handle 0x001F
+    DMI type 127, 4 bytes.
+    End Of Table
+