puppet 7.29.1-universal-darwin → 8.0.1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b729e8e785fd2cb88a298209705431c74ad4d5d81a78f4963d45ed211f35b85
-  data.tar.gz: 9334a4b47c4b02e41f38e0bc9cdca3b26583f99aa0fa8e0bfa6ddfbc6aaac426
+  metadata.gz: 545167c442d15f2c52faa2e1cc7248b2530205b053a0b25f5d165198f496a318
+  data.tar.gz: 11fc8d36afbc752431421b696c6fbcae16aa4f28ab064cf004336d4748f1d938
 SHA512:
-  metadata.gz: 430978e61bed0ed35bc5a4d0f721fb74cb771435015954191f4c91d6670309192a0f64ee0370f53c084c968492e78459ab5de3116609caae7a23d4301fecc206
-  data.tar.gz: 2bcfa908c81677261872d4927b55e64067dcab86bcc21cbadb2362e53eeaa0a760f3e4a32b1ad3856ea33c3f3dea912958f5f66e978a56febaf6727449ecf584
+  metadata.gz: da5d3000b9022268b25de9d3b87de65d26e5307b5206291ca68941868b8281890a6afafa1f4c30217fe68c1e3d1615b4e86d16ecff0d510082a59ab61615c329
+  data.tar.gz: 528c25dc7f81fc6603722b36f2c908a0687eb94ac59953e6a9c1b7e7846be375c90dff7cac3bff8f5e5d72e9cb5657f07a884dec443aa46b0a2d41ecd212d8e9

data/CODEOWNERS

@@ -1,11 +1,11 @@
 # defaults
-* @puppetlabs/phoenix
+* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers
 
 # PAL
 /lib/puppet/pal @puppetlabs/bolt
 
 # puppet module
-/lib/puppet/application/module.rb @puppetlabs/modules
-/lib/puppet/face/module @puppetlabs/modules
-/lib/puppet/forge @puppetlabs/modules
-/lib/puppet/module_tool @puppetlabs/modules
+/lib/puppet/application/module.rb @puppetlabs/pdk
+/lib/puppet/face/module @puppetlabs/pdk
+/lib/puppet/forge @puppetlabs/pdk
+/lib/puppet/module_tool @puppetlabs/pdk

data/Gemfile

@@ -12,14 +12,15 @@ def location_for(place, fake_version = nil)
   end
 end
 
-# override .gemspec deps - may issue warning depending on Bundler version
-gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
-gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
+# Make sure these gem requirements are in sync with the gempspec and ext/project_data.yaml
+
+gem "facter", *location_for(ENV['FACTER_LOCATION'] || ["~> 4.3"])
 gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
 gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])
 
 group(:features) do
   gem 'diff-lcs', '~> 1.3', require: false
+  gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
   gem 'hiera-eyaml', *location_for(ENV['HIERA_EYAML_LOCATION'])
   gem 'hocon', '~> 1.0', require: false
   # requires native libshadow headers/libs
@@ -35,15 +36,15 @@ group(:features) do
 end
 
 group(:test) do
-  gem "ffi", '1.15.5', require: false
+  gem "ffi", require: false
   gem "json-schema", "~> 2.0", require: false
   gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0')
   gem "rspec", "~> 3.1", require: false
   gem "rspec-expectations", ["~> 3.9", "!= 3.9.3"]
   gem "rspec-its", "~> 1.1", require: false
-  gem 'vcr', '~> 5.0', require: false
+  gem 'vcr', '~> 6.1', require: false
   gem 'webmock', '~> 3.0', require: false
-  gem 'webrick', '~> 1.7', require: false if RUBY_VERSION.to_f >= 3.0
+  gem 'webrick', '~> 1.7', require: false
   gem 'yard', require: false
 
   gem 'rubocop', '1.28.0', require: false, platforms: [:ruby]
@@ -64,7 +65,7 @@ group(:packaging) do
 end
 
 group(:documentation, optional: true) do
-  gem 'gettext-setup', '~> 0.28', require: false, platforms: [:ruby]
+  gem 'gettext-setup', '~> 1.0', require: false, platforms: [:ruby]
   gem 'ronn', '~> 0.7.3', require: false, platforms: [:ruby]
 end
 

data/Gemfile.lock

@@ -1,96 +1,95 @@
 PATH
   remote: .
   specs:
-    puppet (7.29.1)
+    puppet (8.0.1)
       CFPropertyList (~> 2.2)
-      concurrent-ruby (~> 1.0)
+      concurrent-ruby (~> 1.0, < 1.2.0)
       deep_merge (~> 1.0)
-      facter (>= 2.4.0, < 5)
-      fast_gettext (>= 1.1, < 3)
-      hiera (>= 3.2.1, < 4)
+      facter (>= 4.3.0, < 5)
+      fast_gettext (>= 2.1, < 3)
       locale (~> 2.1)
       multi_json (~> 1.13)
+      puppet-resource_api (~> 1.5)
       scanf (~> 1.0)
       semantic_puppet (~> 1.0)
 
 GEM
-  remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
+  remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.8.6)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     apt_stage_artifacts (0.11.0)
       docopt
-    artifactory (3.0.17)
+    artifactory (3.0.15)
     ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.6)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
-    crack (1.0.0)
-      bigdecimal
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
       rexml
-    csv (3.2.8)
+    csv (3.2.6)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    diff-lcs (1.5.1)
-    digest-crc (0.6.5)
+    diff-lcs (1.5.0)
+    digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     docopt (0.6.1)
-    facter (4.6.1)
+    erubi (1.12.0)
+    facter (4.4.0)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
-    faraday (2.8.1)
-      base64
+    faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    fast_gettext (1.1.2)
+    fast_gettext (2.3.0)
     ffi (1.15.5)
-    gettext (3.2.9)
+    forwardable (1.3.3)
+    gettext (3.4.3)
+      erubi
       locale (>= 2.0.5)
+      prime
       text (>= 1.3.0)
-    gettext-setup (0.34)
-      fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2, < 3.3.0)
+    gettext-setup (1.1.0)
+      fast_gettext (~> 2.1)
+      gettext (~> 3.4)
       locale
-    google-apis-core (0.14.0)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
+      googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-    google-apis-iamcredentials_v1 (0.19.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-storage_v1 (0.34.0)
-      google-apis-core (>= 0.14.0, < 2.a)
-    google-cloud-core (1.6.1)
-      google-cloud-env (>= 1.0, < 3.a)
+      webrick
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.1)
-      faraday (>= 1.0, < 3.a)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.49.0)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-core (~> 0.13)
-      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (~> 0.33)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
-      googleauth (~> 1.9)
+      googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.11.0)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+    googleauth (1.5.2)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    hashdiff (1.1.0)
-    hiera (3.12.0)
-    hiera-eyaml (3.4.0)
+    hashdiff (1.0.1)
+    hiera-eyaml (3.3.0)
       highline
       optimist
     highline (2.1.0)
@@ -99,19 +98,19 @@ GEM
     httpclient (2.8.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.8.1)
-      base64
+    jwt (2.7.0)
     locale (2.1.3)
+    memoist (0.16.2)
     memory_profiler (1.0.1)
     method_source (1.0.0)
-    mini_mime (1.1.5)
+    mini_mime (1.1.2)
     minitar (0.9)
-    msgpack (1.7.2)
+    msgpack (1.7.0)
     multi_json (1.15.0)
     mustache (1.1.1)
-    optimist (3.1.0)
+    optimist (3.0.1)
     os (1.1.4)
-    packaging (0.116.0)
+    packaging (0.109.7)
       apt_stage_artifacts
       artifactory (~> 3)
       csv (>= 3.1.5)
@@ -119,24 +118,26 @@ GEM
       googleauth
       rake (>= 12.3)
       release-metrics
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-      racc
+    prime (0.1.2)
+      forwardable
+      singleton
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.4)
-    puppet-resource_api (1.9.0)
+    public_suffix (5.0.1)
+    puppet-resource_api (1.8.14)
       hocon (>= 1.0)
-    puppetserver-ca (2.7.0)
+    puppetserver-ca (2.5.0)
       facter (>= 2.0.1, < 5)
     racc (1.5.2)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rdiscount (2.2.7.3)
+    rake (13.0.6)
+    rdiscount (2.2.7)
     rdoc (6.3.3)
-    regexp_parser (2.9.0)
+    regexp_parser (2.8.0)
     release-metrics (1.1.0)
       csv
       docopt
@@ -145,27 +146,27 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.5)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (1.28.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -175,8 +176,8 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.31.1)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
     ruby-prof (1.6.3)
@@ -184,37 +185,40 @@ GEM
     ruby2_keywords (0.0.5)
     scanf (1.0.0)
     semantic_puppet (1.1.0)
-    signet (0.19.0)
+    signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
+    singleton (0.1.1)
     text (1.3.1)
-    thor (1.3.1)
+    thor (1.2.1)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
-    vcr (5.1.0)
-    webmock (3.23.0)
+    unicode-display_width (2.4.2)
+    vcr (6.1.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.36)
+    webrick (1.8.1)
+    yard (0.9.34)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   diff-lcs (~> 1.3)
-  ffi (= 1.15.5)
-  gettext-setup (~> 0.28)
+  facter (~> 4.3)
+  ffi
+  gettext-setup (~> 1.0)
   hiera-eyaml
   hocon (~> 1.0)
   json-schema (~> 2.0)
   memory_profiler
   minitar (~> 0.9)
   msgpack (~> 1.2)
-  packaging (~> 0.113)
+  packaging (~> 0.99)
   pry
   puppet!
   puppet-resource_api (~> 1.5)
@@ -230,9 +234,10 @@ DEPENDENCIES
   rubocop-i18n (~> 3.0)
   ruby-prof (>= 0.16.0)
   semantic_puppet (~> 1.0)
-  vcr (~> 5.0)
+  vcr (~> 6.1)
   webmock (~> 3.0)
+  webrick (~> 1.7)
   yard
 
 BUNDLED WITH
-   2.4.20
+   2.3.22

data/Rakefile

@@ -58,6 +58,33 @@ task(:rubocop) do
   raise "RuboCop detected offenses" if exit_code != 0
 end
 
+desc "verify that commit messages match CONTRIBUTING.md requirements"
+task(:commits) do
+  # This rake task looks at the summary from every commit from this branch not
+  # in the branch targeted for a PR.
+  commit_range = 'HEAD^..HEAD'
+  puts "Checking commits #{commit_range}"
+  %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
+    # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
+    # The exception tries to explain it in more full.
+    if /^\((maint|doc|docs|packaging|l10n|pup-\d+)\)|revert/i.match(commit_summary).nil?
+      raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
+        "\n\t\t#{commit_summary}\n" \
+        "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
+        "\t\t(PUP-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
+        "\t\t(docs)\n" \
+        "\t\t(docs)(DOCUMENT-<digits>)\n" \
+        "\t\t(maint)\n" \
+        "\t\t(packaging)\n" \
+        "\t\t(L10n)\n" \
+        "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
+    else
+      puts "#{commit_summary}"
+    end
+    puts "...passed"
+  end
+end
+
 desc "verify that changed files are clean of Ruby warnings"
 task(:warnings) do
   # This rake task looks at all files modified in this branch.

data/bin/puppet

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 begin
   require 'puppet/util/command_line'

data/examples/enc/regexp_nodes/regexp_nodes.rb

@@ -133,7 +133,7 @@ class ExternalNode
     patternlist = []
 
     begin
-      File.open(filepath).each do |l|
+      open(filepath).each do |l|
         l.chomp!
 
         next if l =~ /^$/

data/ext/build_defaults.yaml

@@ -15,4 +15,4 @@ apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 tar_host: 'downloads.puppetlabs.com'
-nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet7-nightly'
+nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet8-nightly'

data/ext/project_data.yaml

@@ -7,25 +7,24 @@ summary: 'Puppet, an automated configuration management tool'
 description: 'Puppet, an automated configuration management tool'
 version_file: 'lib/puppet/version.rb'
 # files and gem_files are space separated lists
-files: '[A-Z]* install.rb bin lib conf man examples ext tasks locales'
-# Make sure these gem requirements are in sync with the gemspec and Gemfile
-gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks locales'
-gem_test_files:
+files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
+# Make sure these gem requirements are in sync with the gempspec and Gemfile
+gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
+gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_license: 'Apache-2.0'
 gem_forge_project: 'puppet'
-gem_required_ruby_version: '>= 2.5.0'
+gem_required_ruby_version: '>= 3.1.0'
 gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
-  facter: ['> 2.0.1', '< 5']
-  hiera: ['>= 3.2.1', '< 4']
+  facter: ['>= 4.3.0', '< 5']
   semantic_puppet: '~> 1.0'
-  fast_gettext: ['>= 1.1', '< 3']
+  fast_gettext: ['>= 2.1', '< 3']
   locale: '~> 2.1'
-  multi_json: '~> 1.10'
+  multi_json: '~> 1.13'
   puppet-resource_api: '~>1.5'
-  concurrent-ruby: "~> 1.0"
+  concurrent-ruby: ["~> 1.0", "< 1.2.0"]
   deep_merge: '~> 1.0'
   scanf: '~> 1.0'
 gem_rdoc_options:
@@ -40,11 +39,11 @@ gem_platform_dependencies:
       CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
-      ffi: '1.15.5'
+      ffi: ['> 1.9.24', '< 2']
       minitar: '~> 0.9'
   x64-mingw32:
     gem_runtime_dependencies:
-      ffi: '1.15.5'
+      ffi: ['> 1.9.24', '< 2']
       minitar: '~> 0.9'
 bundle_platforms:
   universal-darwin: all

data/ext/windows/service/daemon.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'fileutils'
 require 'puppet/util/windows/daemon'

data/install.rb

@@ -44,7 +44,7 @@ rescue LoadError
   $haverdoc = false
 end
 
-PREREQS = %w{openssl facter cgi hiera}
+PREREQS = %w{openssl facter cgi}
 MIN_FACTER_VERSION = 1.5
 
 InstallOptions = OpenStruct.new
@@ -92,7 +92,7 @@ def do_man(man, strip = 'man/')
     FileUtils.install(mf, omf, mode: 0644, preserve: true, verbose: true)
     # Solaris does not support gzipped man pages. When called with
     # --no-check-prereqs/without facter the default gzip behavior still applies
-    unless $operatingsystem == "Solaris"
+    unless $osname == "Solaris"
       gzip = %x{which gzip}
       gzip.chomp!
       %x{#{gzip} -f #{omf}}
@@ -234,16 +234,16 @@ def prepare_installation
     RbConfig::CONFIG['bindir'] = "/usr/bin"
   end
 
-  # Here we only set $operatingsystem if we have opted to check for prereqs.
+  # Here we only set $osname if we have opted to check for prereqs.
   # Otherwise facter won't be guaranteed to be present.
   if InstallOptions.check_prereqs
     check_prereqs
-    $operatingsystem = Facter.value :operatingsystem
+    $osname = Facter.value('os.name')
   end
 
   if not InstallOptions.configdir.nil?
     configdir = InstallOptions.configdir
-  elsif $operatingsystem == "windows"
+  elsif $osname == "windows"
     configdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "etc")
   else
     configdir = "/etc/puppetlabs/puppet"
@@ -251,7 +251,7 @@ def prepare_installation
 
   if not InstallOptions.codedir.nil?
     codedir = InstallOptions.codedir
-  elsif $operatingsystem == "windows"
+  elsif $osname == "windows"
     codedir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "code")
   else
     codedir = "/etc/puppetlabs/code"
@@ -259,7 +259,7 @@ def prepare_installation
 
   if not InstallOptions.vardir.nil?
     vardir = InstallOptions.vardir
-  elsif $operatingsystem == "windows"
+  elsif $osname == "windows"
     vardir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "cache")
   else
     vardir = "/opt/puppetlabs/puppet/cache"
@@ -267,7 +267,7 @@ def prepare_installation
 
   if not InstallOptions.publicdir.nil?
     publicdir = InstallOptions.publicdir
-  elsif $operatingsystem == "windows"
+  elsif $osname == "windows"
     publicdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "public")
   else
     publicdir = "/opt/puppetlabs/puppet/public"
@@ -275,7 +275,7 @@ def prepare_installation
 
   if not InstallOptions.rundir.nil?
     rundir = InstallOptions.rundir
-  elsif $operatingsystem == "windows"
+  elsif $osname == "windows"
     rundir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "run")
   else
     rundir = "/var/run/puppetlabs"
@@ -283,7 +283,7 @@ def prepare_installation
 
   if not InstallOptions.logdir.nil?
     logdir = InstallOptions.logdir
-  elsif $operatingsystem == "windows"
+  elsif $osname == "windows"
     logdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "log")
   else
     logdir = "/var/log/puppetlabs/puppet"
@@ -298,7 +298,7 @@ def prepare_installation
   if not InstallOptions.localedir.nil?
     localedir = InstallOptions.localedir
   else
-    if $operatingsystem == "windows"
+    if $osname == "windows"
       localedir = File.join(ENV['PROGRAMFILES'], "Puppet Labs", "Puppet", "puppet", "share", "locale")
     else
       localedir = "/opt/puppetlabs/puppet/share/locale"
@@ -376,7 +376,7 @@ end
 # by stripping the drive letter, but only if the basedir is not empty.
 #
 def join(basedir, dir)
-  return "#{basedir}#{dir[2..-1]}" if $operatingsystem == "windows" and basedir.length > 0 and dir.length > 2
+  return "#{basedir}#{dir[2..-1]}" if $osname == "windows" and basedir.length > 0 and dir.length > 2
 
   "#{basedir}#{dir}"
 end
@@ -398,7 +398,7 @@ end
 
 def build_ri(files)
   return unless $haverdoc
-  return if $operatingsystem == "windows"
+  return if $osname == "windows"
   begin
     ri = RDoc::RDoc.new
     #ri.document(["--ri-site", "--merge"] + files)
@@ -427,14 +427,14 @@ def install_binfile(from, op_file, target)
 
   File.open(from) do |ip|
     File.open(tmp_file.path, "w") do |op|
-      op.puts "#!#{ruby}" unless $operatingsystem == "windows"
+      op.puts "#!#{ruby}" unless $osname == "windows"
       contents = ip.readlines
       contents.shift if contents[0] =~ /^#!/
       op.write contents.join
     end
   end
 
-  if $operatingsystem == "windows" && InstallOptions.batch_files
+  if $osname == "windows" && InstallOptions.batch_files
     installed_wrapper = false
 
     unless File.extname(from) =~ /\.(cmd|bat)/
@@ -484,7 +484,7 @@ FileUtils.cd File.dirname(__FILE__) do
 
   prepare_installation
 
-  if $operatingsystem == "windows"
+  if $osname == "windows"
     windows_bins = glob(%w{ext/windows/*bat})
   end
 
@@ -492,8 +492,8 @@ FileUtils.cd File.dirname(__FILE__) do
   #build_ri(ri) if InstallOptions.ri
   do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
   do_bins(bins, InstallOptions.bin_dir)
-  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $operatingsystem == "windows" && InstallOptions.batch_files
+  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $osname == "windows" && InstallOptions.batch_files
   do_libs(libs)
   do_locales(locales)
-  do_man(man) unless $operatingsystem == "windows"
+  do_man(man) unless $osname == "windows"
 end

data/lib/hiera/puppet_function.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hiera_puppet'
 
 # Provides the base class for the puppet functions hiera, hiera_array, hiera_hash, and hiera_include.