puppet 5.5.22-x64-mingw32 → 6.0.0-x64-mingw32

data/Rakefile

@@ -23,11 +23,13 @@ require 'open3'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-begin
-  require 'packaging'
-  Pkg::Util::RakeUtils.load_packaging_tasks
-rescue LoadError => e
-  puts "Error loading packaging rake tasks: #{e}"
+if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
+  begin
+    require 'packaging'
+    Pkg::Util::RakeUtils.load_packaging_tasks
+  rescue LoadError => e
+    puts "Error loading packaging rake tasks: #{e}"
+  end
 end
 
 namespace :package do
@@ -44,20 +46,16 @@ task :default do
 end
 
 task :spec do
+  ENV["LOG_SPEC_ORDER"] = "true"
   sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
 end
 
 desc 'run static analysis with rubocop'
 task(:rubocop) do
-  if RUBY_VERSION < '2.0'
-    puts 'rubocop tests require Ruby 2.0 or higher'
-    puts 'skipping rubocop'
-  else
-    require 'rubocop'
-    cli = RuboCop::CLI.new
-    exit_code = cli.run(%w(--display-cop-names --format simple))
-    raise "RuboCop detected offenses" if exit_code != 0
-  end
+  require 'rubocop'
+  cli = RuboCop::CLI.new
+  exit_code = cli.run(%w(--display-cop-names --format simple))
+  raise "RuboCop detected offenses" if exit_code != 0
 end
 
 desc "verify that commit messages match CONTRIBUTING.md requirements"
@@ -73,7 +71,7 @@ task(:commits) do
   %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?
+    if /^\((maint|doc|docs|packaging|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"  \
@@ -82,7 +80,6 @@ task(:commits) do
         "\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}"
@@ -103,9 +100,7 @@ task(:warnings) do
   puts "Checking modified files #{commit_range}"
   %x{git diff --diff-filter=ACM --name-only #{commit_range}}.each_line do |modified_file|
     modified_file.chomp!
-    # Skip racc generated file as it can have many warnings that cannot be manually fixed
-    next if modified_file.end_with?("pops/parser/eparser.rb")
-    next if modified_file.start_with?('spec/fixtures/', 'acceptance/fixtures/') || File.extname(modified_file) != '.rb'
+    next unless File.extname(modified_file) == '.rb'
     puts modified_file
 
     stdout, stderr, _ = Open3.capture3("ruby -wc \"#{modified_file}\"")
@@ -124,5 +119,6 @@ if Rake.application.top_level_tasks.grep(/^gettext:/).any?
     load "#{spec.gem_dir}/lib/tasks/gettext.rake"
     GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
   rescue LoadError
+    abort("Run `bundle install --with documentation` to install the `gettext-setup` gem.")
   end
 end

data/ext/build_defaults.yaml

@@ -16,4 +16,3 @@ 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/puppet5-nightly'

data/ext/cert_inspector

@@ -75,15 +75,15 @@ class X509Collector
       end
     when OpenSSL::X509::Certificate
       signature_desc = who_signed(meaning, key_names, keys)
-      "Certificate assigning name #{meaning.subject} to #{key_names[meaning.public_key.to_s]}\n    serial number #{meaning.serial}\n    issued by #{meaning.issuer}\n    signed by #{signature_desc}"
+      "Certificate assigning name #{meaning.subject.to_s} to #{key_names[meaning.public_key.to_s]}\n    serial number #{meaning.serial}\n    issued by #{meaning.issuer.to_s}\n    signed by #{signature_desc}"
     when OpenSSL::X509::Request
       signature_desc = who_signed(meaning, key_names, keys)
-      "Certificate request for #{meaning.subject} having key #{key_names[meaning.public_key.to_s]}\n    signed by #{signature_desc}"
+      "Certificate request for #{meaning.subject.to_s} having key #{key_names[meaning.public_key.to_s]}\n    signed by #{signature_desc}"
     when OpenSSL::X509::CRL
       signature_desc = who_signed(meaning, key_names, keys)
       revoked_serial_numbers = meaning.revoked.map { |r| r.serial }
       revoked_desc = if revoked_serial_numbers.count > 0 then "serial numbers #{revoked_serial_numbers.inspect}" else "nothing" end
-      "Certificate revocation list revoking #{revoked_desc}\n    issued by #{meaning.issuer}\n    signed by #{signature_desc}"
+      "Certificate revocation list revoking #{revoked_desc}\n    issued by #{meaning.issuer.to_s}\n    signed by #{signature_desc}"
     else
       "Unknown"
     end

data/ext/debian/copyright

@@ -61,16 +61,6 @@ Files: lib/puppet/external/event-loop/*
 Copyright: Daniel Brockman
 License: GPL-2+
 
-Files: lib/puppet/external/nagios/parser.rb
-Copyright: Minero Aoki
-License: other
- This program is free software.
- You can distribute/modify this program under the same terms of ruby.
- .
- As a special exception, when this code is copied by Racc
- into a Racc output file, you may use that output file
- without restriction.
-
 Files: lib/puppet/network/http_server/mongrel.rb
 Copyright: Manuel Holtgrewe, Luke Kanies
 License: MIT
@@ -94,18 +84,6 @@ License: MIT
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: lib/puppet/provider/augeas/augeas.rb, lib/puppet/type/augeas.rb
-Copyright: Red Hat Inc.
-License: GPL-2+
-
-Files: lib/puppet/provider/mcx/mcxcontent.rb
-Copyright: Jeff McCune <jeff@northstarlabs.net>
-License: GPL-2+
-
-Files: lib/puppet/type/mcx.rb, spec/unit/type/mcx.rb
-Copyright: Jeffrey J McCune.
-License: GPL-2+
-
 Files: lib/puppet/provider/nameservice/directoryservice.rb
 Copyright: Jeff McCune
 License: GPL-2

data/ext/project_data.yaml

@@ -14,16 +14,17 @@ gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
-gem_required_ruby_version: '>= 1.9.3'
+gem_required_ruby_version: '>= 2.3.0'
 gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
   facter: ['> 2.0.1', '< 4']
   hiera: ['>= 3.2.1', '< 4']
-  # PUP-7115 - return to a gem dependency in Puppet 5
-  # semantic_puppet: ['>= 0.1.3', '< 2']
+  semantic_puppet: '~> 1.0'
   fast_gettext: '~> 1.1.2'
   locale: '~> 2.1'
   multi_json: '~> 1.10'
+  httpclient: '~> 2.8'
+  puppet-resource_api: '~>1.5'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
@@ -36,27 +37,24 @@ gem_platform_dependencies:
       CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
-      # Pinning versions that require native extensions
-      # ffi is pinned due to PUP-8438
-      ffi: '<= 1.9.18'
+      ffi: '~> 1.9.25'
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
       win32-process: '= 0.7.5'
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
       win32-service: '= 0.8.8'
-      minitar: '~> 0.9'
+      minitar: '~> 0.6.1'
   x64-mingw32:
     gem_runtime_dependencies:
-      # ffi is pinned due to PUP-8438
-      ffi: '<= 1.9.18'
+      ffi: '~> 1.9.25'
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
       win32-process: '= 0.7.5'
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
       win32-service: '= 0.8.8'
-      minitar: '~> 0.9'
+      minitar: '~> 0.6.1'
 bundle_platforms:
   universal-darwin: all
   x86-mingw32: mingw

data/ext/puppet-test

@@ -435,9 +435,9 @@ begin
             when "--node"
                 $options[:nodes] << arg
             when "--list"
-                Suite.suites.sort_by(&:to_s).each do |suite_name|
+                Suite.suites.sort { |a,b| a.to_s <=> b.to_s }.each do |suite_name|
                     suite = Suite[suite_name]
-                    tests = suite.tests.sort_by(&:to_s).join(", ")
+                    tests = suite.tests.sort { |a,b| a.to_s <=> b.to_s }.join(", ")
                     puts "%20s: %s" % [suite_name, tests]
                 end
                 exit(0)

data/ext/redhat/puppet.spec.erb

@@ -104,10 +104,6 @@ The server can also function as a certificate authority and file server.
 
 
 %build
-for f in external/nagios.rb relationship.rb; do
-  sed -i -e '1d' lib/puppet/$f
-done
-
 find examples/ -type f | xargs --no-run-if-empty chmod a-x
 
 %install

data/ext/regexp_nodes/regexp_nodes.rb

@@ -159,7 +159,7 @@ class ExternalNode
     log("list of patterns for #{filepath}: #{patternlist}")
 
     if matchthis =~ Regexp.union(patternlist)
-      log("matched #{$~} in #{matchthis}, returning true")
+      log("matched #{$~.to_s} in #{matchthis}, returning true")
       return true
 
     else  # hostname didn't match anything in patternlist
@@ -181,7 +181,7 @@ class ExternalNode
       log("Attempting to match [#{@hostname}] in [#{filepath}]")
       if matched_in_patternfile?(filepath,@hostname)
         @classes << patternfile.to_s
-        log("Appended #{patternfile} to classes instance variable")
+        log("Appended #{patternfile.to_s} to classes instance variable")
       end
     end
   end
@@ -198,7 +198,7 @@ class ExternalNode
       log("Attempting to match [#{@hostname}] in [#{filepath}]")
       if matched_in_patternfile?(filepath,@hostname)
         @environment = patternfile.to_s
-        log("Wrote #{patternfile} to environment instance variable")
+        log("Wrote #{patternfile.to_s} to environment instance variable")
       end
     end
   end
@@ -230,7 +230,7 @@ class ExternalNode
         log("Attempting to match [#{@hostname}] in [#{secondlevel}]")
         if matched_in_patternfile?(secondlevel, @hostname)
           @parameters[ parametername.to_s ] = patternfile.to_s
-          log("Set @parameters[#{parametername}] = #{patternfile}")
+          log("Set @parameters[#{parametername.to_s}] = #{patternfile.to_s}")
         end
       end
     end

data/ext/solaris/smf/puppet.xml

@@ -28,8 +28,6 @@
 
     <exec_method type="method" name="stop" exec="/lib/svc/method/puppet stop" timeout_seconds="60"/>
 
-    <exec_method type="method" name="refresh" exec=":kill" timeout_seconds="60"/>
-
   <stability value="Evolving"/>
 
     <template>

data/ext/solaris/smf/svc-puppetd

@@ -12,13 +12,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-if [ -z $SMF_SYSVOL_FS ]; then 
-  piddir=/var/run/puppetlabs
-else
-  piddir=$SMF_SYSVOL_FS/puppetlabs
-fi;
-
-pidfile=$piddir/agent.pid
+pidfile=/var/run/puppetlabs/agent.pid
 
 case "$1" in
 start)
@@ -26,7 +20,6 @@ start)
     # Start daemons.
 
     printf "Starting Puppet client services:"
-    mkdir -p $piddir
 
     /opt/csw/sbin/puppetd
 

data/ext/solaris/smf/svc-puppetmasterd

@@ -8,13 +8,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-if [ -z $SMF_SYSVOL_FS ]; then 
-  piddir=/var/run/puppetlabs
-else
-  piddir=$SMF_SYSVOL_FS/puppetlabs
-fi;
-
-pidfile=$piddir/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 case "$1" in
 start)
@@ -22,7 +16,6 @@ start)
     # Start daemons.
 
     printf "Starting Puppet server services:"
-    mkdir -p $piddir
 
     /opt/csw/sbin/puppetmasterd
 

data/ext/windows/eventlog/Rakefile

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'rake'
+require 'fileutils'
+require 'rbconfig'
+
+BASENAME = "puppetres"
+
+task :default do
+  sh 'rake -T'
+end
+
+desc 'Build puppet eventlog message dll'
+task :dist => ['out', "#{BASENAME}.dll"]
+
+directory 'out'
+
+rule '.rc' => '.mc' do |t|
+  sh "mc -b -r out -h out #{t.source}"
+end
+
+rule '.res' => '.rc' do |t|
+  sh "rc -nologo -r -fo out/#{t.name} out/#{t.source}"
+end
+
+rule '.dll' => '.res' do |t|
+  sh "link -nologo -dll -noentry -machine:x86 -out:out/#{t.name} out/#{t.source}"
+end
+
+desc 'Delete generated files'
+task :clean do
+  FileUtils.rm_rf('out')
+end

data/ext/windows/eventlog/puppetres.mc

@@ -0,0 +1,18 @@
+MessageId=0x1
+SymbolicName=PUPPET_INFO
+Language=English
+%1
+.
+
+MessageId=0x2
+SymbolicName=PUPPET_WARN
+Language=English
+%1
+.
+
+MessageId=0x3
+SymbolicName=PUPPET_ERROR
+Language=English
+%1
+.
+

data/ext/windows/service/daemon.rb

@@ -15,7 +15,6 @@ class WindowsDaemon < Win32::Daemon
 
   @run_thread = nil
   @LOG_TO_FILE = false
-  @loglevel = 0
   LOG_FILE =  File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
   LEVELS.each do |level|
@@ -38,9 +37,7 @@ class WindowsDaemon < Win32::Daemon
       FileUtils.mkdir_p(File.dirname(LOG_FILE))
       args = args.gsub("--logtofile","")
     end
-
-    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    load_env(base_dir)
+    basedir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
     # The puppet installer registers a 'Puppet' event source.  For the moment events will be logged with this key, but
     # it may be a good idea to split the Service and Puppet events later so it's easier to read in the windows Event Log.
@@ -57,29 +54,25 @@ class WindowsDaemon < Win32::Daemon
     #   )
     # end
 
-    puppet = File.join(base_dir, 'puppet', 'bin', 'puppet').tr('/', '\\')
-    ruby = File.join(base_dir, "sys", "ruby", "bin", "ruby.exe").tr('/', '\\')
-    ruby_puppet_cmd = "\"#{ruby}\" \"#{puppet}\""
-
-    unless File.exist?(puppet)
+    puppet = File.join(basedir, 'bin', 'puppet.bat')
+    unless File.exists?(puppet)
       log_err("File not found: '#{puppet}'")
       return
     end
     log_debug("Using '#{puppet}'")
 
     cmdline_debug = argsv.index('--debug') ? :debug : nil
-    @loglevel = parse_log_level(ruby_puppet_cmd, cmdline_debug)
+    @loglevel = parse_log_level(puppet, cmdline_debug)
     log_notice('Service started')
 
     service = self
     @run_thread = Thread.new do
       begin
         while service.running? do
-          runinterval = service.parse_runinterval(ruby_puppet_cmd)
-
+          runinterval = service.parse_runinterval(puppet)
           if service.state == RUNNING or service.state == IDLE
             service.log_notice("Executing agent with arguments: #{args}")
-            pid = Process.create(:command_line => "#{ruby_puppet_cmd} agent --onetime #{args}", :creation_flags => CREATE_NEW_CONSOLE).process_id
+            pid = Process.create(:command_line => "\"#{puppet}\" agent --onetime #{args}", :creation_flags => CREATE_NEW_CONSOLE).process_id
             service.log_debug("Process created: #{pid}")
           else
             service.log_debug("Service is paused.  Not invoking Puppet agent")
@@ -160,7 +153,7 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_runinterval(puppet_path)
     begin
-      runinterval = %x{ #{puppet_path} agent --configprint runinterval }.to_i
+      runinterval = %x{ "#{puppet_path}" agent --configprint runinterval }.to_i
       if runinterval == 0
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
@@ -175,7 +168,7 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_log_level(puppet_path,cmdline_debug)
     begin
-      loglevel = %x{ #{puppet_path} agent --configprint log_level}.chomp
+      loglevel = %x{ "#{puppet_path}" agent --configprint log_level}.chomp
       unless loglevel
         loglevel = :notice
         log_err("Failed to determine loglevel, defaulting to #{loglevel}")
@@ -187,45 +180,6 @@ class WindowsDaemon < Win32::Daemon
 
     LEVELS.index(cmdline_debug ? cmdline_debug : loglevel.to_sym)
   end
-
-  private
-
-  def load_env(base_dir)
-    begin
-      # ENV that uses backward slashes
-      ENV['FACTERDIR'] = File.join(base_dir, 'facter').tr('/', '\\')
-      ENV['FACTER_env_windows_installdir'] = base_dir.tr('/', '\\')
-      ENV['HIERA_DIR'] = File.join(base_dir, 'hiera').tr('/', '\\')
-      ENV['MCOLLECTIVE_DIR'] = File.join(base_dir, 'mcollective').tr('/', '\\')
-      ENV['PL_BASEDIR'] = base_dir.tr('/', '\\')
-      ENV['PUPPET_DIR'] = File.join(base_dir, 'puppet').tr('/', '\\')
-      ENV['RUBYOPT'] = 'rubygems'
-      ENV['RUBY_DIR'] = File.join(base_dir, 'sys', 'ruby').tr('/', '\\')
-      ENV['OPENSSL_CONF'] = File.join(base_dir, 'puppet', 'ssl', 'openssl.cnf').tr('/', '\\')
-      ENV['SSL_CERT_DIR'] = File.join(base_dir, 'puppet', 'ssl', 'certs').tr('/', '\\')
-      ENV['SSL_CERT_FILE'] = File.join(base_dir, 'puppet', 'ssl', 'cert.pem').tr('/', '\\')
-      ENV['Path'] = [
-        File.join(base_dir, 'puppet', 'bin'),
-        File.join(base_dir, 'facter', 'bin'),
-        File.join(base_dir, 'hiera', 'bin'),
-        File.join(base_dir, 'mcollective', 'bin'),
-        File.join(base_dir, 'bin'),
-        File.join(base_dir, 'sys', 'ruby', 'bin'),
-        File.join(base_dir, 'sys', 'tools', 'bin')
-      ].join(';').tr('/', '\\') + ';' + ENV['Path']
-
-      # ENV that uses forward slashes
-      ENV['RUBYLIB'] = [
-        File.join(base_dir, 'puppet','lib'),
-        File.join(base_dir, 'facter', 'lib'),
-        File.join(base_dir, 'hiera', 'lib'),
-        File.join(base_dir, 'mcollective', 'lib'),
-        ENV['RUBYLIB']
-      ].compact.join(';') + ';'
-    rescue => e
-      log_exception(e)
-    end
-  end
 end
 
 if __FILE__ == $0