facter 2.2.0 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c3bd2dd91e105300c5c9699eecdca04fb19de5c2
+  data.tar.gz: 5ef75021f47f8fe499b257f71d4f710dcf0a8d58
+SHA512:
+  metadata.gz: b4d4ec570048df48675d0c5dfe5b04a0565462effef6705cd1633e39c8379e3dad8688744ebea16410051d682ba7deee1afc215311d0fe96de383e4e0b236e5a
+  data.tar.gz: 1be688c0e5d463f063ee245ab51153073ac4239dcd0939820f89ee42ad035b8d59b5fb6245946bd85d1148ab64d2c31551482e8b75ce0a59a7dc0297e829a2eb

data/CONTRIBUTING.md

@@ -16,6 +16,10 @@ top of things.
   * Make sure you fill in the earliest version that you know has the issue.
 * Fork the repository on GitHub
 
+## New Facts
+
+All new facts should also be included in `schema/facter.json`. Without this facts won't pass acceptance tests.
+
 ## Making Changes
 
 * Create a topic branch from where you want to base your work.

data/Gemfile

@@ -13,6 +13,7 @@ group :development, :test do
   gem 'rspec', "~> 2.11.0"
   gem 'mocha', "~> 0.10.5"
   gem 'json', "~> 1.7", :platforms => :ruby
+  gem 'json-schema', :platforms => :ruby
   gem 'puppetlabs_spec_helper'
 end
 
@@ -39,7 +40,7 @@ mingw = [:mingw]
 mingw << :x64_mingw if Bundler::Dsl::VALID_PLATFORMS.include?(:x64_mingw)
 
 platform(*mingw) do
-  gem 'ffi', '~> 1.9.3', :require => false
+  gem 'ffi', '~> 1.9.5', :require => false
   gem 'win32-dir', '~> 0.4.8', :require => false
   gem 'win32-security', '~> 0.2.5', :require => false
 end

data/LICENSE

@@ -1,6 +1,6 @@
 Facter - Host Fact Detection and Reporting
 
-Copyright 2005-2012 Puppet Labs Inc
+Copyright 2005-2014 Puppet Labs Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/ext/project_data.yaml

@@ -19,13 +19,13 @@ gem_platform_dependencies:
       CFPropertyList: '~> 2.2.6'
   x86-mingw32:
     gem_runtime_dependencies:
-      ffi: '~> 1.9.3'
+      ffi: '~> 1.9.5'
       win32-dir: '~> 0.4.8'
       win32-security: '~> 0.2.5'
       win32console: '~> 1.3.2'
   x64-mingw32:
     gem_runtime_dependencies:
-      ffi: '~> 1.9.3'
+      ffi: '~> 1.9.5'
       win32-dir: '~> 0.4.8'
       win32-security: '~> 0.2.5'
 bundle_platforms:

data/lib/facter/ec2.rb

@@ -20,7 +20,7 @@ require 'facter/ec2/rest'
 Facter.define_fact(:ec2_metadata) do
   define_resolution(:rest) do
     confine do
-      Facter.value(:virtual).match /^xen/
+      Facter.value(:virtual).match /^(xen|kvm)/
     end
 
     @querier = Facter::EC2::Metadata.new
@@ -37,7 +37,7 @@ end
 Facter.define_fact(:ec2_userdata) do
   define_resolution(:rest) do
     confine do
-      Facter.value(:virtual).match /^xen/
+      Facter.value(:virtual).match /^(xen|kvm)/
     end
 
     @querier = Facter::EC2::Userdata.new

data/lib/facter/gid.rb

@@ -10,7 +10,16 @@
 
 Facter.add(:gid) do
   confine do
-    Facter::Core::Execution.which('id')
+    Facter::Core::Execution.which('id') && Facter.value(:kernel) != "SunOS"
   end
   setcode { Facter::Core::Execution.exec('id -ng') }
 end
+
+Facter.add(:gid) do
+  confine :kernel => :SunOS
+  setcode do
+    if File.exist? '/usr/xpg4/bin/id'
+      Facter::Core::Execution.exec('/usr/xpg4/bin/id -ng')
+    end
+  end
+end

data/lib/facter/interfaces.rb

@@ -41,6 +41,8 @@ Facter::Util::IP.get_interfaces.each do |interface|
         value = Facter::Util::IP.get_interface_value(interface, label)
         if label == "macaddress"
           value = Facter::Util::Macaddress.standardize(value)
+        elsif label == "mtu"
+          value = value.to_i
         end
         value
       end

data/lib/facter/ipaddress6.rb

@@ -28,7 +28,7 @@ def get_address_after_token(output, token, return_first=false)
 
   String(output).scan(/#{token}\s?((?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/).each do |match|
     match = match.first
-    unless match =~ /fe80.*/ or match == "::1"
+    unless match =~ /^fe80.*/ or match == "::1"
       ip = match
       break if return_first
     end

data/lib/facter/ldom.rb

@@ -9,7 +9,10 @@
 #   Uses the output of `virtinfo -ap`.
 #
 
-if Facter.value(:kernel) == 'SunOS' and Facter::Core::Execution.which('virtinfo')
+if Facter.value(:kernel) == 'SunOS' &&
+   Facter.value(:hardwareisa) == 'sparc' &&
+   Facter::Core::Execution.which('virtinfo')
+
   virtinfo = Facter::Core::Execution.exec('virtinfo -ap')
 
   # Convert virtinfo parseable output format to array of arrays.

data/lib/facter/macosx.rb

@@ -31,7 +31,7 @@ if Facter.value(:kernel) == "Darwin"
     Facter.add("sp_#{fact}") do
       confine :kernel => :darwin
       setcode do
-        value.to_s
+        value
       end
     end
   end
@@ -40,7 +40,7 @@ if Facter.value(:kernel) == "Darwin"
     Facter.add("sp_#{fact}") do
       confine :kernel => :darwin
       setcode do
-        value.to_s
+        value
       end
     end
   end

data/lib/facter/operatingsystem/linux.rb

@@ -31,7 +31,7 @@ module Facter
           "Suse"
         when "Gentoo"
           "Gentoo"
-        when "Archlinux"
+        when "Archlinux", "Manjarolinux"
           "Archlinux"
         when "Mageia", "Mandriva", "Mandrake"
           "Mandrake"
@@ -46,6 +46,8 @@ module Facter
           get_alpine_release_with_release_file
         when "Amazon"
           get_amazon_release_with_lsb
+        when "AristaEOS"
+          get_arista_release_with_release_file
         when "BlueWhite64"
           get_bluewhite_release_with_release_file
         when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM",
@@ -239,6 +241,7 @@ module Facter
       def get_operatingsystem_with_release_files
         operatingsystem = nil
         release_files = {
+          "AristaEOS"   => "/etc/Eos-release",
           "Debian"      => "/etc/debian_version",
           "Gentoo"      => "/etc/gentoo-release",
           "Fedora"      => "/etc/fedora-release",
@@ -247,6 +250,7 @@ module Facter
           "Mandrake"    => "/etc/mandrake-release",
           "MeeGo"       => "/etc/meego-release",
           "Archlinux"   => "/etc/arch-release",
+          "Manjarolinux"=> "/etc/manjaro-release",
           "OracleLinux" => "/etc/oracle-release",
           "OpenWrt"     => "/etc/openwrt_release",
           "Alpine"      => "/etc/alpine-release",
@@ -345,6 +349,14 @@ module Facter
         end
       end
 
+      def get_arista_release_with_release_file
+        if release = Facter::Util::FileRead.read('/etc/Eos-release')
+          if match = /\d+\.\d+(:?\.\d+)?[A-M]?$/.match(release)
+            match[0]
+          end
+        end
+      end
+
       def get_amazon_release_with_lsb
         if lsbdistrelease = get_lsbdistrelease
           lsbdistrelease

data/lib/facter/operatingsystem/sunos.rb

@@ -42,7 +42,7 @@ module Facter
         end
       end
 
-      def get_operatingsystemmajrelease
+      def get_operatingsystemmajorrelease
         if get_operatingsystem == "Solaris"
           if match = get_operatingsystemrelease.match(/^(\d+)/)
             match.captures[0]

data/lib/facter/operatingsystem/windows.rb

@@ -9,6 +9,13 @@ module Facter
         Facter::Util::WMI.execquery("SELECT version, producttype FROM Win32_OperatingSystem").each do |os|
           result =
             case os.version
+            when /^6\.4/
+              # As of October 2014, there are no Win server releases with kernel 6.4.x.
+              # This case prevents future releases from resolving to nil before we
+              # can update the fact regexes.
+              os.producttype == 1 ? "10" : Facter[:kernelrelease].value
+            when /^6\.3/
+              os.producttype == 1 ? "8.1" : "2012 R2"
             when /^6\.2/
               os.producttype == 1 ? "8" : "2012"
             when /^6\.1/

data/lib/facter/physicalprocessorcount.rb

@@ -19,7 +19,7 @@ Facter.add('physicalprocessorcount') do
   setcode do
     processors = Facter.value(:processors)
     if (physicalprocessorcount = processors["physicalcount"])
-      physicalprocessorcount.to_s
+      physicalprocessorcount
     else
       nil
     end

data/lib/facter/processor.rb

@@ -4,8 +4,8 @@
 #   Additional Facts about the machine's CPUs.
 #
 # Resolution:
-#   Utilizes values from the processors structured fact, which itself 
-#   uses various methods to collect CPU information, with implementation 
+#   Utilizes values from the processors structured fact, which itself
+#   uses various methods to collect CPU information, with implementation
 #   dependent upon the OS of the system in question.
 #
 # Caveats:
@@ -37,7 +37,7 @@ Facter.add("ProcessorCount") do
 
   setcode do
     if (processorcount = processors["count"])
-      processorcount.to_s
+      processorcount
     else
       nil
     end

data/lib/facter/processors/os.rb

@@ -159,7 +159,7 @@ module Facter
       private
 
       def query_system_profiler
-        output = Facter::Core::Execution.exec("/usr/sbin/system_profiler -xml SPHardwareDataType")
+        output = Facter::Core::Execution.exec("/usr/sbin/system_profiler -xml SPHardwareDataType 2>/dev/null")
         plist  = CFPropertyList::List.new
         plist.load_str(output)
         parsed_xml = CFPropertyList.native_types(plist.value)
@@ -177,6 +177,16 @@ module Facter
       def get_physical_processor_count
         Facter::Util::POSIX.sysctl("hw.ncpufound").to_i
       end
+
+      def get_processor_speed
+        speed = Facter::Util::POSIX.sysctl("hw.cpuspeed").to_i
+        if speed < 1000
+          "#{speed} MHz"
+        else
+          speed = speed.to_f / 1000
+          "#{(speed * 100).round.to_f / 100.0} GHz"
+        end
+      end
     end
 
     class SunOS < Base

data/lib/facter/rackspace.rb

@@ -1,15 +1,18 @@
-# Purpose: Determine information about Rackspace cloud instances
+# Fact: rsc_<RACKSPACE INSTANCE DATA>
+#
+# Purpose: Determine information about Rackspace cloud instances.
 #
 # Resolution:
-#   If this is a Rackspace Cloud instance, populates rsc_ facts
+#   If this is a Rackspace Cloud instance, populates `rsc_` facts: `is_rsc`, `rsc_region`,
+#   and `rsc_instance_id`.
 #
 # Caveats:
-#   Depends on Xenstore
+#   Depends on Xenstore.
 #
 
 Facter.add(:is_rsc) do
   setcode do
-    result = Facter::Util::Resolution.exec("/usr/bin/xenstore-read vm-data/provider_data/provider")
+    result = Facter::Util::Resolution.exec("/usr/bin/xenstore-read vm-data/provider_data/provider 2> /dev/null")
     if result == "Rackspace"
       "true"
     end
@@ -19,7 +22,7 @@ end
 Facter.add(:rsc_region) do
   confine :is_rsc => "true"
   setcode do
-    Facter::Util::Resolution.exec("/usr/bin/xenstore-read vm-data/provider_data/region")
+    Facter::Util::Resolution.exec("/usr/bin/xenstore-read vm-data/provider_data/region 2> /dev/null")
   end
 end
 

data/lib/facter/rubyplatform.rb

@@ -0,0 +1,12 @@
+# Fact: rubyplatform
+#
+# Purpose: Returns the platform of Ruby that facter is running under.
+#
+# Resolution: Returns the value of the `RUBY_PLATFORM` constant.
+#
+# Caveats:
+#
+
+Facter.add(:rubyplatform) do
+  setcode { RUBY_PLATFORM.to_s }
+end

data/lib/facter/selinux.rb

@@ -85,12 +85,12 @@ end
 Facter.add("selinux") do
   confine :kernel => :linux
   setcode do
-    result = "false"
+    result = false
     if FileTest.exists?("#{selinux_mount_point}/enforce")
       if FileTest.exists?("/proc/self/attr/current")
         begin
           if (File.read("/proc/self/attr/current") != "kernel\0")
-            result = "true"
+            result = true
           end
         rescue
         end
@@ -101,19 +101,19 @@ Facter.add("selinux") do
 end
 
 Facter.add("selinux_enforced") do
-  confine :selinux => :true
+  confine :selinux => true
   setcode do
-    result = "false"
+    result = false
     if FileTest.exists?("#{selinux_mount_point}/enforce") and
        File.read("#{selinux_mount_point}/enforce") =~ /1/i
-      result = "true"
+      result = true
     end
     result
   end
 end
 
 Facter.add("selinux_policyversion") do
-  confine :selinux => :true
+  confine :selinux => true
   setcode do
     result = 'unknown'
     if FileTest.exists?("#{selinux_mount_point}/policyvers")
@@ -124,7 +124,7 @@ Facter.add("selinux_policyversion") do
 end
 
 Facter.add("selinux_current_mode") do
-  confine :selinux => :true
+  confine :selinux => true
   setcode do
     result = 'unknown'
     mode = Facter::Core::Execution.exec(sestatus_cmd)
@@ -134,7 +134,7 @@ Facter.add("selinux_current_mode") do
 end
 
 Facter.add("selinux_config_mode") do
-  confine :selinux => :true
+  confine :selinux => true
   setcode do
     result = 'unknown'
     mode = Facter::Core::Execution.exec(sestatus_cmd)
@@ -144,7 +144,7 @@ Facter.add("selinux_config_mode") do
 end
 
 Facter.add("selinux_config_policy") do
-  confine :selinux => :true
+  confine :selinux => true
   setcode do
     result = 'unknown'
     mode = Facter::Core::Execution.exec(sestatus_cmd)

data/lib/facter/system32.rb

@@ -0,0 +1,21 @@
+# Fact: system32
+#
+# Purpose: Returns the directory of the native system32 directory.
+# For 32-bit ruby on 32-bit Windows, typically: 'C:\Windows\system32'.
+# For 32-bit ruby on 64-bit Windows, typically: 'C:\Windows\sysnative'.
+# For 64-bit ruby on 64-bit Windows, typically: 'C:\Windows\system32'.
+#
+# Resolution: Checks for the existence of the `sysnative` directory, otherwise
+# uses `system32`
+#
+
+Facter.add(:system32) do
+  confine :kernel => :windows
+  setcode do
+    if File.exists?("#{ENV['SYSTEMROOT']}\\sysnative")
+      "#{ENV['SYSTEMROOT']}\\sysnative"
+    else
+      "#{ENV['SYSTEMROOT']}\\system32"
+    end
+  end
+end

data/lib/facter/util/macosx.rb

@@ -15,7 +15,7 @@ module Facter::Util::Macosx
   # by looking at the _name key of the _items dict for each _dataType
 
   def self.profiler_xml(data_field)
-    Facter::Core::Execution.exec("/usr/sbin/system_profiler -xml #{data_field}")
+    Facter::Core::Execution.exec("/usr/sbin/system_profiler -xml #{data_field} 2>/dev/null")
   end
 
   def self.intern_xml(xml)

data/lib/facter/util/parser.rb

@@ -139,8 +139,18 @@ module Facter::Util::Parser
   class PowershellParser < Base
     # Returns a hash of facts from powershell output
     def parse_results
-      shell_command = "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -File \"#{filename}\""
-      KeyValuePairOutputFormat.parse Facter::Core::Execution.exec(shell_command)
+      powershell =
+        if File.exists?("#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe")
+          "#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe"
+        elsif File.exists?("#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe")
+          "#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe"
+        else
+          'powershell.exe'
+        end
+
+      shell_command = "\"#{powershell}\" -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -File \"#{filename}\""
+      output = Facter::Core::Execution.exec(shell_command)
+      KeyValuePairOutputFormat.parse(output)
     end
   end
 

data/lib/facter/util/uptime.rb

@@ -77,6 +77,6 @@ module Facter::Util::Uptime
   end
 
   def self.uptime_executable_cmd
-    "uptime"
+    "/usr/bin/uptime"
   end
 end