puppet 7.34.0-universal-darwin → 8.0.1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 162ad229a11601b8023aa928008c24e320748385f9c8bb60f41e250b64eb27c8
-  data.tar.gz: e3280339b1b42e3e2a20e29c819702d5721507b3569cb921781a6103d5f604f2
+  metadata.gz: 545167c442d15f2c52faa2e1cc7248b2530205b053a0b25f5d165198f496a318
+  data.tar.gz: 11fc8d36afbc752431421b696c6fbcae16aa4f28ab064cf004336d4748f1d938
 SHA512:
-  metadata.gz: 2ab6b2a695d95f7cf2def9f9dd1cd84e97d5805bf3123b4616cbe56fa5c1b776fefa1bcbbf2f384b20489a55e8a12aedc401b54a4c577f824496ae4700192773
-  data.tar.gz: 534997a167cd128a03c517fb18f6b3e26940210b626f6128c125d70023ee04c7a398a1016774919444e26d2d9889115f3b6bcdd819fc42be3a544edadb133085
+  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,18 +12,15 @@ def location_for(place, fake_version = nil)
   end
 end
 
-# Make sure these gem requirements are in sync with the gempspec. Specifically,
-# the runtime_dependencies in puppet.gemspec match the runtime dependencies here
-# (like semantic_puppet and puppet-resource_api)
+# Make sure these gem requirements are in sync with the gempspec and ext/project_data.yaml
 
-# override .gemspec deps for facter & hiera - 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')
+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
@@ -36,20 +33,18 @@ group(:features) do
   # requires native ldap headers/libs
   # gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
   gem 'puppetserver-ca', '~> 2.0', require: false
-  gem 'CFPropertyList', '~> 2.2', require: false
 end
 
 group(:test) do
-  # 1.16.0 - 1.16.2 are broken on Windows
-  gem 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2', 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]
@@ -70,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,147 +1,143 @@
 PATH
   remote: .
   specs:
-    puppet (7.34.0)
-      concurrent-ruby (~> 1.0)
+    puppet (8.0.1)
+      CFPropertyList (~> 2.2)
+      concurrent-ruby (~> 1.0, < 1.2.0)
       deep_merge (~> 1.0)
-      facter (> 2.0.1, < 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.10)
+      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.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    artifactory (3.0.17)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    apt_stage_artifacts (0.11.0)
+      docopt
+    artifactory (3.0.15)
     ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    crack (1.0.0)
-      bigdecimal
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
       rexml
-    csv (3.3.0)
+    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.9.0)
+    erubi (1.12.0)
+    facter (4.4.0)
       hocon (~> 1.3)
-      thor (>= 1.0.1, < 1.3)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
-      json
-      logger
-    faraday-net_http (3.3.0)
-      net-http
-    fast_gettext (1.1.2)
-    ffi (1.16.3)
-    gettext (3.2.9)
+      thor (>= 1.0.1, < 2.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    fast_gettext (2.3.0)
+    ffi (1.15.5)
+    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.15.1)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
-      httpclient (>= 2.8.3, < 3.a)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
-      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-    google-apis-iamcredentials_v1 (0.21.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.47.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.7.1)
-      google-cloud-env (>= 1.0, < 3.a)
+      rexml
+      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.2.1)
-      faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.52.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    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.38)
+      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.1)
-      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.1)
-    hiera (3.12.0)
-    hiera-eyaml (4.1.0)
-      highline (~> 2.1)
-      optimist (~> 3.1)
+    hashdiff (1.0.1)
+    hiera-eyaml (3.3.0)
+      highline
+      optimist
     highline (2.1.0)
     hocon (1.4.0)
     hpricot (0.8.6)
     httpclient (2.8.3)
-    json (2.7.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.9.3)
-      base64
-    locale (2.1.4)
-    logger (1.6.1)
-    memory_profiler (1.1.0)
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    minitar (0.12.1)
-    msgpack (1.7.3)
+    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.2)
+    minitar (0.9)
+    msgpack (1.7.0)
     multi_json (1.15.0)
     mustache (1.1.1)
-    mutex_m (0.2.0)
-    net-http (0.4.1)
-      uri
-    optimist (3.1.0)
+    optimist (3.0.1)
     os (1.1.4)
-    packaging (0.122.2)
+    packaging (0.109.7)
+      apt_stage_artifacts
       artifactory (~> 3)
       csv (>= 3.1.5)
       google-cloud-storage
       googleauth
       rake (>= 12.3)
       release-metrics
-      retriable (~> 3.1, >= 3.1.2)
-      rexml
-    parallel (1.26.3)
-    parser (3.3.5.0)
+    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 (6.0.1)
-    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.2.1)
-    rdiscount (2.2.7.3)
-    rdoc (6.3.4.1)
-    regexp_parser (2.9.2)
+    rake (13.0.6)
+    rdiscount (2.2.7)
+    rdoc (6.3.3)
+    regexp_parser (2.8.0)
     release-metrics (1.1.0)
       csv
       docopt
@@ -150,27 +146,27 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.8)
+    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.1)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    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.2)
+    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)
@@ -180,49 +176,49 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.32.3)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    ruby-prof (1.7.0)
+    ruby-prof (1.6.3)
     ruby-progressbar (1.13.0)
+    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.2.2)
+    thor (1.2.1)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    unicode-display_width (2.6.0)
-    uri (0.13.1)
-    vcr (5.1.0)
-    webmock (3.24.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)
-    webrick (1.8.2)
-    yard (0.9.37)
+    webrick (1.8.1)
+    yard (0.9.34)
 
 PLATFORMS
-  ruby
   x86_64-linux
 
 DEPENDENCIES
-  CFPropertyList (~> 2.2)
   diff-lcs (~> 1.3)
-  ffi (>= 1.15.5, < 1.17.0, != 1.16.2, != 1.16.1, != 1.16.0)
-  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)
@@ -238,10 +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.5.19
+   2.3.22

data/Rakefile

@@ -45,47 +45,6 @@ task :default do
   sh %{rake -T}
 end
 
-namespace :pl_ci do
-  desc 'Build puppet gems'
-  task :gem_build, [:gemspec] do |t, args|
-    args.with_defaults(gemspec: 'puppet.gemspec')
-    stdout, stderr, status = Open3.capture3(<<~END)
-      gem build #{args.gemspec} --platform x86-mingw32 && \
-      gem build #{args.gemspec} --platform x64-mingw32 && \
-      gem build #{args.gemspec} --platform universal-darwin && \
-      gem build #{args.gemspec}
-    END
-    if !status.exitstatus.zero?
-      puts "Error building #{args.gemspec}\n#{stdout} \n#{stderr}"
-      exit(1)
-    else
-      puts stdout
-    end
-  end
-
-  desc 'build the nightly puppet gems'
-  task :nightly_gem_build do
-    # this is taken from `rake package:nightly_gem`
-    extended_dot_version = %x{git describe --tags --dirty --abbrev=7}.chomp.tr('-', '.')
-
-    # we must create tempfile in the same directory as puppetg.gemspec, since
-    # it uses __dir__ to determine which files to include
-    require 'tempfile'
-    Tempfile.create('gemspec', __dir__) do |dst|
-      File.open('puppet.gemspec', 'r') do |src|
-        src.readlines.each do |line|
-          if line.match?(/version\s*=\s*['"][0-9.]+['"]/)
-            line = "spec.version = '#{extended_dot_version}'"
-          end
-          dst.puts line
-        end
-      end
-      dst.flush
-      Rake::Task['pl_ci:gem_build'].invoke(dst.path)
-    end
-  end
-end
-
 task :spec do
   ENV["LOG_SPEC_ORDER"] = "true"
   sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
@@ -99,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

@@ -1,20 +1,53 @@
 ---
 project: 'puppet'
+author: 'Puppet Labs'
+email: 'info@puppetlabs.com'
+homepage: 'https://github.com/puppetlabs/puppet'
+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 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: '>= 3.1.0'
+gem_required_rubygems_version: '> 1.3.1'
+gem_runtime_dependencies:
+  facter: ['>= 4.3.0', '< 5']
+  semantic_puppet: '~> 1.0'
+  fast_gettext: ['>= 2.1', '< 3']
+  locale: '~> 2.1'
+  multi_json: '~> 1.13'
+  puppet-resource_api: '~>1.5'
+  concurrent-ruby: ["~> 1.0", "< 1.2.0"]
+  deep_merge: '~> 1.0'
+  scanf: '~> 1.0'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
   - --main
   - README.md
   - --line-numbers
-# Array of files to include when building source tarballs
-files:
-  - '[A-Z]*'
-  - install.rb
-  - bin
-  - lib
-  - conf
-  - man
-  - examples
-  - ext
-  - tasks
-  - locales
+gem_platform_dependencies:
+  universal-darwin:
+    gem_runtime_dependencies:
+      CFPropertyList: '~> 2.2'
+  x86-mingw32:
+    gem_runtime_dependencies:
+      ffi: ['> 1.9.24', '< 2']
+      minitar: '~> 0.9'
+  x64-mingw32:
+    gem_runtime_dependencies:
+      ffi: ['> 1.9.24', '< 2']
+      minitar: '~> 0.9'
+bundle_platforms:
+  universal-darwin: all
+  x86-mingw32: mingw
+  x64-mingw32: x64_mingw
+pre_tasks:
+  'package:apple': 'cfpropertylist'

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'
@@ -159,19 +160,12 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
     end
   end
 
-  # Parses runinterval.
-  #
-  # @param puppet_path [String] The file path for the Puppet executable.
-  # @return runinterval [Integer] How often to do a Puppet run, in seconds.
   def parse_runinterval(puppet_path)
     begin
-      runinterval = %x(#{puppet_path} config --section agent --log_level notice print runinterval).chomp
-      if runinterval == ''
+      runinterval = %x{ #{puppet_path} config --section agent --log_level notice print runinterval }.to_i
+      if runinterval == 0
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
-      else
-        # Use Kernel#Integer because to_i will return 0 with non-numeric strings.
-        runinterval = Integer(runinterval)
       end
     rescue Exception => e
       log_exception(e)