puppet 3.1.1 → 3.2.0.rc1

data/lib/puppet/indirector/indirection.rb

@@ -1,4 +1,5 @@
 require 'puppet/util/docs'
+require 'puppet/util/profiler'
 require 'puppet/util/methodhelper'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
@@ -86,8 +87,9 @@ class Puppet::Indirector::Indirection
 
     text += scrub(@doc) + "\n\n" if @doc
 
+    text << "* **Indirected Class**: `#{@indirected_class}`\n";
     if s = terminus_setting
-      text += "* **Terminus Setting**: #{terminus_setting}"
+      text << "* **Terminus Setting**: #{terminus_setting}\n"
     end
 
     text
@@ -104,6 +106,7 @@ class Puppet::Indirector::Indirection
     raise(ArgumentError, "Indirection #{@name} is already defined") if @@indirections.find { |i| i.name == @name }
     @@indirections << self
 
+    @indirected_class = options.delete(:indirected_class)
     if mod = options[:extend]
       extend(mod)
       options.delete(:extend)
@@ -183,22 +186,32 @@ class Puppet::Indirector::Indirection
     request = request(:find, key, nil, options)
     terminus = prepare(request)
 
-    if result = find_in_cache(request)
-      return result
-    end
-
-    # Otherwise, return the result from the terminus, caching if appropriate.
-    if ! request.ignore_terminus? and result = terminus.find(request)
-      result.expiration ||= self.expiration if result.respond_to?(:expiration)
-      if cache? and request.use_cache?
-        Puppet.info "Caching #{self.name} for #{request.key}"
-        cache.save request(:save, key, result, options)
+    result = find_in_cache(request)
+    if not result.nil?
+      result
+    elsif request.ignore_terminus?
+      nil
+    else
+      # Otherwise, return the result from the terminus, caching if
+      # appropriate.
+      result = terminus.find(request)
+      if not result.nil?
+        result.expiration ||= self.expiration if result.respond_to?(:expiration)
+        if cache? and request.use_cache?
+          Puppet.info "Caching #{self.name} for #{request.key}"
+          cache.save request(:save, key, result, options)
+        end
+
+        filtered = result
+        if terminus.respond_to?(:filter)
+          Puppet::Util::Profiler.profile("Filtered result for #{self.name} #{request.key}") do
+            filtered = terminus.filter(result)
+          end
+        end
+
+        filtered
       end
-
-      return terminus.respond_to?(:filter) ? terminus.filter(result) : result
     end
-
-    nil
   end
 
   # Search for an instance in the appropriate terminus, and return a

data/lib/puppet/indirector/rest.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'uri'
 
+require 'puppet/network/http'
 require 'puppet/network/http_pool'
 require 'puppet/network/http/api/v1'
 require 'puppet/network/http/compression'
@@ -76,28 +77,35 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     add_accept_encoding({"Accept" => model.supported_formats.join(", ")})
   end
 
+  def add_profiling_header(headers)
+    if (Puppet[:profile])
+      headers[Puppet::Network::HTTP::HEADER_ENABLE_PROFILING] = "true"
+    end
+    headers
+  end
+
   def network(request)
     Puppet::Network::HTTP::Connection.new(request.server || self.class.server, request.port || self.class.port)
   end
 
-  def http_get(request, *args)
-    http_request(:get, request, *args)
+  def http_get(request, path, headers = nil, *args)
+    http_request(:get, request, path, add_profiling_header(headers), *args)
   end
 
-  def http_post(request, *args)
-    http_request(:post, request, *args)
+  def http_post(request, path, data, headers = nil, *args)
+    http_request(:post, request, path, data, add_profiling_header(headers), *args)
   end
 
-  def http_head(request, *args)
-    http_request(:head, request, *args)
+  def http_head(request, path, headers = nil, *args)
+    http_request(:head, request, path, add_profiling_header(headers), *args)
   end
 
-  def http_delete(request, *args)
-    http_request(:delete, request, *args)
+  def http_delete(request, path, headers = nil, *args)
+    http_request(:delete, request, path, add_profiling_header(headers), *args)
   end
 
-  def http_put(request, *args)
-    http_request(:put, request, *args)
+  def http_put(request, path, data, headers = nil, *args)
+    http_request(:put, request, path, data, add_profiling_header(headers), *args)
   end
 
   def http_request(method, request, *args)

data/lib/puppet/interface.rb

@@ -1,20 +1,27 @@
 require 'puppet'
 require 'puppet/util/autoload'
-require 'puppet/interface/documentation'
 require 'prettyprint'
 require 'semver'
 
 # @api public
 class Puppet::Interface
-  include FullDocs
-
+  require 'puppet/interface/documentation'
   require 'puppet/interface/face_collection'
 
+  require 'puppet/interface/action'
+  require 'puppet/interface/action_builder'
   require 'puppet/interface/action_manager'
+
+  require 'puppet/interface/option'
+  require 'puppet/interface/option_builder'
+  require 'puppet/interface/option_manager'
+
+
+  include FullDocs
+
   include Puppet::Interface::ActionManager
   extend Puppet::Interface::ActionManager
 
-  require 'puppet/interface/option_manager'
   include Puppet::Interface::OptionManager
   extend Puppet::Interface::OptionManager
 

data/lib/puppet/interface/action.rb

@@ -1,5 +1,3 @@
-require 'puppet/interface'
-require 'puppet/interface/documentation'
 require 'puppet/util/methodhelper'
 require 'prettyprint'
 
@@ -295,7 +293,7 @@ WRAPPER
   end
 
   def display_global_options(*args)
-    args ? add_display_global_options(args) : @display_global_options + @face.display_global_options 
+    args ? add_display_global_options(args) : @display_global_options + @face.display_global_options
   end
   alias :display_global_option :display_global_options
 

data/lib/puppet/interface/action_builder.rb

@@ -1,6 +1,3 @@
-require 'puppet/interface'
-require 'puppet/interface/action'
-
 # This class is used to build {Puppet::Interface::Action actions}.
 # When an action is defined with
 # {Puppet::Interface::ActionManager#action} the block is evaluated

data/lib/puppet/interface/action_manager.rb

@@ -1,6 +1,3 @@
-require 'puppet/interface/action'
-require 'puppet/interface/action_builder'
-
 # This class is not actually public API, but the method
 # {Puppet::Interface::ActionManager#action action} is public when used
 # as part of the Faces DSL (i.e. from within a

data/lib/puppet/interface/face_collection.rb

@@ -1,5 +1,3 @@
-require 'puppet/interface'
-
 module Puppet::Interface::FaceCollection
   @faces = Hash.new { |hash, key| hash[key] = {} }
 

data/lib/puppet/interface/option.rb

@@ -1,5 +1,3 @@
-require 'puppet/interface'
-
 # This represents an option on an action or face (to be globally applied
 # to its actions). Options should be constructed by calling
 # {Puppet::Interface::OptionManager#option}, which is available on

data/lib/puppet/interface/option_builder.rb

@@ -1,5 +1,3 @@
-require 'puppet/interface/option'
-
 # @api public
 class Puppet::Interface::OptionBuilder
   # The option under construction

data/lib/puppet/interface/option_manager.rb

@@ -1,5 +1,3 @@
-require 'puppet/interface/option_builder'
-
 # This class is not actually public API, but the method
 # {Puppet::Interface::OptionManager#option option} is public when used
 # as part of the Faces DSL (i.e. from within a

data/lib/puppet/metatype/manager.rb

@@ -34,7 +34,7 @@ module Manager
     end
   end
 
-  # Loads all types.  
+  # Loads all types.
   # @note Should only be used for purposes such as generating documentation as this is potentially a very
   #  expensive operation.
   # @return [void]

data/lib/puppet/module_tool.rb

@@ -6,6 +6,7 @@ require 'puppet/util/colors'
 
 module Puppet
   module ModuleTool
+    require 'puppet/module_tool/tar'
     extend Puppet::Util::Colors
 
     # Directory and names that should not be checksummed.

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

@@ -14,9 +14,6 @@ module Puppet::ModuleTool
       attr_accessor :options
 
       def initialize(options = {})
-        if Puppet.features.microsoft_windows?
-          raise Puppet::Error, "`puppet module` actions are currently not supported on Microsoft Windows"
-        end
         @options = options
       end
 

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

@@ -16,9 +16,8 @@ module Puppet::ModuleTool
         copy_contents
         add_metadata
         Puppet.notice "Building #{@path} for release"
-        tar
-        gzip
-        relative = Pathname.new(File.join(@pkg_path, filename('tar.gz'))).relative_path_from(Pathname.new(Dir.pwd))
+        pack
+        relative = Pathname.new(archive_file).relative_path_from(Pathname.new(File.expand_path(Dir.pwd)))
 
         # Return the Pathname object representing the path to the release
         # archive just created. This return value is used by the module_tool
@@ -34,27 +33,16 @@ module Puppet::ModuleTool
 
       private
 
-      def filename(ext)
-        ext.sub!(/^\./, '')
-        "#{metadata.release_name}.#{ext}"
+      def archive_file
+        File.join(@pkg_path, "#{metadata.release_name}.tar.gz")
       end
 
-      def tar
-        tar_name = filename('tar')
-        Dir.chdir(@pkg_path) do
-          FileUtils.rm tar_name rescue nil
-          unless system "tar -cf #{tar_name} #{metadata.release_name}"
-            raise RuntimeError, "Could not create #{tar_name}"
-          end
-        end
-      end
+      def pack
+        FileUtils.rm archive_file rescue nil
 
-      def gzip
+        tar = Puppet::ModuleTool::Tar.instance(metadata.full_module_name)
         Dir.chdir(@pkg_path) do
-          FileUtils.rm filename('tar.gz') rescue nil
-          unless system "gzip #{filename('tar')}"
-            raise RuntimeError, "Could not compress #{filename('tar')}"
-          end
+          tar.pack(metadata.release_name, archive_file)
         end
       end
 

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

@@ -22,7 +22,7 @@ module Puppet::ModuleTool
             next if File.basename(child_path) == "metadata.json"
 
             path = @path + child_path
-            if canonical_checksum != sums.checksum(path)
+            unless path.exist? && canonical_checksum == sums.checksum(path)
               changes << child_path
             end
           end

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

@@ -27,6 +27,7 @@ module Puppet::ModuleTool
       end
 
       def run
+        results = {}
         begin
           if is_module_package?(@name)
             @source = :filesystem

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

@@ -8,6 +8,7 @@ module Puppet::ModuleTool
       def initialize(filename, options = {})
         @filename = Pathname.new(filename)
         parsed = parse_filename(filename)
+        @module_name = parsed[:module_name]
         super(options)
         @module_dir = Pathname.new(options[:target_dir]) + parsed[:dir_name]
       end
@@ -29,23 +30,14 @@ module Puppet::ModuleTool
       end
 
       private
+
       def extract_module_to_install_dir
         delete_existing_installation_or_abort!
 
         build_dir.mkpath
         begin
           begin
-            if Facter.value('osfamily') == "Solaris"
-              # Solaris tar is not as safe and works differently, so we prefer
-              # gnutar instead.
-              if Puppet::Util.which('gtar')
-                Puppet::Util::Execution.execute("gtar xzf #{@filename} -C #{build_dir}")
-              else
-                raise RuntimeError, "Cannot find the command 'gtar'. Make sure GNU tar is installed, and is in your PATH."
-              end
-            else
-              Puppet::Util::Execution.execute("tar xzf #{@filename} -C #{build_dir}")
-            end
+            Puppet::ModuleTool::Tar.instance(@module_name).unpack(@filename.to_s, build_dir.to_s)
           rescue Puppet::ExecutionFailure => e
             raise RuntimeError, "Could not extract contents of module archive: #{e.message}"
           end

data/lib/puppet/module_tool/checksums.rb

@@ -16,7 +16,7 @@ module Puppet::ModuleTool
 
     # Return checksum for the +Pathname+.
     def checksum(pathname)
-      return Digest::MD5.hexdigest(pathname.read)
+      return Digest::MD5.hexdigest(IO.binread(pathname))
     end
 
     # Return checksums for object's +Pathname+, generate if it's needed.

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

@@ -46,7 +46,7 @@ module Puppet::ModuleTool::Errors
         message << "    Currently, '#{@metadata[:name]}' (#{v(@metadata[:version])}) is installed to that directory"
       end
 
-      message << "    Use `puppet module install --dir <DIR>` to install modules elsewhere"
+      message << "    Use `puppet module install --target-dir <DIR>` to install modules elsewhere"
 
       if @dependency
         message << "    Use `puppet module install --ignore-dependencies` to install only this module"
@@ -107,4 +107,21 @@ Could not install module '#{@requested_module}' (#{@requested_version})
       MSG
     end
   end
+
+  class InvalidPathInPackageError < InstallError
+    def initialize(options)
+      @requested_package = options[:requested_package]
+      @entry_path        = options[:entry_path]
+      @directory         = options[:directory]
+      super "Attempt to install file into #{@entry_path.inspect} under #{@directory.inspect}"
+    end
+
+    def multiline
+      <<-MSG.strip
+Could not install package #{@requested_package}
+  Package #{@requested_package} attempted to install file into
+  #{@entry_path.inspect} under #{@directory.inspect}.
+      MSG
+    end
+  end
 end

data/lib/puppet/module_tool/modulefile.rb

@@ -30,13 +30,13 @@ module Puppet::ModuleTool
       @metadata.full_module_name = name
     end
 
-    # Set the module +version+ (e.g., "0.0.1"). Required.
+    # Set the module +version+ (e.g., "0.1.0"). Required.
     def version(version)
       @metadata.version = version
     end
 
     # Add a dependency with the full_module_name +name+ (e.g. "myuser-mymodule"), an
-    # optional +version_requirement+ (e.g. "0.0.1") and +repository+ (a URL
+    # optional +version_requirement+ (e.g. "0.1.0") and +repository+ (a URL
     # string). Optional. Can be called multiple times to add many dependencies.
     def dependency(name, version_requirement = nil, repository = nil)
       @metadata.dependencies << Dependency.new(name, version_requirement, repository)

data/lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb

@@ -1,5 +1,5 @@
 name    '<%= metadata.full_module_name %>'
-version '0.0.1'
+version '0.1.0'
 source '<%= metadata.source %>'
 author '<%= metadata.author %>'
 license '<%= metadata.license %>'

data/lib/puppet/module_tool/tar.rb

@@ -0,0 +1,17 @@
+module Puppet::ModuleTool::Tar
+  require 'puppet/module_tool/tar/gnu'
+  require 'puppet/module_tool/tar/solaris'
+  require 'puppet/module_tool/tar/mini'
+
+  def self.instance(module_name)
+    if Facter.value('osfamily') == 'Solaris' && Puppet::Util.which('gtar') && ! Puppet::Util::Platform.windows?
+      Solaris.new
+    elsif Puppet::Util.which('tar') && ! Puppet::Util::Platform.windows?
+      Gnu.new
+    elsif Puppet.features.minitar? && Puppet.features.zlib?
+      Mini.new(module_name)
+    else
+      raise RuntimeError, 'No suitable tar implementation found'
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+class Puppet::ModuleTool::Tar::Gnu
+  def unpack(sourcefile, destdir)
+    Puppet::Util::Execution.execute("tar xzf #{sourcefile} -C #{destdir}")
+  end
+
+  def pack(sourcedir, destfile)
+    Puppet::Util::Execution.execute("tar cf - #{sourcedir} | gzip -c > #{destfile}")
+  end
+end