facter 1.7.3 → 1.7.4.rc1

data/Gemfile

@@ -14,21 +14,24 @@ end
 
 group :development, :test do
   gem 'rake'
-  gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
   gem 'rspec', "~> 2.11.0"
   gem 'mocha', "~> 0.10.5"
-  gem 'json', "~> 1.7"
+  gem 'json', "~> 1.7", :platforms => :ruby
   gem 'puppetlabs_spec_helper'
 end
 
 platform :mswin, :mingw do
-  gem "win32-api", "~> 1.4.8"
-  gem "win32-dir", "~> 0.3.7"
-  gem "windows-api", "~> 0.4.1"
-  gem "windows-pr", "~> 1.2.1"
-  gem "win32console", "~> 1.3.2"
+  gem "ffi", "1.9.0", :require => false
+  gem "sys-admin", "1.5.6", :require => false
+  gem "win32-api", "1.4.8", :require => false
+  gem "win32-dir", "0.4.3", :require => false
+  gem "windows-api", "0.4.2", :require => false
+  gem "windows-pr", "1.2.2", :require => false
+  gem "win32console", "1.3.2", :require => false
 end
 
+gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
+
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

data/bin/facter

@@ -1,62 +1,4 @@
 #!/usr/bin/env ruby
-#
-# = Synopsis
-#
-# Collect and display facts about the system.
-#
-# = Usage
-#
-#   facter [-d|--debug] [-h|--help] [-p|--puppet] [-v|--version] [-y|--yaml] [-j|--json] [--external-dir DIR] [--no-external-dir] [fact] [fact] [...]
-#
-# = Description
-#
-# Collect and display facts about the current system.  The library behind
-# Facter is easy to expand, making Facter an easy way to collect information
-# about a system from within the shell or within Ruby.
-#
-# If no facts are specifically asked for, then all facts will be returned.
-#
-# = Options
-#
-# yaml::
-#   Emit facts in YAML format.
-#
-# json::
-#   Emit facts in JSON format.
-#
-# puppet::
-#   Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.
-#
-# version::
-#   Print the version and exit.
-#
-# help::
-#   Print this help message.
-#
-# debug::
-#   Enable debugging.
-#
-# trace::
-#   Enable backtraces.
-#
-# timing::
-#   Enable timing.
-#
-# facts.d::
-#   The directory to use for external facts.
-#
-# = Example
-#
-#   facter kernel
-#
-# = Author
-#
-# Luke Kanies
-#
-# = Copyright
-#
-# Copyright (c) 2011 Puppet Labs, Inc
-# Licensed under the Apache 2.0 license
 
 # Bundler and rubygems maintain a set of directories from which to
 # load gems. If Bundler is loaded, let it determine what can be

data/ext/build_defaults.yaml

@@ -2,14 +2,14 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-quantal-i386.cow base-quantal-amd64.cow base-raring-i386.cow base-raring-amd64.cow base-sid-i386.cow base-sid-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-stable-i386.cow base-stable-amd64.cow base-testing-i386.cow base-testing-amd64.cow base-unstable-i386.cow base-unstable-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
+cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-quantal-i386.cow base-quantal-amd64.cow base-raring-i386.cow base-raring-amd64.cow base-saucy-i386.cow base-saucy-amd64.cow base-sid-i386.cow base-sid-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-stable-i386.cow base-stable-amd64.cow base-testing-i386.cow base-testing-amd64.cow base-unstable-i386.cow base-unstable-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-fedora-17-i386 pl-fedora-17-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/ext/debian/rules

@@ -7,4 +7,4 @@ LIBDIR=$(shell /usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendordir"]')
 BINDIR=$(shell /usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["bindir"]')
 
 binary-install/facter::
-	 /usr/bin/ruby install.rb --sitelibdir=$(LIBDIR) --bindir=$(BINDIR) --ruby=/usr/bin/ruby --destdir=$(CURDIR)/debian/$(cdbs_curpkg) --quick
+	 /usr/bin/ruby install.rb --sitelibdir=$(LIBDIR) --bindir=$(BINDIR) --ruby=/usr/bin/ruby --destdir=$(CURDIR)/debian/$(cdbs_curpkg) --quick --man

data/lib/facter/application.rb

@@ -93,35 +93,80 @@ module Facter
     # @return [Hash] options hash
     def self.parse(argv)
       options = {}
-      OptionParser.new do |opts|
-        opts.on("-y", "--yaml")   { |v| options[:yaml]   = v }
-        opts.on("-j", "--json")   { |v| options[:json]   = v }
-        opts.on(      "--trace")  { |v| options[:trace]  = v }
-        opts.on(      "--external-dir DIR") { |v| create_directory_loader(v) }
-        opts.on(      "--no-external-dir") { |v| create_nothing_loader }
-        opts.on("-d", "--debug")  { |v| Facter.debugging(1) }
-        opts.on("-t", "--timing") { |v| Facter.timing(1) }
-        opts.on("-p", "--puppet") { |v| load_puppet }
-
-        opts.on_tail("-v", "--version") do
+      parser = OptionParser.new do |opts|
+        opts.banner = <<-BANNER
+Synopsis
+========
+
+Collect and display facts about the system.
+
+Usage
+=====
+
+  facter [-d|--debug] [-h|--help] [-p|--puppet] [-v|--version] [-y|--yaml] [-j|--json] [--external-dir DIR] [--no-external-dir] [fact] [fact] [...]
+
+Description
+===========
+
+Collect and display facts about the current system.  The library behind
+Facter is easy to expand, making Facter an easy way to collect information
+about a system from within the shell or within Ruby.
+
+If no facts are specifically asked for, then all facts will be returned.
+
+EXAMPLE
+=======
+  facter kernel
+
+AUTHOR
+======
+  Luke Kanies
+
+COPYRIGHT
+=========
+  Copyright (c) 2011-2012 Puppet Labs, Inc Licensed under the Apache 2.0 license
+
+USAGE
+=====
+        BANNER
+        opts.on("-y",
+                "--yaml",
+                "Emit facts in YAML format.")   { |v| options[:yaml]   = v }
+        opts.on("-j",
+                "--json",
+                "Emit facts in JSON format.")   { |v| options[:json]   = v }
+        opts.on("--trace",
+                "Enable backtraces.")  { |v| options[:trace]  = v }
+        opts.on("--external-dir DIR",
+                "The directory to use for external facts.") { |v| create_directory_loader(v) }
+        opts.on("--no-external-dir",
+                "Turn off external facts.") { |v| create_nothing_loader }
+        opts.on("-d",
+                "--debug",
+                "Enable debugging.")  { |v| Facter.debugging(1) }
+        opts.on("-t",
+                "--timing",
+                "Enable timing.") { |v| Facter.timing(1) }
+        opts.on("-p",
+                "--puppet",
+                "Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.") { |v| load_puppet }
+
+        opts.on_tail("-v",
+                     "--version",
+                     "Print the version and exit.") do
           puts Facter.version
           exit(0)
         end
 
-        opts.on_tail("-h", "--help") do
-          begin
-            require 'rdoc/ri/ri_paths'
-            require 'rdoc/usage'
-            RDoc.usage # print usage and exit
-          rescue LoadError
-            $stderr.puts "No help available unless your RDoc has RDoc.usage"
-            exit(1)
-          rescue => e
-            $stderr.puts "fatal: #{e}"
-            exit(1)
-          end
+        opts.on_tail("-h",
+                     "--help",
+                     "Print this help message.") do
+          puts parser
+          exit(0)
         end
-      end.parse!(argv)
+      end
+
+      parser.parse!(argv)
 
       options
     rescue OptionParser::InvalidOption => e

data/lib/facter/architecture.rb

@@ -4,18 +4,31 @@
 #   Return the CPU hardware architecture.
 #
 # Resolution:
-#   On OpenBSD, Linux and Debian's kfreebsd, use the hardwaremodel fact.
+#   On non-AIX IBM, OpenBSD, Linux and Debian's kfreebsd, use the hardwaremodel fact.
+#   On AIX get the arch value from lsattr -El proc0 -a type
 #   Gentoo and Debian call "x86_86" "amd64".
 #   Gentoo also calls "i386" "x86".
 #
 # Caveats:
 #
 
+require 'facter/util/architecture'
+
 Facter.add(:architecture) do
   setcode do
     model = Facter.value(:hardwaremodel)
     case model
       # most linuxen use "x86_64"
+    when /IBM*/
+      case Facter.value(:operatingsystem)
+      when "AIX"
+         arch = Facter::Util::Architecture.lsattr
+         if (match = arch.match /type\s(\S+)\s/)
+           match[1]
+         end
+      else
+        model
+      end
     when "x86_64"
       case Facter.value(:operatingsystem)
       when "Debian", "Gentoo", "GNU/kFreeBSD", "Ubuntu"

data/lib/facter/operatingsystemrelease.rb

@@ -5,7 +5,7 @@
 # Resolution:
 #   On RedHat derivatives, returns their '/etc/<variant>-release' file.
 #   On Debian, returns '/etc/debian_version'.
-#   On Ubuntu, parses '/etc/issue' for the release version.
+#   On Ubuntu, parses '/etc/lsb-release' for the release version.
 #   On Suse, derivatives, parses '/etc/SuSE-release' for a selection of version
 #   information.
 #   On Slackware, parses '/etc/slackware-version'.
@@ -61,8 +61,8 @@ end
 Facter.add(:operatingsystemrelease) do
   confine :operatingsystem => %w{Ubuntu}
   setcode do
-    if release = Facter::Util::FileRead.read('/etc/issue')
-      if match = release.match(/Ubuntu ((\d+.\d+)(\.(\d+))?)/)
+    if release = Facter::Util::FileRead.read('/etc/lsb-release')
+      if match = release.match(/DISTRIB_RELEASE=((\d+.\d+)(\.(\d+))?)/)
         # Return only the major and minor version numbers.  This behavior must
         # be preserved for compatibility reasons.
         match[2]

data/lib/facter/util/architecture.rb

@@ -0,0 +1,19 @@
+# A module to help test architecture facts on non-AIX test hardware
+
+module Facter::Util::Architecture
+  ##
+  # lsattr is intended to directly delegate to Facter::Util::Resolution.exec in
+  # an effort to make the processorX facts easier to test.  See also the
+  # {lsdev} method.
+  def self.lsattr(command="lsattr -El proc0 -a type")
+    Facter::Util::Resolution.exec(command)
+  end
+
+  ##
+  # kernel_fact_value is intended to directly delegate to Facter.value(:kernel)
+  # to make it easier to stub the kernel fact without affecting the entire
+  # system.
+  def self.kernel_fact_value
+    Facter.value(:kernel)
+  end
+end

data/lib/facter/util/collection.rb

@@ -21,7 +21,7 @@ class Facter::Util::Collection
   # Add a resolution mechanism for a named fact.  This does not distinguish
   # between adding a new fact and adding a new way to resolve a fact.
   def add(name, options = {}, &block)
-    name = canonize(name)
+    name = canonicalize(name)
 
     unless fact = @facts[name]
       fact = Facter::Util::Fact.new(name)
@@ -78,7 +78,7 @@ class Facter::Util::Collection
 
   # Return a fact by name.
   def fact(name)
-    name = canonize(name)
+    name = canonicalize(name)
 
     # Try to load the fact if necessary
     load(name) unless @facts[name]
@@ -96,6 +96,7 @@ class Facter::Util::Collection
   # Flush all cached values.
   def flush
     @facts.each { |name, fact| fact.flush }
+    @external_facts_loaded = nil
   end
 
   # Return a list of all of the facts.
@@ -106,13 +107,13 @@ class Facter::Util::Collection
 
   def load(name)
     internal_loader.load(name)
-    external_loader.load(self)
+    load_external_facts
   end
 
   # Load all known facts.
   def load_all
     internal_loader.load_all
-    external_loader.load(self)
+    load_external_facts
   end
 
   def internal_loader
@@ -143,9 +144,14 @@ class Facter::Util::Collection
 
   private
 
-  # Provide a consistent means of getting the exact same fact name
-  # every time.
-  def canonize(name)
+  def canonicalize(name)
     name.to_s.downcase.to_sym
   end
+
+  def load_external_facts
+    if ! @external_facts_loaded
+      @external_facts_loaded = true
+      external_loader.load(self)
+    end
+  end
 end

data/lib/facter/util/config.rb

@@ -30,16 +30,22 @@ module Facter::Util::Config
   end
 
   def self.external_facts_dirs
-    windows_dir = windows_data_dir
-    if windows_dir.nil? then
-      ["/etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"]
+    if Facter::Util::Root.root?
+      windows_dir = windows_data_dir
+      if windows_dir.nil? then
+        ["/etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"]
+      else
+        [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
+      end
     else
-      [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
+      [File.expand_path(File.join("~", ".facter", "facts.d"))]
     end
   end
 end
 
 if Facter::Util::Config.is_windows?
-  require 'rubygems'
   require 'win32/dir'
+  require 'facter/util/windows_root'
+else
+  require 'facter/util/unix_root'
 end

data/lib/facter/util/ip/windows.rb

@@ -43,8 +43,8 @@ class Facter::Util::IP::Windows
     interface_names = []
 
     network_adapter_configurations.map do |nic|
-      Facter::Util::WMI.execquery("SELECT * FROM Win32_NetworkAdapter WHERE Index = #{nic.Index}").each do |nic|
-        interface_names << nic.NetConnectionId
+      Facter::Util::WMI.execquery("SELECT * FROM Win32_NetworkAdapter WHERE Index = #{nic.Index} AND NetEnabled = TRUE").each do |nic|
+        interface_names << nic.NetConnectionId unless nic.NetConnectionId.nil? or nic.NetConnectionId.empty?
       end
     end
 

data/lib/facter/util/loader.rb

@@ -97,7 +97,7 @@ class Facter::Util::Loader
       # Don't store the path if the file can't be loaded
       # in case it's loadable later on.
       @loaded.delete(file)
-      warn "Error loading fact #{file} #{detail}"
+      Facter.warn "Error loading fact #{file} #{detail}"
     end
   end
 

data/lib/facter/util/memory.rb

@@ -67,6 +67,14 @@ module Facter::Memory
     freemem = ( memfree + memspecfree ) * pagesize
   end
 
+  # on AIX use svmon to get the free memory:
+  # it's the third value on the line starting with memory
+  # svmon can be run by non root users
+  def self.svmon_aix_find_free_memory()
+    Facter::Util::Resolution.exec("/usr/bin/svmon -O unit=KB") =~ /^memory\s+\d+\s+\d+\s+(\d+)\s+/
+    $1
+  end
+
   def self.mem_free(kernel = Facter.value(:kernel))
     output = mem_free_info(kernel)
     scale_mem_free_value output, kernel
@@ -80,12 +88,14 @@ module Facter::Memory
       vmstat_find_free_memory(["-H"])
     when /Darwin/i
       vmstat_darwin_find_free_memory()
+    when /AIX/i
+      svmon_aix_find_free_memory()
     end
   end
 
   def self.scale_mem_free_value (value, kernel)
     case kernel
-    when /OpenBSD/i, /FreeBSD/i, /SunOS/i, /Dragonfly/i
+    when /OpenBSD/i, /FreeBSD/i, /SunOS/i, /Dragonfly/i, /AIX/i
       value.to_f / 1024.0
     when /Darwin/i
       value.to_f / 1024.0 / 1024.0
@@ -109,6 +119,10 @@ module Facter::Memory
       Facter::Util::Resolution.exec("sysctl -n hw.memsize")
     when /Dragonfly/i
       Facter::Util::Resolution.exec("sysctl -n hw.physmem")
+    when /AIX/i
+      if Facter::Util::Resolution.exec("/usr/bin/svmon -O unit=KB") =~ /^memory\s+(\d+)\s+/
+        $1
+      end
     end
   end
 
@@ -116,6 +130,8 @@ module Facter::Memory
     case kernel
     when /OpenBSD/i, /FreeBSD/i, /Darwin/i, /Dragonfly/i
       value.to_f / 1024.0 / 1024.0
+    when /AIX/i
+      value.to_f / 1024.0
     else
       value.to_f
     end
@@ -134,7 +150,7 @@ module Facter::Memory
   def self.swap_info(kernel = Facter.value(:kernel))
     case kernel
     when /AIX/i
-      (Facter.value(:id) == "root") ? Facter::Util::Resolution.exec('swap -l') : nil
+      (Facter.value(:id) == "root") ? Facter::Util::Resolution.exec('swap -l 2>/dev/null') : nil
     when /OpenBSD/i
       Facter::Util::Resolution.exec('swapctl -s')
     when /FreeBSD/i
@@ -142,7 +158,7 @@ module Facter::Memory
     when /Darwin/i
       Facter::Util::Resolution.exec('sysctl vm.swapusage')
     when /SunOS/i
-      Facter::Util::Resolution.exec('/usr/sbin/swap -l')
+      Facter::Util::Resolution.exec('/usr/sbin/swap -l 2>/dev/null')
     end
   end