puppet 3.4.3 → 3.5.0.rc1

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

@@ -12,6 +12,6 @@ class Puppet::Resource::Rest < Puppet::Indirector::REST
     # Body is [ral_res.to_resource, transaction.report]
     format = Puppet::Network::FormatHandler.format_for(content_type)
     ary = format.intern(Array, body)
-    [Puppet::Resource.from_pson(ary[0]), Puppet::Transaction::Report.from_pson(ary[1])]
+    [Puppet::Resource.from_data_hash(ary[0]), Puppet::Transaction::Report.from_data_hash(ary[1])]
   end
 end

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

@@ -23,10 +23,7 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
   # @return [Puppet::Resource::Type, nil]
   # @api public
   def find(request)
-    begin
-      # This is a fix in 3.x that will be replaced with the use of a context
-      # (That is not available until 3.5).
-      $squelsh_parse_errors = true
+    Puppet.override(:squelch_parse_errors => true) do
       krt = resource_types_in(request.environment)
 
       # This is a bit ugly.
@@ -39,8 +36,6 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
         end
       end
       nil
-    ensure
-      $squelsh_parse_errors = false
     end
   end
 
@@ -60,10 +55,7 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
   #
   # @api public
   def search(request)
-    begin
-      # This is a fix in 3.x that will be replaced with the use of a context
-      # (That is not available until 3.5).
-      $squelsh_parse_errors = true
+    Puppet.override(:squelch_parse_errors => true) do
 
       krt = resource_types_in(request.environment)
       # Make sure we've got all of the types loaded.
@@ -93,15 +85,13 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
       begin
         regex = Regexp.new(key)
       rescue => detail
-        raise ArgumentError, "Invalid regex '#{request.key}': #{detail}"
+        raise ArgumentError, "Invalid regex '#{request.key}': #{detail}", detail.backtrace
       end
 
       result.reject! { |t| t.name.to_s !~ regex }
       return nil if result.empty?
       result
     end
-  ensure
-    $squelsh_parse_errors = false
   end
 
   def resource_types_in(environment)

data/lib/puppet/indirector/rest.rb

@@ -8,7 +8,6 @@ require 'puppet/network/http/compression'
 
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
-  include Puppet::Network::HTTP::API::V1
   include Puppet::Network::HTTP::Compression.module
 
   class << self
@@ -85,7 +84,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def find(request)
-    uri, body = request_to_uri_and_body(request)
+    uri, body = Puppet::Network::HTTP::API::V1.request_to_uri_and_body(request)
     uri_with_query_string = "#{uri}?#{body}"
 
     response = do_request(request) do |request|
@@ -111,7 +110,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
 
   def head(request)
     response = do_request(request) do |request|
-      http_head(request, indirection2uri(request), headers)
+      http_head(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), headers)
     end
 
     if is_http_200?(response)
@@ -124,7 +123,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
 
   def search(request)
     response = do_request(request) do |request|
-      http_get(request, indirection2uri(request), headers)
+      http_get(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), headers)
     end
 
     if is_http_200?(response)
@@ -140,7 +139,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     raise ArgumentError, "DELETE does not accept options" unless request.options.empty?
 
     response = do_request(request) do |request|
-      http_delete(request, indirection2uri(request), headers)
+      http_delete(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), headers)
     end
 
     if is_http_200?(response)
@@ -156,7 +155,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     raise ArgumentError, "PUT does not accept options" unless request.options.empty?
 
     response = do_request(request) do |request|
-      http_put(request, indirection2uri(request), request.instance.render, headers.merge({ "Content-Type" => request.instance.mime }))
+      http_put(request, Puppet::Network::HTTP::API::V1.indirection2uri(request), request.instance.render, headers.merge({ "Content-Type" => request.instance.mime }))
     end
 
     if is_http_200?(response)
@@ -242,6 +241,6 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def environment
-    Puppet::Node::Environment.new
+    Puppet.lookup(:environments).get(Puppet[:environment])
   end
 end

data/lib/puppet/indirector/ssl_file.rb

@@ -69,14 +69,14 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
 
   # Remove our file.
   def destroy(request)
-    path = path(request.key)
-    return false unless Puppet::FileSystem::File.exist?(path)
+    path = Puppet::FileSystem.pathname(path(request.key))
+    return false unless Puppet::FileSystem.exist?(path)
 
     Puppet.notice "Removing file #{model} #{request.key} at '#{path}'"
     begin
-      Puppet::FileSystem::File.unlink(path)
+      Puppet::FileSystem.unlink(path)
     rescue => detail
-      raise Puppet::Error, "Could not remove #{request.key}: #{detail}"
+      raise Puppet::Error, "Could not remove #{request.key}: #{detail}", detail.backtrace
     end
   end
 
@@ -135,10 +135,10 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
   # which we'll be EOL'ing at some point.  This method was added at 20080702
   # and should be removed at some point.
   def rename_files_with_uppercase(file)
-    return file if Puppet::FileSystem::File.exist?(file)
+    return file if Puppet::FileSystem.exist?(file)
 
     dir, short = File.split(file)
-    return nil unless Puppet::FileSystem::File.exist?(dir)
+    return nil unless Puppet::FileSystem.exist?(dir)
 
     raise ArgumentError, "Tried to fix SSL files to a file containing uppercase" unless short.downcase == short
     real_file = Dir.entries(dir).reject { |f| f =~ /^\./ }.find do |other|
@@ -166,7 +166,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
       begin
         Puppet.settings.setting(setting).open_file(path, 'w') { |f| yield f }
       rescue => detail
-        raise Puppet::Error, "Could not write #{path} to #{setting}: #{detail}"
+        raise Puppet::Error, "Could not write #{path} to #{setting}: #{detail}", detail.backtrace
       end
     else
       raise Puppet::DevError, "You must provide a setting to determine where the files are stored"

data/lib/puppet/indirector/yaml.rb

@@ -6,12 +6,12 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
   # Read a given name's file in and convert it from YAML.
   def find(request)
     file = path(request.key)
-    return nil unless Puppet::FileSystem::File.exist?(file)
+    return nil unless Puppet::FileSystem.exist?(file)
 
     begin
-      return Puppet::Util::Yaml.load_file(file)
+      return fix(Puppet::Util::Yaml.load_file(file))
     rescue Puppet::Util::Yaml::YamlLoadError => detail
-      raise Puppet::Error, "Could not parse YAML data for #{indirection.name} #{request.key}: #{detail}"
+      raise Puppet::Error, "Could not parse YAML data for #{indirection.name} #{request.key}: #{detail}", detail.backtrace
     end
   end
 
@@ -24,7 +24,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     basedir = File.dirname(file)
 
     # This is quite likely a bad idea, since we're not managing ownership or modes.
-    Dir.mkdir(basedir) unless Puppet::FileSystem::File.exist?(basedir)
+    Dir.mkdir(basedir) unless Puppet::FileSystem.exist?(basedir)
 
     begin
       Puppet::Util::Yaml.dump(request.instance, file)
@@ -46,22 +46,18 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
 
   def destroy(request)
     file_path = path(request.key)
-    Puppet::FileSystem::File.unlink(file_path) if Puppet::FileSystem::File.exist?(file_path)
+    Puppet::FileSystem.unlink(file_path) if Puppet::FileSystem.exist?(file_path)
   end
 
   def search(request)
     Dir.glob(path(request.key,'')).collect do |file|
-      YAML.load_file(file)
+      fix(Puppet::Util::Yaml.load_file(file))
     end
   end
 
-  private
+  protected
 
-  def from_yaml(text)
-    YAML.load(text)
-  end
-
-  def to_yaml(object)
-    YAML.dump(object)
+  def fix(object)
+    object
   end
 end

data/lib/puppet/metatype/manager.rb

@@ -49,9 +49,8 @@ module Manager
   # method is kept).
   #
   # @param name [String] the name of the type to create or redefine.
-  # @param options [Hash] options passed on to {Puppet::Util::ClassGen#genclass} as the option `:attributes` after
-  #   first having removed any present `:parent` option.
-  # @option options [Puppet::Type] :parent the parent (super type) of this type. If nil, the default is
+  # @param options [Hash] options passed on to {Puppet::Util::ClassGen#genclass} as the option `:attributes`.
+  # @option options [Puppet::Type]
   #   Puppet::Type. This option is not passed on as an attribute to genclass.
   # @yield [ ] a block evaluated in the context of the created class, thus allowing further detailing of
   #   that class.
@@ -64,7 +63,6 @@ module Manager
     # Handle backward compatibility
     unless options.is_a?(Hash)
       Puppet.warning "Puppet::Type.newtype(#{name}) now expects a hash as the second argument, not #{options.inspect}"
-      options = {:parent => options}
     end
 
     # First make sure we don't have a method sitting around
@@ -85,7 +83,9 @@ module Manager
 
     options = symbolize_options(options)
 
-    if parent = options[:parent]
+
+    if options.include?(:parent) 
+      Puppet.deprecation_warning "option :parent is deprecated. It has no effect"
       options.delete(:parent)
     end
 
@@ -93,7 +93,7 @@ module Manager
 
     klass = genclass(
       name,
-      :parent => (parent || Puppet::Type),
+      :parent => Puppet::Type,
       :overwrite => true,
       :hash => @types,
       :attributes => options,
@@ -142,6 +142,11 @@ module Manager
   # @return [Puppet::Type, nil] the type or nil if the type was not defined and could not be loaded
   #
   def type(name)
+    # Avoid loading if name obviously is not a type name
+    if name.to_s.include?(':')
+      return nil
+    end
+
     @types ||= {}
 
     # We are overwhelmingly symbols here, which usually match, so it is worth
@@ -155,7 +160,7 @@ module Manager
       return @types[name] if @types[name]
     end
     # Try loading the type.
-    if typeloader.load(name, Puppet::Node::Environment.current)
+    if typeloader.load(name, Puppet.lookup(:current_environment))
       Puppet.warning "Loaded puppet/type/#{name} but no class was created" unless @types.include? name
     end
 

data/lib/puppet/module.rb

@@ -1,6 +1,6 @@
 require 'puppet/util/logging'
 require 'semver'
-require 'puppet/module_tool/applications'
+require 'json'
 
 # Support for modules
 class Puppet::Module
@@ -28,7 +28,8 @@ class Puppet::Module
   # of +path+, return +nil+
   def self.find(modname, environment = nil)
     return nil unless modname
-    Puppet::Node::Environment.new(environment).module(modname)
+    env = Puppet.lookup(:environments).get(environment || Puppet[:environment])
+    env.module(modname)
   end
 
   attr_reader :name, :environment, :path
@@ -54,11 +55,11 @@ class Puppet::Module
   def has_metadata?
     return false unless metadata_file
 
-    return false unless Puppet::FileSystem::File.exist?(metadata_file)
+    return false unless Puppet::FileSystem.exist?(metadata_file)
 
     begin
-      metadata =  PSON.parse(File.read(metadata_file))
-    rescue PSON::PSONError => e
+      metadata =  JSON.parse(File.read(metadata_file))
+    rescue JSON::JSONError => e
       Puppet.debug("#{name} has an invalid and unparsable metadata.json file.  The parse error: #{e.message}")
       return false
     end
@@ -71,7 +72,7 @@ class Puppet::Module
     # we have files of a given type.
     define_method(type +'?') do
       type_subpath = subpath(location)
-      unless Puppet::FileSystem::File.exist?(type_subpath)
+      unless Puppet::FileSystem.exist?(type_subpath)
         Puppet.debug("No #{type} found in subpath '#{type_subpath}' " +
                          "(file / directory does not exist)")
         return false
@@ -94,7 +95,7 @@ class Puppet::Module
         full_path = subpath(location)
       end
 
-      return nil unless Puppet::FileSystem::File.exist?(full_path)
+      return nil unless Puppet::FileSystem.exist?(full_path)
       return full_path
     end
 
@@ -112,7 +113,7 @@ class Puppet::Module
   end
 
   def load_metadata
-    data = PSON.parse File.read(metadata_file)
+    data = JSON.parse File.read(metadata_file)
     @forge_name = data['name'].gsub('-', '/') if data['name']
 
     [:source, :author, :version, :license, :puppetversion, :dependencies].each do |attr|
@@ -153,7 +154,7 @@ class Puppet::Module
   end
 
   def all_manifests
-    return [] unless Puppet::FileSystem::File.exist?(manifests)
+    return [] unless Puppet::FileSystem.exist?(manifests)
 
     Dir.glob(File.join(manifests, '**', '*.{rb,pp}'))
   end
@@ -209,11 +210,15 @@ class Puppet::Module
   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
 

data/lib/puppet/module_tool.rb

@@ -103,34 +103,30 @@ module Puppet
       end
     end
 
+    # @param options [Hash<Symbol,String>] This hash will contain any
+    #   command-line arguments that are not Settings, as those will have already
+    #   been extracted by the underlying application code.
+    #
+    # @note Unfortunately the whole point of this method is the side effect of
+    # modifying the options parameter.  This same hash is referenced both
+    # when_invoked and when_rendering.  For this reason, we are not returning
+    # a duplicate.
+    #
+    # An :environment_instance and a :target_dir are added/updated in the
+    # options parameter.
+    #
+    # @api private
     def self.set_option_defaults(options)
-      sep = File::PATH_SEPARATOR
-
-      if options[:environment]
-        Puppet.settings[:environment] = options[:environment]
-      else
-        options[:environment] = Puppet.settings[:environment]
-      end
+      current_environment = Puppet.lookup(:current_environment)
+      modulepath =  [options[:target_dir]] + current_environment.full_modulepath
 
-      if options[:modulepath]
-        Puppet.settings[:modulepath] = options[:modulepath]
-      else
-        # (#14872) make sure the module path of the desired environment is used
-        # when determining the default value of the --target-dir option
-        Puppet.settings[:modulepath] = options[:modulepath] =
-          Puppet.settings.value(:modulepath, options[:environment])
-      end
+      face_environment = current_environment.override_with(
+        :modulepath => modulepath.compact
+      )
 
-      if options[:target_dir]
-        options[:target_dir] = File.expand_path(options[:target_dir])
-        # prepend the target dir to the module path
-        Puppet.settings[:modulepath] = options[:modulepath] =
-          options[:target_dir] + sep + options[:modulepath]
-      else
-        # default to the first component of the module path
-        options[:target_dir] =
-          File.expand_path(options[:modulepath].split(sep).first)
-      end
+      options[:environment_instance] = face_environment
+      # Note: environment will have expanded the path
+      options[:target_dir] = face_environment.full_modulepath.first
     end
   end
 end
@@ -144,5 +140,4 @@ require 'puppet/module_tool/dependency'
 require 'puppet/module_tool/metadata'
 require 'puppet/module_tool/modulefile'
 require 'puppet/module_tool/skeleton'
-require 'puppet/forge/cache'
 require 'puppet/forge'

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

@@ -53,7 +53,7 @@ module Puppet::ModuleTool
               begin
                 @metadata.extra_metadata = PSON.load(f)
               rescue PSON::ParserError
-                raise ArgumentError, "Could not parse JSON #{extra_metadata_path}"
+                raise ArgumentError, "Could not parse JSON #{extra_metadata_path}", $!.backtrace
               end
             end
           end

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

@@ -10,7 +10,8 @@ module Puppet::ModuleTool
         begin
           @metadata = Metadata.new(:full_module_name => full_module_name)
         rescue ArgumentError
-          raise "Could not generate directory #{full_module_name.inspect}, you must specify a dash-separated username and module name."
+          msg = "Could not generate directory #{full_module_name.inspect}, you must specify a dash-separated username and module name."
+          raise $!, msg, $!.backtrace
         end
         super(options)
       end

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

@@ -18,7 +18,7 @@ module Puppet::ModuleTool
       def initialize(name, forge, install_dir, options = {})
         super(options)
         @action              = :install
-        @environment         = Puppet::Node::Environment.new(Puppet.settings[:environment])
+        @environment         = options[:environment_instance]
         @force               = options[:force]
         @ignore_dependencies = options[:force] || options[:ignore_dependencies]
         @name                = name
@@ -32,7 +32,7 @@ module Puppet::ModuleTool
           if is_module_package?(@name)
             @source = :filesystem
             @filename = File.expand_path(@name)
-            raise MissingPackageError, :requested_package => @filename unless Puppet::FileSystem::File.exist?(@filename)
+            raise MissingPackageError, :requested_package => @filename unless Puppet::FileSystem.exist?(@filename)
 
             parsed = parse_filename(@filename)
             @module_name = parsed[:module_name]
@@ -91,7 +91,7 @@ module Puppet::ModuleTool
             :module_name       => @module_name,
             :installed_version => @installed[@module_name].first.version,
             :requested_version => @version || (@conditions[@module_name].empty? ? :latest : :best),
-            :local_changes     => @installed[@module_name].first.local_changes
+            :local_changes     => Puppet::ModuleTool::Applications::Checksummer.run(@installed[@module_name].first.path)
         end
 
         if @ignore_dependencies && @source == :filesystem
@@ -135,6 +135,8 @@ 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(',')}")
+
         graph.each do |release|
           @environment.modules_by_path[options[:target_dir]].each do |mod|
             if mod.has_metadata?
@@ -165,8 +167,11 @@ module Puppet::ModuleTool
                 :directory         => mod.path,
                 :metadata          => metadata
             end
+          end
 
-            resolve_install_conflicts(release[:dependencies], true)
+          deps = release[:dependencies]
+          if deps && !deps.empty?
+            resolve_install_conflicts(deps, true)
           end
         end
       end