facter 1.6.1 → 1.6.2

data/lib/facter/application.rb

@@ -35,6 +35,7 @@ module Facter
       # Print the facts as JSON and exit
       if options[:json]
         begin
+          require 'rubygems'
           require 'json'
           puts JSON.dump(facts)
           exit(0)

data/lib/facter/architecture.rb

@@ -12,35 +12,27 @@
 #
 
 Facter.add(:architecture) do
-    confine :kernel => [:linux, :"gnu/kfreebsd"]
-    setcode do
-        model = Facter.value(:hardwaremodel)
-        case model
-        # most linuxen use "x86_64"
-        when "x86_64"
-            case Facter.value(:operatingsystem)
-            when "Debian", "Gentoo", "GNU/kFreeBSD"
-                "amd64"
-            else
-                model
-            end
-        when /(i[3456]86|pentium)/
-            case Facter.value(:operatingsystem)
-            when "Gentoo"
-                "x86"
-            else
-                "i386"
-            end
-        else
-            model
-        end
-    end
-end
-
-Facter.add(:architecture) do
-    confine :kernel => :openbsd
-    setcode do
-        architecture = Facter.value(:hardwaremodel)
+  setcode do
+    model = Facter.value(:hardwaremodel)
+    case model
+      # most linuxen use "x86_64"
+    when "x86_64"
+      case Facter.value(:operatingsystem)
+      when "Debian", "Gentoo", "GNU/kFreeBSD", "Ubuntu"
+        "amd64"
+      else
+        model
+      end
+    when /(i[3456]86|pentium)/
+      case Facter.value(:operatingsystem)
+      when "Gentoo"
+        "x86"
+      else
+        "i386"
+      end
+    else
+      model
     end
+  end
 end
 

data/lib/facter/domain.rb

@@ -19,45 +19,45 @@
 #
 
 Facter.add(:domain) do
-    setcode do
-        # Get the domain from various sources; the order of these
-        # steps is important
+  setcode do
+    # Get the domain from various sources; the order of these
+    # steps is important
 
-        if name = Facter::Util::Resolution.exec('hostname') and 
-            name =~ /.*?\.(.+$)/
+    if name = Facter::Util::Resolution.exec('hostname') and 
+      name =~ /.*?\.(.+$)/
 
-            $1
-        elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and 
-            domain =~ /.+\..+/
+      $1
+    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and 
+      domain =~ /.+\..+/
 
-            domain
-        elsif FileTest.exists?("/etc/resolv.conf")
-            domain = nil
-            search = nil
-            File.open("/etc/resolv.conf") { |file|
-                file.each { |line|
-                    if line =~ /domain\s+(\S+)/
-                        domain = $1
-                    elsif line =~ /search\s+(\S+)/
-                        search = $1
-                    end
-                }
-            }
-            next domain if domain
-            next search if search
-        end
+      domain
+    elsif FileTest.exists?("/etc/resolv.conf")
+      domain = nil
+      search = nil
+      File.open("/etc/resolv.conf") { |file|
+        file.each { |line|
+          if line =~ /^\s*domain\s+(\S+)/
+            domain = $1
+          elsif line =~ /^\s*search\s+(\S+)/
+            search = $1
+          end
+        }
+      }
+      next domain if domain
+      next search if search
     end
+  end
 end
 
 Facter.add(:domain) do
-    confine :kernel => :windows
-    setcode do
-        require 'facter/util/wmi'
-        domain = ""
-        Facter::Util::WMI.execquery("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").each { |nic|
-            domain = nic.DNSDomain
-            break
-        }
-        domain
-    end
+  confine :kernel => :windows
+  setcode do
+    require 'facter/util/wmi'
+    domain = ""
+    Facter::Util::WMI.execquery("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").each { |nic|
+      domain = nic.DNSDomain
+      break
+    }
+    domain
+  end
 end

data/lib/facter/facterversion.rb

@@ -8,5 +8,5 @@
 #
 
 Facter.add(:facterversion) do
-    setcode { Facter::FACTERVERSION.to_s }
+  setcode { Facter::FACTERVERSION.to_s }
 end

data/lib/facter/fqdn.rb

@@ -10,13 +10,13 @@
 #
 
 Facter.add(:fqdn) do
-    setcode do
-        host = Facter.value(:hostname)
-        domain = Facter.value(:domain)
-        if host and domain
-            [host, domain].join(".")
-        else
-            nil
-        end
+  setcode do
+    host = Facter.value(:hostname)
+    domain = Facter.value(:domain)
+    if host and domain
+      [host, domain].join(".")
+    else
+      nil
     end
+  end
 end

data/lib/facter/hardwareisa.rb

@@ -11,6 +11,6 @@
 #
 
 Facter.add(:hardwareisa) do
-    setcode 'uname -p'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OracleLinux OVS GNU/kFreeBSD}
+  setcode 'uname -p'
+  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD DragonFly OEL OracleLinux OVS GNU/kFreeBSD}
 end

data/lib/facter/hardwaremodel.rb

@@ -12,23 +12,23 @@
 #
 
 Facter.add(:hardwaremodel) do
-    setcode 'uname -m'
+  setcode 'uname -m'
 end
 
 Facter.add(:hardwaremodel) do
-    confine :operatingsystem => :aix
-    setcode do
-        model = Facter::Util::Resolution.exec('lsattr -El sys0 -a modelname')
-        if model =~ /modelname\s(\S+)\s/
-            $1
-        end
+  confine :operatingsystem => :aix
+  setcode do
+    model = Facter::Util::Resolution.exec('lsattr -El sys0 -a modelname')
+    if model =~ /modelname\s(\S+)\s/
+      $1
     end
+  end
 end
 
 Facter.add(:hardwaremodel) do
-    confine :operatingsystem => :windows
-    setcode do
-        require 'rbconfig'
-        Config::CONFIG['host_cpu']
-    end
+  confine :operatingsystem => :windows
+  setcode do
+    require 'rbconfig'
+    Config::CONFIG['host_cpu']
+  end
 end

data/lib/facter/hostname.rb

@@ -12,22 +12,22 @@
 #
 
 Facter.add(:hostname, :ldapname => "cn") do
-    setcode do
-        hostname = nil
-        if name = Facter::Util::Resolution.exec('hostname')
-            if name =~ /(.*?)\./
-                hostname = $1
-            else
-                hostname = name
-            end
-        end
-        hostname
+  setcode do
+    hostname = nil
+    if name = Facter::Util::Resolution.exec('hostname')
+      if name =~ /(.*?)\./
+        hostname = $1
+      else
+        hostname = name
+      end
     end
+    hostname
+  end
 end
 
 Facter.add(:hostname) do
-    confine :kernel => :darwin, :kernelrelease => "R7"
-    setcode do
-        Facter::Util::Resolution.exec('/usr/sbin/scutil --get LocalHostName')
-    end
+  confine :kernel => :darwin, :kernelrelease => "R7"
+  setcode do
+    Facter::Util::Resolution.exec('/usr/sbin/scutil --get LocalHostName')
+  end
 end

data/lib/facter/id.rb

@@ -12,10 +12,10 @@
 #
 
 Facter.add(:id) do
-    setcode "whoami"
+  setcode "whoami"
 end
 
 Facter.add(:id) do
-    confine :kernel => :SunOS
-    setcode "/usr/xpg4/bin/id -un"
+  confine :kernel => :SunOS
+  setcode "/usr/xpg4/bin/id -un"
 end

data/lib/facter/interfaces.rb

@@ -20,22 +20,22 @@ require 'facter/util/ip'
 # is missing.
 
 Facter.add(:interfaces) do
-    confine :kernel => Facter::Util::IP.supported_platforms
-    setcode do
-        Facter::Util::IP.get_interfaces.collect { |iface| Facter::Util::IP.alphafy(iface) }.join(",")
-    end
+  confine :kernel => Facter::Util::IP.supported_platforms
+  setcode do
+    Facter::Util::IP.get_interfaces.collect { |iface| Facter::Util::IP.alphafy(iface) }.join(",")
+  end
 end
 
 Facter::Util::IP.get_interfaces.each do |interface|
 
-    # Make a fact for each detail of each interface.  Yay.
-    #   There's no point in confining these facts, since we wouldn't be able to create
-    # them if we weren't running on a supported platform.
-    %w{ipaddress ipaddress6 macaddress netmask}.each do |label|
-        Facter.add(label + "_" + Facter::Util::IP.alphafy(interface)) do
-            setcode do
-                Facter::Util::IP.get_interface_value(interface, label)
-            end
-        end
+  # Make a fact for each detail of each interface.  Yay.
+  #   There's no point in confining these facts, since we wouldn't be able to create
+  # them if we weren't running on a supported platform.
+  %w{ipaddress ipaddress6 macaddress netmask}.each do |label|
+    Facter.add(label + "_" + Facter::Util::IP.alphafy(interface)) do
+      setcode do
+        Facter::Util::IP.get_interface_value(interface, label)
+      end
     end
+  end
 end

data/lib/facter/ipaddress.rb

@@ -23,138 +23,138 @@
 #
 
 Facter.add(:ipaddress) do
-    confine :kernel => :linux
-    setcode do
-        ip = nil
-        output = %x{/sbin/ifconfig}
+  confine :kernel => :linux
+  setcode do
+    ip = nil
+    output = %x{/sbin/ifconfig}
 
-        output.split(/^\S/).each { |str|
-            if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
+    output.split(/^\S/).each { |str|
+      if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./
+          ip = tmp
+          break
+        end
+      end
+    }
 
-        ip
-    end
+    ip
+  end
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{FreeBSD OpenBSD Darwin}
-    setcode do
-        ip = nil
-        output = %x{/sbin/ifconfig}
+  confine :kernel => %w{FreeBSD OpenBSD Darwin DragonFly}
+  setcode do
+    ip = nil
+    output = %x{/sbin/ifconfig}
 
-        output.split(/^\S/).each { |str|
-            if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
+    output.split(/^\S/).each { |str|
+      if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./
+          ip = tmp
+          break
+        end
+      end
+    }
 
-        ip
-    end
+    ip
+  end
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{NetBSD SunOS}
-    setcode do
-        ip = nil
-        output = %x{/sbin/ifconfig -a}
+  confine :kernel => %w{NetBSD SunOS}
+  setcode do
+    ip = nil
+    output = %x{/sbin/ifconfig -a}
 
-        output.split(/^\S/).each { |str|
-            if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./ or tmp == "0.0.0.0"
-                    ip = tmp
-                    break
-                end
-            end
-        }
+    output.split(/^\S/).each { |str|
+      if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./ or tmp == "0.0.0.0"
+          ip = tmp
+          break
+        end
+      end
+    }
 
-        ip
-    end
+    ip
+  end
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{AIX}
-    setcode do
-        ip = nil
-        output = %x{/usr/sbin/ifconfig -a}
+  confine :kernel => %w{AIX}
+  setcode do
+    ip = nil
+    output = %x{/usr/sbin/ifconfig -a}
 
-        output.split(/^\S/).each { |str|
-            if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-                tmp = $1
-                unless tmp =~ /^127\./
-                    ip = tmp
-                    break
-                end
-            end
-        }
+    output.split(/^\S/).each { |str|
+      if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+        tmp = $1
+        unless tmp =~ /^127\./
+          ip = tmp
+          break
+        end
+      end
+    }
 
-        ip
-    end
+    ip
+  end
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{windows}
-    setcode do
-        require 'socket'
-        IPSocket.getaddress(Socket.gethostname)
-    end
+  confine :kernel => %w{windows}
+  setcode do
+    require 'socket'
+    IPSocket.getaddress(Socket.gethostname)
+  end
 end
 
 Facter.add(:ipaddress, :ldapname => "iphostnumber", :timeout => 2) do
-    setcode do
+  setcode do
+    if Facter.value(:kernel) == 'windows'
+      require 'win32/resolv'
+    else
+      require 'resolv'
+    end
+    
+    begin
+      if hostname = Facter.value(:hostname)
         if Facter.value(:kernel) == 'windows'
-            require 'win32/resolv'
+          ip = Win32::Resolv.get_resolv_info.last[0]
         else
-            require 'resolv'
+          ip = Resolv.getaddress(hostname)        
         end
-        
-        begin
-            if hostname = Facter.value(:hostname)
-                if Facter.value(:kernel) == 'windows'
-                    ip = Win32::Resolv.get_resolv_info.last[0]
-                else
-                    ip = Resolv.getaddress(hostname)                
-                end
-                unless ip == "127.0.0.1"
-                    ip
-                end
-            else
-                nil
-            end
-        rescue Resolv::ResolvError
-            nil
-        rescue NoMethodError # i think this is a bug in resolv.rb?
-            nil
+        unless ip == "127.0.0.1"
+          ip
         end
+      else
+        nil
+      end
+    rescue Resolv::ResolvError
+      nil
+    rescue NoMethodError # i think this is a bug in resolv.rb?
+      nil
     end
+  end
 end
 
 Facter.add(:ipaddress, :timeout => 2) do
-    setcode do
-        if hostname = Facter.value(:hostname)
-            # we need Hostname to exist for this to work
-            host = nil
-            if host = Facter::Util::Resolution.exec("host #{hostname}")
-                list = host.chomp.split(/\s/)
-                if defined? list[-1] and
-                        list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
-                    list[-1]
-                end
-            else
-                nil
-            end
-        else
-            nil
+  setcode do
+    if hostname = Facter.value(:hostname)
+      # we need Hostname to exist for this to work
+      host = nil
+      if host = Facter::Util::Resolution.exec("host #{hostname}")
+        list = host.chomp.split(/\s/)
+        if defined? list[-1] and
+          list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
+          list[-1]
         end
+      else
+        nil
+      end
+    else
+      nil
     end
+  end
 end