facter 1.5.8 → 1.5.9

data/CHANGELOG

@@ -1,3 +1,97 @@
+1.5.9
+=====
+4de8b20 Updated CHANGELOG for 1.5.9rc6
+cc67a01 Removed inappropriately uncredited Ohai method from ec2 fact
+69f98da Add facter test for ticket 7039
+f91c120 downcase arp output so that the ec2 arp is matched
+a75f0f9 (#7039) Pre-load all facts when requesting a single fact
+6b97242 Update CHANGELOG for 1.5.9rc5
+acf0bb2 Ensures that ARP facts are returned only on EC2 hosts
+76f544b Updated CHANGELOG for 1.5.9rc4
+09b9f9b (#6795) Update tests to reflect changed exec
+3db1cd0 Updated CHANGELOG for 1.5.9rc3
+def3322 (#6795) xendomains: Ignore error output from xm list
+f39d487 (#6763) Use Facter::Util::Resolution.exec for arp
+3eb9410 arp: Cleanup indendation
+50b9b3f Updated CHANGELOG for 1.5.9rc2
+2fb8316 Clean up indentation, and alignment in macaddress_spec.rb
+3f0a340 (#6716) fix facter issues on OSX with ipv6 in macaddress.rb.
+43f82ef Update CHANGELOG for 1.5.9rc1
+d62e079 Fixed #2346 - A much cleverer EC2 fact
+0411d2e Fixed #2346 - Part 1: Added arp fact for Linux
+5b6f4fa Discussion on ec2 facts - #2346
+e917e1a Fixed #3087 - Identify VMWare
+d0f0f63 (#6327) Memory facts should be available on Mac Darwin
+458a22d Incremented release to 1.5.9
+4eb64fe Fixed #6719 Typo
+ffd80ac (#5011) Adds swap statistics for OSX
+1207765 (#6719) Restricts virtualization types for zones
+8d71db3 Fixed #6616 - Stubbing in VMware tests on Linux
+aa959df Remove Solaris from the list of confined systems. It won't get the original lsb facts, and it's nonsensical too.
+2e48e18 Fixed #6695 - Updated id fact for Darwin et al
+d718af4 Fix #6679 - Added Scientific Linux to operatingsystem fact
+dea6f78 Further fix to #5485 - SELinux facts
+6d6d8da (#2721) Merged patch from Brane GraAnar
+868e7ba (#5485) Made selinux_mode fact work
+214da73 Fixed #5485 - Updated selinux_mode fact
+ba2601f Fix for #6495 - Updated interface detection
+93461d9 Fixed #5950 - Solaris ipaddress incorrect after bonding failure
+2e06cdc (#6615) fix missing stub calls in loader specs
+3c7841e (#5666) windows support for facter/id.rb
+dd5d5bf (#4925) - MS Windows doesn't do man pages
+52026ee Fixed #5699 - Added processorcount support for S390x
+7dd730d Fixed #5699 - Added virtual support for s390x/Zlinux
+d6ce08a Fixed #6611 - Fixed broken HPVM test and rationalised test structure
+84fa3c4 (#6525) change semicolons to 'then' in case statement for ruby 1.9.2 compatibility
+3e6217d Fixes #6521 and other Ruby 1.9 issues
+eb5d6fc Fixed #6525 - Test failures on Ruby 1.9.x
+cb25119 (#2270) add testing for the new ipaddress6 feature
+ea29483 (#2270) add IPv6 support to facter core.
+77eb512 (#2270) Remove DWIM code from ipaddress on Darwin.
+f5bf0f5 (#6360) Flush Facter top level cache before every test case.
+0d7a2e6 Fix #4755: add support for GNU/kFreeBSD platform where missing.
+b88a088 (#5510) Facter should load custom fact definitions in filename order.
+7a8be16 Refactor #6044 -- use _spec.rb as the pattern for spec tests.
+b39f892 Refactor #6044 -- require spec_helper with a consistent path.
+a4fe459 Refactor #6044 -- port testing to rspec2
+af9134c (#5086) Try using kstat before falling back to 'who -b' to determine uptime.
+cbbfe55 Refactor util/uptime.rb tests to reduce duplication using contexts
+f0cc2c0 (#4575) win32 support for manufacturer, productname, & serialnumber
+c40fc07 (#1423) Memory facts for Solaris
+1985528 (#4754) Change is_virtual logic to not enumerate virtual types
+739040f (#4754) Add support for Darwin and Parallels VM to "virtual" fact
+9332f8a (#5325) Add tests for SPARC manufacturer and product name
+5b561e3 (#5325) Manufacturer and product name on SPARC
+9d99079 maint: Fix spec failures caused by having a space in the path to facter's source
+89da001 maint: require rubygems so hudson can run the specs
+1eef842 Maint: add "Local-branch:" info to mails sent by "rake mail_patches"
+f007a9d (#4989) Add xendomains fact
+1fa87a9 JSON support. Works in 1.9.1. Warnings in 1.9.2. LoadError on 1.8.7 for some reason
+43e203c (#5040) fact virtual should detect hpvm
+7cec60a (#5016) is_virtual should be true on solaris zones
+f2e66b6 (#5031) Remove redundant puts from RDoc.usage
+f4da528 maint: Fix merge error
+d62b013 Issue #4889 Fact values should all be strings
+07f186d [#4552] Updating --timing to report in milliseconds instead of seconds
+1f387a5 [#4552] Apply patch from Dean Wilson
+244d2f1 Better fix for Bug 4569: Uptime Fact is incorrect on Windows
+11544c1 [#4289] operatingsystemrelease fact for oel, ovs
+e6bfdf9 Fix for bug #4569
+8c4d0cd (#4558) Fail with message on --help errors
+7210429 [#4558] Refactor facter binary using optparse
+b5c85de [#4563] Add a --trace option to the binary
+ebcb81b [#4558] Refactor facter binary using optparse
+b8b7123 (#4567) Remove unnecessary or non-portable redirects
+7ecba71 (#4567) Retain detached HEAD state
+1125e1e Make sure FreeBSD spec also works on systems that have /proc/cpuinfo.
+889e150 Sync rpm spec file from Fedora/EPEL
+725dce0 Rename Reductive Labs to Puppet Labs
+ff473ef Updated signing rake task
+a85f2b0 [#2865] Fix reporting of virtual facts
+f67ec05 [#4567] Add ext/facter-diff to compare output of 2 versions
+4050acc Removing stupid .DS_Store files :(
+016cf03 [#3703] Fix macaddress fact for Darwin
+
 1.5.8
 =====
 ca2da36  Updated install.rb and created man page

data/INSTALL

@@ -1,5 +1,5 @@
 Run 'ruby install.rb' or use one of the distributed gem files at
-http://reductivelabs.com/downloads/gems .
+http://puppetlabs.com/downloads/gems .
 
 install.rb should successfully install; let me know if it doesn't.
 

data/README

@@ -5,4 +5,4 @@ processors, etc.
 
 See bin/facter for an example of the interface.
 
-See http://reductivelabs.com/projects/facter/ for more details.
+See http://www.puppetlabs.com/puppet/related-projects/facter for more details.

data/README.rst

@@ -16,11 +16,11 @@ Run the ``facter`` binary on the command for a full list of facts supported on y
 Adding your own facts
 +++++++++++++++++++++
 
-See the `Adding Facts`_ wiki page for details of how to add your own custom facts to Facter.
+See the `Adding Facts`_ page for details of how to add your own custom facts to Facter.
  
 Further Information
 +++++++++++++++++++
 
-See http://reductivelabs.com/projects/facter/ for more details.
+See http://www.puppetlabs.com/puppet/related-projects/facter for more details.
 
-.. _Adding Facts: http://reductivelabs.com/trac/puppet/wiki/AddingFacts
+.. _Adding Facts: http://docs.puppetlabs.com/guides/custom_facts.html

data/Rakefile

@@ -3,8 +3,9 @@
 $: << File.expand_path('lib')
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
-require 'spec'
-require 'spec/rake/spectask'
+require 'rubygems'
+require 'rspec'
+require 'rspec/core/rake_task'
 begin
     require 'rcov'
 rescue LoadError
@@ -61,12 +62,14 @@ task :default do
     sh %{rake -T}
 end
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new do |t|
+    t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+    t.fail_on_error = false
 end
 
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-    t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new('spec:rcov') do |t|
+    t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+    t.fail_on_error = false
     if defined?(Rcov)
         t.rcov = true
         t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*,gems/*']

data/bin/facter

@@ -6,7 +6,7 @@
 #
 # = Usage
 #
-#   facter [-d|--debug] [-h|--help] [-p|--puppet] [-v|--version] [-y|--yaml] [fact] [fact] [...]
+#   facter [-d|--debug] [-h|--help] [-p|--puppet] [-v|--version] [-y|--yaml] [-j|--json] [fact] [fact] [...]
 #
 # = Description
 #
@@ -18,11 +18,11 @@
 #
 # = Options
 #
-# debug::
-#   Enable debugging.
+# yaml::
+#   Emit facts in YAML format.
 #
-# help::
-#   Print this help message
+# json::
+#   Emit facts in JSON format.
 #
 # puppet::
 #   Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.
@@ -30,8 +30,17 @@
 # version::
 #   Print the version and exit.
 #
-# yaml::
-#   Emit facts in YAML format.
+# help::
+#   Print this help message.
+#
+# debug::
+#   Enable debugging.
+#
+# trace::
+#   Enable backtraces.
+#
+# timing::
+#   Enable timing.
 #
 # = Example
 #
@@ -46,120 +55,6 @@
 # Copyright (c) 2006 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
-require 'getoptlong'
-require 'facter'
-
-$haveusage = true
-
-begin
-    require 'rdoc/ri/ri_paths'
-    require 'rdoc/usage'
-rescue Exception
-    $haveusage = false
-end
-
-def load_puppet
-    require 'puppet'
-    Puppet.parse_config
-
-    # If you've set 'vardir' but not 'libdir' in your
-    # puppet.conf, then the hook to add libdir to $:
-    # won't get triggered.  This makes sure that it's setup
-    # correctly.
-    unless $LOAD_PATH.include?(Puppet[:libdir])
-        $LOAD_PATH << Puppet[:libdir]
-    end
-end
-
-$debug = 0
-
-config = nil
-
-result = GetoptLong.new(
-    [ "--version", "-v", GetoptLong::NO_ARGUMENT       ],
-    [ "--help",    "-h", GetoptLong::NO_ARGUMENT       ],
-    [ "--debug",   "-d", GetoptLong::NO_ARGUMENT       ],
-    [ "--yaml",    "-y", GetoptLong::NO_ARGUMENT       ],
-    [ "--config",  "-c", GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--puppet",  "-p", GetoptLong::NO_ARGUMENT       ]
-)
-
-options = {
-    :yaml => false
-}
-
-begin
-    result.each { |opt,arg|
-        case opt
-        when "--version"
-            puts "%s" % Facter.version
-            exit
-        when "--puppet"
-            begin
-                load_puppet()
-            rescue LoadError => detail
-                $stderr.puts "Could not load Puppet: %s" % detail
-            end
-        when "--yaml"
-            options[:yaml] = true
-        when "--debug"
-            Facter.debugging(1)
-        when "--help"
-            if $haveusage
-                RDoc::usage && exit
-            else
-                puts "No help available unless you have RDoc::usage installed"
-                exit
-            end
-        else
-            $stderr.puts "Invalid option '#{opt}'"
-            exit(12)
-        end
-    }
-rescue
-    exit(12)
-end
-
-names = []
-
-unless config.nil?
-    File.open(config) { |file|
-        names = file.readlines.collect { |line|
-            line.chomp
-        }
-    }
-end
-
-ARGV.each { |item|
-    names.push item
-}
-
-facts = Facter.to_hash
-
-unless names.empty?
-    facts = {}
-    names.each { |name|
-        begin
-            facts[name] = Facter.value(name)
-        rescue => error
-            STDERR.puts "Could not retrieve %s: #{error}" % name
-            exit 10
-        end
-    }
-end
-
-if options[:yaml]
-    require 'yaml'
-    puts YAML.dump(facts)
-    exit(0)
-end
+require 'facter/application'
 
-facts.sort { |a, b| a[0].to_s <=> b[0].to_s }.each { |name,value|
-    if facts.length == 1
-        unless value.nil?
-            puts value
-        end
-    else
-        puts "%s => %s" % [name,value]
-    end
-}
+Facter::Application.run(ARGV)

data/conf/redhat/facter.spec

@@ -5,12 +5,14 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.5
+Version: 1.5.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-URL: http://reductivelabs.com/projects/facter
-Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
+URL: http://www.puppetlabs.com/puppet/related-projects/%{name}/
+Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -50,6 +52,19 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 28 2010 Todd Zullinger <tmz@pobox.com> - 1.5.8-1
+- Update to 1.5.8
+
+* Fri Sep 25 2009 Todd Zullinger <tmz@pobox.com> - 1.5.7-1
+- Update to 1.5.7
+- Update #508037 patch from upstream ticket
+
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz@pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch
@@ -58,6 +73,9 @@ rm -rf %{buildroot}
 - New version
 - Use upstream install script
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Sep 09 2008 Todd Zullinger <tmz@pobox.com> - 1.5.2-1
 - New version
 - Simplify spec file checking for Fedora and RHEL versions

data/conf/solaris/pkginfo

@@ -2,6 +2,6 @@ PKG=CSWfacter
 NAME=facter - System Fact Gatherer
 VERSION=1.3.5
 CATEGORY=application
-VENDOR=http://reductivelabs.com/projects/facter
-HOTLINE=http://reductivelabs.com/cgi-bin/facter.cgi
+VENDOR=http://www.puppetlabs.com/puppet/related-projects/facter
+HOTLINE=http://puppetlabs.com/cgi-bin/facter.cgi
 EMAIL=luke@madstop.com

data/install.rb

@@ -97,16 +97,20 @@ def do_libs(libs, strip = 'lib/')
 end
 
 def do_man(man, strip = 'man/')
+  if (InstallOptions.man == true)  
     man.each do |mf|
-        omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
-        om = File.dirname(omf)
-        FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
-        FileUtils.chmod(0755, om)
-        FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
-        gzip = %x{which gzip}
-        gzip.chomp!
-        %x{#{gzip} -f #{omf}}
+	omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+	om = File.dirname(omf)
+	FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
+	FileUtils.chmod(0755, om)
+	FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
+	gzip = %x{which gzip}
+	gzip.chomp!
+	%x{#{gzip} -f #{omf}}
     end
+  else
+    puts "Skipping Man Page Generation"
+  end
 end
 
 # Verify that all of the prereqs are installed
@@ -121,6 +125,10 @@ def check_prereqs
     }
 end
 
+def is_windows?
+  RUBY_PLATFORM.to_s.match(/mswin|win32|dos|cygwin|mingw/)
+end
+
 ##
 # Prepare the file installation.
 #
@@ -128,7 +136,7 @@ def prepare_installation
     # Only try to do docs if we're sure they have rdoc
     if $haverdoc
         InstallOptions.rdoc  = true
-        if RUBY_PLATFORM == "i386-mswin32"
+        if is_windows?
             InstallOptions.ri  = false
         else
             InstallOptions.ri  = true
@@ -141,7 +149,7 @@ def prepare_installation
 
     if $haveman
         InstallOptions.man = true
-        if RUBY_PLATFORM == "i386-mswin32"
+        if is_windows?
             InstallOptions.man  = false
         end
     else

data/lib/facter.rb

@@ -27,7 +27,7 @@ module Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.5.8'
+    FACTERVERSION = '1.5.9'
     # = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
@@ -48,6 +48,7 @@ module Facter
     GREEN = ""
     RESET = ""
     @@debug = 0
+    @@timing = 0
 
     # module methods
 
@@ -77,6 +78,15 @@ module Facter
         @@debug != 0
     end
 
+    # show the timing information
+    def self.show_time(string)
+        puts "#{GREEN}#{string}#{RESET}" if string and Facter.timing?
+    end
+
+    def self.timing?
+        @@timing != 0
+    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)
@@ -177,6 +187,22 @@ module Facter
         end
     end
 
+    # Set timing on or off.
+    def self.timing(bit)
+        if bit
+            case bit
+            when TrueClass; @@timing = 1
+            when Fixnum
+                if bit > 0
+                    @@timing = 1
+                else
+                    @@timing = 0
+                end
+            end
+        else
+            @@timing = 0
+        end
+    end
 
     def self.warn(msg)
         if Facter.debugging? and msg and not msg.empty?