puppet 8.4.0-universal-darwin → 8.5.1-universal-darwin

data/lib/puppet/interface/option.rb

@@ -42,7 +42,7 @@ class Puppet::Interface::Option
         dup = dups[name]
         if dup
           raise ArgumentError, _("%{option}: duplicates existing alias %{duplicate} in %{parent}") %
-              { option: item.inspect, duplicate: dup.inspect, parent: @parent }
+                               { option: item.inspect, duplicate: dup.inspect, parent: @parent }
         else
           dups[name] = item
         end
@@ -70,11 +70,11 @@ class Puppet::Interface::Option
 
     # Is our argument optional?  The rules about consistency apply here, also,
     # just like they do to taking arguments at all. --daniel 2011-03-30
-    @optional_argument = @optparse.any? { |o| o=~/[ =]\[/ }
+    @optional_argument = @optparse.any? { |o| o =~ /[ =]\[/ }
     if @optional_argument
       raise ArgumentError, _("Options with optional arguments are not supported")
     end
-    if @optional_argument and not @optparse.all? { |o| o=~/[ =]\[/ } then
+    if @optional_argument and not @optparse.all? { |o| o =~ /[ =]\[/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about the argument being optional") % { name: @name }
     end
   end
@@ -131,7 +131,7 @@ class Puppet::Interface::Option
     unless proc.is_a? Proc
       # TRANSLATORS 'proc' is a Ruby block of code
       raise ArgumentError, _("default value for %{name} is a %{class_name}, not a proc") %
-          { name: self, class_name: proc.class.name.inspect }
+                           { name: self, class_name: proc.class.name.inspect }
     end
     @default = proc
   end
@@ -156,7 +156,7 @@ class Puppet::Interface::Option
     unless proc.is_a? Proc
       # TRANSLATORS 'proc' is a Ruby block of code
       raise ArgumentError, _("before action hook for %{name} is a %{class_name}, not a proc") %
-          { name: self, class_name: proc.class.name.inspect }
+                           { name: self, class_name: proc.class.name.inspect }
     end
     @before_action =
       @parent.__send__(:__add_method, __decoration_name(:before), proc)
@@ -168,7 +168,7 @@ class Puppet::Interface::Option
     unless proc.is_a? Proc
       # TRANSLATORS 'proc' is a Ruby block of code
       raise ArgumentError, _("after action hook for %{name} is a %{class_name}, not a proc") %
-          { name: self, class_name: proc.class.name.inspect }
+                           { name: self, class_name: proc.class.name.inspect }
     end
     @after_action =
       @parent.__send__(:__add_method, __decoration_name(:after), proc)

data/lib/puppet/interface/option_manager.rb

@@ -58,7 +58,7 @@ module Puppet::Interface::OptionManager
       conflict = get_option(name)
       if conflict
         raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict}") %
-            { option: option, conflict: conflict }
+                             { option: option, conflict: conflict }
       end
 
       actions.each do |action|
@@ -66,7 +66,7 @@ module Puppet::Interface::OptionManager
         conflict = action.get_option(name)
         if conflict
           raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict} on %{action}") %
-              { option: option, conflict: conflict, action: action }
+                               { option: option, conflict: conflict, action: action }
         end
       end
     end

data/lib/puppet/interface.rb

@@ -51,7 +51,7 @@ class Puppet::Interface
     # @param name [Symbol] the name of the face
     # @param version [String] the version of the face (this should
     #   conform to {http://semver.org/ Semantic Versioning})
-    # @overload define(name, version, {|| ... })
+    # @overload define(name, version, { ... })
     # @return [Puppet::Interface] The created face
     # @api public
     # @dsl Faces

data/lib/puppet/metatype/manager.rb

@@ -28,7 +28,7 @@ module Manager
   #
   def clear_misses
     unless @types.nil?
-      @types.delete_if {|_, v| v.nil? }
+      @types.compact
     end
   end
 
@@ -77,7 +77,7 @@ module Manager
       unless options.is_a?(Hash)
         # TRANSLATORS 'Puppet::Type.newtype' should not be translated
         Puppet.warning(_("Puppet::Type.newtype(%{name}) now expects a hash as the second argument, not %{argument}") %
-                       { name: name, argument: options.inspect})
+                       { name: name, argument: options.inspect })
       end
 
       # First make sure we don't have a method sitting around
@@ -90,7 +90,7 @@ module Manager
       if @types.include?(name)
         if self.respond_to?(newmethod)
           # Remove the old newmethod
-          selfobj.send(:remove_method,newmethod)
+          selfobj.send(:remove_method, newmethod)
         end
       end
 
@@ -118,7 +118,7 @@ module Manager
 
       # If they've got all the necessary methods defined and they haven't
       # already added the property, then do so now.
-      klass.ensurable if klass.ensurable? and ! klass.validproperty?(:ensure)
+      klass.ensurable if klass.ensurable? and !klass.validproperty?(:ensure)
 
       # Now set up autoload any providers that might exist for this type.
 
@@ -196,4 +196,3 @@ module Manager
   end
 end
 end
-

data/lib/puppet/module/plan.rb

@@ -43,7 +43,7 @@ class Puppet::Module
     class PlanNotFound < Error
       def initialize(plan_name, module_name)
         msg = _("Plan %{plan_name} not found in module %{module_name}.") %
-          {plan_name: plan_name, module_name: module_name}
+              { plan_name: plan_name, module_name: module_name }
         super(msg, 'puppet.plans/plan-not-found', { 'name' => plan_name })
       end
     end
@@ -102,7 +102,7 @@ class Puppet::Module
     def self.plans_in_module(pup_module)
       # Search e.g. 'modules/<pup_module>/plans' for all plans
       plan_files = Dir.glob(File.join(pup_module.plans_directory, '*'))
-        .keep_if { |f| valid, _ = is_plans_filename?(f); valid }
+                      .keep_if { |f| valid, _ = is_plans_filename?(f); valid }
 
       plans = plan_files.group_by { |f| plan_name_from_path(f) }
 
@@ -144,7 +144,7 @@ class Puppet::Module
 
     def ==(other)
       self.name == other.name &&
-      self.module == other.module
+        self.module == other.module
     end
 
     def environment_name

data/lib/puppet/module/task.rb

@@ -44,7 +44,7 @@ class Puppet::Module
     class TaskNotFound < Error
       def initialize(task_name, module_name)
         msg = _("Task %{task_name} not found in module %{module_name}.") %
-          {task_name: task_name, module_name: module_name}
+              { task_name: task_name, module_name: module_name }
         super(msg, 'puppet.tasks/task-not-found', { 'name' => task_name })
       end
     end
@@ -87,16 +87,16 @@ class Puppet::Module
     # Find task's required lib files and retrieve paths for both 'files' and 'implementation:files' metadata keys
     def self.find_extra_files(metadata, envname = nil)
       return [] if metadata.nil?
-      
+
       files = metadata.fetch('files', [])
       unless files.is_a?(Array)
-        msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: files}
+        msg = _("The 'files' task metadata expects an array, got %{files}.") % { files: files }
         raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
       end
-      impl_files = metadata.fetch('implementations', []).flat_map do |impl| 
+      impl_files = metadata.fetch('implementations', []).flat_map do |impl|
         file_array = impl.fetch('files', [])
         unless file_array.is_a?(Array)
-          msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: file_array}
+          msg = _("The 'files' task metadata expects an array, got %{files}.") % { files: file_array }
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end
         file_array
@@ -112,13 +112,13 @@ class Puppet::Module
         pup_module = Puppet::Module.find(module_name, envname)
         if pup_module.nil?
           msg = _("Could not find module %{module_name} containing task file %{filename}" %
-                  {module_name: module_name, filename: endpath})
+                  { module_name: module_name, filename: endpath })
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end
 
         unless MOUNTS.include? mount
           msg = _("Files must be saved in module directories that Puppet makes available via mount points: %{mounts}" %
-                  {mounts: MOUNTS.join(', ')})
+                  { mounts: MOUNTS.join(', ') })
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end
 
@@ -136,14 +136,14 @@ class Puppet::Module
         last_char = file[-1] == '/'
         if File.directory?(path)
           unless last_char
-            msg = _("Directories specified in task metadata must include a trailing slash: %{dir}" % { dir: file } )
+            msg = _("Directories specified in task metadata must include a trailing slash: %{dir}" % { dir: file })
             raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
           end
           dir_files = Dir.glob("#{path}**/*").select { |f| File.file?(f) }
           dir_files.map { |f| get_file_details(f, pup_module) }
         else
           if last_char
-            msg = _("Files specified in task metadata cannot include a trailing slash: %{file}" % { file: file } )
+            msg = _("Files specified in task metadata cannot include a trailing slash: %{file}" % { file: file })
             raise InvalidMetadata.new(msg, 'puppet.task/invalid-metadata')
           end
           get_file_details(path, pup_module)
@@ -172,7 +172,7 @@ class Puppet::Module
           path = executables.find { |real_impl| File.basename(real_impl) == impl['name'] }
           unless path
             msg = _("Task metadata for task %{name} specifies missing implementation %{implementation}" % { name: name, implementation: impl['name'] })
-            raise InvalidTask.new(msg, 'puppet.tasks/missing-implementation', { missing: [impl['name']] } )
+            raise InvalidTask.new(msg, 'puppet.tasks/missing-implementation', { missing: [impl['name']] })
           end
           { "name" => impl['name'], "path" => path }
         end
@@ -184,11 +184,11 @@ class Puppet::Module
       implementations = executables.select { |impl| File.basename(impl, '.*') == basename }
       if implementations.empty?
         msg = _('No source besides task metadata was found in directory %{directory} for task %{name}') %
-          { name: name, directory: directory }
+              { name: name, directory: directory }
         raise InvalidTask.new(msg, 'puppet.tasks/no-implementation')
       elsif implementations.length > 1
-        msg =_("Multiple executables were found in directory %{directory} for task %{name}; define 'implementations' in metadata to differentiate between them") %
-          { name: name, directory: implementations[0] }
+        msg = _("Multiple executables were found in directory %{directory} for task %{name}; define 'implementations' in metadata to differentiate between them") %
+              { name: name, directory: implementations[0] }
         raise InvalidTask.new(msg, 'puppet.tasks/multiple-implementations')
       end
 
@@ -211,7 +211,7 @@ class Puppet::Module
 
     def self.tasks_in_module(pup_module)
       task_files = Dir.glob(File.join(pup_module.tasks_directory, '*'))
-        .keep_if { |f| is_tasks_file?(f) }
+                      .keep_if { |f| is_tasks_file?(f) }
 
       module_executables = task_files.reject(&method(:is_tasks_metadata_filename?)).map.to_a
 
@@ -244,7 +244,7 @@ class Puppet::Module
         content.empty? ? {} : Puppet::Util::Json.load(content)
       end
     rescue SystemCallError, IOError => err
-      msg = _("Error reading metadata: %{message}" % {message: err.message})
+      msg = _("Error reading metadata: %{message}" % { message: err.message })
       raise InvalidMetadata.new(msg, 'puppet.tasks/unreadable-metadata')
     rescue Puppet::Util::Json::ParseError => err
       raise InvalidMetadata.new(err.message, 'puppet.tasks/unparseable-metadata')
@@ -265,7 +265,7 @@ class Puppet::Module
 
     def ==(other)
       self.name == other.name &&
-      self.module == other.module
+        self.module == other.module
     end
 
     def environment_name

data/lib/puppet/module.rb

@@ -452,9 +452,9 @@ class Puppet::Module
 
   def ==(other)
     self.name == other.name &&
-    self.version == other.version &&
-    self.path == other.path &&
-    self.environment == other.environment
+      self.version == other.version &&
+      self.path == other.path &&
+      self.environment == other.environment
   end
 
   private
@@ -465,8 +465,9 @@ class Puppet::Module
       relative_pattern = Puppet::FileSystem::PathPattern.relative(extended)
     rescue Puppet::FileSystem::PathPattern::InvalidPattern => error
       raise Puppet::Module::InvalidFilePattern.new(
-        "The pattern \"#{pattern}\" to find manifests in the module \"#{name}\" " +
-        "is invalid and potentially unsafe.", error)
+        "The pattern \"#{pattern}\" to find manifests in the module \"#{name}\" " \
+        "is invalid and potentially unsafe.", error
+      )
     end
 
     relative_pattern.prefix_with(@absolute_path_to_manifests)

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

@@ -44,7 +44,7 @@ module Puppet::ModuleTool
         elsif metadata_file.exist?
           # Check metadata.json too; legacy modules store their checksums there.
           Puppet::Util::Json.load(metadata_file.read)['checksums'] or
-          raise ArgumentError, _("No file containing checksums found.")
+            raise ArgumentError, _("No file containing checksums found.")
         else
           raise ArgumentError, _("No file containing checksums found.")
         end

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

@@ -229,7 +229,7 @@ module Puppet::ModuleTool
 
           results[:result] = :success
           results[:installed_modules] = releases
-          results[:graph] = [ build_install_graph(releases.first, releases) ]
+          results[:graph] = [build_install_graph(releases.first, releases)]
         rescue ModuleToolError, ForgeError => err
           results[:error] = {
             :oneline => err.message,
@@ -315,7 +315,7 @@ module Puppet::ModuleTool
 
         if @ignore_dependencies && @source == :filesystem
           @urls   = {}
-          @remote = { "#{@module_name}@#{@version}" => { } }
+          @remote = { "#{@module_name}@#{@version}" => {} }
           @versions = {
             @module_name => [
               { :vstring => @version, :semver => SemanticPuppet::Version.parse(@version) }
@@ -354,7 +354,7 @@ module Puppet::ModuleTool
       # install into the same directory 'foo'.
       #
       def resolve_install_conflicts(graph, is_dependency = false)
-        Puppet.debug("Resolving conflicts for #{graph.map {|n| n[:module]}.join(',')}")
+        Puppet.debug("Resolving conflicts for #{graph.map { |n| n[:module] }.join(',')}")
 
         graph.each do |release|
           @environment.modules_by_path[options[:target_dir]].each do |mod|

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

@@ -8,7 +8,7 @@ module Puppet::ModuleTool
       def initialize(name, options)
         @name        = name
         @options     = options
-        @errors      = Hash.new {|h, k| h[k] = {}}
+        @errors      = Hash.new { |h, k| h[k] = {} }
         @unfiltered  = []
         @installed   = []
         @suggestions = []

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

@@ -44,7 +44,7 @@ module Puppet::ModuleTool
       # @api private
       # Error on symlinks and other junk
       def sanity_check
-        symlinks = Dir.glob("#{tmpdir}/**/*", File::FNM_DOTMATCH).map { |f| Pathname.new(f) }.select {|p| Puppet::FileSystem.symlink? p}
+        symlinks = Dir.glob("#{tmpdir}/**/*", File::FNM_DOTMATCH).map { |f| Pathname.new(f) }.select { |p| Puppet::FileSystem.symlink? p }
         tmpdirpath = Pathname.new tmpdir
 
         symlinks.each do |s|

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

@@ -95,7 +95,7 @@ module Puppet::ModuleTool
             raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
           elsif results[:requested_version] != :latest
             requested = Puppet::Module.parse_range(results[:requested_version])
-            unless available_versions.any? {|m| requested.include? m.version}
+            unless available_versions.any? { |m| requested.include? m.version }
               raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
             end
           end
@@ -202,7 +202,7 @@ module Puppet::ModuleTool
           results[:result] = :success
           results[:base_dir] = releases.first.install_dir
           results[:affected_modules] = releases
-          results[:graph] = [ build_install_graph(releases.first, releases) ]
+          results[:graph] = [build_install_graph(releases.first, releases)]
         rescue VersionAlreadyInstalledError => e
           results[:result] = (e.newer_versions.empty? ? :noop : :failure)
           results[:error] = { :oneline => e.message, :multiline => e.multiline }
@@ -257,7 +257,7 @@ module Puppet::ModuleTool
 
         graphed << release
 
-        dependencies = release.dependencies.values.map do |deps|
+        dependencies = release.dependencies.values.filter_map do |deps|
           dep = (deps & installed).first
           if dep == installed_modules[dep.name]
             next
@@ -266,7 +266,7 @@ module Puppet::ModuleTool
           if dep && !graphed.include?(dep)
             build_install_graph(dep, installed, graphed)
           end
-        end.compact
+        end
 
         return {
           :release => release,

data/lib/puppet/module_tool/contents_description.rb

@@ -32,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
@@ -45,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

@@ -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/installer.rb

@@ -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

@@ -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,14 +114,14 @@ 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|
+      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")}
+      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")

data/lib/puppet/module_tool/installed_modules.rb

@@ -44,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

@@ -20,9 +20,9 @@ module Puppet::ModuleTool
 
     def fetch(name)
       if @release.name == name
-        [ @release ]
+        [@release]
       else
-        [ ]
+        []
       end
     end
 
@@ -56,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 || {})

data/lib/puppet/module_tool/metadata.rb

@@ -41,7 +41,7 @@ module Puppet::ModuleTool
     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
@@ -64,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
 

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -4,9 +4,9 @@ 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|
@@ -66,8 +66,8 @@ 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] << {
@@ -138,7 +138,7 @@ module Puppet::ModuleTool::Shared
         :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)
@@ -159,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
@@ -175,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/mini.rb

@@ -11,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

@@ -10,7 +10,7 @@ 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

data/lib/puppet/module_tool.rb

@@ -48,7 +48,7 @@ module Puppet
     # @return [Pathname, nil] the root path of the module directory or nil if
     #   we cannot find one
     def self.find_module_root(path)
-      path = Pathname.new(path) if path.class == String
+      path = Pathname.new(path) if path.instance_of?(String)
 
       path.expand_path.ascend do |p|
         return p if is_module_root?(p)
@@ -63,7 +63,7 @@ module Puppet
     # @param path [Pathname, String] path to analyse
     # @return [Boolean] true if the path is a module root, false otherwise
     def self.is_module_root?(path)
-      path = Pathname.new(path) if path.class == String
+      path = Pathname.new(path) if path.instance_of?(String)
 
       FileTest.file?(path + 'metadata.json')
     end
@@ -103,7 +103,7 @@ module Puppet
         mod[:text] += " [#{mod[:path]}]" unless mod[:path].to_s == dir.to_s
 
         deps = (mod[:dependencies] || [])
-        deps.sort! { |a, b| a[:name] <=> b[:name] }
+        deps.sort_by! { |a| a[:name] }
         build_tree(deps, dir)
       end
     end
@@ -179,7 +179,7 @@ module Puppet
         parsed_range = SemanticPuppet::VersionRange::EMPTY_RANGE
       end
 
-      [ dep_name, parsed_range, range ]
+      [dep_name, parsed_range, range]
     end
   end
 end

data/lib/puppet/network/client_request.rb

@@ -28,4 +28,3 @@ module Puppet::Network # :nodoc:
     end
   end
 end
-

data/lib/puppet/network/format.rb

@@ -76,7 +76,7 @@ class Puppet::Network::Format
     return instances[0].class.send(render_multiple_method, instances) if instances[0].class.respond_to?(render_multiple_method)
 
     raise NotImplementedError, _("%{klass} does not respond to %{method}; can not render multiple instances to %{mime}") %
-        { klass: instances[0].class, method: render_multiple_method, mime: mime }
+                               { klass: instances[0].class, method: render_multiple_method, mime: mime }
   end
 
   def required_methods_present?(klass)