puppet 7.3.0-x64-mingw32 → 7.7.0-x64-mingw32

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

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

@@ -3,23 +3,26 @@ module Puppet::Network::HTTP
   HEADER_ENABLE_PROFILING = "X-Puppet-Profiling"
   HEADER_PUPPET_VERSION = "X-Puppet-Version"
 
-  MASTER_URL_PREFIX = "/puppet"
-  MASTER_URL_VERSIONS = "v3"
+  SERVER_URL_PREFIX = "/puppet"
+  SERVER_URL_VERSIONS = "v3"
+
+  MASTER_URL_PREFIX = SERVER_URL_PREFIX
+  MASTER_URL_VERSIONS = SERVER_URL_VERSIONS
 
   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.
@@ -18,18 +18,22 @@ class Puppet::Network::HTTP::API
                                                                       "Note that Puppet 3 agents aren't compatible with this version; if you're " +
                                                                       "running Puppet 3, you must either upgrade your agents to match the server " +
                                                                       "or point them to a server running Puppet 3.\n\n" +
-                                                                      "Master Info:\n" +
+                                                                      "Server Info:\n" +
                                                                       "  Puppet version: #{Puppet.version}\n" +
-                                                                      "  Supported /puppet API versions: #{Puppet::Network::HTTP::MASTER_URL_VERSIONS}\n",
+                                                                      "  Supported /puppet API versions: #{Puppet::Network::HTTP::SERVER_URL_VERSIONS}\n",
                                                                   Puppet::Network::HTTP::Issues::HANDLER_NOT_FOUND)
       end)
   end
 
-  def self.master_routes
-    master_prefix = Regexp.new("^#{Puppet::Network::HTTP::MASTER_URL_PREFIX}/")
-    Puppet::Network::HTTP::Route.path(master_prefix).
+  def self.server_routes
+    server_prefix = Regexp.new("^#{Puppet::Network::HTTP::SERVER_URL_PREFIX}/")
+    Puppet::Network::HTTP::Route.path(server_prefix).
       any.
-      chain(Puppet::Network::HTTP::API::Master::V3.routes,
+      chain(Puppet::Network::HTTP::API::Server::V3.routes,
             Puppet::Network::HTTP::API.not_found)
   end
+
+  def self.master_routes
+    server_routes
+  end
 end

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
 

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

@@ -1,2 +1,3 @@
-module Puppet::Network::HTTP::API::Master
-end
+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,26 +1,3 @@
-class Puppet::Network::HTTP::API::Master::V3
-  require 'puppet/network/http/api/master/v3/environments'
-  require 'puppet/network/http/api/indirected_routes'
+require_relative '../../../../../puppet/network/http/api/master'
+require_relative '../../../../../puppet/network/http/api/server/v3'
 
-  def self.wrap(&block)
-    lambda do |request, response|
-      Puppet::Network::Authorization.check_external_authorization(request.method, request.path)
-
-      block.call.call(request, response)
-    end
-  end
-
-  INDIRECTED = Puppet::Network::HTTP::Route.
-      path(/.*/).
-      any(wrap { Puppet::Network::HTTP::API::IndirectedRoutes.new } )
-
-  ENVIRONMENTS = Puppet::Network::HTTP::Route.
-      path(%r{^/environments$}).
-      get(wrap { Environments.new(Puppet.lookup(:environments)) } )
-
-  def self.routes
-    Puppet::Network::HTTP::Route.path(%r{v3}).
-        any.
-        chain(ENVIRONMENTS, INDIRECTED)
-  end
-end

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

@@ -1,34 +1,3 @@
-require 'puppet/util/json'
+require_relative '../../../../../../puppet/network/http/api/master'
+require_relative '../../../../../../puppet/network/http/api/server/v3/environments'
 
-class Puppet::Network::HTTP::API::Master::V3::Environments
-  def initialize(env_loader)
-    @env_loader = env_loader
-  end
-
-  def call(request, response)
-    response.respond_with(200, "application/json", Puppet::Util::Json.dump({
-      "search_paths" => @env_loader.search_paths,
-      "environments" => Hash[@env_loader.list.collect do |env|
-        [env.name, {
-          "settings" => {
-            "modulepath" => env.full_modulepath,
-            "manifest" => env.manifest,
-            "environment_timeout" => timeout(env),
-            "config_version" => env.config_version || '',
-          }
-        }]
-      end]
-    }))
-  end
-
-  private
-
-  def timeout(env)
-    ttl = @env_loader.get_conf(env.name).environment_timeout
-    if ttl == Float::INFINITY
-      "unlimited"
-    else
-      ttl
-    end
-  end
-end

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

@@ -0,0 +1,10 @@
+module Puppet
+  module Network
+    module HTTP
+      class API
+        module Server
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require_relative 'v3/environments'
+require_relative '../../../../../puppet/network/http/api/indirected_routes'
+
+module Puppet
+  module Network
+    module HTTP
+      class API
+        module Server
+          class V3
+
+            def self.wrap(&block)
+              lambda do |request, response|
+                Puppet::Network::Authorization.
+                  check_external_authorization(request.method,
+                                               request.path)
+
+                block.call.call(request, response)
+              end
+            end
+
+            INDIRECTED = Puppet::Network::HTTP::Route.
+                path(/.*/).
+                any(wrap { Puppet::Network::HTTP::API::IndirectedRoutes.new } )
+
+            ENVIRONMENTS = Puppet::Network::HTTP::Route.
+                path(%r{^/environments$}).
+                get(wrap { Environments.new(Puppet.lookup(:environments)) } )
+
+            def self.routes
+              Puppet::Network::HTTP::Route.path(%r{v3}).
+                  any.
+                  chain(ENVIRONMENTS, INDIRECTED)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require_relative '../../../../../../puppet/util/json'
+
+module Puppet
+  module Network
+    module HTTP
+      class API
+        module Server
+          class V3
+            class Environments
+
+              def initialize(env_loader)
+                @env_loader = env_loader
+              end
+
+              def call(request, response)
+                response.respond_with(200, "application/json", Puppet::Util::Json.dump({
+                  "search_paths" => @env_loader.search_paths,
+                  "environments" => Hash[@env_loader.list.collect do |env|
+                    [env.name, {
+                      "settings" => {
+                        "modulepath" => env.full_modulepath,
+                        "manifest" => env.manifest,
+                        "environment_timeout" => timeout(env),
+                        "config_version" => env.config_version || '',
+                      }
+                    }]
+                  end]
+                }))
+              end
+
+              private
+
+              def timeout(env)
+                ttl = @env_loader.get_conf(env.name).environment_timeout
+                if ttl == Float::INFINITY
+                  "unlimited"
+                else
+                  ttl
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+