facter 2.1.0 → 2.2.0

data/lib/facter/operatingsystem/sunos.rb

@@ -0,0 +1,54 @@
+require 'facter/util/file_read'
+require 'facter/operatingsystem/base'
+
+module Facter
+  module Operatingsystem
+    class SunOS < Base
+      def get_operatingsystem
+        output = Facter::Core::Execution.exec('uname -v')
+        if output =~ /^joyent_/
+          "SmartOS"
+        elsif output =~ /^oi_/
+          "OpenIndiana"
+        elsif output =~ /^omnios-/
+          "OmniOS"
+        elsif FileTest.exists?("/etc/debian_version")
+          "Nexenta"
+        else
+          "Solaris"
+        end
+      end
+
+      def get_osfamily
+        "Solaris"
+      end
+
+      def get_operatingsystemrelease
+        if release = Facter::Util::FileRead.read('/etc/release')
+          line = release.split("\n").first
+
+          # Solaris 10: Solaris 10 10/09 s10x_u8wos_08a X86
+          # Solaris 11 (old naming scheme): Oracle Solaris 11 11/11 X86
+          # Solaris 11 (new naming scheme): Oracle Solaris 11.1 SPARC
+          if match = /\s+s(\d+)[sx]?(_u\d+)?.*(?:SPARC|X86)/.match(line)
+            match.captures.join('')
+          elsif match = /Solaris ([0-9\.]+(?:\s*[0-9\.\/]+))\s*(?:SPARC|X86)/.match(line)
+            match.captures[0]
+          else
+            Facter[:kernelrelease].value
+          end
+        else
+          Facter[:kernelrelease].value
+        end
+      end
+
+      def get_operatingsystemmajrelease
+        if get_operatingsystem == "Solaris"
+          if match = get_operatingsystemrelease.match(/^(\d+)/)
+            match.captures[0]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/operatingsystem/vmkernel.rb

@@ -0,0 +1,11 @@
+require 'facter/operatingsystem/base'
+
+module Facter
+  module Operatingsystem
+    class VMkernel < Base
+      def get_operatingsystem
+        "ESXi"
+      end
+    end
+  end
+end

data/lib/facter/operatingsystem/windows.rb

@@ -0,0 +1,37 @@
+require 'facter/operatingsystem/base'
+
+module Facter
+  module Operatingsystem
+    class Windows < Base
+      def get_operatingsystemrelease
+        require 'facter/util/wmi'
+        result = nil
+        Facter::Util::WMI.execquery("SELECT version, producttype FROM Win32_OperatingSystem").each do |os|
+          result =
+            case os.version
+            when /^6\.2/
+              os.producttype == 1 ? "8" : "2012"
+            when /^6\.1/
+              os.producttype == 1 ? "7" : "2008 R2"
+            when /^6\.0/
+              os.producttype == 1 ? "Vista" : "2008"
+            when /^5\.2/
+              if os.producttype == 1
+                "XP"
+              else
+                begin
+                  os.othertypedescription == "R2" ? "2003 R2" : "2003"
+                rescue NoMethodError
+                  "2003"
+                end
+              end
+            else
+              Facter[:kernelrelease].value
+            end
+          break
+        end
+        result
+      end
+    end
+  end
+end

data/lib/facter/operatingsystemmajrelease.rb

@@ -3,45 +3,26 @@
 # Purpose: Returns the major release of the operating system.
 #
 # Resolution:
-#   Splits down the operatingsystemrelease fact at decimal point for
+#   Uses the releasemajor key of the os structured fact, which itself
+#   splits down its operatingsystemrelease key at decimal point for
 #   osfamily RedHat derivatives and Debian.
-#   Uses operatingsystemrelease to the first non decimal character for
-#   operatingsystem Solaris
+#   Uses operatingsystemrelease key to the first non decimal
+#   character for operatingsystem Solaris.
 #
-# This should be the same as lsbmajdistrelease, but on minimal systems there
-# are too many dependencies to use LSB
+#   This should be the same as lsbmajdistrelease, but on minimal systems there
+#   are too many dependencies to use LSB
 #
 # List of operatingsystems at time of writing:
-#"Alpine" "Amazon" "Archlinux" "Ascendos" "Bluewhite64" "CentOS" "CloudLinux" 
-#"Debian" "Fedora" "Gentoo" "Mandrake" "Mandriva" "MeeGo" "OEL" "OpenSuSE" 
-#"OracleLinux" "OVS" "PSBM" "RedHat" "Scientific" "Slackware" "Slamd64" "SLC"
-#"SLED" "SLES" "SuSE" "Ubuntu" "VMWareESX"
+#   "Alpine" "Amazon" "Archlinux" "Ascendos" "Bluewhite64" "CentOS" "CloudLinux" 
+#   "Debian" "Fedora" "Gentoo" "Mandrake" "Mandriva" "MeeGo" "OEL" "OpenSuSE" 
+#   "OracleLinux" "OVS" "PSBM" "RedHat" "Scientific" "Slackware" "Slamd64" "SLC"
+#   "SLED" "SLES" "SuSE" "Ubuntu" "VMWareESX"
+#
 
 Facter.add(:operatingsystemmajrelease) do
-  confine :operatingsystem => [
-    :Amazon,
-    :CentOS,
-    :CloudLinux,
-    :Debian,
-    :Fedora,
-    :OEL,
-    :OracleLinux,
-    :OVS,
-    :RedHat,
-    :Scientific,
-    :SLC,
-    :CumulusLinux
-  ]
-  setcode do
-    Facter.value('operatingsystemrelease').split('.').first
+  confine do
+    !Facter.value("os")["release"]["major"].nil?
   end
-end
 
-Facter.add(:operatingsystemmajrelease) do
-  confine :operatingsystem => :solaris
-  setcode do
-    if match = Facter.value(:operatingsystemrelease).match(/^(\d+)/)
-      match.captures[0]
-    end
-  end
+  setcode { Facter.value("os")["release"]["major"].to_s }
 end

data/lib/facter/operatingsystemrelease.rb

@@ -3,248 +3,27 @@
 # Purpose: Returns the release of the operating system.
 #
 # Resolution:
-#   On RedHat derivatives, returns their '/etc/<variant>-release' file.
-#   On Debian, returns '/etc/debian_version'.
-#   On Ubuntu, parses '/etc/lsb-release' for the release version.
-#   On Suse, derivatives, parses '/etc/SuSE-release' for a selection of version
+#   Uses the release key of the os structured hash, which itself
+#   operates on the following conditions:
+#
+#   On RedHat derivatives, returns their `/etc/<variant>-release` file.
+#   On Debian, returns `/etc/debian_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'.
-#   On Amazon Linux, returns the 'lsbdistrelease' value.
-#   On Mageia, parses '/etc/mageia-release' for the release version.
+#   On Slackware, parses `/etc/slackware-version`.
+#   On Amazon Linux, returns the `lsbdistrelease` value.
+#   On Mageia, parses `/etc/mageia-release` for the release version.
 #
-#   On all remaining systems, returns the 'kernelrelease' value.
+#   On all remaining systems, returns the kernelrelease fact's value.
 #
 # Caveats:
 #
 
-require 'facter/util/operatingsystem'
-require 'facter/util/file_read'
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{CentOS Fedora oel ovs OracleLinux RedHat MeeGo Scientific SLC Ascendos CloudLinux PSBM}
-  setcode do
-    case Facter.value(:operatingsystem)
-    when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "XenServer"
-      releasefile = "/etc/redhat-release"
-    when "Fedora"
-      releasefile = "/etc/fedora-release"
-    when "MeeGo"
-      releasefile = "/etc/meego-release"
-    when "OracleLinux"
-      releasefile = "/etc/oracle-release"
-    when "OEL", "oel"
-      releasefile = "/etc/enterprise-release"
-    when "OVS", "ovs"
-      releasefile = "/etc/ovs-release"
-    end
-
-    if release = Facter::Util::FileRead.read(releasefile)
-      line = release.split("\n").first.chomp
-      if match = /\(Rawhide\)$/.match(line)
-        "Rawhide"
-      elsif match = /release (\d[\d.]*)/.match(line)
-        match[1]
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{Debian}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/debian_version')
-      release.sub!(/\s*$/, '')
-      release
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{Ubuntu}
-  setcode do
-    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]
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => 'LinuxMint'
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/linuxmint/info')
-      if match = release.match(/RELEASE\=(\d+)/)
-        match[1]
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-confine :operatingsystem => 'CumulusLinux'
-  setcode do
-    Facter::Util::Operatingsystem.os_release['VERSION_ID']
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{SLES SLED OpenSuSE}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/SuSE-release')
-      if match = /^VERSION\s*=\s*(\d+)/.match(release)
-        releasemajor = match[1]
-        if match = /^PATCHLEVEL\s*=\s*(\d+)/.match(release)
-          releaseminor = match[1]
-        elsif match = /^VERSION\s=.*.(\d+)/.match(release)
-          releaseminor = match[1]
-        else
-          releaseminor = "0"
-        end
-        releasemajor + "." + releaseminor
-      else
-        "unknown"
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{OpenWrt}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/openwrt_version')
-      if match = /^(\d+\.\d+.*)/.match(release)
-        match[1]
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{Slackware}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/slackware-version')
-      if match = /Slackware ([0-9.]+)/.match(release)
-        match[1]
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{Mageia}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/mageia-release')
-      if match = /Mageia release ([0-9.]+)/.match(release)
-        match[1]
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{Bluewhite64}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/bluewhite64-version')
-      if match = /^\s*\w+\s+(\d+)\.(\d+)/.match(release)
-        match[1] + "." + match[2]
-      else
-        "unknown"
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{VMwareESX}
-  setcode do
-    release = Facter::Core::Execution.exec('vmware -v')
-    if match = /VMware ESX .*?(\d.*)/.match(release)
-      match[1]
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %w{Slamd64}
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/slamd64-version')
-      if match = /^\s*\w+\s+(\d+)\.(\d+)/.match(release)
-        match[1] + "." + match[2]
-      else
-        "unknown"
-      end
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => :Alpine
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/alpine-release')
-      release.sub!(/\s*$/, '')
-      release
-    end
-  end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => %W{Amazon}
-  setcode do Facter[:lsbdistrelease].value end
-end
-
-Facter.add(:operatingsystemrelease) do
-  confine :osfamily => :solaris
-  setcode do
-    if release = Facter::Util::FileRead.read('/etc/release')
-      line = release.split("\n").first.chomp
-      # Solaris 10: Solaris 10 10/09 s10x_u8wos_08a X86
-      # Solaris 11 (old naming scheme): Oracle Solaris 11 11/11 X86
-      # Solaris 11 (new naming scheme): Oracle Solaris 11.1 SPARC
-      if match = /\s+s(\d+)[sx]?(_u\d+)?.*(?:SPARC|X86)/.match(line)
-        match.captures.join('')
-      elsif match = /Solaris ([0-9\.]+(?:\s*[0-9\.\/]+))\s*(?:SPARC|X86)/.match(line)
-        match.captures[0]
-      end
-    end
-  end
-end
-
 Facter.add(:operatingsystemrelease) do
-  confine :operatingsystem => :windows
-  setcode do
-    require 'facter/util/wmi'
-    result = nil
-    Facter::Util::WMI.execquery("SELECT version, producttype FROM Win32_OperatingSystem").each do |os|
-      result =
-        case os.version
-        when /^6\.2/
-          os.producttype == 1 ? "8" : "2012"
-        when /^6\.1/
-          os.producttype == 1 ? "7" : "2008 R2"
-        when /^6\.0/
-          os.producttype == 1 ? "Vista" : "2008"
-        when /^5\.2/
-          if os.producttype == 1
-            "XP"
-          else
-            begin
-              os.othertypedescription == "R2" ? "2003 R2" : "2003"
-            rescue NoMethodError
-              "2003"
-            end
-          end
-        else
-          Facter[:kernelrelease].value
-        end
-      break
-    end
-    result
+  confine do
+    !Facter.value("os")["release"]["full"].nil?
   end
-end
 
-Facter.add(:operatingsystemrelease) do
-  setcode do Facter[:kernelrelease].value end
+  setcode { Facter.value("os")["release"]["full"].to_s }
 end

data/lib/facter/os.rb

@@ -0,0 +1,69 @@
+# Fact: os
+#
+# Purpose:
+#   Return various facts related to the machine's operating system.
+#
+# Resolution:
+#   For operatingsystem, if the kernel is a Linux kernel, check for the
+#   existence of a selection of files in `/etc` to find the specific flavor.
+#   On SunOS based kernels, attempt to determine the flavor, otherwise return Solaris.
+#   On systems other than Linux, use the kernel value.
+#
+#   For operatingsystemrelease, on RedHat derivatives, we return their `/etc/<varient>-release` file.
+#   On Debian, returns `/etc/debian_version`.
+#   On Ubuntu, parses `/etc/lsb-release` for the release version
+#   On Suse and derivatives, parses `/etc/SuSE-release` for a selection of version information.
+#   On Slackware, parses `/etc/slackware-version`.
+#   On Amazon Linux, returns the lsbdistrelease fact's value.
+#   On Mageia, parses `/etc/mageia-release` for the release version.
+#   On all remaining systems, returns the kernelrelease fact's value.
+#
+#   For the lsb facts, uses the `lsb_release` system command.
+#
+# Caveats:
+#   Lsb facts only work on Linux (and the kfreebsd derivative) systems.
+#   Requires the `lsb_release` program, which may not be installed by default.
+#   It is only as accurate as the ourput of lsb_release.
+#
+
+require 'facter/operatingsystem/implementation'
+
+Facter.add(:os, :type => :aggregate) do
+  def os
+    @os ||= Facter::Operatingsystem.implementation
+  end
+
+  chunk(:name) do
+    os_hash = {}
+    if (operatingsystem = os.get_operatingsystem)
+      os_hash["name"] = operatingsystem
+      os_hash
+    end
+  end
+
+  chunk(:family) do
+    os_hash = {}
+    if (osfamily = os.get_osfamily)
+      os_hash["family"] = osfamily
+      os_hash
+    end
+  end
+
+  chunk(:release) do
+    os_hash = {}
+    if (releasedata = os.get_operatingsystemrelease_hash)
+      os_hash["release"] = releasedata
+      os_hash unless os_hash["release"].empty?
+    end
+  end
+
+  chunk(:lsb) do
+    os_hash = {}
+    if os.has_lsb?
+      if (lsbdata = os.get_lsb_facts_hash)
+        os_hash["lsb"] = lsbdata
+        os_hash unless os_hash["lsb"].empty?
+      end
+    end
+  end
+end