facter 1.6.18 → 1.7.0.rc1

data/Gemfile

@@ -1,16 +1,31 @@
-source "https://rubygems.org"
+if gem_source = ENV['GEM_SOURCE']
+  source gem_source
+else
+  source "https://rubygems.org"
+end
 
-group :development do
-  gem 'watchr'
+# C Ruby (MRI) or Rubinius, but NOT Windows
+platforms :ruby do
+  gem 'watchr', :group => :development
+  gem 'pry', :group => :development
+  gem 'yard', :group => :development
+  gem 'redcarpet', :group => :development
 end
 
 group :development, :test do
   gem 'rake'
-  gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__), :require => false
-  gem 'rspec', "~> 2.11.0", :require => false
-  gem 'mocha', "~> 0.10.5", :require => false
-  gem 'json', "~> 1.7", :require => false
-  gem 'puppetlabs_spec_helper', :require => false
+  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 '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"
 end
 
 if File.exists? "#{__FILE__}.local"

data/bin/facter

@@ -6,7 +6,7 @@
 #
 # = Usage
 #
-#   facter [-d|--debug] [-h|--help] [-p|--puppet] [-v|--version] [-y|--yaml] [-j|--json] [fact] [fact] [...]
+#   facter [-d|--debug] [-h|--help] [-p|--puppet] [-v|--version] [-y|--yaml] [-j|--json] [--external-dir DIR] [--no-external-dir] [fact] [fact] [...]
 #
 # = Description
 #
@@ -42,6 +42,9 @@
 # timing::
 #   Enable timing.
 #
+# facts.d::
+#   The directory to use for external facts.
+#
 # = Example
 #
 #   facter kernel

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 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-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-oneiric-i386.cow base-oneiric-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-quantal-i386.cow base-quantal-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'

data/ext/debian/changelog.erb

@@ -1,32 +1,14 @@
-facter (<%= @debversion %>) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+facter (<%= @debversion %>) hardy lucid oneiric unstable sid wheezy lucid squeeze precise quantal; urgency=low
 
   * Update to version <% @debversion %>
 
  -- Puppet Labs Release <info@puppetlabs.com>  <%= Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")%>
 
-facter (2.0.0-0.1rc4puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+facter (1.7.0-0.1rc1puppetlabs1) hardy lucid oneiric unstable sid wheezy lucid squeeze precise; urgency=low
 
-  * Imported upstream 2.0.0rc4. 
+  * Add dependency on virt-what to facter for better virutalization detection
 
- -- Moses Mendoza <moses@puppetlabs.com>  Thu, 24 May 2012 17:09:25 +0000
-
-facter (2.0.0-0.1rc3puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
-
-  * Imported upstream 2.0.0rc3. 
-
- -- Moses Mendoza <moses@puppetlabs.com>  Tue, 22 May 2012 11:48:25 +0000
-
-facter (2.0.0-0.1rc2puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
-
-  * Imported upstream 2.0.0rc2. 
-
- -- Moses Mendoza <moses@puppetlabs.com>  Thu, 17 May 2012 13:15:25 +0000
-
-facter (2.0.0-0.1rc1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
-
-  * Imported upstream 2.0.0rc1. Updated debian/control to include ruby1.9 options.
-
- -- Matthaus Litteken <matthaus@puppetlabs.com>  Tue, 15 May 2012 23:43:25 +0000
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Mon, 01 Apr 2013 13:11:30 +0000
 
 facter (1.6.8-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
 

data/ext/debian/control

@@ -7,8 +7,8 @@ Standards-Version: 3.9.1
 Homepage: http://www.puppetlabs.com
 
 Package: facter
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.8 | libopenssl-ruby1.9.1, dmidecode, pciutils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.8 | libopenssl-ruby1.9.1, dmidecode [i386 amd64 ia64], virt-what, pciutils
 Description: Ruby module for collecting simple facts about a host operating system
  Some of the facts are preconfigured, such as the hostname and the operating
  system. Additional facts can be added through simple Ruby scripts.

data/ext/project_data.yaml

@@ -7,7 +7,7 @@ summary: 'Facter, a system inventory tool'
 description: 'You can prove anything with facts!'
 version_file: 'lib/facter/version.rb'
 # files and gem_files are space separated lists
-files: '[A-Z]* acceptance bin documentation etc ext install.rb lib man spec'
+files: '[A-Z]* acceptance bin documentation etc ext install.rb lib libexec man spec'
 gem_files: '[A-Z]* install.rb bin etc ext lib spec'
 gem_require_path: 'lib'
 gem_test_files: 'spec/**/*'

data/ext/redhat/facter.spec.erb

@@ -31,6 +31,7 @@ Requires:       which
 Requires:       dmidecode
 Requires:       pciutils
 %endif
+Requires:       virt-what
 Requires:       ruby(abi) >= 1.8
 BuildRequires:  ruby >= 1.8.5
 
@@ -72,6 +73,9 @@ rm -rf %{buildroot}
 * <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  1:<%= @rpmversion %>-<%= @rpmrelease %>
 - Build for <%= @version %>
 
+* Mon Apr 01 2013 Matthaus Owens <matthaus@puppetlabs.com> - 1:1.7.0-0.1rc1
+- Add dependency on virt-what to facter for better virutalization detection
+
 * Wed Aug 08 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.11-2
 - Use correct ruby libdir for fedora 17 / ruby 1.9
 
@@ -84,17 +88,14 @@ rm -rf %{buildroot}
 * Sat Jul 07 2012 Michael Stahnke <stahnma@puppetlabs.com> - 1.6.10-2
 - Attempt to build fro Ruby 1.9.3
 
-* Wed Jun 13 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.10-1
-- Update for 1.6.10
-
-* Fri Jun 8 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.10-0.1rc1.2
-- Bump epoch to 1 to address errant Facter 2.0 rc release
+* Tue May 22 2012 Moses Mendoza <moses@puppetlabs.com> - 2.0.0-0.1rc3
+- Update for 2.0.0rc3 release
 
-* Wed Jun 6 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.10-0.1rc1
-- Update for 1.6.10rc1
+* Thu May 17 2012 Moses Mendoza <moses@puppetlabs.com> - 2.0.0-0.1rc2
+- Update for 2.0.0rc2 release
 
-* Thu May 17 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.9-1
-- Update for 1.6.9
+* Tue May 15 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.0.0-0.1rc1
+- Facter 2.0.0rc1 release
 
 * Thu May 10 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 1.6.9-0.1rc1
 - Update for 1.6.9rc1

data/install.rb

@@ -14,20 +14,17 @@
 #
 #   bin/  # executable files -- "commands"
 #   lib/  # the source of the library
-#   tests/  # unit tests
 #
 # The default behaviour:
-# 1) Run all unit test files (ending in .rb) found in all directories under
-#  tests/.
-# 2) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
+# 1) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
 #  all .rb files in lib/, ./README, ./ChangeLog, and ./Install.
-# 3) Build ri documentation from all files in bin/ (excluding .bat and .cmd),
+# 2) Build ri documentation from all files in bin/ (excluding .bat and .cmd),
 #  and all .rb files in lib/. This is disabled by default on Win32.
-# 4) Install commands from bin/ into the Ruby bin directory. On Windows, if a
+# 3) Install commands from bin/ into the Ruby bin directory. On Windows, if a
 #  if a corresponding batch file (.bat or .cmd) exists in the bin directory,
 #  it will be copied over as well. Otherwise, a batch file (always .bat) will
 #  be created to run the specified command.
-# 5) Install all library files ending in .rb from lib/ into Ruby's
+# 4) Install all library files ending in .rb from lib/ into Ruby's
 #  site_lib/version directory.
 #
 #++
@@ -59,7 +56,7 @@ rescue
   $haveman = false
 end
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
 require 'facter'
 @operatingsystem = Facter[:operatingsystem].value
 
@@ -74,14 +71,6 @@ def glob(list)
   g
 end
 
-# Set these values to what you want installed.
-bins  = glob(%w{bin/*})
-rdoc  = glob(%w{bin/* lib/**/*.rb README README-library TODO }).reject { |e| e=~ /\.(bat|cmd)$/ }
-ri  = glob(%w(bin/*.rb lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
-man   = glob(%w{man/man8/*})
-libs  = glob(%w{lib/**/*.rb lib/**/*.py})
-tests = glob(%w{tests/**/*.rb})
-
 def do_bins(bins, target, strip = 's?bin/')
   bins.each do |bf|
     obf = bf.gsub(/#{strip}/, '')
@@ -91,7 +80,7 @@ end
 
 def do_libs(libs, strip = 'lib/')
   libs.each do |lf|
-    olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
+    olf = File.join(InstallOptions.site_dir, lf.gsub(/^#{strip}/, ''))
     op = File.dirname(olf)
     FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
     FileUtils.chmod(0755, op)
@@ -159,8 +148,6 @@ def prepare_installation
     InstallOptions.man = false
   end
 
-  InstallOptions.tests = true
-
   ARGV.options do |opts|
     opts.banner = "Usage: #{File.basename($0)} [options]"
     opts.separator ""
@@ -173,8 +160,9 @@ def prepare_installation
     opts.on('--[no-]man', 'Presents the creation of man pages.', 'Default on.') do |onman|
     InstallOptions.man = onman
     end
-    opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
+    opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default off.') do |ontest|
       InstallOptions.tests = ontest
+      warn "The tests flag has never worked in Facter, is deprecated as of Nov 29, 2012, and will be removed in a future release of Facter."
     end
     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
       InstallOptions.destdir = destdir
@@ -194,12 +182,10 @@ def prepare_installation
     opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
       InstallOptions.rdoc   = false
       InstallOptions.ri   = false
-      InstallOptions.tests  = false
     end
     opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
       InstallOptions.rdoc   = true
       InstallOptions.ri   = true
-      InstallOptions.tests  = true
     end
     opts.separator("")
     opts.on_tail('--help', "Shows this help text.") do
@@ -332,27 +318,6 @@ def build_man(bins)
   end
 end
 
-def run_tests(test_list)
-  begin
-    require 'test/unit/ui/console/testrunner'
-    $:.unshift "lib"
-    test_list.each do |test|
-      next if File.directory?(test)
-      require test
-    end
-
-    tests = []
-    ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
-    tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
-    tests.delete_if { |o| o == Test::Unit::TestCase }
-
-    tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
-    $:.shift
-  rescue LoadError
-    puts "Missing testrunner library; skipping tests"
-  end
-end
-
 ##
 # Install file(s) from ./bin to RbConfig::CONFIG['bindir']. Patch it on the way
 # to insert a #! line; on a Unix install, the command is named as expected
@@ -409,13 +374,22 @@ EOS
   tmp_file.unlink
 end
 
-check_prereqs
-prepare_installation
-
-run_tests(tests) if InstallOptions.tests
-#build_rdoc(rdoc) if InstallOptions.rdoc
-#build_ri(ri) if InstallOptions.ri
-#build_man(bins) if InstallOptions.man
-do_bins(bins, InstallOptions.bin_dir)
-do_libs(libs)
-do_man(man)
+# Change directory into the facter root so we don't get the wrong files for install.
+FileUtils.cd File.dirname(__FILE__) do
+  # Set these values to what you want installed.
+  bins  = glob(%w{bin/*})
+  rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
+  ri  = glob(%w(bin/*.rb lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
+  man   = glob(%w{man/man8/*})
+  libs  = glob(%w{lib/**/*.rb lib/**/*.py lib/**/LICENSE})
+
+  check_prereqs
+  prepare_installation
+
+  #build_rdoc(rdoc) if InstallOptions.rdoc
+  #build_ri(ri) if InstallOptions.ri
+  #build_man(bins) if InstallOptions.man
+  do_bins(bins, InstallOptions.bin_dir)
+  do_libs(libs)
+  do_man(man)
+end

data/lib/facter.rb

@@ -40,21 +40,20 @@ module Facter
   # puts Facter['operatingsystem']
   #
 
-  # Set LANG to force i18n to C
-  #
-  ENV['LANG'] = 'C'
-
   GREEN = ""
   RESET = ""
   @@debug = 0
   @@timing = 0
   @@messages = {}
+  @@debug_messages = {}
 
   # module methods
 
   def self.collection
     unless defined?(@collection) and @collection
-      @collection = Facter::Util::Collection.new
+      @collection = Facter::Util::Collection.new(
+        Facter::Util::Loader.new,
+        Facter::Util::Config.ext_fact_loader)
     end
     @collection
   end
@@ -69,6 +68,14 @@ module Facter
     end
   end
 
+  # Debug once.
+  def self.debugonce(msg)
+    if msg and not msg.empty? and @@debug_messages[msg].nil?
+      @@debug_messages[msg] = true
+      debug(msg)
+    end
+  end
+
   def self.debugging?
     @@debug != 0
   end
@@ -82,6 +89,17 @@ module Facter
     @@timing != 0
   end
 
+  # Facter.json? is meant to provide a lightweight way to check if the JSON
+  # "feature" is available.
+  def self.json?
+    begin
+      require 'json'
+      true
+    rescue LoadError
+      false
+    end
+  end
+
   # Return a fact object by name.  If you use this, you still have to call
   # 'value' on it to retrieve the actual value.
   def self.[](name)

data/lib/facter/application.rb

@@ -1,5 +1,21 @@
 module Facter
   module Application
+
+    require 'facter/util/nothing_loader'
+
+    def self.create_directory_loader(dir)
+      begin
+        Facter::Util::Config.ext_fact_loader = Facter::Util::DirectoryLoader.loader_for(dir)
+      rescue Facter::Util::DirectoryLoader::NoSuchDirectoryError => error
+        $stderr.puts "Specified external facts directory #{dir} does not exist."
+        exit(1)
+      end
+    end
+
+    def self.create_nothing_loader
+      Facter::Util::Config.ext_fact_loader = Facter::Util::NothingLoader.new
+    end
+
     def self.run(argv)
       require 'optparse'
       require 'facter'
@@ -9,6 +25,9 @@ module Facter
       # Accept fact names to return from the command line
       names = argv
 
+      # Change location of external facts dir
+      # Check here for valid ext_dir and exit program
+
       # Create the facts hash that is printed to standard out.
       unless names.empty?
         facts = {}
@@ -78,6 +97,8 @@ module Facter
         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 }

data/lib/facter/blockdevices.rb

@@ -0,0 +1,105 @@
+# Fact: blockdevice_<devicename>_size
+#
+# Purpose:
+#   Return the size of a block device in bytes
+#
+# Resolution:
+#   Parse the contents of /sys/block/<device>/size to receive the size (multiplying by 512 to correct for blocks-to-bytes)
+#
+# Caveats:
+#   Only supports Linux 2.6+ at this time, due to the reliance on sysfs
+#
+
+# Fact: blockdevice_<devicename>_vendor
+#
+# Purpose:
+#   Return the vendor name of block devices attached to the system
+#
+# Resolution:
+#   Parse the contents of /sys/block/<device>/device/vendor to retrieve the vendor for a device
+#
+# Caveats:
+#   Only supports Linux 2.6+ at this time, due to the reliance on sysfs
+#
+
+# Fact: blockdevice_<devicename>_model
+#
+# Purpose:
+#   Return the model name of block devices attached to the system
+#
+# Resolution:
+#   Parse the contents of /sys/block/<device>/device/model to retrieve the model name/number for a device
+#
+# Caveats:
+#   Only supports Linux 2.6+ at this time, due to the reliance on sysfs
+#
+
+
+# Fact: blockdevices
+#
+# Purpose:
+#   Return a comma seperated list of block devices
+#
+# Resolution:
+#   Retrieve the block devices that were identified and iterated over in the creation of the blockdevice_ facts
+#
+# Caveats:
+#   Block devices must have been identified using sysfs information
+#
+
+# Author: Jason Gill <jasongill@gmail.com>
+
+require 'facter'
+
+# Only Linux 2.6+ kernels support sysfs which is required to easily get device details
+if Facter.value(:kernel) == 'Linux'
+
+  sysfs_block_directory = '/sys/block/'
+
+  blockdevices = []
+
+  # This should prevent any non-2.6 kernels or odd machines without sysfs support from being investigated further
+  if File.exist?(sysfs_block_directory)
+
+    # Iterate over each file in the /sys/block/ directory and skip ones that do not have a device subdirectory
+    Dir.entries(sysfs_block_directory).each do |device|
+      sysfs_device_directory = sysfs_block_directory + device + "/device"
+      next unless File.exist?(sysfs_device_directory)
+
+      # Add the device to the blockdevices list, which is returned as it's own fact later on
+      blockdevices << device
+
+      sizefile = sysfs_block_directory + device + "/size"
+      vendorfile = sysfs_device_directory + "/vendor"
+      modelfile = sysfs_device_directory + "/model"
+
+      if File.exist?(sizefile)
+        Facter.add("blockdevice_#{device}_size".to_sym) do
+          setcode { IO.read(sizefile).strip.to_i * 512 }
+        end
+      end
+
+      if File.exist?(vendorfile)
+        Facter.add("blockdevice_#{device}_vendor".to_sym) do
+          setcode { IO.read(vendorfile).strip }
+        end
+      end
+
+      if File.exist?(modelfile)
+        Facter.add("blockdevice_#{device}_model".to_sym) do
+          setcode { IO.read(modelfile).strip }
+        end
+      end
+
+    end
+
+  end
+
+  # Return a comma-seperated list of block devices found
+  unless blockdevices.empty?
+    Facter.add(:blockdevices) do
+      setcode { blockdevices.sort.join(',') }
+    end
+  end
+
+end