puppet 3.8.7-x64-mingw32 → 4.0.0.rc1-x64-mingw32

data/lib/puppet/indirector/node/ldap.rb

@@ -75,7 +75,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
 
   # The attributes that Puppet will stack as array over the full
   # hierarchy.
-  def stacked_attributes(dummy_argument=:work_arround_for_ruby_GC_bug)
+  def stacked_attributes
     Puppet[:ldapstackedattrs].split(/\s*,\s*/)
   end
 

data/lib/puppet/indirector/request.rb

@@ -1,13 +1,15 @@
 require 'cgi'
 require 'uri'
 require 'puppet/indirector'
-require 'puppet/util/pson'
 require 'puppet/network/resolver'
+require 'puppet/util/psych_support'
 
 # This class encapsulates all of the information you need to make an
 # Indirection call, and as a result also handles REST calls.  It's somewhat
 # analogous to an HTTP Request object, except tuned for our Indirector.
 class Puppet::Indirector::Request
+  include Puppet::Util::PsychSupport
+
   attr_accessor :key, :method, :options, :instance, :node, :ip, :authenticated, :ignore_cache, :ignore_terminus
 
   attr_accessor :server, :port, :uri, :protocol
@@ -18,64 +20,6 @@ class Puppet::Indirector::Request
   # and keep it "trusted"
   OPTION_ATTRIBUTES = [:ip, :node, :authenticated, :ignore_terminus, :ignore_cache, :instance, :environment]
 
-  ::PSON.register_document_type('IndirectorRequest',self)
-
-  def self.from_data_hash(data)
-    raise ArgumentError, "No indirection name provided in data" unless indirection_name = data['type']
-    raise ArgumentError, "No method name provided in data" unless method = data['method']
-    raise ArgumentError, "No key provided in data" unless key = data['key']
-
-    request = new(indirection_name, method, key, nil, data['attributes'])
-
-    if instance = data['instance']
-      klass = Puppet::Indirector::Indirection.instance(request.indirection_name).model
-      if instance.is_a?(klass)
-        request.instance = instance
-      else
-        request.instance = klass.from_data_hash(instance)
-      end
-    end
-
-    request
-  end
-
-  def self.from_pson(json)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(json)
-  end
-
-  def to_data_hash
-    result = {
-      'type' => indirection_name,
-      'method' => method,
-      'key' => key
-    }
-    attributes = {}
-    OPTION_ATTRIBUTES.each do |key|
-      next unless value = send(key)
-      attributes[key] = value
-    end
-
-    options.each do |opt, value|
-      attributes[opt] = value
-    end
-
-    result['attributes'] = attributes unless attributes.empty?
-    result['instance'] = instance if instance
-    result
-  end
-
-  def to_pson_data_hash
-    {
-      'document_type' => 'IndirectorRequest',
-      'data' => to_data_hash,
-    }
-  end
-
-  def to_pson(*args)
-    to_pson_data_hash.to_pson(*args)
-  end
-
   # Is this an authenticated request?
   def authenticated?
     # Double negative, so we just get true or false
@@ -92,8 +36,6 @@ class Puppet::Indirector::Request
     @environment =
     if env.is_a?(Puppet::Node::Environment)
       env
-    elsif (current_environment = Puppet.lookup(:current_environment)).name == env
-      current_environment
     else
       Puppet.lookup(:environments).get!(env)
     end
@@ -167,25 +109,7 @@ class Puppet::Indirector::Request
   # Create the query string, if options are present.
   def query_string
     return "" if options.nil? || options.empty?
-
-    # For backward compatibility with older (pre-3.3) masters,
-    # this puppet option allows serialization of query parameter
-    # arrays as yaml.  This can be removed when we remove yaml
-    # support entirely.
-    if Puppet.settings[:legacy_query_parameter_serialization]
-      replace_arrays_with_yaml
-    end
-
-    "?" + encode_params(expand_into_parameters(options.to_a))
-  end
-
-  def replace_arrays_with_yaml
-    options.each do |key, value|
-      case value
-        when Array
-          options[key] = YAML.dump(value)
-      end
-    end
+    encode_params(expand_into_parameters(options.to_a))
   end
 
   def expand_into_parameters(data)
@@ -223,6 +147,22 @@ class Puppet::Indirector::Request
     end.join("&")
   end
 
+  def initialize_from_hash(hash)
+    @indirection_name = hash['indirection_name'].to_sym
+    @method = hash['method'].to_sym
+    @key = hash['key']
+    @instance = hash['instance']
+    @options = hash['options']
+  end
+
+  def to_data_hash
+    { 'indirection_name' => @indirection_name.to_s,
+      'method' => @method.to_s,
+      'key' => @key,
+      'instance' => @instance,
+      'options' => @options }
+  end
+
   def to_hash
     result = options.dup
 
@@ -234,7 +174,7 @@ class Puppet::Indirector::Request
     result
   end
 
-  def to_s
+  def description
     return(uri ? uri : "/#{indirection_name}/#{key}")
   end
 

data/lib/puppet/indirector/resource/ral.rb

@@ -6,8 +6,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
   desc "Manipulate resources with the resource abstraction layer. Only used internally."
 
   def allow_remote_requests?
-    Puppet.deprecation_warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
-    super
+    false
   end
 
   def find( request )

data/lib/puppet/indirector/resource/store_configs.rb

@@ -7,7 +7,6 @@ class Puppet::Resource::StoreConfigs < Puppet::Indirector::StoreConfigs
   desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
 
   def allow_remote_requests?
-    Puppet.deprecation_warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
-    super
+    false
   end
 end

data/lib/puppet/indirector/resource_type/parser.rb

@@ -31,7 +31,7 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
         # We have to us 'find_<type>' here because it will
         # load any missing types from disk, whereas the plain
         # '<type>' method only returns from memory.
-        if r = krt.send("find_#{type}", [""], request.key)
+        if r = krt.send("find_#{type}", request.key)
           return r
         end
       end

data/lib/puppet/indirector/rest.rb

@@ -3,13 +3,13 @@ require 'uri'
 
 require 'puppet/network/http'
 require 'puppet/network/http_pool'
-require 'puppet/network/http/api/v1'
-require 'puppet/network/http/compression'
 
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   include Puppet::Network::HTTP::Compression.module
 
+  IndirectedRoutes = Puppet::Network::HTTP::API::IndirectedRoutes
+
   class << self
     attr_reader :server_setting, :port_setting
   end
@@ -43,7 +43,12 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
 
   # Provide appropriate headers.
   def headers
-    add_accept_encoding({"Accept" => model.supported_formats.join(", ")})
+    common_headers = {
+      "Accept"                                     => model.supported_formats.join(", "),
+      Puppet::Network::HTTP::HEADER_PUPPET_VERSION => Puppet.version
+    }
+
+    add_accept_encoding(common_headers)
   end
 
   def add_profiling_header(headers)
@@ -84,21 +89,20 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def find(request)
-    uri, body = Puppet::Network::HTTP::API::V1.request_to_uri_and_body(request)
+    uri, body = IndirectedRoutes.request_to_uri_and_body(request)
     uri_with_query_string = "#{uri}?#{body}"
 
-    response = do_request(request) do |request|
+    response = do_request(request) do |req|
       # WEBrick in Ruby 1.9.1 only supports up to 1024 character lines in an HTTP request
       # http://redmine.ruby-lang.org/issues/show/3991
       if "GET #{uri_with_query_string} HTTP/1.1\r\n".length > 1024
-        http_post(request, uri, body, headers)
+        http_post(req, uri, body, headers)
       else
-        http_get(request, uri_with_query_string, headers)
+        http_get(req, uri_with_query_string, headers)
       end
     end
 
     if is_http_200?(response)
-      check_master_version(response)
       content_type, body = parse_response(response)
       result = deserialize_find(content_type, body)
       result.name = request.key if result.respond_to?(:name=)
@@ -122,12 +126,11 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def head(request)
-    response = do_request(request) do |request|
-      http_head(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), headers)
+    response = do_request(request) do |req|
+      http_head(req, IndirectedRoutes.request_to_uri(req), headers)
     end
 
     if is_http_200?(response)
-      check_master_version(response)
       true
     else
       false
@@ -135,12 +138,11 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def search(request)
-    response = do_request(request) do |request|
-      http_get(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), headers)
+    response = do_request(request) do |req|
+      http_get(req, IndirectedRoutes.request_to_uri(req), headers)
     end
 
     if is_http_200?(response)
-      check_master_version(response)
       content_type, body = parse_response(response)
       deserialize_search(content_type, body) || []
     else
@@ -151,12 +153,11 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def destroy(request)
     raise ArgumentError, "DELETE does not accept options" unless request.options.empty?
 
-    response = do_request(request) do |request|
-      http_delete(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), headers)
+    response = do_request(request) do |req|
+      http_delete(req, IndirectedRoutes.request_to_uri(req), headers)
     end
 
     if is_http_200?(response)
-      check_master_version(response)
       content_type, body = parse_response(response)
       deserialize_destroy(content_type, body)
     else
@@ -167,12 +168,11 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def save(request)
     raise ArgumentError, "PUT does not accept options" unless request.options.empty?
 
-    response = do_request(request) do |request|
-      http_put(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), request.instance.render, headers.merge({ "Content-Type" => request.instance.mime }))
+    response = do_request(request) do |req|
+      http_put(req, IndirectedRoutes.request_to_uri(req), req.instance.render, headers.merge({ "Content-Type" => req.instance.mime }))
     end
 
     if is_http_200?(response)
-      check_master_version(response)
       content_type, body = parse_response(response)
       deserialize_save(content_type, body)
     else
@@ -187,7 +187,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # to request.do_request from here, thus if we change what we pass or how we
   # get it, we only need to change it here.
   def do_request(request)
-    request.do_request(self.class.srv_service, self.class.server, self.class.port) { |request| yield(request) }
+    request.do_request(self.class.srv_service, self.class.server, self.class.port) { |req| yield(req) }
   end
 
   def validate_key(request)
@@ -217,18 +217,6 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     Net::HTTPError.new(message, response)
   end
 
-  def check_master_version response
-    if !response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION] &&
-       (Puppet[:legacy_query_parameter_serialization] == false || Puppet[:report_serialization_format] != "yaml")
-      Puppet.notice "Using less secure serialization of reports and query parameters for compatibility"
-      Puppet.notice "with older puppet master. To remove this notice, please upgrade your master(s) "
-      Puppet.notice "to Puppet 3.3 or newer."
-      Puppet.notice "See http://links.puppetlabs.com/deprecate_yaml_on_network for more information."
-      Puppet[:legacy_query_parameter_serialization] = true
-      Puppet[:report_serialization_format] = "yaml"
-    end
-  end
-
   # Returns the content_type, stripping any appended charset, and the
   # body, decompressed if necessary (content-encoding is checked inside
   # uncompress_body)

data/lib/puppet/interface.rb

@@ -31,13 +31,6 @@ class Puppet::Interface
     # This is just so we can search for actions.  We only use its
     # list of directories to search.
 
-    # @api private
-    # @deprecated
-    def autoloader
-      Puppet.deprecation_warning("Puppet::Interface.autoloader is deprecated; please use Puppet::Interface#loader instead")
-      @autoloader ||= Puppet::Util::Autoload.new(:application, "puppet/face")
-    end
-
     # Lists all loaded faces
     # @return [Array<Symbol>] The names of the loaded faces
     def faces

data/lib/puppet/interface/action_builder.rb

@@ -61,7 +61,7 @@ class Puppet::Interface::ActionBuilder
   # code to do so.  One or more strings are given, in the style of
   # OptionParser (see example). These strings are parsed to derive a
   # name for the option. Any `-` characters within the option name (ie
-  # excluding the intial `-` or `--` for an option) will be translated
+  # excluding the initial `-` or `--` for an option) will be translated
   # to `_`.The first long option will be used as the name, and the rest
   # are retained as aliases. The original form of the option is used
   # when invoking the face, the translated form is used internally.

data/lib/puppet/interface/action_manager.rb

@@ -29,18 +29,6 @@ module Puppet::Interface::ActionManager
     @actions[action.name] = action
   end
 
-  # Defines an action without using ActionBuilder. The block given is
-  # the code that will be executed when the action is invoked.
-  # @api public
-  # @deprecated
-  def script(name, &block)
-    @actions ||= {}
-    Puppet.warning "Redefining action #{name} for #{self}" if action?(name)
-
-    # REVISIT: (#18048) it's possible to create multiple default actions
-    @actions[name] = Puppet::Interface::Action.new(self, name, :when_invoked => block)
-  end
-
   # Returns the list of available actions for this face.
   # @return [Array<Symbol>] The names of the actions for this face
   # @api private
@@ -56,7 +44,7 @@ module Puppet::Interface::ActionManager
     # We need to uniq the result, because we duplicate actions when they are
     # fetched to ensure that they have the correct bindings; they shadow the
     # parent, and uniq implements that. --daniel 2011-06-01
-    result.uniq.sort
+    (result - @deactivated_actions.to_a).uniq.sort
   end
 
   # Retrieves a named action
@@ -94,6 +82,14 @@ module Puppet::Interface::ActionManager
     default.first
   end
 
+  # Deactivate a named action
+  # @return [Puppet::Interface::Action]
+  # @api public
+  def deactivate_action(name)
+    @deactivated_actions ||= Set.new
+    @deactivated_actions.add name.to_sym
+  end
+
   # @api private
   def action?(name)
     actions.include?(name.to_sym)

data/lib/puppet/interface/face_collection.rb

@@ -27,8 +27,8 @@ module Puppet::Interface::FaceCollection
       # ...we need to search for it bound to an o{lder,ther} version.  Since
       # we load all actions when the face is first references, this will be in
       # memory in the known set of versions of the face.
-      (@faces[name].keys - [ :current ]).sort.reverse.each do |version|
-        break if action = @faces[name][version].get_action(action_name)
+      (@faces[name].keys - [ :current ]).sort.reverse.each do |vers|
+        break if action = @faces[name][vers].get_action(action_name)
       end
     end
 

data/lib/puppet/interface/option_builder.rb

@@ -83,9 +83,7 @@ class Puppet::Interface::OptionBuilder
     if @option.has_default?
       raise ArgumentError, "#{@option} already has a default value"
     end
-    # Ruby 1.8 treats a block without arguments as accepting any number; 1.9
-    # gets this right, so we work around it for now... --daniel 2011-07-20
-    unless block.arity == 0 or (RUBY_VERSION =~ /^1\.8/ and block.arity == -1)
+    unless block.arity == 0
       raise ArgumentError, "#{@option} default_to block should not take any arguments"
     end
     @option.default = block

data/lib/puppet/metatype/manager.rb

@@ -83,12 +83,6 @@ module Manager
 
     options = symbolize_options(options)
 
-
-    if options.include?(:parent) 
-      Puppet.deprecation_warning "option :parent is deprecated. It has no effect"
-      options.delete(:parent)
-    end
-
     # Then create the class.
 
     klass = genclass(
@@ -174,7 +168,7 @@ module Manager
   # @api private
   def typeloader
     unless defined?(@typeloader)
-      @typeloader = Puppet::Util::Autoload.new(self, "puppet/type", :wrap => false)
+      @typeloader = Puppet::Util::Autoload.new(self, "puppet/type")
     end
 
     @typeloader

data/lib/puppet/module.rb

@@ -33,6 +33,25 @@ class Puppet::Module
     env.module(modname)
   end
 
+  def self.is_module_directory?(name, path)
+    # it must be a directory
+    fullpath = File.join(path, name)
+    return false unless Puppet::FileSystem.directory?(fullpath)
+    return is_module_directory_name?(name)
+  end
+
+  def self.is_module_directory_name?(name)
+    # it must match an installed module name according to forge validator
+    return true if name =~ /^[a-z][a-z0-9_]*$/
+    return false
+  end
+
+  def self.is_module_namespaced_name?(name)
+    # it must match the full module name according to forge validator
+    return true if name =~ /^[a-zA-Z0-9]+[-][a-z][a-z0-9_]*$/   
+    return false
+  end
+
   attr_reader :name, :environment, :path, :metadata
   attr_writer :environment
 
@@ -124,14 +143,9 @@ class Puppet::Module
         end
       end
 
-      # NOTICE: The fallback to `versionRequirement` is something we'd like to
-      # not have to support, but we have a reasonable number of releases that
-      # don't use `version_requirement`. When we can deprecate this, we should.
       if attr == :dependencies
-        value.tap do |dependencies|
-          dependencies.each do |dep|
-            dep['version_requirement'] ||= dep['versionRequirement'] || '>= 0.0.0'
-          end
+        value.each do |dep|
+          dep['version_requirement'] ||= '>= 0.0.0'
         end
       end
 
@@ -140,7 +154,7 @@ class Puppet::Module
   end
 
   # Return the list of manifests matching the given glob pattern,
-  # defaulting to 'init.{pp,rb}' for empty modules.
+  # defaulting to 'init.pp' for empty modules.
   def match_manifests(rest)
     if rest
       wanted_manifests = wanted_manifests_from(rest)
@@ -150,14 +164,17 @@ class Puppet::Module
     end
 
     # (#4220) Always ensure init.pp in case class is defined there.
-    init_manifests = [manifest("init.pp"), manifest("init.rb")].compact
-    init_manifests + searched_manifests
+    init_manifest = manifest("init.pp")
+    if !init_manifest.nil? && !searched_manifests.include?(init_manifest)
+      searched_manifests.unshift(init_manifest)
+    end
+    searched_manifests
   end
 
   def all_manifests
     return [] unless Puppet::FileSystem.exist?(manifests)
 
-    Dir.glob(File.join(manifests, '**', '*.{rb,pp}'))
+    Dir.glob(File.join(manifests, '**', '*.pp'))
   end
 
   def metadata_file
@@ -210,19 +227,6 @@ class Puppet::Module
     environment.module_requirements[self.forge_name] || {}
   end
 
-  def has_local_changes?
-    Puppet.deprecation_warning("This method is being removed.")
-    require 'puppet/module_tool/applications'
-    changes = Puppet::ModuleTool::Applications::Checksummer.run(path)
-    !changes.empty?
-  end
-
-  def local_changes
-    Puppet.deprecation_warning("This method is being removed.")
-    require 'puppet/module_tool/applications'
-    Puppet::ModuleTool::Applications::Checksummer.run(path)
-  end
-
   # Identify and mark unmet dependencies.  A dependency will be marked unmet
   # for the following reasons:
   #
@@ -254,7 +258,8 @@ class Puppet::Module
     return unmet_dependencies unless dependencies
 
     dependencies.each do |dependency|
-      forge_name = dependency['name']
+      name = dependency['name']
+      forge_name = name.tr('-', '/')
       version_string = dependency['version_requirement'] || '>= 0.0.0'
 
       dep_mod = begin
@@ -264,7 +269,7 @@ class Puppet::Module
       end
 
       error_details = {
-        :name => forge_name,
+        :name => name,
         :version_constraint => version_string.gsub(/^(?=\d)/, "v"),
         :parent => {
           :name => self.forge_name,
@@ -307,11 +312,18 @@ class Puppet::Module
     raise IncompatibleModule, "Module #{self.name} is only compatible with Puppet version #{puppetversion}, not #{Puppet.version}"
   end
 
+  def ==(other)
+    self.name == other.name &&
+    self.version == other.version &&
+    self.path == other.path &&
+    self.environment == other.environment
+  end
+
   private
 
   def wanted_manifests_from(pattern)
     begin
-      extended = File.extname(pattern).empty? ? "#{pattern}.{pp,rb}" : pattern
+      extended = File.extname(pattern).empty? ? "#{pattern}.pp" : pattern
       relative_pattern = Puppet::FileSystem::PathPattern.relative(extended)
     rescue Puppet::FileSystem::PathPattern::InvalidPattern => error
       raise Puppet::Module::InvalidFilePattern.new(
@@ -327,13 +339,8 @@ class Puppet::Module
   end
 
   def assert_validity
-    raise InvalidName, "Invalid module name #{name}; module names must be alphanumeric (plus '-'), not '#{name}'" unless name =~ /^[-\w]+$/
-  end
-
-  def ==(other)
-    self.name == other.name &&
-    self.version == other.version &&
-    self.path == other.path &&
-    self.environment == other.environment
+    if !Puppet::Module.is_module_directory_name?(@name) && !Puppet::Module.is_module_namespaced_name?(@name)
+      raise InvalidName, "Invalid module name #{@name}; module names must be alphanumeric (plus '-'), not '#{@name}'"
+    end
   end
 end