puppet 7.6.1-universal-darwin → 7.10.0-universal-darwin

data/lib/puppet/module/plan.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/logging'
+require_relative '../../puppet/util/logging'
 
 class Puppet::Module
   class Plan
@@ -50,7 +50,6 @@ class Puppet::Module
     RESERVED_DATA_TYPES = %w{any array boolean catalogentry class collection
         callable data default enum float hash integer numeric optional pattern
         resource runtime scalar string struct tuple type undef variant}
-    MOUNTS = %w[lib files plans]
 
     def self.is_plan_name?(name)
       return true if name =~ /^[a-z][a-z0-9_]*$/

data/lib/puppet/module/task.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/logging'
+require_relative '../../puppet/util/logging'
 
 class Puppet::Module
   class Task
@@ -45,7 +45,7 @@ class Puppet::Module
     end
 
     FORBIDDEN_EXTENSIONS = %w{.conf .md}
-    MOUNTS = %w[lib files tasks]
+    MOUNTS = %w[files lib scripts tasks]
 
     def self.is_task_name?(name)
       return true if name =~ /^[a-z][a-z0-9_]*$/

data/lib/puppet/module_tool.rb

@@ -2,11 +2,11 @@
 # Load standard libraries
 require 'pathname'
 require 'fileutils'
-require 'puppet/util/colors'
+require_relative '../puppet/util/colors'
 
 module Puppet
   module ModuleTool
-    require 'puppet/module_tool/tar'
+    require_relative 'module_tool/tar'
     extend Puppet::Util::Colors
 
     # Directory and names that should not be checksummed.
@@ -184,11 +184,11 @@ module Puppet
 end
 
 # Load remaining libraries
-require 'puppet/module_tool/errors'
-require 'puppet/module_tool/applications'
-require 'puppet/module_tool/checksums'
-require 'puppet/module_tool/contents_description'
-require 'puppet/module_tool/dependency'
-require 'puppet/module_tool/metadata'
-require 'puppet/forge/cache'
-require 'puppet/forge'
+require_relative 'module_tool/errors'
+require_relative 'module_tool/applications'
+require_relative 'module_tool/checksums'
+require_relative 'module_tool/contents_description'
+require_relative 'module_tool/dependency'
+require_relative 'module_tool/metadata'
+require_relative '../puppet/forge/cache'
+require_relative '../puppet/forge'

data/lib/puppet/module_tool/applications.rb

@@ -1,12 +1,12 @@
-require 'puppet/module_tool'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   module Applications
-    require 'puppet/module_tool/applications/application'
-    require 'puppet/module_tool/applications/checksummer'
-    require 'puppet/module_tool/applications/installer'
-    require 'puppet/module_tool/applications/unpacker'
-    require 'puppet/module_tool/applications/uninstaller'
-    require 'puppet/module_tool/applications/upgrader'
+    require_relative 'applications/application'
+    require_relative 'applications/checksummer'
+    require_relative 'applications/installer'
+    require_relative 'applications/unpacker'
+    require_relative 'applications/uninstaller'
+    require_relative 'applications/upgrader'
   end
 end

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

@@ -1,6 +1,6 @@
 require 'net/http'
-require 'puppet/util/json'
-require 'puppet/util/colors'
+require_relative '../../../puppet/util/json'
+require_relative '../../../puppet/util/colors'
 
 module Puppet::ModuleTool
   module Applications

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

@@ -1,5 +1,5 @@
-require 'puppet/util/json'
-require 'puppet/module_tool/checksums'
+require_relative '../../../puppet/util/json'
+require_relative '../../../puppet/module_tool/checksums'
 
 module Puppet::ModuleTool
   module Applications

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

@@ -3,13 +3,13 @@ require 'pathname'
 require 'fileutils'
 require 'tmpdir'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
-require 'puppet/module_tool/shared_behaviors'
-require 'puppet/module_tool/install_directory'
-require 'puppet/module_tool/local_tarball'
-require 'puppet/module_tool/installed_modules'
-require 'puppet/network/uri'
+require_relative '../../../puppet/forge'
+require_relative '../../../puppet/module_tool'
+require_relative '../../../puppet/module_tool/shared_behaviors'
+require_relative '../../../puppet/module_tool/install_directory'
+require_relative '../../../puppet/module_tool/local_tarball'
+require_relative '../../../puppet/module_tool/installed_modules'
+require_relative '../../../puppet/network/uri'
 
 module Puppet::ModuleTool
   module Applications
@@ -59,6 +59,10 @@ module Puppet::ModuleTool
         results = { :action => :install, :module_name => name, :module_version => version }
 
         begin
+          if !@local_tarball && name !~ /-/
+            raise InvalidModuleNameError.new(module_name: @name, suggestion: "puppetlabs-#{@name}", action: :install)
+          end
+
           installed_module = installed_modules[name]
           if installed_module
             unless forced?
@@ -134,7 +138,7 @@ module Puppet::ModuleTool
           rescue SemanticPuppet::Dependency::UnsatisfiableGraph => e
             unsatisfied = nil
 
-            if e.respond_to?(:unsatisfied)
+            if e.respond_to?(:unsatisfied) && e.unsatisfied
               constraints = {}
               # If the module we're installing satisfies all its
               # dependencies, but would break an already installed
@@ -160,8 +164,12 @@ module Puppet::ModuleTool
               # If the module fails to satisfy one of its
               # dependencies, show the unsatisfiable module
               else
-                unsatisfied_range = graph.dependencies[name].max.constraints[e.unsatisfied].first[1]
-                constraints[e.unsatisfied] = unsatisfied_range
+                dep_constraints = graph.dependencies[name].max.constraints
+
+                if dep_constraints.key?(e.unsatisfied)
+                  unsatisfied_range = dep_constraints[e.unsatisfied].first[1]
+                  constraints[e.unsatisfied] = unsatisfied_range
+                end
               end
 
               installed_module = @environment.module_by_forge_name(e.unsatisfied.tr('-', '/'))
@@ -171,7 +179,7 @@ module Puppet::ModuleTool
                 :name => e.unsatisfied,
                 :constraints => constraints,
                 :current_version => current_version
-              }
+              } if constraints.any?
             end
 
             raise NoVersionsSatisfyError, results.merge(

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

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'tmpdir'
-require 'puppet/util/json'
-require 'puppet/file_system'
+require_relative '../../../puppet/util/json'
+require_relative '../../../puppet/file_system'
 
 module Puppet::ModuleTool
   module Applications

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

@@ -1,10 +1,10 @@
 require 'pathname'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
-require 'puppet/module_tool/shared_behaviors'
-require 'puppet/module_tool/install_directory'
-require 'puppet/module_tool/installed_modules'
+require_relative '../../../puppet/forge'
+require_relative '../../../puppet/module_tool'
+require_relative '../../../puppet/module_tool/shared_behaviors'
+require_relative '../../../puppet/module_tool/install_directory'
+require_relative '../../../puppet/module_tool/installed_modules'
 
 module Puppet::ModuleTool
   module Applications

data/lib/puppet/module_tool/checksums.rb

@@ -1,5 +1,5 @@
 require 'digest/md5'
-require 'puppet/network/format_support'
+require_relative '../../puppet/network/format_support'
 
 module Puppet::ModuleTool
 

data/lib/puppet/module_tool/contents_description.rb

@@ -1,4 +1,4 @@
-require 'puppet/module_tool'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
 

data/lib/puppet/module_tool/dependency.rb

@@ -1,5 +1,5 @@
-require 'puppet/module_tool'
-require 'puppet/network/format_support'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/network/format_support'
 
 module Puppet::ModuleTool
 

data/lib/puppet/module_tool/errors.rb

@@ -1,11 +1,11 @@
-require 'puppet/module_tool'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   module Errors
-    require 'puppet/module_tool/errors/base'
-    require 'puppet/module_tool/errors/installer'
-    require 'puppet/module_tool/errors/uninstaller'
-    require 'puppet/module_tool/errors/upgrader'
-    require 'puppet/module_tool/errors/shared'
+    require_relative 'errors/base'
+    require_relative 'errors/installer'
+    require_relative 'errors/uninstaller'
+    require_relative 'errors/upgrader'
+    require_relative 'errors/shared'
   end
 end

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

@@ -127,6 +127,23 @@ module Puppet::ModuleTool::Errors
     end
   end
 
+  class InvalidModuleNameError < ModuleToolError
+    def initialize(options)
+      @module_name = options[:module_name]
+      @suggestion = options[:suggestion]
+      @action = options[:action]
+      super _("Could not %{action} '%{module_name}', did you mean '%{suggestion}'?") % { action: @action, module_name: @module_name, suggestion: @suggestion }
+    end
+
+    def multiline
+      message = []
+      message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @module_name }
+      message << _("  The name '%{module_name}' is invalid") % { module_name: @module_name }
+      message << _("    Did you mean `puppet module %{action} %{suggestion}`?") % { action: @action, suggestion: @suggestion }
+      message.join("\n")
+    end
+  end
+
   class NotInstalledError < ModuleToolError
     def initialize(options)
       @module_name = options[:module_name]

data/lib/puppet/module_tool/install_directory.rb

@@ -1,5 +1,5 @@
-require 'puppet/module_tool'
-require 'puppet/module_tool/errors'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/module_tool/errors'
 
 module Puppet
   module ModuleTool

data/lib/puppet/module_tool/installed_modules.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   class InstalledModules < SemanticPuppet::Dependency::Source

data/lib/puppet/module_tool/local_tarball.rb

@@ -1,8 +1,8 @@
 require 'pathname'
 require 'tmpdir'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   class LocalTarball < SemanticPuppet::Dependency::Source

data/lib/puppet/module_tool/metadata.rb

@@ -1,7 +1,7 @@
-require 'puppet/module_tool'
-require 'puppet/network/format_support'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/network/format_support'
 require 'uri'
-require 'puppet/util/json'
+require_relative '../../puppet/util/json'
 require 'set'
 
 module Puppet::ModuleTool

data/lib/puppet/module_tool/tar.rb

@@ -1,9 +1,9 @@
-require 'puppet/module_tool'
-require 'puppet/util'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/util'
 
 module Puppet::ModuleTool::Tar
-  require 'puppet/module_tool/tar/gnu'
-  require 'puppet/module_tool/tar/mini'
+  require_relative 'tar/gnu'
+  require_relative 'tar/mini'
 
   def self.instance
     if Puppet.features.minitar? && Puppet.features.zlib?

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

@@ -107,7 +107,7 @@ class Puppet::ModuleTool::Tar::Mini
       raise Puppet::ModuleTool::Errors::InvalidPathInPackageError, :entry_path => path, :directory => destdir
     end
 
-    path = File.expand_path File.join(destdir, path)
+    path = Pathname.new(File.join(destdir, path)).cleanpath.to_path
 
     if path !~ /\A#{Regexp.escape destdir}/
       raise Puppet::ModuleTool::Errors::InvalidPathInPackageError, :entry_path => path, :directory => destdir

data/lib/puppet/network/format.rb

@@ -1,4 +1,4 @@
-require 'puppet/confiner'
+require_relative '../../puppet/confiner'
 
 # A simple class for modeling encoding formats for moving
 # instances around the network.

data/lib/puppet/network/format_handler.rb

@@ -1,6 +1,6 @@
 require 'yaml'
-require 'puppet/network'
-require 'puppet/network/format'
+require_relative '../../puppet/network'
+require_relative '../../puppet/network/format'
 
 module Puppet::Network::FormatHandler
   class FormatError < Puppet::Error; end
@@ -105,4 +105,4 @@ module Puppet::Network::FormatHandler
   end
 end
 
-require 'puppet/network/formats'
+require_relative '../../puppet/network/formats'

data/lib/puppet/network/format_support.rb

@@ -1,4 +1,4 @@
-require 'puppet/network/format_handler'
+require_relative '../../puppet/network/format_handler'
 
 # Provides network serialization support when included
 # @api public

data/lib/puppet/network/formats.rb

@@ -1,5 +1,5 @@
-require 'puppet/network/format_handler'
-require 'puppet/util/json'
+require_relative '../../puppet/network/format_handler'
+require_relative '../../puppet/util/json'
 
 Puppet::Network::FormatHandler.create_serialized_formats(:msgpack, :weight => 20, :mime => "application/x-msgpack", :required_methods => [:render_method, :intern_method], :intern_method => :from_data_hash) do
 

data/lib/puppet/network/http.rb

@@ -12,17 +12,17 @@ module Puppet::Network::HTTP
   CA_URL_PREFIX = "/puppet-ca"
   CA_URL_VERSIONS = "v1"
 
-  require 'puppet/network/authconfig'
-  require 'puppet/network/authorization'
+  require_relative '../../puppet/network/authconfig'
+  require_relative '../../puppet/network/authorization'
 
-  require 'puppet/network/http/issues'
-  require 'puppet/network/http/error'
-  require 'puppet/network/http/route'
-  require 'puppet/network/http/api'
-  require 'puppet/network/http/api/master'
-  require 'puppet/network/http/api/master/v3'
-  require 'puppet/network/http/handler'
-  require 'puppet/network/http/response'
-  require 'puppet/network/http/request'
-  require 'puppet/network/http/memory_response'
+  require_relative 'http/issues'
+  require_relative 'http/error'
+  require_relative 'http/route'
+  require_relative 'http/api'
+  require_relative 'http/api/master'
+  require_relative 'http/api/master/v3'
+  require_relative 'http/handler'
+  require_relative 'http/response'
+  require_relative 'http/request'
+  require_relative 'http/memory_response'
 end

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

@@ -1,5 +1,5 @@
 class Puppet::Network::HTTP::API
-  require 'puppet/version'
+  require_relative '../../../puppet/version'
 
   def self.not_found
     Puppet::Network::HTTP::Route.

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -1,4 +1,4 @@
-require 'puppet/network/http/api/indirection_type'
+require_relative '../../../../puppet/network/http/api/indirection_type'
 
 class Puppet::Network::HTTP::API::IndirectedRoutes
 
@@ -98,7 +98,7 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
       params[:environment] = configured_environment
     end
 
-    if configured_environment.nil?
+    if configured_environment.nil? && indirection.terminus.require_environment?
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(
         _("Could not find environment '%{environment}'") % { environment: environment })
     end

data/lib/puppet/network/http/api/master.rb

@@ -1,3 +1,3 @@
-require 'puppet/network/http/api/server'
+require_relative '../../../../puppet/network/http/api/server'
 
 Puppet::Network::HTTP::API::Master = Puppet::Network::HTTP::API::Server

data/lib/puppet/network/http/api/master/v3.rb

@@ -1,3 +1,3 @@
-require 'puppet/network/http/api/master'
-require 'puppet/network/http/api/server/v3'
+require_relative '../../../../../puppet/network/http/api/master'
+require_relative '../../../../../puppet/network/http/api/server/v3'
 

data/lib/puppet/network/http/api/master/v3/environments.rb

@@ -1,3 +1,3 @@
-require 'puppet/network/http/api/master'
-require 'puppet/network/http/api/server/v3/environments'
+require_relative '../../../../../../puppet/network/http/api/master'
+require_relative '../../../../../../puppet/network/http/api/server/v3/environments'