puppet 2.7.11 → 2.7.12

data/lib/puppet/{module_tool → forge}/cache.rb

@@ -1,7 +1,6 @@
 require 'uri'
 
-module Puppet::Module::Tool
-
+module Puppet::Forge
   # = Cache
   #
   # Provides methods for reading files from local cache, filesystem or network.

data/lib/puppet/{module_tool → forge}/repository.rb

@@ -2,13 +2,19 @@ require 'net/http'
 require 'digest/sha1'
 require 'uri'
 
-module Puppet::Module::Tool
+require 'puppet/module_tool/utils'
+
+module Puppet::Forge
+  # Directory names that should not be checksummed.
+  ARTIFACTS = ['pkg', /^\./, /^~/, /^#/, 'coverage']
+  FULL_MODULE_NAME_PATTERN = /\A([^-\/|.]+)[-|\/](.+)\z/
+  REPOSITORY_URL = Puppet.settings[:module_repository]
 
   # = Repository
   #
   # This class is a file for accessing remote repositories with modules.
   class Repository
-    include Utils::Interrogation
+    include Puppet::Module::Tool::Utils::Interrogation
 
     attr_reader :uri, :cache
 
@@ -19,6 +25,42 @@ module Puppet::Module::Tool
       @cache = Cache.new(self)
     end
 
+    # Read HTTP proxy configurationm from Puppet's config file, or the
+    # http_proxy environment variable.
+    def http_proxy_env
+      proxy_env = ENV["http_proxy"] || ENV["HTTP_PROXY"] || nil
+      begin
+        return URI.parse(proxy_env) if proxy_env
+      rescue URI::InvalidURIError
+        return nil
+      end
+      return nil
+    end
+
+    def http_proxy_host
+      env = http_proxy_env
+
+      if env and env.host then
+        return env.host
+      end
+
+      if Puppet.settings[:http_proxy_host] == 'none'
+        return nil
+      end
+
+      return Puppet.settings[:http_proxy_host]
+    end
+
+    def http_proxy_port
+      env = http_proxy_env
+
+      if env and env.port then
+        return env.port
+      end
+
+      return Puppet.settings[:http_proxy_port]
+    end
+
     # Return a Net::HTTPResponse read for this +request+.
     #
     # Options:
@@ -37,8 +79,8 @@ module Puppet::Module::Tool
     def read_response(request)
       begin
         Net::HTTP::Proxy(
-            Puppet::Module::Tool::http_proxy_host,
-            Puppet::Module::Tool::http_proxy_port
+            http_proxy_host,
+            http_proxy_port
             ).start(@uri.host, @uri.port) do |http|
           http.request(request)
         end

data/lib/puppet/indirector/exec.rb

@@ -28,7 +28,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
     raise Puppet::DevError, "Exec commands must be an array" unless external_command.is_a?(Array)
 
     # Make sure it's fully qualified.
-    raise ArgumentError, "You must set the exec parameter to a fully qualified command" unless external_command[0][0] == File::SEPARATOR[0]
+    raise ArgumentError, "You must set the exec parameter to a fully qualified command" unless Puppet::Util.absolute_path?(external_command[0])
 
     # Add our name to it.
     external_command << name

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -27,7 +27,7 @@ module Puppet::FileBucketFile
         raise "could not find diff_with #{request.options[:diff_with]}" unless ::File.exists?(file2_path)
         return `diff #{file_path.inspect} #{file2_path.inspect}`
       else
-        contents = Puppet::Util.binread(file_path)
+        contents = IO.binread(file_path)
         Puppet.info "FileBucket read #{checksum}"
         model.new(contents)
       end
@@ -55,7 +55,7 @@ module Puppet::FileBucketFile
       paths_path = ::File.join(dir_path, 'paths')
       return false unless ::File.exists?(paths_path)
       ::File.open(paths_path) do |f|
-        f.each do |line|
+        f.each_line do |line|
           return true if line.chomp == files_original_path
         end
       end
@@ -122,7 +122,7 @@ module Puppet::FileBucketFile
     # If conflict_check is enabled, verify that the passed text is
     # the same as the text in our file.
     def verify_identical_file!(bucket_file)
-      disk_contents = Puppet::Util.binread(path_for(bucket_file.bucket_path, bucket_file.checksum_data, 'contents'))
+      disk_contents = IO.binread(path_for(bucket_file.bucket_path, bucket_file.checksum_data, 'contents'))
 
       # If the contents don't match, then we've found a conflict.
       # Unlikely, but quite bad.

data/lib/puppet/interface/action.rb

@@ -74,8 +74,12 @@ class Puppet::Interface::Action
       msg += ", not #{proc.class.name}" unless proc.nil?
       raise ArgumentError, msg
     end
-    if proc.arity != 1 then
-      msg = "when_rendering methods take one argument, the result, not "
+
+    if proc.arity != 1 and proc.arity != (@positional_arg_count + 1)
+      msg =  "the when_rendering method for the #{@face.name} face #{name} action "
+      msg += "takes either just one argument, the result of when_invoked, "
+      msg += "or the result plus the #{@positional_arg_count} arguments passed "
+      msg += "to the when_invoked block, not "
       if proc.arity < 0 then
         msg += "a variable number"
       else

data/lib/puppet/module.rb

@@ -1,4 +1,6 @@
 require 'puppet/util/logging'
+require 'semver'
+require 'puppet/module_tool/applications'
 
 # Support for modules
 class Puppet::Module
@@ -30,6 +32,7 @@ class Puppet::Module
   attr_reader :name, :environment
   attr_writer :environment
 
+  attr_accessor :dependencies, :forge_name
   attr_accessor :source, :author, :version, :license, :puppetversion, :summary, :description, :project_page
 
   def has_metadata?
@@ -38,6 +41,8 @@ class Puppet::Module
     return false unless FileTest.exist?(metadata_file)
 
     metadata = PSON.parse File.read(metadata_file)
+
+
     return metadata.is_a?(Hash) && !metadata.keys.empty?
   end
 
@@ -56,7 +61,6 @@ class Puppet::Module
     load_metadata if has_metadata?
 
     validate_puppet_version
-    validate_dependencies
   end
 
   FILETYPES.each do |type|
@@ -107,7 +111,9 @@ class Puppet::Module
 
   def load_metadata
     data = PSON.parse File.read(metadata_file)
-    [:source, :author, :version, :license, :puppetversion].each do |attr|
+    @forge_name = data['name'].gsub('-', '/') if data['name']
+
+    [:source, :author, :version, :license, :puppetversion, :dependencies].each do |attr|
       unless value = data[attr.to_s]
         unless attr == :puppetversion
           raise MissingMetadata, "No #{attr} module metadata provided for #{self.name}"
@@ -154,18 +160,72 @@ class Puppet::Module
     result
   end
 
-  def validate_dependencies
-    return unless defined?(@requires)
+  def dependencies_as_modules
+    dependent_modules = []
+    dependencies and dependencies.each do |dep|
+      author, dep_name = dep["name"].split('/')
+      found_module = environment.module(dep_name)
+      dependent_modules << found_module if found_module
+    end
+
+    dependent_modules
+  end
+
+  def required_by
+    environment.module_requirements[self.forge_name] || {}
+  end
+
+  def has_local_changes?
+    changes = Puppet::Module::Tool::Applications::Checksummer.run(path)
+    !changes.empty?
+  end
 
-    @requires.each do |name, version|
-      unless mod = environment.module(name)
-        raise MissingModule, "Missing module #{name} required by #{self.name}"
+  def unmet_dependencies
+    return [] unless dependencies
+
+    unmet_dependencies = []
+
+    dependencies.each do |dependency|
+      forge_name = dependency['name']
+      author, dep_name = forge_name.split('/')
+      version_string = dependency['version_requirement']
+
+      equality, dep_version = version_string ? version_string.split("\s") : [nil, nil]
+
+      unless dep_mod = environment.module(dep_name)
+        msg =  "Missing dependency `#{dep_name}`:\n"
+        msg += "  `#{self.name}` (#{self.version}) requires `#{forge_name}` (#{version_string})\n"
+        unmet_dependencies << { :name => forge_name, :error => msg }
+        next
       end
 
-      if version and mod.version != version
-        raise IncompatibleModule, "Required module #{name} is version #{mod.version} but #{self.name} requires #{version}"
+      if dep_version && !dep_mod.version
+        msg =  "Unversioned dependency `#{dep_mod.name}`:\n"
+        msg += "  `#{self.name}` (#{self.version}) requires `#{forge_name}` (#{version_string})\n"
+        unmet_dependencies << { :name => forge_name, :error => msg }
+        next
+      end
+
+      if dep_version
+        begin
+          required_version_semver = SemVer.new(dep_version)
+          actual_version_semver = SemVer.new(dep_mod.version)
+        rescue ArgumentError
+          msg =  "Non semantic version dependency `#{dep_mod.name}` (#{dep_mod.version}):\n"
+          msg += "  `#{self.name}` (#{self.version}) requires `#{forge_name}` (#{version_string})\n"
+          unmet_dependencies << { :name => forge_name, :error => msg }
+          next
+        end
+
+        if !actual_version_semver.send(equality, required_version_semver)
+          msg =  "Version dependency mismatch `#{dep_mod.name}` (#{dep_mod.version}):\n"
+          msg += "  `#{self.name}` (#{self.version}) requires `#{forge_name}` (#{version_string})\n"
+          unmet_dependencies << { :name => forge_name, :error => msg }
+          next
+        end
       end
     end
+    unmet_dependencies
   end
 
   def validate_puppet_version
@@ -191,7 +251,7 @@ class Puppet::Module
   end
 
   def assert_validity
-    raise InvalidName, "Invalid module name; module names must be alphanumeric (plus '-'), not '#{name}'" unless name =~ /^[-\w]+$/
+    raise InvalidName, "Invalid module name #{name}; module names must be alphanumeric (plus '-'), not '#{name}'" unless name =~ /^[-\w]+$/
   end
 
   def ==(other)

data/lib/puppet/module_tool.rb

@@ -37,42 +37,6 @@ module Puppet
         end
       end
 
-      # Read HTTP proxy configurationm from Puppet's config file, or the
-      # http_proxy environment variable.
-      def self.http_proxy_env
-        proxy_env = ENV["http_proxy"] || ENV["HTTP_PROXY"] || nil
-        begin
-          return URI.parse(proxy_env) if proxy_env
-        rescue URI::InvalidURIError
-          return nil
-        end
-        return nil
-      end
-
-      def self.http_proxy_host
-        env = http_proxy_env
-
-        if env and env.host then
-          return env.host
-        end
-
-        if Puppet.settings[:http_proxy_host] == 'none'
-          return nil
-        end
-
-        return Puppet.settings[:http_proxy_host]
-      end
-
-      def self.http_proxy_port
-        env = http_proxy_env
-
-        if env and env.port then
-          return env.port
-        end
-
-        return Puppet.settings[:http_proxy_port]
-      end
-
       def self.find_module_root(path)
         for dir in [path, Dir.pwd].compact
           if File.exist?(File.join(dir, 'Modulefile'))
@@ -87,11 +51,11 @@ end
 
 # Load remaining libraries
 require 'puppet/module_tool/applications'
-require 'puppet/module_tool/cache'
 require 'puppet/module_tool/checksums'
 require 'puppet/module_tool/contents_description'
 require 'puppet/module_tool/dependency'
 require 'puppet/module_tool/metadata'
 require 'puppet/module_tool/modulefile'
-require 'puppet/module_tool/repository'
 require 'puppet/module_tool/skeleton'
+require 'puppet/forge/cache'
+require 'puppet/forge'

data/lib/puppet/module_tool/applications.rb

@@ -1,13 +1,17 @@
-module Puppet::Module::Tool
-  module Applications
-    require 'puppet/module_tool/applications/application'
-    require 'puppet/module_tool/applications/builder'
-    require 'puppet/module_tool/applications/checksummer'
-    require 'puppet/module_tool/applications/cleaner'
-    require 'puppet/module_tool/applications/generator'
-    require 'puppet/module_tool/applications/installer'
-    require 'puppet/module_tool/applications/searcher'
-    require 'puppet/module_tool/applications/unpacker'
-    require 'puppet/module_tool/applications/uninstaller'
+require 'puppet/module'
+
+class Puppet::Module
+  module Tool
+    module Applications
+      require 'puppet/module_tool/applications/application'
+      require 'puppet/module_tool/applications/builder'
+      require 'puppet/module_tool/applications/checksummer'
+      require 'puppet/module_tool/applications/cleaner'
+      require 'puppet/module_tool/applications/generator'
+      require 'puppet/module_tool/applications/installer'
+      require 'puppet/module_tool/applications/searcher'
+      require 'puppet/module_tool/applications/unpacker'
+      require 'puppet/module_tool/applications/uninstaller'
+    end
   end
 end

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

@@ -1,10 +1,11 @@
 require 'net/http'
 require 'semver'
+require 'puppet/module_tool/utils/interrogation'
 
 module Puppet::Module::Tool
   module Applications
     class Application
-      include Utils::Interrogation
+      include Puppet::Module::Tool::Utils::Interrogation
 
       def self.run(*args)
         new(*args).run
@@ -16,10 +17,6 @@ module Puppet::Module::Tool
         @options = options
       end
 
-      def repository
-        @repository ||= Repository.new(@options[:module_repository])
-      end
-
       def run
         raise NotImplementedError, "Should be implemented in child classes."
       end

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

@@ -2,7 +2,7 @@ module Puppet::Module::Tool
   module Applications
     class Cleaner < Application
       def run
-        Puppet::Module::Tool::Cache.clean
+        Puppet::Forge::Cache.clean
 
         # Return a status Hash containing the status of the clean command
         # and a status message. This return value is used by the module_tool

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

@@ -7,22 +7,26 @@ module Puppet::Module::Tool
     class Installer < Application
 
       def initialize(name, options = {})
+        @forge = Puppet::Forge::Forge.new
+        @install_params = {}
+
         if File.exist?(name)
           if File.directory?(name)
             # TODO Unify this handling with that of Unpacker#check_clobber!
             raise ArgumentError, "Module already installed: #{name}"
           end
-          @source = :filesystem
           @filename = File.expand_path(name)
+          @install_params[:source] = :filesystem
+          @install_params[:filename] = @filename
           parse_filename!
         else
-          @source = :repository
+          @install_params[:source] = :repository
           begin
-            @username, @module_name = Puppet::Module::Tool::username_and_modname_from(name)
+            @install_params[:author], @install_params[:modname] = Puppet::Module::Tool::username_and_modname_from(name)
           rescue ArgumentError
             raise "Could not install module with invalid name: #{name}"
           end
-          @version_requirement = options[:version]
+          @install_params[:version_requirement] = options[:version]
         end
         super(options)
       end
@@ -32,27 +36,9 @@ module Puppet::Module::Tool
       end
 
       def run
-        case @source
-        when :repository
-          if match['file']
-            begin
-              cache_path = repository.retrieve(match['file'])
-            rescue OpenURI::HTTPError => e
-              raise RuntimeError, "Could not install module: #{e.message}"
-            end
-            module_dir = Unpacker.run(cache_path, options)
-          else
-            raise RuntimeError, "Malformed response from module repository."
-          end
-        when :filesystem
-          repository = Repository.new('file:///')
-          uri = URI.parse("file://#{URI.escape(File.expand_path(@filename))}")
-          cache_path = repository.retrieve(uri)
-          module_dir = Unpacker.run(cache_path, options)
-        else
-          raise ArgumentError, "Could not determine installation source"
-        end
+        cache_path = @forge.get_release_package(@install_params)
 
+        module_dir = Unpacker.run(cache_path, options)
         # Return the Pathname object representing the path to the installed
         # module. This return value is used by the module_tool face install
         # action, and displayed to on the console.
@@ -63,27 +49,6 @@ module Puppet::Module::Tool
         #
         module_dir
       end
-
-      private
-
-      def match
-        return @match ||= begin
-          url = repository.uri + "/users/#{@username}/modules/#{@module_name}/releases/find.json"
-          if @version_requirement
-            url.query = "version=#{URI.escape(@version_requirement)}"
-          end
-          begin
-            raw_result = read_match(url)
-          rescue => e
-            raise ArgumentError, "Could not find a release for this module (#{e.message})"
-          end
-          @match = PSON.parse(raw_result)
-        end
-      end
-
-      def read_match(url)
-        return url.read
-      end
     end
   end
 end