openvox 7.37.1 → 8.19.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'pathname'
 require 'fileutils'
@@ -14,7 +16,6 @@ require_relative '../../../puppet/network/uri'
 module Puppet::ModuleTool
   module Applications
     class Installer < Application
-
       include Puppet::ModuleTool::Errors
       include Puppet::Forge::Errors
       include Puppet::Network::Uri
@@ -71,12 +72,16 @@ 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,
-                  :requested_version => options[:version] || :latest,
-                  :local_changes     => changes
+                      :module_name => name,
+                      :installed_version => installed_modules[name].version,
+                      :requested_version => options[:version] || :latest,
+                      :local_changes => changes
               end
             end
           end
@@ -106,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?
 
-              release.mod.dependencies.each do |dep|
-                dep_name = dep['name'].tr('/', '-')
+            # 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
 
-                range = dep['version_requirement']
-                graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range).include? node.version
-                end
+            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
             end
           end
@@ -183,9 +188,9 @@ module Puppet::ModuleTool
             end
 
             raise NoVersionsSatisfyError, results.merge(
-                    :requested_name => name,
-                    :requested_version => options[:version] || graph.dependencies[name].max.version.to_s,
-                    :unsatisfied => unsatisfied
+              :requested_name => name,
+              :requested_version => options[:version] || graph.dependencies[name].max.version.to_s,
+              :unsatisfied => unsatisfied
             )
           end
 
@@ -193,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|
@@ -228,11 +232,10 @@ 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,
+            :oneline => err.message,
             :multiline => err.multiline,
           }
         ensure
@@ -252,7 +255,7 @@ module Puppet::ModuleTool
         @tarball_source ||= begin
           Puppet::ModuleTool::LocalTarball.new(@name)
         rescue Puppet::Module::Error => e
-          raise InvalidModuleError.new(@name, :action => @action, :error  => e)
+          raise InvalidModuleError.new(@name, :action => @action, :error => e)
         end
       end
 
@@ -287,14 +290,14 @@ 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,
-          :dependencies     => dependencies.compact,
-          :version          => release.version,
+        {
+          :release => release,
+          :name => release.name,
+          :path => release.install_dir.to_s,
+          :dependencies => dependencies.compact,
+          :version => release.version,
           :previous_version => previous,
-          :action           => (previous.nil? || previous == release.version || forced? ? :install : :upgrade),
+          :action => (previous.nil? || previous == release.version || forced? ? :install : :upgrade),
         }
       end
 
@@ -307,15 +310,15 @@ module Puppet::ModuleTool
 
         if !forced? && @installed.include?(@module_name)
           raise AlreadyInstalledError,
-            :module_name       => @module_name,
-            :installed_version => @installed[@module_name].first.version,
-            :requested_version => @version || (@conditions[@module_name].empty? ? :latest : :best),
-            :local_changes     => Puppet::ModuleTool::Applications::Checksummer.run(@installed[@module_name].first.path)
+                :module_name => @module_name,
+                :installed_version => @installed[@module_name].first.version,
+                :requested_version => @version || (@conditions[@module_name].empty? ? :latest : :best),
+                :local_changes => Puppet::ModuleTool::Applications::Checksummer.run(@installed[@module_name].first.path)
         end
 
         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,13 +357,13 @@ 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|
             if mod.has_metadata?
               metadata = {
-                :name    => mod.forge_name.tr('/', '-'),
+                :name => mod.forge_name.tr('/', '-'),
                 :version => mod.version
               }
               next if release[:module] == metadata[:name]
@@ -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]
@@ -394,18 +397,6 @@ module Puppet::ModuleTool
           end
         end
       end
-
-      #
-      # Check if a file is a vaild module package.
-      # ---
-      # FIXME: Checking for a valid module package should be more robust and
-      # use the actual metadata contained in the package. 03132012 - Hightower
-      # +++
-      #
-      def is_module_package?(name)
-        filename = File.expand_path(name)
-        filename =~ /.tar.gz$/
-      end
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::ModuleTool
   module Applications
     class Uninstaller < Application
@@ -6,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 = []
@@ -16,7 +18,7 @@ module Puppet::ModuleTool
 
       def run
         results = {
-          :module_name       => @name,
+          :module_name => @name,
           :requested_version => @version,
         }
 
@@ -30,7 +32,7 @@ module Puppet::ModuleTool
           results[:result] = :success
         rescue ModuleToolError => err
           results[:error] = {
-            :oneline   => err.message,
+            :oneline => err.message,
             :multiline => err.multiline,
           }
         rescue => e
@@ -52,9 +54,9 @@ module Puppet::ModuleTool
           mod_name = (mod.forge_name || mod.name).tr('/', '-')
           if mod_name == @name
             @unfiltered << {
-              :name    => mod_name,
+              :name => mod_name,
               :version => mod.version,
-              :path    => mod.modulepath,
+              :path => mod.modulepath,
             }
             if @options[:version] && mod.version
               next unless Puppet::Module.parse_range(@options[:version]).include?(SemanticPuppet::Version.parse(mod.version))
@@ -67,20 +69,20 @@ module Puppet::ModuleTool
 
         if @installed.length > 1
           raise MultipleInstalledError,
-            :action            => :uninstall,
-            :module_name       => @name,
-            :installed_modules => @installed.sort_by { |mod| @environment.modulepath.index(mod.modulepath) }
+                :action => :uninstall,
+                :module_name => @name,
+                :installed_modules => @installed.sort_by { |mod| @environment.modulepath.index(mod.modulepath) }
         elsif @installed.empty?
           if @unfiltered.empty?
             raise NotInstalledError,
-              :action      => :uninstall,
-              :suggestions => @suggestions,
-              :module_name => @name
+                  :action => :uninstall,
+                  :suggestions => @suggestions,
+                  :module_name => @name
           else
             raise NoVersionMatchesError,
-              :installed_modules => @unfiltered.sort_by { |mod| @environment.modulepath.index(mod[:path]) },
-              :version_range     => @options[:version],
-              :module_name       => @name
+                  :installed_modules => @unfiltered.sort_by { |mod| @environment.modulepath.index(mod[:path]) },
+                  :version_range => @options[:version],
+                  :module_name => @name
           end
         end
       end
@@ -99,19 +101,19 @@ module Puppet::ModuleTool
 
           if mod.has_metadata? && !changes.empty?
             raise LocalChangesError,
-              :action            => :uninstall,
-              :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
-              :requested_version => @options[:version],
-              :installed_version => mod.version
+                  :action => :uninstall,
+                  :module_name => (mod.forge_name || mod.name).tr('/', '-'),
+                  :requested_version => @options[:version],
+                  :installed_version => mod.version
           end
         end
 
         if !@options[:force] && !mod.required_by.empty?
           raise ModuleIsRequiredError,
-            :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
-            :required_by       => mod.required_by,
-            :requested_version => @options[:version],
-            :installed_version => mod.version
+                :module_name => (mod.forge_name || mod.name).tr('/', '-'),
+                :required_by => mod.required_by,
+                :requested_version => @options[:version],
+                :installed_version => mod.version
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'tmpdir'
 require_relative '../../../puppet/util/json'
@@ -7,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)
@@ -36,13 +38,13 @@ 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
       # 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|
@@ -52,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
@@ -64,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
@@ -92,9 +92,11 @@ module Puppet::ModuleTool
       #
       # @api private
       # @return [String] path to temporary unpacking location
+      # rubocop:disable Naming/MemoizedInstanceVariableName
       def tmpdir
         @dir ||= Dir.mktmpdir('tmp', Puppet::Forge::Cache.base_path)
       end
+      # rubocop:enable Naming/MemoizedInstanceVariableName
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require_relative '../../../puppet/forge'
@@ -9,7 +11,6 @@ require_relative '../../../puppet/module_tool/installed_modules'
 module Puppet::ModuleTool
   module Applications
     class Upgrader < Application
-
       include Puppet::ModuleTool::Errors
 
       def initialize(name, options)
@@ -75,13 +76,17 @@ 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,
-                :module_name       => name,
-                :requested_version => results[:requested_version],
-                :installed_version => mod.version
+                    :action => :upgrade,
+                    :module_name => name,
+                    :requested_version => results[:requested_version],
+                    :installed_version => mod.version
             end
           end
 
@@ -94,7 +99,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
@@ -116,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?
 
-              release.mod.dependencies.each do |dep|
-                dep_name = dep['name'].tr('/', '-')
+            # 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('/', '-')
 
-                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
@@ -145,48 +150,47 @@ 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,
-                :module_name       => name,
-                :requested_version => results[:requested_version],
-                :installed_version => results[:installed_version],
-                :newer_versions    => newer_versions,
-                :possible_culprits => installed_modules_source.fetched.reject { |x| x == name }
+                    :module_name => name,
+                    :requested_version => results[:requested_version],
+                    :installed_version => results[:installed_version],
+                    :newer_versions => newer_versions,
+                    :possible_culprits => installed_modules_source.fetched.reject { |x| x == name }
             elsif child.version < results[:installed_version]
               raise DowngradingUnsupportedError,
-                :module_name       => name,
-                :requested_version => results[:requested_version],
-                :installed_version => results[:installed_version]
+                    :module_name => name,
+                    :requested_version => results[:requested_version],
+                    :installed_version => results[:installed_version]
             end
           end
 
           Puppet.info _("Preparing to upgrade ...")
-          releases.each { |release| release.prepare }
+          releases.each(&:prepare)
 
           Puppet.notice _('Upgrading -- do not interrupt ...')
           releases.each do |release|
@@ -201,14 +205,13 @@ 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 }
         rescue => e
           results[:error] = {
-            :oneline   => e.message,
+            :oneline => e.message,
             :multiline => e.respond_to?(:multiline) ? e.multiline : [e.to_s, e.backtrace].join("\n")
           }
         ensure
@@ -219,6 +222,8 @@ module Puppet::ModuleTool
       end
 
       private
+
+      # rubocop:disable Naming/MemoizedInstanceVariableName
       def module_repository
         @repo ||= Puppet::Forge.new(Puppet[:module_repository])
       end
@@ -226,6 +231,7 @@ module Puppet::ModuleTool
       def installed_modules_source
         @installed ||= Puppet::ModuleTool::InstalledModules.new(@environment)
       end
+      # rubocop:enable Naming/MemoizedInstanceVariableName
 
       def installed_modules
         installed_modules_source.modules
@@ -254,7 +260,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
@@ -263,16 +269,16 @@ module Puppet::ModuleTool
           if dep && !graphed.include?(dep)
             build_install_graph(dep, installed, graphed)
           end
-        end.compact
-
-        return {
-          :release          => release,
-          :name             => release.name,
-          :path             => release.install_dir,
-          :dependencies     => dependencies.compact,
-          :version          => release.version,
+        end
+
+        {
+          :release => release,
+          :name => release.name,
+          :path => release.install_dir,
+          :dependencies => dependencies.compact,
+          :version => release.version,
           :previous_version => previous,
-          :action           => action,
+          :action => action,
         }
       end
 

data/lib/puppet/module_tool/applications.rb

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