puppet 7.30.0-universal-darwin → 8.0.1-universal-darwin

data/lib/puppet/provider/service/gentoo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage gentoo services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :gentoo, :parent => :init do
@@ -10,7 +11,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
   commands :update => "/sbin/rc-update"
 
-  confine :operatingsystem => :gentoo
+  confine 'os.name' => :gentoo
 
   def disable
       output = update :del, @resource[:name], :default

data/lib/puppet/provider/service/init.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # The standard init-based service type.  Many other service types are
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
   desc "Standard `init`-style service management."
 
   def self.defpath
-    case Puppet.runtime[:facter].value(:operatingsystem)
+    case Puppet.runtime[:facter].value('os.name')
     when "FreeBSD", "DragonFly"
       ["/etc/rc.d", "/usr/local/etc/rc.d"]
     when "HP-UX"
@@ -19,9 +20,12 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   # Debian and Ubuntu should use the Debian provider.
-  confine :false => ['Debian', 'Ubuntu'].include?(Puppet.runtime[:facter].value('operatingsystem'))
   # RedHat systems should use the RedHat provider.
-  confine :false => Puppet.runtime[:facter].value('osfamily') == 'RedHat'
+  confine :true => begin
+      os = Puppet.runtime[:facter].value('os.name').downcase
+      family = Puppet.runtime[:facter].value('os.family').downcase
+      !(os == 'debian' || os == 'ubuntu' || family == 'redhat')
+  end
 
   # We can't confine this here, because the init path can be overridden.
   #confine :exists => defpath
@@ -51,7 +55,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # these excludes were found with grep -r -L start /etc/init.d
     excludes += %w{rcS module-init-tools}
     # Prevent puppet failing on unsafe scripts from Yocto Linux
-    if Puppet.runtime[:facter].value(:osfamily) == "cisco-wrlinux"
+    if Puppet.runtime[:facter].value('os.family') == "cisco-wrlinux"
       excludes += %w{banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
                    hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
                    rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
@@ -169,7 +173,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   def service_execute(type, command, fof = true, squelch = false, combine = true)
-    if type == :start && Puppet.runtime[:facter].value(:osfamily) == "Solaris"
+    if type == :start && Puppet.runtime[:facter].value('os.family') == "Solaris"
         command =  ["/usr/bin/ctrun -l child", command].flatten.join(" ")
     end
     super(type, command, fof, squelch, combine)

data/lib/puppet/provider/service/launchd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
@@ -42,8 +43,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
   commands :launchctl => "/bin/launchctl"
 
-  defaultfor :operatingsystem => :darwin
-  confine :operatingsystem    => :darwin
+  defaultfor 'os.name' => :darwin
+  confine 'os.name'    => :darwin
   confine :feature            => :cfpropertylist
 
   has_feature :enableable
@@ -70,7 +71,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.get_os_version
-    @os_version ||= Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i
+    @os_version ||= Facter.value('os.release.major').to_i
   end
 
   # Defines the path to the overrides plist file where service enabling

data/lib/puppet/provider/service/openbsd.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :openbsd, :parent => :init do
 
   desc "Provider for OpenBSD's rc.d daemon control scripts"
 
   commands :rcctl => '/usr/sbin/rcctl'
 
-  confine :operatingsystem => :openbsd
-  defaultfor :operatingsystem => :openbsd
+  confine 'os.name' => :openbsd
+  defaultfor 'os.name' => :openbsd
   has_feature :flaggable
 
   def startcmd

data/lib/puppet/provider/service/openrc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Gentoo OpenRC
 Puppet::Type.type(:service).provide :openrc, :parent => :base do
   desc <<-EOT
@@ -7,8 +8,8 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
 
   EOT
 
-  defaultfor :operatingsystem => :gentoo
-  defaultfor :operatingsystem => :funtoo
+  defaultfor 'os.name' => :gentoo
+  defaultfor 'os.name' => :funtoo
 
   has_command(:rcstatus, '/bin/rc-status') do
     environment :RC_SVCNAME => nil

data/lib/puppet/provider/service/openwrt.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init do
   desc <<-EOT
     Support for OpenWrt flavored init scripts.
@@ -6,8 +7,8 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
 
   EOT
 
-  defaultfor :operatingsystem => :openwrt
-  confine :operatingsystem => :openwrt
+  defaultfor 'os.name' => :openwrt
+  confine 'os.name' => :openwrt
 
   has_feature :enableable
 

data/lib/puppet/provider/service/rcng.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   desc <<-EOT
     RCng service management with rc.d
   EOT
 
-  defaultfor :operatingsystem => [:netbsd, :cargos]
-  confine :operatingsystem => [:netbsd, :cargos]
+  defaultfor 'os.name' => [:netbsd, :cargos]
+  confine 'os.name' => [:netbsd, :cargos]
 
   def self.defpath
     "/etc/rc.d"

data/lib/puppet/provider/service/redhat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
 
 Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init do
@@ -8,8 +9,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
 
-  defaultfor :osfamily => :redhat
-  defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["10", "11"]
+  defaultfor 'os.family' => :redhat
+  defaultfor 'os.family' => :suse, 'os.release.major' => ["10", "11"]
 
   # Remove the symlinks
   def disable
@@ -35,7 +36,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     # For Suse OS family, chkconfig returns 0 even if the service is disabled or non-existent
     # Therefore, check the output for '<name>  on' (or '<name>  B for boot services)
     # to see if it is enabled
-    return :false unless Puppet.runtime[:facter].value(:osfamily) != 'Suse' || output =~ /^#{name}\s+(on|B)$/
+    return :false unless Puppet.runtime[:facter].value('os.family') != 'Suse' || output =~ /^#{name}\s+(on|B)$/
 
     :true
   end

data/lib/puppet/provider/service/runit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>

data/lib/puppet/provider/service/service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :service do
   desc "The simplest form of service support."
 

data/lib/puppet/provider/service/smf.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 
 # Solaris 10 SMF-style services.
@@ -18,9 +19,9 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     be imported if it does not exist.
   EOT
 
-  defaultfor :osfamily => :solaris
+  defaultfor 'os.family' => :solaris
 
-  confine :osfamily => :solaris
+  confine 'os.family' => :solaris
 
   commands :adm => "/usr/sbin/svcadm",
            :svcs => "/usr/bin/svcs",
@@ -101,14 +102,14 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
   # Returns true if the provider supports incomplete services.
   def supports_incomplete_services?
-    Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value(:operatingsystemrelease), '11.1') >= 0
+    Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value('os.release.full'), '11.1') >= 0
   end
 
   # Returns true if the service is complete. A complete service is a service that
   # has the general/complete property defined.
   def complete_service?
     unless supports_incomplete_services?
-      raise Puppet::Error, _("Cannot query if the %{service} service is complete: The concept of complete/incomplete services was introduced in Solaris 11.1. You are on a Solaris %{release} machine.") % { service: @resource[:name], release: Puppet.runtime[:facter].value(:operatingsystemrelease) }
+      raise Puppet::Error, _("Cannot query if the %{service} service is complete: The concept of complete/incomplete services was introduced in Solaris 11.1. You are on a Solaris %{release} machine.") % { service: @resource[:name], release: Puppet.runtime[:facter].value('os.release.full') }
     end
 
     return @complete_service if @complete_service
@@ -138,7 +139,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   end
 
   def restartcmd
-    if Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value(:operatingsystemrelease), '11.2') >= 0
+    if Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value('os.release.full'), '11.2') >= 0
       [command(:adm), :restart, "-s", self.service_fmri]
     else
       # Synchronous restart only supported in Solaris 11.2 and above

data/lib/puppet/provider/service/src.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 
 # AIX System Resource controller (SRC)
@@ -13,8 +14,8 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   is not yet supported.
   "
 
-  defaultfor :operatingsystem => :aix
-  confine :operatingsystem => :aix
+  defaultfor 'os.name' => :aix
+  confine 'os.name' => :aix
 
   optional_commands :stopsrc  => "/usr/bin/stopsrc",
                     :startsrc => "/usr/bin/startsrc",

data/lib/puppet/provider/service/systemd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage systemd services using systemctl
 
 require_relative '../../../puppet/file_system'
@@ -13,20 +14,19 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   confine :true => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
-  defaultfor :osfamily => [:archlinux]
-  defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8", "9"]
-  defaultfor :osfamily => :redhat, :operatingsystem => :fedora
-  defaultfor :osfamily => :suse
-  defaultfor :osfamily => :coreos
-  defaultfor :osfamily => :gentoo
-  defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2", "2023"]
-  defaultfor :operatingsystem => :debian
-  notdefaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["5", "6", "7"] # These are using the "debian" method
-  defaultfor :operatingsystem => :LinuxMint
-  notdefaultfor :operatingsystem => :LinuxMint, :operatingsystemmajrelease => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
-  defaultfor :operatingsystem => :ubuntu
-  notdefaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["10.04", "12.04", "14.04", "14.10"] # These are using upstart
-  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3", "4"]
+  defaultfor 'os.family' => [:archlinux]
+  defaultfor 'os.family' => :redhat, 'os.release.major' => ["7", "8", "9"]
+  defaultfor 'os.family' => :redhat, 'os.name' => :fedora
+  defaultfor 'os.family' => :suse
+  defaultfor 'os.family' => :coreos
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2"]
+  defaultfor 'os.name' => :debian
+  notdefaultfor 'os.name' => :debian, 'os.release.major' => ["5", "6", "7"] # These are using the "debian" method
+  defaultfor 'os.name' => :LinuxMint
+  notdefaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
+  defaultfor 'os.name' => :ubuntu
+  notdefaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"] # These are using upstart
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ["3", "4"]
 
   def self.instances
     i = []
@@ -40,8 +40,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     return []
   end
 
-  # Static services cannot be enabled or disabled manually. Indirect services
-  # should not be enabled or disabled due to limitations in systemd (see
+  # Static services cannot be enabled or disabled manually. Indirect services 
+  # should not be enabled or disabled due to limitations in systemd (see 
   # https://github.com/systemd/systemd/issues/6681).
   def enabled_insync?(current)
     case cached_enabled?[:output]
@@ -111,7 +111,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     # The indirect state indicates that the unit is not enabled.
     return :false if output == 'indirect'
     return :true if (code == 0)
-    if (output.empty?) && (code > 0) && (Puppet.runtime[:facter].value(:osfamily).casecmp('debian').zero?)
+    if (output.empty?) && (code > 0) && (Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?)
       ret = debian_enabled?
       return ret if ret
     end

data/lib/puppet/provider/service/upstart.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   START_ON = /^\s*start\s+on/
   COMMENTED_START_ON = /^\s*#+\s*start\s+on/
@@ -10,14 +11,14 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   "
 
   confine :any => [
-    Puppet.runtime[:facter].value(:operatingsystem) == 'Ubuntu',
-    (Puppet.runtime[:facter].value(:osfamily) == 'RedHat' and Puppet.runtime[:facter].value(:operatingsystemrelease) =~ /^6\./),
-    (Puppet.runtime[:facter].value(:operatingsystem) == 'Amazon' and Puppet.runtime[:facter].value(:operatingsystemmajrelease) =~ /\d{4}/),
-    Puppet.runtime[:facter].value(:operatingsystem) == 'LinuxMint',
+    Puppet.runtime[:facter].value('os.name') == 'Ubuntu',
+    (Puppet.runtime[:facter].value('os.family') == 'RedHat' and Puppet.runtime[:facter].value('os.release.full') =~ /^6\./),
+    (Puppet.runtime[:facter].value('os.name') == 'Amazon' and Puppet.runtime[:facter].value('os.release.major') =~ /\d{4}/),
+    Puppet.runtime[:facter].value('os.name') == 'LinuxMint',
   ]
 
-  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["10.04", "12.04", "14.04", "14.10"]
-  defaultfor :operatingsystem => :LinuxMint, :operatingsystemmajrelease => ["10", "11", "12", "13", "14", "15", "16", "17"]
+  defaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"]
+  defaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"]
 
   commands :start   => "/sbin/start",
            :stop    => "/sbin/stop",
@@ -57,7 +58,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
   def self.excludes
     excludes = super
-    if Puppet.runtime[:facter].value(:osfamily) == 'RedHat'
+    if Puppet.runtime[:facter].value('os.family') == 'RedHat'
       # Puppet cannot deal with services that have instances, so we have to
       # ignore these services using instances on redhat based systems.
       excludes += %w[serial tty]

data/lib/puppet/provider/service/windows.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Windows Service Control Manager (SCM) provider
 
 Puppet::Type.type(:service).provide :windows, :parent => :service do
@@ -11,8 +12,8 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     services as a specific user.
   EOT
 
-  defaultfor :operatingsystem => :windows
-  confine    :operatingsystem => :windows
+  defaultfor 'os.name' => :windows
+  confine    'os.name' => :windows
 
   has_feature :refreshable, :configurable_timeout, :manages_logon_credentials
 

data/lib/puppet/provider/user/aix.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # User Puppet provider for AIX. It uses standard commands to manage users:
 #  mkuser, rmuser, lsuser, chuser
 #
@@ -17,8 +18,8 @@ require 'date'
 Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   desc "User management for AIX."
 
-  defaultfor :operatingsystem => :aix
-  confine :operatingsystem => :aix
+  defaultfor 'os.name' => :aix
+  confine 'os.name' => :aix
 
   # Commands that manage the element
   commands :list      => "/usr/sbin/lsuser"

data/lib/puppet/provider/user/directoryservice.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet'
 require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
 require 'base64'
@@ -16,9 +17,9 @@ Puppet::Type.type(:user).provide :directoryservice do
   commands :dscacheutil  => '/usr/bin/dscacheutil'
 
   # Provider confines and defaults
-  confine    :operatingsystem => :darwin
+  confine    'os.name' => :darwin
   confine    :feature         => :cfpropertylist
-  defaultfor :operatingsystem => :darwin
+  defaultfor 'os.name' => :darwin
 
   # Need this to create getter/setter methods automagically
   # This command creates methods that return @property_hash[:value]
@@ -159,7 +160,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   end
 
   def self.get_os_version
-    @os_version ||= Puppet.runtime[:facter].value(:macosx_productversion_major)
+    @os_version ||= Puppet.runtime[:facter].value('os.macosx.version.major')
   end
 
   # Use dscl to retrieve an array of hashes containing attributes about all
@@ -636,7 +637,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def set_salted_sha512(users_plist, shadow_hash_data, value)
     unless shadow_hash_data
       shadow_hash_data = Hash.new
-      shadow_hash_data['SALTED-SHA512'] = ''
+      shadow_hash_data['SALTED-SHA512'] = String.new
     end
     shadow_hash_data['SALTED-SHA512'] = base64_decode_string(value)
     binary_plist = self.class.convert_hash_to_binary(shadow_hash_data)

data/lib/puppet/provider/user/hpux.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   desc "User management for HP-UX. This provider uses the undocumented `-F`
     switch to HP-UX's special `usermod` binary to work around the fact that
@@ -5,8 +6,8 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     New functionality provides for changing trusted computing passwords and
     resetting password expirations under trusted computing."
 
-  defaultfor :operatingsystem => "hp-ux"
-  confine :operatingsystem => "hp-ux"
+  defaultfor 'os.name' => "hp-ux"
+  confine 'os.name' => "hp-ux"
 
   commands :modify => "/usr/sam/lbin/usermod.sam", :delete => "/usr/sam/lbin/userdel.sam", :add => "/usr/sam/lbin/useradd.sam"
   options :comment, :method => :gecos

data/lib/puppet/provider/user/ldap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do

data/lib/puppet/provider/user/openbsd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/error'
 
 Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
@@ -10,8 +11,8 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
            :modify   => "usermod",
            :password => "passwd"
 
-  defaultfor :operatingsystem => :openbsd
-  confine    :operatingsystem => :openbsd
+  defaultfor 'os.name' => :openbsd
+  confine    'os.name' => :openbsd
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos

data/lib/puppet/provider/user/pw.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/provider/nameservice/pw'
 require 'open3'
 
@@ -7,8 +8,8 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   commands :pw => "pw"
   has_features :manages_homedir, :allows_duplicates, :manages_passwords, :manages_expiry, :manages_shell
 
-  defaultfor :operatingsystem => [:freebsd, :dragonfly]
-  confine    :operatingsystem => [:freebsd, :dragonfly]
+  defaultfor 'os.name' => [:freebsd, :dragonfly]
+  confine    'os.name' => [:freebsd, :dragonfly]
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos

data/lib/puppet/provider/user/user_role_add.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util'
 require_relative '../../../puppet/util/user_attr'
 require 'date'
@@ -6,7 +7,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
 
   desc "User and role management on Solaris, via `useradd` and `roleadd`."
 
-  defaultfor :osfamily => :solaris
+  defaultfor 'os.family' => :solaris
 
   commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "passwd", :role_add => "roleadd", :role_delete => "roledel", :role_modify => "rolemod"
   options :home, :flag => "-d", :method => :dir

data/lib/puppet/provider/user/useradd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/provider/nameservice/objectadd'
 require 'date'
 require_relative '../../../puppet/util/libuser'
@@ -24,13 +25,13 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   options :expiry, :method => :sp_expire,
     :munge => proc { |value|
       if value == :absent
-        if Puppet.runtime[:facter].value(:operatingsystem)=='SLES' && Puppet.runtime[:facter].value(:operatingsystemmajrelease) == "11"
+        if Puppet.runtime[:facter].value('os.name')=='SLES' && Puppet.runtime[:facter].value('os.release.major') == "11"
           -1
         else
           ''
         end
       else
-        case Puppet.runtime[:facter].value(:operatingsystem)
+        case Puppet.runtime[:facter].value('os.name')
         when 'Solaris'
           # Solaris uses %m/%d/%Y for useradd/usermod
           expiry_year, expiry_month, expiry_day = value.split('-')
@@ -216,7 +217,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   has_features :manages_homedir, :allows_duplicates, :manages_expiry
-  has_features :system_users unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value(:operatingsystem)
+  has_features :system_users unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value('os.name')
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
   has_features :manages_shell
@@ -251,8 +252,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       # libuser does not implement the -m flag
       cmd << "-m" unless @resource.forcelocal?
     else
-      osfamily = Puppet.runtime[:facter].value(:osfamily)
-      osversion = Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i
+      osfamily = Puppet.runtime[:facter].value('os.family')
+      osversion = Puppet.runtime[:facter].value('os.release.major').to_i
       # SLES 11 uses pwdutils instead of shadow, which does not have -M
       # Solaris and OpenBSD use different useradd flavors
       unless osfamily =~ /Solaris|OpenBSD/ || osfamily == 'Suse' && osversion <= 11
@@ -350,7 +351,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       cmd = [command(:delete)]
     end
     # Solaris `userdel -r` will fail if the homedir does not exist.
-    if @resource.managehome? && (('Solaris' != Puppet.runtime[:facter].value(:operatingsystem)) || Dir.exist?(Dir.home(@resource[:name])))
+    if @resource.managehome? && (('Solaris' != Puppet.runtime[:facter].value('os.name')) || Dir.exist?(Dir.home(@resource[:name])))
       cmd << '-r'
     end
     cmd << @resource[:name]

data/lib/puppet/provider/user/windows_adsi.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:user).provide :windows_adsi do
   desc "Local user management for Windows."
 
-  defaultfor :operatingsystem => :windows
-  confine    :operatingsystem => :windows
+  defaultfor 'os.name' => :windows
+  confine    'os.name' => :windows
 
   has_features :manages_homedir, :manages_passwords, :manages_roles
 

data/lib/puppet/provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A Provider is an implementation of the actions that manage resources (of some type) on a system.
 # This class is the base class for all implementation of a Puppet Provider.
 #

data/lib/puppet/reference/configuration.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all settings") do
   docs = {}
   Puppet.settings.each do |name, object|
     docs[name] = object
   end
 
-  str = ""
+  str = String.new
   docs.sort { |a, b|
     a[0].to_s <=> b[0].to_s
   }.each do |name, object|

data/lib/puppet/reference/function.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 function = Puppet::Util::Reference.newreference :function, :doc => "All functions available in the parser" do
   Puppet::Parser::Functions.functiondocs
 end

data/lib/puppet/reference/indirection.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/indirection'
 require_relative '../../puppet/util/checksums'
 require_relative '../../puppet/file_serving/content'
 require_relative '../../puppet/file_serving/metadata'
 
 reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
-  text = ""
+  text = String.new
   Puppet::Indirector::Indirection.instances.sort_by(&:to_s).each do |indirection|
     ind = Puppet::Indirector::Indirection.instance(indirection)
     name = indirection.to_s.capitalize

data/lib/puppet/reference/metaparameter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Util::Reference.newreference :metaparameter, :doc => "All Puppet metaparameters and all their details" do
   str = %{
 

data/lib/puppet/reference/providers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 providers = Puppet::Util::Reference.newreference :providers, :title => "Provider Suitability Report", :depth => 1, :dynamic => true, :doc => "Which providers are valid for this machine" do
   types = []
   Puppet::Type.loadall
@@ -13,11 +14,10 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
   ret = "Details about this host:\n\n"
 
   # Throw some facts in there, so we know where the report is from.
-  ["Ruby Version", "Puppet Version", "Operating System", "Operating System Release"].each do |label|
-    name = label.gsub(/\s+/, '')
-    value = Puppet.runtime[:facter].value(name)
-    ret << option(label, value)
-  end
+  ret << option('Ruby Version', Facter.value('ruby.version'))
+  ret << option('Puppet Version', Facter.value('puppetversion'))
+  ret << option('Operating System', Facter.value('os.name'))
+  ret << option('Operating System Release', Facter.value('os.release.full'))
   ret << "\n"
 
   count = 1

data/lib/puppet/reference/report.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/reports'
 
 report = Puppet::Util::Reference.newreference :report, :doc => "All available transaction reports" do

data/lib/puppet/reference/type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types and all their details" do
   types = {}
   Puppet::Type.loadall

data/lib/puppet/relationship.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # subscriptions are permanent associations determining how different
 # objects react to an event