puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/module_tool/contents_description.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
-
   # = ContentsDescription
   #
   # This class populates +Metadata+'s Puppet type information.
   class ContentsDescription
-
     # Instantiate object for string +module_path+.
     def initialize(module_path)
       @module_path = module_path
@@ -33,12 +32,12 @@ module Puppet::ModuleTool
       unless @data
         @data = []
         type_names = []
-        for module_filename in Dir[File.join(@module_path, "lib/puppet/type/*.rb")]
+        (Dir[File.join(@module_path, "lib/puppet/type/*.rb")]).each do |module_filename|
           require module_filename
           type_name = File.basename(module_filename, ".rb")
           type_names << type_name
 
-          for provider_filename in Dir[File.join(@module_path, "lib/puppet/provider/#{type_name}/*.rb")]
+          (Dir[File.join(@module_path, "lib/puppet/provider/#{type_name}/*.rb")]).each do |provider_filename|
             require provider_filename
           end
         end
@@ -46,7 +45,7 @@ module Puppet::ModuleTool
         type_names.each do |name|
           type = Puppet::Type.type(name.to_sym)
           if type
-            type_hash = {:name => name, :doc => type.doc}
+            type_hash = { :name => name, :doc => type.doc }
             type_hash[:properties] = attr_doc(type, :property)
             type_hash[:parameters] = attr_doc(type, :param)
             if type.providers.size > 0

data/lib/puppet/module_tool/dependency.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 
 module Puppet::ModuleTool
-
   class Dependency
     include Puppet::Network::FormatSupport
 
@@ -34,8 +34,8 @@ module Puppet::ModuleTool
 
     def to_data_hash
       result = { :name => @full_module_name }
-      result[:version_requirement] = @version_requirement if @version_requirement && ! @version_requirement.nil?
-      result[:repository] = @repository.to_s if @repository && ! @repository.nil?
+      result[:version_requirement] = @version_requirement if @version_requirement && !@version_requirement.nil?
+      result[:repository] = @repository.to_s if @repository && !@repository.nil?
       result
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::ModuleTool::Errors
   class ModuleToolError < Puppet::Error
     def v(version)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Puppet::ModuleTool::Errors
 
+module Puppet::ModuleTool::Errors
   class InstallError < ModuleToolError; end
 
   class AlreadyInstalledError < InstallError
@@ -17,9 +17,9 @@ module Puppet::ModuleTool::Errors
       message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @module_name, version: @requested_version }
       message << _("  Module '%{module_name}' (%{installed_version}) is already installed") % { module_name: @module_name, installed_version: @installed_version }
       message << _("    Installed module has had changes made locally") unless @local_changes.empty?
-      #TRANSLATORS `puppet module upgrade` is a command line and should not be translated
+      # TRANSLATORS `puppet module upgrade` is a command line and should not be translated
       message << _("    Use `puppet module upgrade` to install a different version")
-      #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+      # TRANSLATORS `puppet module install --force` is a command line and should not be translated
       message << _("    Use `puppet module install --force` to re-install only this module")
       message.join("\n")
     end
@@ -54,7 +54,7 @@ module Puppet::ModuleTool::Errors
       message = []
       message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: @requested_version }
       message << _("  Path '%{directory}' exists but is not a directory.") % { directory: @directory }
-      #TRANSLATORS "mkdir -p '%{directory}'" is a command line example and should not be translated
+      # TRANSLATORS "mkdir -p '%{directory}'" is a command line example and should not be translated
       message << _("  A potential solution is to rename the path and then \"mkdir -p '%{directory}'\"") % { directory: @directory }
       message.join("\n")
     end
@@ -71,7 +71,7 @@ module Puppet::ModuleTool::Errors
     def multiline
       message = []
       message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: @requested_version }
-      message << _("  Permission is denied when trying to create directory '%{directory}'.")  % { directory: @directory }
+      message << _("  Permission is denied when trying to create directory '%{directory}'.") % { directory: @directory }
       message << _('  A potential solution is to check the ownership and permissions of parent directories.')
       message.join("\n")
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Puppet::ModuleTool::Errors
 
+module Puppet::ModuleTool::Errors
   class NoVersionsSatisfyError < ModuleToolError
     def initialize(options)
       @requested_name    = options[:requested_name]
@@ -31,7 +31,7 @@ module Puppet::ModuleTool::Errors
         message << _("  The requested version cannot satisfy all dependencies")
       end
 
-      #TRANSLATORS `puppet module %{action} --ignore-dependencies` is a command line and should not be translated
+      # TRANSLATORS `puppet module %{action} --ignore-dependencies` is a command line and should not be translated
       message << _("  Use `puppet module %{action} '%{module_name}' --ignore-dependencies` to %{action} only this module") % { action: @action, module_name: @requested_name }
       message.join("\n")
     end
@@ -90,10 +90,10 @@ module Puppet::ModuleTool::Errors
       end
 
       if @dependency
-        #TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
+        # TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
         message << _("    Use `puppet module install --ignore-dependencies` to install only this module")
       else
-        #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+        # TRANSLATORS `puppet module install --force` is a command line and should not be translated
         message << _("    Use `puppet module install --force` to install this module anyway")
       end
       message.join("\n")
@@ -106,7 +106,7 @@ module Puppet::ModuleTool::Errors
       @requested_module  = options[:requested_module]
       @requested_version = options[:requested_version]
       @conditions        = options[:conditions]
-      @source            = options[:source][1..-1]
+      @source            = options[:source][1..]
 
       super _("'%{module_name}' (%{version}) requested; Invalid dependency cycle") % { module_name: @requested_module, version: v(@requested_version) }
     end
@@ -114,15 +114,15 @@ module Puppet::ModuleTool::Errors
     def multiline
       dependency_list = []
       dependency_list << _("You specified '%{name}' (%{version})") % { name: @source.first[:name], version: v(@requested_version) }
-      dependency_list += @source[1..-1].map do |m|
-        #TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
+      dependency_list += @source[1..].map do |m|
+        # TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
         _("This depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) }
       end
       message = []
       message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: v(@requested_version) }
       message << _("  No version of '%{module_name}' will satisfy dependencies") % { module_name: @module_name }
-      message << dependency_list.map {|s| "    #{s}".join(",\n")}
-      #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+      message << dependency_list.map { |s| "    #{s}".join(",\n") }
+      # TRANSLATORS `puppet module install --force` is a command line and should not be translated
       message << _("    Use `puppet module install --force` to install this module anyway")
       message.join("\n")
     end
@@ -158,10 +158,10 @@ module Puppet::ModuleTool::Errors
       message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @module_name }
       message << _("  Module '%{module_name}' is not installed") % { module_name: @module_name }
       message += @suggestions.map do |suggestion|
-        #TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
+        # TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
         _("    You may have meant `puppet module %{action} %{suggestion}`") % { action: @action, suggestion: suggestion }
       end
-      #TRANSLATORS `puppet module install` is a command line and should not be translated
+      # TRANSLATORS `puppet module install` is a command line and should not be translated
       message << _("    Use `puppet module install` to install this module") if @action == :upgrade
       message.join("\n")
     end
@@ -172,7 +172,7 @@ module Puppet::ModuleTool::Errors
       @module_name = options[:module_name]
       @modules     = options[:installed_modules]
       @action      = options[:action]
-      #TRANSLATORS "module path" refers to a set of directories where modules may be installed
+      # TRANSLATORS "module path" refers to a set of directories where modules may be installed
       super _("Could not %{action} '%{module_name}'; module appears in multiple places in the module path") % { action: @action, module_name: @module_name }
     end
 
@@ -181,10 +181,10 @@ module Puppet::ModuleTool::Errors
       message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @module_name }
       message << _("  Module '%{module_name}' appears multiple places in the module path") % { module_name: @module_name }
       message += @modules.map do |mod|
-        #TRANSLATORS This is repeats as separate lines as a list under "Module '%{module_name}' appears multiple places in the module path"
+        # TRANSLATORS This is repeats as separate lines as a list under "Module '%{module_name}' appears multiple places in the module path"
         _("    '%{module_name}' (%{version}) was found in %{path}") % { module_name: @module_name, version: v(mod.version), path: mod.modulepath }
       end
-      #TRANSLATORS `--modulepath` is command line option and should not be translated
+      # TRANSLATORS `--modulepath` is command line option and should not be translated
       message << _("    Use the `--modulepath` option to limit the search to specific directories")
       message.join("\n")
     end
@@ -203,7 +203,7 @@ module Puppet::ModuleTool::Errors
       message = []
       message << _("Could not %{action} module '%{module_name}' (%{version})") % { action: @action, module_name: @module_name, version: vstring }
       message << _("  Installed module has had changes made locally")
-      #TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
+      # TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
       message << _("    Use `puppet module %{action} --ignore-changes` to %{action} this module anyway") % { action: @action }
       message.join("\n")
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Puppet::ModuleTool::Errors
 
+module Puppet::ModuleTool::Errors
   class UninstallError < ModuleToolError; end
 
   class NoVersionMatchesError < UninstallError
@@ -43,7 +43,7 @@ module Puppet::ModuleTool::Errors
       message += @required_by.map do |mod|
         _("    '%{module_name}' (%{version}) requires '%{module_dep}' (%{dep_version})") % { module_name: mod['name'], version: v(mod['version']), module_dep: @module_name, dep_version: v(mod['version_requirement']) }
       end
-      #TRANSLATORS `puppet module uninstall --force` is a command line option that should not be translated
+      # TRANSLATORS `puppet module uninstall --force` is a command line option that should not be translated
       message << _("    Use `puppet module uninstall --force` to uninstall this module anyway")
       message.join("\n")
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Puppet::ModuleTool::Errors
 
+module Puppet::ModuleTool::Errors
   class UpgradeError < ModuleToolError
     def initialize(msg)
       @action = :upgrade
@@ -37,7 +37,7 @@ module Puppet::ModuleTool::Errors
           end
         end
       end
-      #TRANSLATORS `puppet module upgrade --force` is a command line option that should not be translated
+      # TRANSLATORS `puppet module upgrade --force` is a command line option that should not be translated
       message << _("    Use `puppet module upgrade --force` to upgrade only this module")
       message.join("\n")
     end
@@ -45,7 +45,7 @@ module Puppet::ModuleTool::Errors
 
   class DowngradingUnsupportedError < UpgradeError
     def initialize(options)
-      @module_name    = options[:module_name]
+      @module_name = options[:module_name]
       @requested_version = options[:requested_version]
       @installed_version = options[:installed_version]
       @conditions        = options[:conditions]

data/lib/puppet/module_tool/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool

data/lib/puppet/module_tool/install_directory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/module_tool/errors'
 
@@ -9,6 +10,7 @@ module Puppet
       include Puppet::ModuleTool::Errors
 
       attr_reader :target
+
       def initialize(target)
         @target = target
       end
@@ -26,7 +28,7 @@ module Puppet
         end
       end
 
-    private
+      private
 
       ERROR_MAPPINGS = {
         Errno::EACCES => PermissionDeniedCreateInstallDirectoryError,
@@ -37,9 +39,9 @@ module Puppet
         return orig_error if not ERROR_MAPPINGS.include?(orig_error.class)
 
         ERROR_MAPPINGS[orig_error.class].new(orig_error,
-          :requested_module  => module_name,
-          :requested_version => version,
-          :directory         => @target.to_s)
+                                             :requested_module => module_name,
+                                             :requested_version => version,
+                                             :directory => @target.to_s)
       end
     end
   end

data/lib/puppet/module_tool/installed_modules.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 
 require_relative '../../puppet/forge'
@@ -23,6 +24,7 @@ module Puppet::ModuleTool
         modules[path].each do |mod|
           @by_name[mod.name] = mod
           next unless mod.has_metadata?
+
           release = ModuleRelease.new(self, mod)
           @modules[release.name] ||= release
         end
@@ -42,9 +44,9 @@ module Puppet::ModuleTool
 
       if @modules.key? name
         @fetched << name
-        [ @modules[name] ]
+        [@modules[name]]
       else
-        [ ]
+        []
       end
     end
 

data/lib/puppet/module_tool/local_tarball.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 require 'tmpdir'
 
@@ -19,9 +20,9 @@ module Puppet::ModuleTool
 
     def fetch(name)
       if @release.name == name
-        [ @release ]
+        [@release]
       else
-        [ ]
+        []
       end
     end
 
@@ -55,7 +56,7 @@ module Puppet::ModuleTool
           dependencies = mod.dependencies.map do |dep|
             Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
           end
-          dependencies = Hash[dependencies]
+          dependencies = dependencies.to_h
         end
 
         super(source, name, version, dependencies || {})
@@ -76,9 +77,11 @@ module Puppet::ModuleTool
     # Obtain a suitable temporary path for unpacking tarballs
     #
     # @return [String] path to temporary unpacking location
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     def tmpdir
       @dir ||= Dir.mktmpdir('local-tarball', Puppet::Forge::Cache.base_path)
     end
+    # rubocop:enable Naming/MemoizedInstanceVariableName
 
     def unpack(file, destination)
       begin

data/lib/puppet/module_tool/metadata.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 require 'uri'
@@ -6,7 +7,6 @@ require_relative '../../puppet/util/json'
 require 'set'
 
 module Puppet::ModuleTool
-
   # This class provides a data structure representing a module's metadata.
   # @api private
   class Metadata
@@ -15,15 +15,15 @@ module Puppet::ModuleTool
     attr_accessor :module_name
 
     DEFAULTS = {
-      'name'          => nil,
-      'version'       => nil,
-      'author'        => nil,
-      'summary'       => nil,
-      'license'       => 'Apache-2.0',
-      'source'        => '',
-      'project_page'  => nil,
-      'issues_url'    => nil,
-      'dependencies'  => Set.new.freeze,
+      'name' => nil,
+      'version' => nil,
+      'author' => nil,
+      'summary' => nil,
+      'license' => 'Apache-2.0',
+      'source' => '',
+      'project_page' => nil,
+      'issues_url' => nil,
+      'dependencies' => Set.new.freeze,
       'data_provider' => nil,
     }
 
@@ -40,7 +40,8 @@ module Puppet::ModuleTool
     # Returns a string that uniquely represents this version of this module.
     def release_name
       return nil unless @data['name'] && @data['version']
-      [ dashed_name, @data['version'] ].join('-')
+
+      [dashed_name, @data['version']].join('-')
     end
 
     alias :name :module_name
@@ -63,7 +64,7 @@ module Puppet::ModuleTool
     # Validates the name and version_requirement for a dependency, then creates
     # the Dependency and adds it.
     # Returns the Dependency that was added.
-    def add_dependency(name, version_requirement=nil, repository=nil)
+    def add_dependency(name, version_requirement = nil, repository = nil)
       validate_name(name)
       validate_version_range(version_requirement) if version_requirement
 
@@ -111,6 +112,7 @@ module Puppet::ModuleTool
     # Expose any metadata keys as callable reader methods.
     def method_missing(name, *args)
       return @data[name.to_s] if @data.key? name.to_s
+
       super
     end
 
@@ -149,7 +151,6 @@ module Puppet::ModuleTool
         data['project_page'] ||= @data['project_page'] || source_uri.to_s
         data['issues_url'] ||= @data['issues_url'] || source_uri.to_s.sub(/\/*$/, '') + '/issues'
       end
-
     rescue URI::Error
       return
     end
@@ -172,15 +173,15 @@ module Puppet::ModuleTool
       modname = :namespace_missing if namespace == ''
 
       err = case modname
-      when nil, '', :namespace_missing
-        _("the field must be a namespaced module name")
-      when /[^a-z0-9_]/i
-        _("the module name contains non-alphanumeric (or underscore) characters")
-      when /^[^a-z]/i
-        _("the module name must begin with a letter")
-      else
-        _("the namespace contains non-alphanumeric characters")
-      end
+            when nil, '', :namespace_missing
+              _("the field must be a namespaced module name")
+            when /[^a-z0-9_]/i
+              _("the module name contains non-alphanumeric (or underscore) characters")
+            when /^[^a-z]/i
+              _("the module name must begin with a letter")
+            else
+              _("the namespace contains non-alphanumeric characters")
+            end
 
       raise ArgumentError, _("Invalid 'name' field in metadata.json: %{err}") % { err: err }
     end

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
-module Puppet::ModuleTool::Shared
 
+module Puppet::ModuleTool::Shared
   include Puppet::ModuleTool::Errors
 
   def get_local_constraints
-    @local      = Hash.new { |h,k| h[k] = { } }
-    @conditions = Hash.new { |h,k| h[k] = [] }
-    @installed  = Hash.new { |h,k| h[k] = [] }
+    @local      = Hash.new { |h, k| h[k] = {} }
+    @conditions = Hash.new { |h, k| h[k] = [] }
+    @installed  = Hash.new { |h, k| h[k] = [] }
 
     @environment.modules_by_path.values.flatten.each do |mod|
       mod_name = (mod.forge_name || mod.name).tr('/', '-')
@@ -26,9 +26,9 @@ module Puppet::ModuleTool::Shared
   end
 
   def get_remote_constraints(forge)
-    @remote   = Hash.new { |h,k| h[k] = { } }
+    @remote   = Hash.new { |h, k| h[k] = {} }
     @urls     = {}
-    @versions = Hash.new { |h,k| h[k] = [] }
+    @versions = Hash.new { |h, k| h[k] = [] }
 
     Puppet.notice _("Downloading from %{uri} ...") % { uri: forge.uri }
     author, modname = Puppet::ModuleTool.username_and_modname_from(@module_name)
@@ -39,7 +39,7 @@ module Puppet::ModuleTool::Shared
       releases.each do |rel|
         semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
-        @versions[mod_name].sort! { |a, b| a[:semver] <=> b[:semver] }
+        @versions[mod_name].sort_by! { |a| a[:semver] }
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
         d = @remote["#{mod_name}@#{rel['version']}"]
         (rel['dependencies'] || []).each do |name, conditions|
@@ -54,6 +54,7 @@ module Puppet::ModuleTool::Shared
     if @conditions[mod].all? { |c| c[:queued] || c[:module] == :you }
       return :latest
     end
+
     return :best
   end
 
@@ -65,15 +66,15 @@ module Puppet::ModuleTool::Shared
     end
   end
 
-  def resolve_constraints(dependencies, source = [{:name => :you}], seen = {}, action = @action)
-    dependencies = dependencies.map do |mod, range|
+  def resolve_constraints(dependencies, source = [{ :name => :you }], seen = {}, action = @action)
+    dependencies = dependencies.filter_map do |mod, range|
       source.last[:dependency] = range
 
       @conditions[mod] << {
-        :module     => source.last[:name],
-        :version    => source.last[:version],
+        :module => source.last[:name],
+        :version => source.last[:version],
         :dependency => range,
-        :queued     => true
+        :queued => true
       }
 
       if forced?
@@ -90,15 +91,16 @@ module Puppet::ModuleTool::Shared
         req_module   = @module_name
         req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
         raise InvalidDependencyCycleError,
-          :module_name       => mod,
-          :source            => (source + [{ :name => mod, :version => source.last[:dependency] }]),
-          :requested_module  => req_module,
-          :requested_version => @version || annotated_version(req_module, req_versions),
-          :conditions        => @conditions
+              :module_name => mod,
+              :source => (source + [{ :name => mod, :version => source.last[:dependency] }]),
+              :requested_module => req_module,
+              :requested_version => @version || annotated_version(req_module, req_versions),
+              :conditions => @conditions
       end
 
       if !(forced? || @installed[mod].empty? || source.last[:name] == :you)
         next if range === SemanticPuppet::Version.parse(@installed[mod].first.version)
+
         action = :upgrade
       elsif @installed[mod].empty?
         action = :install
@@ -117,26 +119,26 @@ module Puppet::ModuleTool::Shared
         req_module   = @module_name
         req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
         raise NoVersionsSatisfyError,
-          :requested_name    => req_module,
-          :requested_version => @version || annotated_version(req_module, req_versions),
-          :installed_version => @installed[@module_name].empty? ? nil : @installed[@module_name].first.version,
-          :dependency_name   => mod,
-          :conditions        => @conditions[mod],
-          :action            => @action
+              :requested_name => req_module,
+              :requested_version => @version || annotated_version(req_module, req_versions),
+              :installed_version => @installed[@module_name].empty? ? nil : @installed[@module_name].first.version,
+              :dependency_name => mod,
+              :conditions => @conditions[mod],
+              :action => @action
       end
 
       seen[mod] = version
 
       {
-        :module           => mod,
-        :version          => version,
-        :action           => action,
+        :module => mod,
+        :version => version,
+        :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),
-        :dependencies     => []
+        :file => @urls["#{mod}@#{version[:vstring]}"],
+        :path => action == :install ? @options[:target_dir] : (@installed[mod].empty? ? @options[:target_dir] : @installed[mod].first.modulepath),
+        :dependencies => []
       }
-    end.compact
+    end
     dependencies.each do |mod|
       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)
@@ -157,7 +159,7 @@ module Puppet::ModuleTool::Shared
       end
 
       [
-        { (release[:path] ||= default_path) => cache_path},
+        { (release[:path] ||= default_path) => cache_path },
         *download_tarballs(release[:dependencies], default_path, forge)
       ]
     end.flatten
@@ -173,7 +175,7 @@ module Puppet::ModuleTool::Shared
     # problems at install time, we should reject any solution that
     # depends on multiple nodes with the same "module name".
     graph.add_graph_constraint('PMT') do |nodes|
-      names = nodes.map { |x| x.dependency_names + [ x.name ] }.flatten
+      names = nodes.map { |x| x.dependency_names + [x.name] }.flatten
       names = names.map { |x| x.tr('/', '-') }.uniq
       names = names.map { |x| x[/-(.*)/, 1] }
       names.length == names.uniq.length

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'shellwords'
 
 class Puppet::ModuleTool::Tar::Gnu

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|
@@ -10,7 +11,7 @@ class Puppet::ModuleTool::Tar::Mini
       args = [reader, destdir, find_valid_files(reader)]
       spec = Gem::Specification.find_by_name('minitar')
       if spec && spec.version >= Gem::Version.new('0.9')
-        args << {:fsync => false}
+        args << { :fsync => false }
       end
       Archive::Tar::Minitar.unpack(*args) do |action, name, stats|
         case action

data/lib/puppet/module_tool/tar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/util'
 
@@ -9,10 +10,10 @@ module Puppet::ModuleTool::Tar
   def self.instance
     if Puppet.features.minitar? && Puppet.features.zlib?
       Mini.new
-    elsif Puppet::Util.which('tar') && ! Puppet::Util::Platform.windows?
+    elsif Puppet::Util.which('tar') && !Puppet::Util::Platform.windows?
       Gnu.new
     else
-      #TRANSLATORS "tar" is a program name and should not be translated
+      # TRANSLATORS "tar" is a program name and should not be translated
       raise RuntimeError, _('No suitable tar implementation found')
     end
   end