puppet 5.5.0-universal-darwin → 5.5.1-universal-darwin

data/Rakefile

@@ -121,7 +121,7 @@ task(:warnings) do
   commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master...HEAD' : ENV['TRAVIS_COMMIT_RANGE']
   ruby_files_ok = true
   puts "Checking modified files #{commit_range}"
-  %x{git diff --name-only #{commit_range}}.each_line do |modified_file|
+  %x{git diff --diff-filter=ACM --name-only #{commit_range}}.each_line do |modified_file|
     modified_file.chomp!
     next unless File.extname(modified_file) == '.rb'
     puts modified_file

data/ext/upload_facts.rb

@@ -102,7 +102,7 @@ HELP
     files.each do |file|
       facts = YAML.load_file(file)
 
-      request = Puppet::Indirector::Request.new(:facts, :save, facts)
+      request = Puppet::Indirector::Request.new(:facts, :save, facts, nil)
 
       # The terminus warns for us if we fail.
       if terminus.save(request)

data/lib/hiera/scope.rb

@@ -20,13 +20,35 @@ class Hiera
       elsif key == CALLING_CLASS_PATH
         ans = find_hostclass(@real).gsub(/::/, '/')
       elsif key == CALLING_MODULE
-        ans = @real.lookupvar(MODULE_NAME)
+        ans = safe_lookupvar(MODULE_NAME)
       else
-        ans = @real.lookupvar(key)
+        ans = safe_lookupvar(key)
       end
       ans == EMPTY_STRING ? nil : ans
     end
 
+    # This method is used to handle the throw of :undefined_variable since when
+    # strict variables is not in effect, missing handling of the throw leads to
+    # a more expensive code path.
+    #
+    def safe_lookupvar(key)
+      reason = catch :undefined_variable do
+        return @real.lookupvar(key)
+      end
+
+      case Puppet[:strict]
+      when :off
+        # do nothing
+      when :warning
+        Puppet.warn_once(Puppet::Parser::Scope::UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: key },
+        _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
+      when :error
+        raise ArgumentError, _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason }
+      end
+      nil
+    end
+    private :safe_lookupvar
+
     def exist?(key)
       CALLING_KEYS.include?(key) || @real.exist?(key)
     end

data/lib/puppet.rb

@@ -4,7 +4,7 @@ if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("1.9.3")
   raise LoadError, _("Puppet %{version} requires ruby 1.9.3 or greater.") % { version: Puppet.version }
 end
 
-Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.1.0'
+Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.3.0'
 
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end

data/lib/puppet/application.rb

@@ -311,13 +311,13 @@ class Application
   # handling of this.
   option("--version", "-V") do |arg|
     puts "#{Puppet.version}"
-    exit
+    exit(0)
   end
 
   # Every app responds to --help
   option("--help", "-h") do |v|
     puts help
-    exit
+    exit(0)
   end
 
   def app_defaults()

data/lib/puppet/application/face_base.rb

@@ -24,7 +24,7 @@ class Puppet::Application::FaceBase < Puppet::Application
     else
       puts Puppet::Face[:help, :current].help(face.name)
     end
-    exit
+    exit(0)
   end
 
   attr_accessor :face, :action, :type, :arguments, :render_as

data/lib/puppet/application/resource.rb

@@ -21,7 +21,7 @@ class Puppet::Application::Resource < Puppet::Application
       types << t.name.to_s
     end
     puts types.sort
-    exit
+    exit(0)
   end
 
   option("--param PARAM", "-p") do |arg|

data/lib/puppet/configurer.rb

@@ -179,18 +179,15 @@ class Puppet::Configurer
   # Apply supplied catalog and return associated application report
   def apply_catalog(catalog, options)
     report = options[:report]
-    begin
-      report.configuration_version = catalog.version
+    report.configuration_version = catalog.version
 
-      benchmark(:notice, _("Applied catalog in %{seconds} seconds")) do
-        apply_catalog_time = thinmark do
-          catalog.apply(options)
-        end
-        options[:report].add_times(:catalog_application, apply_catalog_time)
+    benchmark(:notice, _("Applied catalog in %{seconds} seconds")) do
+      apply_catalog_time = thinmark do
+        catalog.apply(options)
       end
-    ensure
-      report.finalize_report
+      options[:report].add_times(:catalog_application, apply_catalog_time)
     end
+
     report
   end
 
@@ -209,6 +206,7 @@ class Puppet::Configurer
 
     Puppet::Util::Log.newdestination(report)
 
+    completed = nil
     begin
       Puppet.override(:http_pool => pool) do
 
@@ -233,18 +231,21 @@ class Puppet::Configurer
               report.master_used = "#{server[0]}:#{server[1]}"
             end
 
-            run_internal(options.merge(:node => found[:node]))
+            completed = run_internal(options.merge(:node => found[:node]))
           end
         else
-          run_internal(options)
+          completed = run_internal(options)
         end
       end
     ensure
       pool.close
     end
+
+    completed ? report.exit_status : nil
   end
 
   def run_internal(options)
+    start = Time.now
     report = options[:report]
 
     # If a cached catalog is explicitly requested, attempt to retrieve it. Skip the node request,
@@ -366,7 +367,7 @@ class Puppet::Configurer
       options[:report].catalog_uuid = catalog.catalog_uuid
       options[:report].cached_catalog_status = @cached_catalog_status
       apply_catalog(catalog, options)
-      report.exit_status
+      true
     rescue => detail
       Puppet.log_exception(detail, _("Failed to apply catalog: %{detail}") % { detail: detail })
       return nil
@@ -375,6 +376,8 @@ class Puppet::Configurer
     end
   ensure
     report.cached_catalog_status ||= @cached_catalog_status
+    report.add_times(:total, Time.now - start)
+    report.finalize_report
     Puppet::Util::Log.close(report)
     send_report(report)
     Puppet.pop_context

data/lib/puppet/context.rb

@@ -52,7 +52,7 @@ class Puppet::Context
     elsif block
       block.call
     else
-      raise UndefinedBindingError, _("no '%{name}' in %{table} at top of %{stack}") % { name: name, table: @table.inspect, stack: @stack.inspect }
+      raise UndefinedBindingError, _("Unable to lookup '%{name}'") % { name: name }
     end
   end
 

data/lib/puppet/error.rb

@@ -72,13 +72,8 @@ module Puppet
     end
 
     def self.from_issue_and_stack(issue, args = {})
-      stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-      if stacktrace.size > 0
-        filename, line = stacktrace[0]
-      else
-        filename = nil
-        line = nil
-      end
+      filename, line = Puppet::Pops::PuppetStack.top_of_stack
+
       self.new(
             issue.format(args),
             filename,

data/lib/puppet/face/config.rb

@@ -85,8 +85,10 @@ Puppet::Face.define(:config, '0.0.1') do
         # the requested section
         values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
 
-        warn_default_section(options[:section]) if @default_section
-        report_section_and_environment(options[:section], Puppet.settings[:environment])
+        if Puppet::Util::Log.sendlevel?(:info)
+          warn_default_section(options[:section]) if @default_section
+          report_section_and_environment(options[:section], Puppet.settings[:environment])
+        end
 
         to_be_rendered = {}
         args.sort.each do |setting_name|
@@ -191,7 +193,9 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
         EOM
       end
 
-      report_section_and_environment(options[:section], Puppet.settings[:environment])
+      if Puppet::Util::Log.sendlevel?(:info)
+        report_section_and_environment(options[:section], Puppet.settings[:environment])
+      end
 
       path = Puppet::FileSystem.pathname(Puppet.settings.which_configuration_file)
       Puppet::FileSystem.touch(path)
@@ -239,7 +243,9 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
             setting_string = config.delete(options[:section], name)
             if setting_string
 
-              report_section_and_environment(options[:section], Puppet.settings[:environment])
+              if Puppet::Util::Log.sendlevel?(:info)
+                report_section_and_environment(options[:section], Puppet.settings[:environment])
+              end
 
               puts(_("Deleted setting from '%{section_name}': '%{setting_string}'") %
                        { section_name: options[:section], name: name, setting_string: setting_string.strip })

data/lib/puppet/functions/break.rb

@@ -36,13 +36,9 @@ Puppet::Functions.create_function(:break) do
   end
 
   def break_impl()
-    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-    if stacktrace.size > 0
-      file, line = stacktrace[0]
-    else
-      file = nil
-      line = nil
-    end
+    # get file, line if available, else they are set to nil
+    file, line = Puppet::Pops::PuppetStack.top_of_stack
+
     # PuppetStopIteration contains file and line and is a StopIteration exception
     # so it can break a Ruby Kernel#loop or enumeration
     #

data/lib/puppet/functions/empty.rb

@@ -66,13 +66,11 @@ Puppet::Functions.create_function(:empty) do
   # (Yes, it is strange, but undef was passed as empty string in 3.x API)
   #
   def undef_empty(x)
-    deprecation_warning_for('Undef')
     true
   end
 
   def deprecation_warning_for(arg_type)
-    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-    file, line = stacktrace[0] # defaults to nil
+    file, line = Puppet::Pops::PuppetStack.top_of_stack
     msg = _("Calling function empty() with %{arg_type} value is deprecated.") % { arg_type: arg_type }
     Puppet.warn_once('deprecations', "empty-from-#{file}-#{line}", msg, file, line)
   end

data/lib/puppet/functions/next.rb

@@ -9,14 +9,7 @@ Puppet::Functions.create_function(:next) do
   end
 
   def next_impl(value = nil)
-    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-    if stacktrace.size > 0
-      file, line = stacktrace[0]
-    else
-      file = nil
-      line = nil
-    end
-
+    file, line = Puppet::Pops::PuppetStack.top_of_stack
     exc = Puppet::Pops::Evaluator::Next.new(value, file, line)
     raise exc
   end

data/lib/puppet/functions/return.rb

@@ -9,14 +9,7 @@ Puppet::Functions.create_function(:return, Puppet::Functions::InternalFunction)
   end
 
   def return_impl(value = nil)
-    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-    if stacktrace.size > 0
-      file, line = stacktrace[0]
-    else
-      file = nil
-      line = nil
-    end
-
+    file, line = Puppet::Pops::PuppetStack.top_of_stack
     raise Puppet::Pops::Evaluator::Return.new(value, file, line)
   end
 end

data/lib/puppet/functions/strftime.rb

@@ -202,13 +202,7 @@ Puppet::Functions.create_function(:strftime) do
   end
 
   def legacy_strftime(format, timezone = nil)
-    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-    if stacktrace.size > 0
-      file, line = stacktrace[0]
-    else
-      file = nil
-      line = nil
-    end
+    file, line = Puppet::Pops::PuppetStack.top_of_stack
     Puppet.warn_once('deprecations', 'legacy#strftime',
       _('The argument signature (String format, [String timezone]) is deprecated for #strftime. See #strftime documentation and Timespan type for more info'),
       file, line)

data/lib/puppet/indirector/request.rb

@@ -197,23 +197,19 @@ class Puppet::Indirector::Request
     end
 
     # ... Fall back onto the default server.
-    begin
-      bound_server = Puppet.lookup(:server)
-    rescue
+     bound_server = Puppet.lookup(:server) do
       if primary_server = Puppet.settings[:server_list][0]
-        bound_server = primary_server[0]
+        primary_server[0]
       else
-        bound_server = Puppet.settings[:server]
+        Puppet.settings[:server]
       end
     end
 
-    begin
-      bound_port = Puppet.lookup(:serverport)
-    rescue
+    bound_port = Puppet.lookup(:serverport) do
       if primary_server = Puppet.settings[:server_list][0]
-        bound_port = primary_server[1]
+        primary_server[1]
       else
-        bound_port = Puppet.settings[:masterport]
+        Puppet.settings[:masterport]
       end
     end
     self.server = default_server || bound_server

data/lib/puppet/indirector/rest.rb

@@ -57,9 +57,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     if setting && setting != :server && Puppet.settings.set_by_config?(setting)
       Puppet.settings[setting]
     else
-      begin
-        Puppet.lookup(:server)
-      rescue
+      server = Puppet.lookup(:server) do
         if primary_server = Puppet.settings[:server_list][0]
           Puppet.debug "Dynamically-bound server lookup failed; using first entry"
           primary_server[0]
@@ -69,6 +67,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
           Puppet.settings[setting]
         end
       end
+      server
     end
   end
 
@@ -84,22 +83,21 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
        (srv_setting && srv_setting != :server && Puppet.settings.set_by_config?(srv_setting))
       Puppet.settings[setting].to_i
     else
-      begin
-        Puppet.lookup(:serverport).to_i
-      rescue
+      port = Puppet.lookup(:serverport) do
         if primary_server = Puppet.settings[:server_list][0]
           Puppet.debug "Dynamically-bound port lookup failed; using first entry"
 
           # Port might not be set, so we want to fallback in that
           # case. We know we don't need to use `setting` here, since
           # the default value of every port setting is `masterport`
-          (primary_server[1] || Puppet.settings[:masterport]).to_i
+          (primary_server[1] || Puppet.settings[:masterport])
         else
           setting ||= :masterport
           Puppet.debug "Dynamically-bound port lookup failed; falling back to #{setting} setting"
-          Puppet.settings[setting].to_i
+          Puppet.settings[setting]
         end
       end
+      port.to_i
     end
   end
 
@@ -263,7 +261,9 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def handle_response(request, response)
     server_version = response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION]
     if server_version
-      Puppet.push_context({:server_agent_version => server_version})
+      Puppet.lookup(:server_agent_version) do
+        Puppet.push_context(:server_agent_version => server_version)
+      end
       if SemanticPuppet::Version.parse(server_version).major < MAJOR_VERSION_JSON_DEFAULT &&
           Puppet[:preferred_serialization_format] != 'pson'
         #TRANSLATORS "PSON" should not be translated

data/lib/puppet/module_tool/dependency.rb

@@ -16,7 +16,7 @@ module Puppet::ModuleTool
       # TODO: add error checking, the next line raises ArgumentError when +full_module_name+ is invalid
       @username, @name = Puppet::ModuleTool.username_and_modname_from(full_module_name)
       @version_requirement = version_requirement
-      @repository = repository ? Puppet::Forge::Repository.new(repository) : nil
+      @repository = repository ? Puppet::Forge::Repository.new(repository, nil) : nil
     end
 
     # We override Object's ==, eql, and hash so we can more easily find identical

data/lib/puppet/network/http/compression.rb

@@ -32,7 +32,7 @@ module Puppet::Network::HTTP::Compression
     end
 
     def uncompress(response)
-      raise Net::HTTPError.new("No block passed") unless block_given?
+      raise Net::HTTPError.new("No block passed", response) unless block_given?
 
       case response['content-encoding']
       when 'gzip','deflate'

data/lib/puppet/network/http/connection.rb

@@ -5,6 +5,7 @@ require 'puppet/ssl/validator'
 require 'puppet/network/http'
 require 'uri'
 require 'date'
+require 'time'
 
 module Puppet::Network::HTTP
 
@@ -297,7 +298,14 @@ module Puppet::Network::HTTP
     end
 
     def execute_request(connection, request)
+      start = Time.now
       connection.request(request)
+    rescue EOFError => e
+      elapsed = (Time.now - start).to_f.round(3)
+      uri = @site.addr + request.path.split('?')[0]
+      eof = EOFError.new(_('request %{uri} interrupted after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
+      eof.set_backtrace(e.backtrace) unless e.backtrace.empty?
+      raise eof
     end
 
     def with_connection(site, &block)