puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/lib/puppet/indirector/indirection.rb

@@ -208,7 +208,7 @@ class Puppet::Indirector::Indirection
 
         filtered = result
         if terminus.respond_to?(:filter)
-          Puppet::Util::Profiler.profile("Filtered result for #{self.name} #{request.key}") do
+          Puppet::Util::Profiler.profile("Filtered result for #{self.name} #{request.key}", [:indirector, :filter, self.name, request.key]) do
             filtered = terminus.filter(result)
           end
         end

data/lib/puppet/indirector/request.rb

@@ -83,14 +83,20 @@ class Puppet::Indirector::Request
   end
 
   def environment
-    @environment ||= Puppet.lookup(:environments).get(Puppet[:environment])
+    # If environment has not been set directly, we should use the application's
+    # current environment
+    @environment ||= Puppet.lookup(:current_environment)
   end
 
   def environment=(env)
-    @environment = if env.is_a?(Puppet::Node::Environment)
+    @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)
+      Puppet.lookup(:environments).get(env) ||
+      raise(Puppet::Environments::EnvironmentNotFound, env)
     end
   end
 

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

@@ -59,6 +59,6 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
   end
 
   def type( request )
-    Puppet::Type.type(type_name(request)) or raise Puppet::Error, "Could not find type #{type}"
+    Puppet::Type.type(type_name(request)) or raise Puppet::Error, "Could not find type #{type_name(request)}"
   end
 end

data/lib/puppet/indirector/rest.rb

@@ -114,7 +114,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
       # that makes a user aware of the reason for the failure.
       #
       content_type, body = parse_response(response)
-      msg = "Find #{uri_with_query_string} resulted in 404 with the message: #{body}"
+      msg = "Find #{elide(uri_with_query_string, 100)} resulted in 404 with the message: #{body}"
       raise Puppet::Error, msg
     else
       nil
@@ -257,7 +257,11 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     nil
   end
 
-  def environment
-    Puppet.lookup(:environments).get(Puppet[:environment])
+  def elide(string, length)
+    if Puppet::Util::Log.level == :debug || string.length <= length
+      string
+    else
+      string[0, length - 3] + "..."
+    end
   end
 end

data/lib/puppet/loaders.rb

@@ -11,7 +11,6 @@ module Puppet
       require 'puppet/pops/loader/null_loader'
       require 'puppet/pops/loader/static_loader'
       require 'puppet/pops/loader/ruby_function_instantiator'
-      require 'puppet/pops/loader/ruby_legacy_function_instantiator'
       require 'puppet/pops/loader/loader_paths'
       require 'puppet/pops/loader/simple_environment_loader'
     end

data/lib/puppet/module.rb

@@ -28,7 +28,8 @@ class Puppet::Module
   # of +path+, return +nil+
   def self.find(modname, environment = nil)
     return nil unless modname
-    env = Puppet.lookup(:environments).get(environment || Puppet[:environment])
+    # Unless a specific environment is given, use the current environment
+    env = environment ? Puppet.lookup(:environments).get(environment) : Puppet.lookup(:current_environment)
     env.module(modname)
   end
 

data/lib/puppet/module_tool.rb

@@ -149,6 +149,8 @@ module Puppet
       elsif options[:environment].is_a?(Puppet::Node::Environment)
         options[:environment]
       elsif options[:environment]
+        # This use of looking up an environment is correct since it honours
+        # a reguest to get a particular environment via environment name.
         Puppet.lookup(:environments).get(options[:environment])
       else
         Puppet.lookup(:current_environment)

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

@@ -40,6 +40,10 @@ module Puppet::ModuleTool
           raise ArgumentError, "Could not determine module path"
         end
 
+        if require_metadata && !Puppet::ModuleTool.is_module_root?(@path)
+          raise ArgumentError, "Unable to find metadata.json or Modulefile in module root at #{@path} See http://links.puppetlabs.com/modulefile for required file format."
+        end
+
         modulefile_path = File.join(@path, 'Modulefile')
         metadata_path   = File.join(@path, 'metadata.json')
 
@@ -63,11 +67,6 @@ module Puppet::ModuleTool
           Puppet::ModuleTool::ModulefileReader.evaluate(@metadata, modulefile_path)
         end
 
-        has_metadata = File.file?(modulefile_path) || File.file?(metadata_path)
-        if !has_metadata && require_metadata
-          raise ArgumentError, "No metadata found for module #{@path}"
-        end
-
         return @metadata
       end
 

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

@@ -1,5 +1,7 @@
 require 'fileutils'
 require 'json'
+require 'puppet/file_system'
+require 'pathspec'
 
 module Puppet::ModuleTool
   module Applications
@@ -55,20 +57,77 @@ module Puppet::ModuleTool
         FileUtils.mkdir(build_path)
       end
 
+      def ignored_files
+        if @ignored_files
+          return @ignored_files
+        else
+          pmtignore = File.join(@path, '.pmtignore')
+          gitignore = File.join(@path, '.gitignore')
+
+          if File.file? pmtignore
+            @ignored_files = PathSpec.new File.read(pmtignore)
+          elsif File.file? gitignore
+            @ignored_files = PathSpec.new File.read(gitignore)
+          else
+            @ignored_files = PathSpec.new
+          end
+        end
+      end
+
       def copy_contents
-        Dir[File.join(@path, '*')].each do |path|
-          case File.basename(path)
-          when *Puppet::ModuleTool::ARTIFACTS
+        symlinks = []
+        Find.find(File.join(@path)) do |path|
+          # because Find.find finds the path itself
+          if path == @path
             next
+          end
+
+          # Needed because pathspec looks for a trailing slash in the path to
+          # determine if a path is a directory
+          path = path.to_s + '/' if File.directory? path
+
+          # if it matches, then prune it with fire
+          unless ignored_files.match_paths([path], @path).empty?
+            Find.prune
+          end
+
+          # don't copy all the Puppet ARTIFACTS
+          rel = Pathname.new(path).relative_path_from(Pathname.new(@path))
+          case rel.to_s
+          when *Puppet::ModuleTool::ARTIFACTS
+            Find.prune
+          end
+
+          # make dir tree, copy files, and add symlinks to the symlinks list
+          dest = "#{build_path}/#{rel.to_s}"
+          if File.directory? path
+            FileUtils.mkdir dest, :mode => File.stat(path).mode
+          elsif Puppet::FileSystem.symlink? path
+            symlinks << path
           else
-            FileUtils.cp_r path, build_path, :preserve => true
+            FileUtils.cp path, dest, :preserve => true
+          end
+        end
+
+        # send a message about each symlink and raise an error if they exist
+        unless symlinks.empty?
+          symlinks.each do |s|
+            s = Pathname.new s
+            mpath = Pathname.new @path
+            Puppet.warning "Symlinks in modules are unsupported. Please investigate symlink #{s.relative_path_from mpath} -> #{s.realpath.relative_path_from mpath}."
           end
+
+          raise Puppet::ModuleTool::Errors::ModuleToolError, "Found symlinks. Symlinks in modules are not allowed, please remove them."
         end
       end
 
       def write_json
         metadata_path = File.join(build_path, 'metadata.json')
 
+        if metadata.to_hash.include? 'checksums'
+          Puppet.warning "A 'checksums' field was found in metadata.json. This field will be ignored and can safely be removed."
+        end
+
         # TODO: This may necessarily change the order in which the metadata.json
         # file is packaged from what was written by the user.  This is a
         # regretable, but required for now.
@@ -77,7 +136,7 @@ module Puppet::ModuleTool
         end
 
         File.open(File.join(build_path, 'checksums.json'), 'w') do |f|
-          f.write(PSON.pretty_generate(Checksums.new(@path)))
+          f.write(PSON.pretty_generate(Checksums.new(build_path)))
         end
       end
 

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

@@ -11,6 +11,7 @@ module Puppet::ModuleTool
         @installed   = []
         @suggestions = []
         @environment = options[:environment_instance]
+        @ignore_changes = options[:force] || options[:ignore_changes]
       end
 
       def run
@@ -87,14 +88,14 @@ module Puppet::ModuleTool
       def validate_module
         mod = @installed.first
 
-        if !@options[:force] && mod.has_metadata?
+        unless @ignore_changes
           changes = begin
             Puppet::ModuleTool::Applications::Checksummer.run(mod.path)
           rescue ArgumentError
             []
           end
 
-          if !changes.empty?
+          if mod.has_metadata? && !changes.empty?
             raise LocalChangesError,
               :action            => :uninstall,
               :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),

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

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'tmpdir'
 require 'json'
+require 'puppet/file_system'
 
 module Puppet::ModuleTool
   module Applications
@@ -8,6 +9,7 @@ module Puppet::ModuleTool
       def self.unpack(filename, target)
         app = self.new(filename, :target_dir => target)
         app.unpack
+        app.sanity_check
         app.move_into(target)
       end
 
@@ -28,6 +30,7 @@ module Puppet::ModuleTool
 
       def run
         unpack
+        sanity_check
         module_dir = @module_path + module_name
         move_into(module_dir)
 
@@ -36,6 +39,17 @@ module Puppet::ModuleTool
         return 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}
+        tmpdirpath = Pathname.new tmpdir
+
+        symlinks.each do |s|
+          Puppet.warning "Symlinks in modules are unsupported. Please investigate symlink #{s.relative_path_from tmpdirpath}->#{s.realpath.relative_path_from tmpdirpath}."
+        end
+      end
+
       # @api private
       def unpack
         begin

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

@@ -18,6 +18,7 @@ module Puppet::ModuleTool
         @action              = :upgrade
         @environment         = options[:environment_instance]
         @name                = name
+        @ignore_changes      = forced? || options[:ignore_changes]
         @ignore_dependencies = forced? || options[:ignore_dependencies]
 
         Semantic::Dependency.add_source(installed_modules_source)
@@ -45,7 +46,7 @@ module Puppet::ModuleTool
             raise MultipleInstalledError, results.merge(:module_name => name, :installed_modules => matching_modules)
           end
 
-          mod = installed_modules[name]
+          installed_release = installed_modules[name]
 
           # `priority` is an attribute of a `Semantic::Dependency::Source`,
           # which is delegated through `ModuleRelease` instances for the sake of
@@ -60,17 +61,17 @@ module Puppet::ModuleTool
           # of behavior to be reasonably common in Semantic, we should probably
           # see about implementing a `ModuleRelease#override_priority` method
           # (or something similar).
-          def mod.priority
+          def installed_release.priority
             0
           end
 
-          mod = mod.mod
+          mod = installed_release.mod
           results[:installed_version] = Semantic::Version.parse(mod.version)
           dir = Pathname.new(mod.modulepath)
 
           vstring = mod.version ? "v#{mod.version}" : '???'
           Puppet.notice "Found '#{name}' (#{colorize(:cyan, vstring)}) in #{dir} ..."
-          unless forced?
+          unless @ignore_changes
             changes = Checksummer.run(mod.path) rescue []
             if mod.has_metadata? && !changes.empty?
               raise LocalChangesError,
@@ -83,6 +84,18 @@ module Puppet::ModuleTool
 
           Puppet::Forge::Cache.clean
 
+          # Ensure that there is at least one candidate release available
+          # for the target package.
+          available_versions = module_repository.fetch(name)
+          if available_versions.empty?
+            raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
+          elsif results[:requested_version] != :latest
+            requested = Semantic::VersionRange.parse(results[:requested_version])
+            unless available_versions.any? {|m| requested.include? m.version}
+              raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
+            end
+          end
+
           Puppet.notice "Downloading from #{module_repository.host} ..."
           if @ignore_dependencies
             graph = build_single_module_graph(name, version)
@@ -122,14 +135,6 @@ module Puppet::ModuleTool
             end
           end
 
-          # Ensure that there is at least one candidate release available
-          # for the target package.
-          if graph.dependencies[name].empty? || graph.dependencies[name] == SortedSet.new([ installed_modules[name] ])
-            if results[:requested_version] == :latest || !Semantic::VersionRange.parse(results[:requested_version]).include?(results[:installed_version])
-              raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
-            end
-          end
-
           begin
             Puppet.info "Resolving dependencies ..."
             releases = Semantic::Dependency.resolve(graph)
@@ -160,7 +165,7 @@ module Puppet::ModuleTool
           child = releases.find { |x| x.name == name }
 
           unless forced?
-            if child.version <= results[:installed_version]
+            if child.version == results[:installed_version]
               versions = graph.dependencies[name].map { |r| r.version }
               newer_versions = versions.select { |v| v > results[:installed_version] }
 
@@ -170,6 +175,11 @@ module Puppet::ModuleTool
                 :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]
             end
           end
 

data/lib/puppet/module_tool/dependency.rb

@@ -20,6 +20,18 @@ module Puppet::ModuleTool
       @repository = repository ? Puppet::Forge::Repository.new(repository) : nil
     end
 
+    # We override Object's ==, eql, and hash so we can more easily find identical
+    # dependencies.
+    def ==(o)
+      self.hash == o.hash
+    end
+
+    alias :eql? :==
+
+    def hash
+      [@full_module_name, @version_requirement, @repository].hash
+    end
+
     def to_data_hash
       result = { :name => @full_module_name }
       result[:version_requirement] = @version_requirement if @version_requirement && ! @version_requirement.nil?

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

@@ -164,7 +164,7 @@ module Puppet::ModuleTool::Errors
       message = []
       message << "Could not #{@action} module '#{@module_name}' (#{vstring})"
       message << "  Installed module has had changes made locally"
-      message << "    Use `puppet module #{@action} --force` to #{@action} this module anyway"
+      message << "    Use `puppet module #{@action} --ignore-changes` to #{@action} this module anyway"
       message.join("\n")
     end
   end

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

@@ -40,4 +40,24 @@ module Puppet::ModuleTool::Errors
       message.join("\n")
     end
   end
+
+  class DowngradingUnsupportedError < UpgradeError
+    def initialize(options)
+      @module_name    = options[:module_name]
+      @requested_version = options[:requested_version]
+      @installed_version = options[:installed_version]
+      @conditions        = options[:conditions]
+      @action            = options[:action]
+
+      super "Could not #{@action} '#{@module_name}' (#{vstring}); downgrades are not allowed"
+    end
+
+    def multiline
+      message = []
+      message << "Could not #{@action} module '#{@module_name}' (#{vstring})"
+      message << "  Downgrading is not allowed."
+
+      message.join("\n")
+    end
+  end
 end

data/lib/puppet/module_tool/installed_modules.rb

@@ -58,7 +58,12 @@ module Puppet::ModuleTool
         @mod = mod
         @metadata = mod.metadata
         name = mod.forge_name.tr('/', '-')
-        version = Semantic::Version.parse(mod.version)
+        begin
+          version = Semantic::Version.parse(mod.version)
+        rescue Semantic::Version::ValidationFailure => e
+          Puppet.warning "#{mod.name} (#{mod.path}) has an invalid version number (#{mod.version}). The version has been set to 0.0.0. If you are the maintainer for this module, please update the metadata.json with a valid Semantic Version (http://semver.org)."
+          version = Semantic::Version.parse("0.0.0")
+        end
         release = "#{name}@#{version}"
 
         super(source, name, version, {})

data/lib/puppet/module_tool/metadata.rb

@@ -3,6 +3,7 @@ require 'puppet/module_tool'
 require 'puppet/network/format_support'
 require 'uri'
 require 'json'
+require 'set'
 
 module Puppet::ModuleTool
 
@@ -22,7 +23,7 @@ module Puppet::ModuleTool
       'source'       => '',
       'project_page' => nil,
       'issues_url'   => nil,
-      'dependencies' => [].freeze,
+      'dependencies' => Set.new.freeze,
     }
 
     def initialize
@@ -51,11 +52,41 @@ module Puppet::ModuleTool
       process_name(data) if data['name']
       process_version(data) if data['version']
       process_source(data) if data['source']
+      merge_dependencies(data) if data['dependencies']
 
       @data.merge!(data)
       return self
     end
 
+    # Validates the name and version_requirement for a dependency, then creates
+    # the Dependency and adds it.
+    # Returns the Dependency that was added.
+    def add_dependency(name, version_requirement=nil, repository=nil)
+      validate_name(name)
+      validate_version_range(version_requirement) if version_requirement
+
+      if dup = @data['dependencies'].find { |d| d.full_module_name == name && d.version_requirement != version_requirement }
+        raise ArgumentError, "Dependency conflict for #{full_module_name}: Dependency #{name} was given conflicting version requirements #{version_requirement} and #{dup.version_requirement}. Verify that there are no duplicates in the metadata.json or the Modulefile."
+      end
+
+      dep = Dependency.new(name, version_requirement, repository)
+      @data['dependencies'].add(dep)
+
+      dep
+    end
+
+    # Provides an accessor for the now defunct 'description' property.  This
+    # addresses a regression in Puppet 3.6.x where previously valid templates
+    # refering to the 'description' property were broken.
+    # @deprecated
+    def description
+      @data['description']
+    end
+
+    def dependencies
+      @data['dependencies'].to_a
+    end
+
     # Returns a hash of the module's metadata.  Used by Puppet's automated
     # serialization routines.
     #
@@ -66,6 +97,8 @@ module Puppet::ModuleTool
     alias :to_data_hash :to_hash
 
     def to_json
+      data = @data.dup.merge('dependencies' => dependencies)
+
       # This is used to simulate an ordered hash.  In particular, some keys
       # are promoted to the top of the serialized hash (while others are
       # demoted) for human-friendliness.
@@ -73,12 +106,12 @@ module Puppet::ModuleTool
       # This particularly works around the lack of ordered hashes in 1.8.7.
       promoted_keys = %w[ name version author summary license source ]
       demoted_keys = %w[ dependencies ]
-      keys = @data.keys
+      keys = data.keys
       keys -= promoted_keys
       keys -= demoted_keys
 
       contents = (promoted_keys + keys + demoted_keys).map do |k|
-        value = (JSON.pretty_generate(@data[k]) rescue @data[k].to_json)
+        value = (JSON.pretty_generate(data[k]) rescue data[k].to_json)
         "#{k.to_json}: #{value}"
       end
 
@@ -127,6 +160,16 @@ module Puppet::ModuleTool
       return
     end
 
+    # Validates and parses the dependencies.
+    def merge_dependencies(data)
+      data['dependencies'].each do |dep|
+        add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
+      end
+
+      # Clear dependencies so @data dependencies are not overwritten
+      data.delete 'dependencies'
+    end
+
     # Validates that the given module name is both namespaced and well-formed.
     def validate_name(name)
       return if name =~ /\A[a-z0-9]+[-\/][a-z][a-z0-9_]*\Z/i
@@ -155,5 +198,12 @@ module Puppet::ModuleTool
       err = "version string cannot be parsed as a valid Semantic Version"
       raise ArgumentError, "Invalid 'version' field in metadata.json: #{err}"
     end
+
+    # Validates that the version range can be parsed by Semantic.
+    def validate_version_range(version_range)
+      Semantic::VersionRange.parse(version_range)
+    rescue ArgumentError => e
+      raise ArgumentError, "Invalid 'version_range' field in metadata.json: #{e}"
+    end
   end
 end