puppet 8.5.0-x64-mingw32 → 8.6.0-x64-mingw32

data/lib/puppet/module_tool/applications/installer.rb

@@ -72,7 +72,11 @@ module Puppet::ModuleTool
                 results[:version] = installed_module.version
                 return results
               else
-                changes = Checksummer.run(installed_modules[name].mod.path) rescue []
+                changes = begin
+                  Checksummer.run(installed_modules[name].mod.path)
+                rescue
+                  []
+                end
                 raise AlreadyInstalledError,
                       :module_name => name,
                       :installed_version => installed_modules[name].version,
@@ -107,22 +111,22 @@ module Puppet::ModuleTool
 
             version = release.version
 
-            unless forced?
-              # Since upgrading already installed modules can be troublesome,
-              # we'll place constraints on the graph for each installed module,
-              # locking it to upgrades within the same major version.
-              installed_range = ">=#{version} #{version.major}.x"
-              graph.add_constraint('installed', mod, installed_range) do |node|
-                Puppet::Module.parse_range(installed_range).include? node.version
-              end
+            next if forced?
+
+            # Since upgrading already installed modules can be troublesome,
+            # we'll place constraints on the graph for each installed module,
+            # locking it to upgrades within the same major version.
+            installed_range = ">=#{version} #{version.major}.x"
+            graph.add_constraint('installed', mod, installed_range) do |node|
+              Puppet::Module.parse_range(installed_range).include? node.version
+            end
 
-              release.mod.dependencies.each do |dep|
-                dep_name = dep['name'].tr('/', '-')
+            release.mod.dependencies.each do |dep|
+              dep_name = dep['name'].tr('/', '-')
 
-                range = dep['version_requirement']
-                graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range).include? node.version
-                end
+              range = dep['version_requirement']
+              graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
+                Puppet::Module.parse_range(range).include? node.version
               end
             end
           end
@@ -194,28 +198,27 @@ module Puppet::ModuleTool
             # Check for module name conflicts.
             releases.each do |rel|
               installed_module = installed_modules_source.by_name[rel.name.split('-').last]
-              if installed_module
-                next if installed_module.has_metadata? && installed_module.forge_name.tr('/', '-') == rel.name
-
-                if rel.name != name
-                  dependency = {
-                    :name => rel.name,
-                    :version => rel.version
-                  }
-                end
-
-                raise InstallConflictError,
-                      :requested_module => name,
-                      :requested_version => options[:version] || 'latest',
-                      :dependency => dependency,
-                      :directory => installed_module.path,
-                      :metadata => installed_module.metadata
+              next unless installed_module
+              next if installed_module.has_metadata? && installed_module.forge_name.tr('/', '-') == rel.name
+
+              if rel.name != name
+                dependency = {
+                  :name => rel.name,
+                  :version => rel.version
+                }
               end
+
+              raise InstallConflictError,
+                    :requested_module => name,
+                    :requested_version => options[:version] || 'latest',
+                    :dependency => dependency,
+                    :directory => installed_module.path,
+                    :metadata => installed_module.metadata
             end
           end
 
           Puppet.info _("Preparing to install ...")
-          releases.each { |release| release.prepare }
+          releases.each(&:prepare)
 
           Puppet.notice _('Installing -- do not interrupt ...')
           releases.each do |release|
@@ -287,7 +290,7 @@ module Puppet::ModuleTool
 
         previous = installed_modules[release.name]
         previous = previous.version if previous
-        return {
+        {
           :release => release,
           :name => release.name,
           :path => release.install_dir.to_s,
@@ -368,24 +371,24 @@ module Puppet::ModuleTool
               metadata = nil
             end
 
-            if release[:module] =~ /-#{mod.name}$/
-              dependency_info = {
-                :name => release[:module],
-                :version => release[:version][:vstring]
-              }
-              dependency = is_dependency ? dependency_info : nil
-              all_versions = @versions["#{@module_name}"].sort_by { |h| h[:semver] }
-              versions = all_versions.select { |x| x[:semver].special == '' }
-              versions = all_versions if versions.empty?
-              latest_version = versions.last[:vstring]
+            next unless release[:module] =~ /-#{mod.name}$/
 
-              raise InstallConflictError,
-                    :requested_module => @module_name,
-                    :requested_version => @version || "latest: v#{latest_version}",
-                    :dependency => dependency,
-                    :directory => mod.path,
-                    :metadata => metadata
-            end
+            dependency_info = {
+              :name => release[:module],
+              :version => release[:version][:vstring]
+            }
+            dependency = is_dependency ? dependency_info : nil
+            all_versions = @versions[@module_name.to_s].sort_by { |h| h[:semver] }
+            versions = all_versions.select { |x| x[:semver].special == '' }
+            versions = all_versions if versions.empty?
+            latest_version = versions.last[:vstring]
+
+            raise InstallConflictError,
+                  :requested_module => @module_name,
+                  :requested_version => @version || "latest: v#{latest_version}",
+                  :dependency => dependency,
+                  :directory => mod.path,
+                  :metadata => metadata
           end
 
           deps = release[:dependencies]

data/lib/puppet/module_tool/applications/unpacker.rb

@@ -9,7 +9,7 @@ module Puppet::ModuleTool
   module Applications
     class Unpacker < Application
       def self.unpack(filename, target)
-        app = self.new(filename, :target_dir => target)
+        app = new(filename, :target_dir => target)
         app.unpack
         app.sanity_check
         app.move_into(target)
@@ -38,7 +38,7 @@ module Puppet::ModuleTool
 
         # Return the Pathname object representing the directory where the
         # module release archive was unpacked the to.
-        return module_dir
+        module_dir
       end
 
       # @api private
@@ -54,11 +54,9 @@ module Puppet::ModuleTool
 
       # @api private
       def unpack
-        begin
-          Puppet::ModuleTool::Tar.instance.unpack(@filename.to_s, tmpdir, [@module_path.stat.uid, @module_path.stat.gid].join(':'))
-        rescue Puppet::ExecutionFailure => e
-          raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
-        end
+        Puppet::ModuleTool::Tar.instance.unpack(@filename.to_s, tmpdir, [@module_path.stat.uid, @module_path.stat.gid].join(':'))
+      rescue Puppet::ExecutionFailure => e
+        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
       end
 
       # @api private
@@ -66,7 +64,7 @@ module Puppet::ModuleTool
         return @root_dir if @root_dir
 
         # Grab the first directory containing a metadata.json file
-        metadata_file = Dir["#{tmpdir}/**/metadata.json"].sort_by(&:length)[0]
+        metadata_file = Dir["#{tmpdir}/**/metadata.json"].min_by(&:length)
 
         if metadata_file
           @root_dir = Pathname.new(metadata_file).dirname

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -76,7 +76,11 @@ module Puppet::ModuleTool
           vstring = mod.version ? "v#{mod.version}" : '???'
           Puppet.notice _("Found '%{name}' (%{version}) in %{dir} ...") % { name: name, version: colorize(:cyan, vstring), dir: dir }
           unless @ignore_changes
-            changes = Checksummer.run(mod.path) rescue []
+            changes = begin
+              Checksummer.run(mod.path)
+            rescue
+              []
+            end
             if mod.has_metadata? && !changes.empty?
               raise LocalChangesError,
                     :action => :upgrade,
@@ -117,22 +121,22 @@ module Puppet::ModuleTool
 
             version = release.version
 
-            unless forced?
-              # Since upgrading already installed modules can be troublesome,
-              # we'll place constraints on the graph for each installed
-              # module, locking it to upgrades within the same major version.
-              installed_range = ">=#{version} #{version.major}.x"
-              graph.add_constraint('installed', installed_module, installed_range) do |node|
-                Puppet::Module.parse_range(installed_range).include? node.version
-              end
+            next if forced?
+
+            # Since upgrading already installed modules can be troublesome,
+            # we'll place constraints on the graph for each installed
+            # module, locking it to upgrades within the same major version.
+            installed_range = ">=#{version} #{version.major}.x"
+            graph.add_constraint('installed', installed_module, installed_range) do |node|
+              Puppet::Module.parse_range(installed_range).include? node.version
+            end
 
-              release.mod.dependencies.each do |dep|
-                dep_name = dep['name'].tr('/', '-')
+            release.mod.dependencies.each do |dep|
+              dep_name = dep['name'].tr('/', '-')
 
-                range = dep['version_requirement']
-                graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range).include? node.version
-                end
+              range = dep['version_requirement']
+              graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
+                Puppet::Module.parse_range(range).include? node.version
               end
             end
           end
@@ -146,30 +150,29 @@ module Puppet::ModuleTool
 
           releases.each do |rel|
             mod = installed_modules_source.by_name[rel.name.split('-').last]
-            if mod
-              next if mod.has_metadata? && mod.forge_name.tr('/', '-') == rel.name
-
-              if rel.name != name
-                dependency = {
-                  :name => rel.name,
-                  :version => rel.version
-                }
-              end
-
-              raise InstallConflictError,
-                    :requested_module => name,
-                    :requested_version => options[:version] || 'latest',
-                    :dependency => dependency,
-                    :directory => mod.path,
-                    :metadata => mod.metadata
+            next unless mod
+            next if mod.has_metadata? && mod.forge_name.tr('/', '-') == rel.name
+
+            if rel.name != name
+              dependency = {
+                :name => rel.name,
+                :version => rel.version
+              }
             end
+
+            raise InstallConflictError,
+                  :requested_module => name,
+                  :requested_version => options[:version] || 'latest',
+                  :dependency => dependency,
+                  :directory => mod.path,
+                  :metadata => mod.metadata
           end
 
           child = releases.find { |x| x.name == name }
 
           unless forced?
             if child.version == results[:installed_version]
-              versions = graph.dependencies[name].map { |r| r.version }
+              versions = graph.dependencies[name].map(&:version)
               newer_versions = versions.select { |v| v > results[:installed_version] }
 
               raise VersionAlreadyInstalledError,
@@ -187,7 +190,7 @@ module Puppet::ModuleTool
           end
 
           Puppet.info _("Preparing to upgrade ...")
-          releases.each { |release| release.prepare }
+          releases.each(&:prepare)
 
           Puppet.notice _('Upgrading -- do not interrupt ...')
           releases.each do |release|
@@ -268,7 +271,7 @@ module Puppet::ModuleTool
           end
         end
 
-        return {
+        {
           :release => release,
           :name => release.name,
           :path => release.install_dir,

data/lib/puppet/module_tool/checksums.rb

@@ -19,7 +19,7 @@ module Puppet::ModuleTool
 
     # Return checksum for the +Pathname+.
     def checksum(pathname)
-      return Digest::MD5.hexdigest(Puppet::FileSystem.binread(pathname))
+      Digest::MD5.hexdigest(Puppet::FileSystem.binread(pathname))
     end
 
     # Return checksums for object's +Pathname+, generate if it's needed.
@@ -36,7 +36,7 @@ module Puppet::ModuleTool
           end
         end
       end
-      return @data
+      @data
     end
 
     alias :to_data_hash :data

data/lib/puppet/module_tool/dependency.rb

@@ -23,7 +23,7 @@ module Puppet::ModuleTool
     # We override Object's ==, eql, and hash so we can more easily find identical
     # dependencies.
     def ==(o)
-      self.hash == o.hash
+      hash == o.hash
     end
 
     alias :eql? :==

data/lib/puppet/module_tool/errors/base.rb

@@ -10,7 +10,7 @@ module Puppet::ModuleTool::Errors
       if @action == :upgrade
         "#{v(@installed_version)} -> #{v(@requested_version)}"
       else
-        "#{v(@installed_version || @requested_version)}"
+        v(@installed_version || @requested_version).to_s
       end
     end
   end

data/lib/puppet/module_tool/install_directory.rb

@@ -36,7 +36,7 @@ module Puppet
       }
 
       def converted_to_friendly_error(module_name, version, orig_error)
-        return orig_error if not ERROR_MAPPINGS.include?(orig_error.class)
+        return orig_error unless ERROR_MAPPINGS.include?(orig_error.class)
 
         ERROR_MAPPINGS[orig_error.class].new(orig_error,
                                              :requested_module => module_name,

data/lib/puppet/module_tool/local_tarball.rb

@@ -84,11 +84,9 @@ module Puppet::ModuleTool
     # rubocop:enable Naming/MemoizedInstanceVariableName
 
     def unpack(file, destination)
-      begin
-        Puppet::ModuleTool::Applications::Unpacker.unpack(file, destination)
-      rescue Puppet::ExecutionFailure => e
-        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
-      end
+      Puppet::ModuleTool::Applications::Unpacker.unpack(file, destination)
+    rescue Puppet::ExecutionFailure => e
+      raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
     end
   end
 end

data/lib/puppet/module_tool/metadata.rb

@@ -58,7 +58,7 @@ module Puppet::ModuleTool
       merge_dependencies(data) if data['dependencies']
 
       @data.merge!(data)
-      return self
+      self
     end
 
     # Validates the name and version_requirement for a dependency, then creates
@@ -102,7 +102,11 @@ module Puppet::ModuleTool
       data = @data.dup.merge('dependencies' => dependencies)
 
       contents = data.keys.map do |k|
-        value = (Puppet::Util::Json.dump(data[k], :pretty => true) rescue data[k].to_json)
+        value = begin
+          Puppet::Util::Json.dump(data[k], :pretty => true)
+        rescue
+          data[k].to_json
+        end
         %Q("#{k}": #{value})
       end
 
@@ -121,7 +125,7 @@ module Puppet::ModuleTool
     # Do basic validation and parsing of the name parameter.
     def process_name(data)
       validate_name(data['name'])
-      author, @module_name = data['name'].split(/[-\/]/, 2)
+      author, @module_name = data['name'].split(%r{[-/]}, 2)
 
       data['author'] ||= author if @data['author'] == DEFAULTS['author']
     end
@@ -139,7 +143,7 @@ module Puppet::ModuleTool
     # GitHub, we can predict sensible defaults for both project_page and
     # issues_url.
     def process_source(data)
-      if data['source'] =~ %r[://]
+      if data['source'] =~ %r{://}
         source_uri = URI.parse(data['source'])
       else
         source_uri = URI.parse("http://#{data['source']}")
@@ -149,10 +153,10 @@ module Puppet::ModuleTool
         source_uri.scheme = 'https'
         source_uri.path.sub!(/\.git$/, '')
         data['project_page'] ||= @data['project_page'] || source_uri.to_s
-        data['issues_url'] ||= @data['issues_url'] || source_uri.to_s.sub(/\/*$/, '') + '/issues'
+        data['issues_url'] ||= @data['issues_url'] || source_uri.to_s.sub(%r{/*$}, '') + '/issues'
       end
     rescue URI::Error
-      return
+      nil
     end
 
     # Validates and parses the dependencies.
@@ -167,9 +171,9 @@ module Puppet::ModuleTool
 
     # Validates that the given module name is both namespaced and well-formed.
     def validate_name(name)
-      return if name =~ /\A[a-z0-9]+[-\/][a-z][a-z0-9_]*\Z/i
+      return if name =~ %r{\A[a-z0-9]+[-/][a-z][a-z0-9_]*\Z}i
 
-      namespace, modname = name.split(/[-\/]/, 2)
+      namespace, modname = name.split(%r{[-/]}, 2)
       modname = :namespace_missing if namespace == ''
 
       err = case modname

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -13,7 +13,8 @@ module Puppet::ModuleTool::Shared
       @installed[mod_name] << mod
       d = @local["#{mod_name}@#{mod.version}"]
       (mod.dependencies || []).each do |hash|
-        name, conditions = hash['name'], hash['version_requirement']
+        name = hash['name']
+        conditions = hash['version_requirement']
         name = name.tr('/', '-')
         d[name] = conditions
         @conditions[name] << {
@@ -37,7 +38,11 @@ module Puppet::ModuleTool::Shared
       mod_name, releases = pair
       mod_name = mod_name.tr('/', '-')
       releases.each do |rel|
-        semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
+        semver = begin
+          SemanticPuppet::Version.parse(rel['version'])
+        rescue
+          SemanticPuppet::Version::MIN
+        end
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
         @versions[mod_name].sort_by! { |a| a[:semver] }
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
@@ -55,14 +60,14 @@ module Puppet::ModuleTool::Shared
       return :latest
     end
 
-    return :best
+    :best
   end
 
   def annotated_version(mod, versions)
     if versions.empty?
-      return implicit_version(mod)
+      implicit_version(mod)
     else
-      return "#{implicit_version(mod)}: #{versions.last}"
+      "#{implicit_version(mod)}: #{versions.last}"
     end
   end
 
@@ -78,10 +83,16 @@ module Puppet::ModuleTool::Shared
       }
 
       if forced?
-        range = Puppet::Module.parse_range(@version) rescue Puppet::Module.parse_range('>= 0.0.0')
+        range = begin
+          Puppet::Module.parse_range(@version)
+        rescue
+          Puppet::Module.parse_range('>= 0.0.0')
+        end
       else
         range = (@conditions[mod]).map do |r|
-          Puppet::Module.parse_range(r[:dependency]) rescue Puppet::Module.parse_range('>= 0.0.0')
+          Puppet::Module.parse_range(r[:dependency])
+        rescue
+          Puppet::Module.parse_range('>= 0.0.0')
         end.inject(&:&)
       end
 
@@ -89,7 +100,7 @@ module Puppet::ModuleTool::Shared
         next if range === seen[mod][:semver]
 
         req_module   = @module_name
-        req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
+        req_versions = @versions[@module_name.to_s].map { |v| v[:semver] }
         raise InvalidDependencyCycleError,
               :module_name => mod,
               :source => (source + [{ :name => mod, :version => source.last[:dependency] }]),
@@ -110,14 +121,14 @@ module Puppet::ModuleTool::Shared
         @conditions.each { |_, conds| conds.delete_if { |c| c[:module] == mod } }
       end
 
-      versions = @versions["#{mod}"].select { |h| range === h[:semver] }
+      versions = @versions[mod.to_s].select { |h| range === h[:semver] }
       valid_versions = versions.select { |x| x[:semver].special == '' }
       valid_versions = versions if valid_versions.empty?
 
       version = valid_versions.last
       unless version
         req_module   = @module_name
-        req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
+        req_versions = @versions[@module_name.to_s].map { |v| v[:semver] }
         raise NoVersionsSatisfyError,
               :requested_name => req_module,
               :requested_version => @version || annotated_version(req_module, req_versions),
@@ -135,7 +146,11 @@ module Puppet::ModuleTool::Shared
         :action => action,
         :previous_version => @installed[mod].empty? ? nil : @installed[mod].first.version,
         :file => @urls["#{mod}@#{version[:vstring]}"],
-        :path => action == :install ? @options[:target_dir] : (@installed[mod].empty? ? @options[:target_dir] : @installed[mod].first.modulepath),
+        :path => if action == :install
+                   @options[:target_dir]
+                 else
+                   @installed[mod].empty? ? @options[:target_dir] : @installed[mod].first.modulepath
+                 end,
         :dependencies => []
       }
     end
@@ -143,7 +158,7 @@ module Puppet::ModuleTool::Shared
       deps = @remote["#{mod[:module]}@#{mod[:version][:vstring]}"].sort_by(&:first)
       mod[:dependencies] = resolve_constraints(deps, source + [{ :name => mod[:module], :version => mod[:version][:vstring] }], seen, :install)
     end unless @ignore_dependencies
-    return dependencies
+    dependencies
   end
 
   def download_tarballs(graph, default_path, forge)

data/lib/puppet/module_tool/tar/mini.rb

@@ -44,9 +44,9 @@ class Puppet::ModuleTool::Tar::Mini
 
   private
 
-  EXECUTABLE = 0755
-  NOT_EXECUTABLE = 0644
-  USER_EXECUTE = 0100
+  EXECUTABLE = 0o755
+  NOT_EXECUTABLE = 0o644
+  USER_EXECUTE = 0o100
 
   def set_dir_mode!(stats)
     if stats.key?(:mode)

data/lib/puppet/module_tool.rb

@@ -13,7 +13,7 @@ module Puppet
 
     # Directory and names that should not be checksummed.
     ARTIFACTS = ['pkg', /^\./, /^~/, /^#/, 'coverage', 'checksums.json', 'REVISION']
-    FULL_MODULE_NAME_PATTERN = /\A([^-\/|.]+)[-|\/](.+)\z/
+    FULL_MODULE_NAME_PATTERN = %r{\A([^-/|.]+)[-|/](.+)\z}
     REPOSITORY_URL = Puppet.settings[:module_repository]
 
     # Is this a directory that shouldn't be checksummed?
@@ -35,7 +35,7 @@ module Puppet
     def self.username_and_modname_from(full_module_name)
       matcher = full_module_name.match(FULL_MODULE_NAME_PATTERN)
       if matcher
-        return matcher.captures
+        matcher.captures
       else
         raise ArgumentError, _("Not a valid full name: %{full_module_name}") % { full_module_name: full_module_name }
       end
@@ -87,7 +87,7 @@ module Puppet
         str << branch
       end
 
-      return str
+      str
     end
 
     def self.build_tree(mods, dir)
@@ -102,7 +102,7 @@ module Puppet
         mod[:text] = "#{mod[:name]} (#{colorize(:cyan, version_string)})"
         mod[:text] += " [#{mod[:path]}]" unless mod[:path].to_s == dir.to_s
 
-        deps = (mod[:dependencies] || [])
+        deps = mod[:dependencies] || []
         deps.sort_by! { |a| a[:name] }
         build_tree(deps, dir)
       end

data/lib/puppet/network/client_request.rb

@@ -7,7 +7,7 @@ module Puppet::Network # :nodoc:
     attr_accessor :name, :ip, :authenticated, :handler, :method
 
     def authenticated?
-      self.authenticated
+      authenticated
     end
 
     # A common way of talking about the full call.  Individual servers
@@ -20,11 +20,13 @@ module Puppet::Network # :nodoc:
     end
 
     def initialize(name, ip, authenticated)
-      @name, @ip, @authenticated = name, ip, authenticated
+      @name = name
+      @ip = ip
+      @authenticated = authenticated
     end
 
     def to_s
-      "#{self.name}(#{self.ip})"
+      "#{name}(#{ip})"
     end
   end
 end

data/lib/puppet/network/format.rb

@@ -14,7 +14,7 @@ class Puppet::Network::Format
     value = @options.delete(name)
     value = default if value.nil?
 
-    self.send(name.to_s + "=", value)
+    send(name.to_s + "=", value)
   end
 
   def initialize(name, options = {}, &block)
@@ -111,6 +111,6 @@ class Puppet::Network::Format
 
     method = send(name)
 
-    return(type == :class ? klass.respond_to?(method) : klass.method_defined?(method))
+    (type == :class ? klass.respond_to?(method) : klass.method_defined?(method))
   end
 end

data/lib/puppet/network/format_support.rb

@@ -68,7 +68,7 @@ module Puppet::Network::FormatSupport
     end
 
     def friendly_name
-      if self.respond_to? :indirection
+      if respond_to? :indirection
         indirection.name
       else
         self

data/lib/puppet/network/formats.rb

@@ -222,7 +222,7 @@ Puppet::Network::FormatHandler.create(:flat,
           a["#{i}.#{el_k}"] = el_v
         end
       else
-        a["#{i}"] = el
+        a[i.to_s] = el
       end
     end
     a