r10k 2.0.3 → 2.1.0

data/lib/r10k/deployment/config/loader.rb

@@ -1,59 +0,0 @@
-require 'r10k/logging'
-
-module R10K
-  class Deployment
-    class Config
-      class Loader
-
-        include R10K::Logging
-
-        attr_reader :loadpath
-
-        CONFIG_FILE = 'r10k.yaml'
-        DEFAULT_LOCATION = File.join('/etc/puppetlabs/r10k', CONFIG_FILE)
-        OLD_DEFAULT_LOCATION = File.join('/etc', CONFIG_FILE)
-
-        # Search for a deployment configuration file (r10k.yaml) in several locations
-        def initialize
-          @loadpath = []
-          populate_loadpath
-        end
-
-        # @return [String] The path to the first valid configfile
-        def search
-
-          # If both default files are present, issue a warning.
-          if (File.file? DEFAULT_LOCATION) && (File.file? OLD_DEFAULT_LOCATION)
-            logger.warn "Both #{DEFAULT_LOCATION} and #{OLD_DEFAULT_LOCATION} configuration files exist."
-            logger.warn "#{DEFAULT_LOCATION} will be used."
-          end
-
-          path = @loadpath.find {|filename| File.file? filename}
-
-          if path == OLD_DEFAULT_LOCATION
-            logger.warn "The r10k configuration file at #{OLD_DEFAULT_LOCATION} is deprecated."
-            logger.warn "Please move your r10k configuration to #{DEFAULT_LOCATION}."
-          end
-
-          path
-        end
-
-        private
-
-        def populate_loadpath
-
-          # Add the current directory for r10k.yaml
-          @loadpath << File.join(Dir.getwd, CONFIG_FILE)
-
-          # Add the AIO location for of r10k.yaml
-          @loadpath << DEFAULT_LOCATION
-
-          # Add the old default location last.
-          @loadpath << OLD_DEFAULT_LOCATION
-
-          @loadpath
-        end
-      end
-    end
-  end
-end

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

@@ -1,197 +0,0 @@
-require 'uri'
-require 'json'
-require 'set'
-require 'semantic_puppet/version' 
-
-module Puppet
-module ModuleTool
-
-  # This class provides a data structure representing a module's metadata.
-  # @api private
-  class Metadata
-
-    attr_accessor :module_name
-
-    DEFAULTS = {
-      'name'         => nil,
-      'version'      => nil,
-      'author'       => nil,
-      'summary'      => nil,
-      'license'      => 'Apache-2.0',
-      'source'       => '',
-      'project_page' => nil,
-      'issues_url'   => nil,
-      'dependencies' => Set.new.freeze,
-    }
-
-    def initialize
-      @data = DEFAULTS.dup
-      @data['dependencies'] = @data['dependencies'].dup
-    end
-
-    # Returns a filesystem-friendly version of this module name.
-    def dashed_name
-      @data['name'].tr('/', '-') if @data['name']
-    end
-
-    # Returns a string that uniquely represents this version of this module.
-    def release_name
-      return nil unless @data['name'] && @data['version']
-      [ dashed_name, @data['version'] ].join('-')
-    end
-
-    alias :name :module_name
-    alias :full_module_name :dashed_name
-
-    # Merges the current set of metadata with another metadata hash.  This
-    # method also handles the validation of module names and versions, in an
-    # effort to be proactive about module publishing constraints.
-    def update(data, with_dependencies = true)
-      process_name(data) if data['name']
-      process_version(data) if data['version']
-      process_source(data) if data['source']
-      merge_dependencies(data) if with_dependencies && 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.
-    #
-    # @see Puppet::Network::FormatSupport#to_data_hash
-    def to_hash
-      @data
-    end
-    alias :to_data_hash :to_hash
-
-    def to_json
-      data = @data.dup.merge('dependencies' => dependencies)
-
-      contents = data.keys.map do |k|
-        value = (JSON.pretty_generate(data[k]) rescue data[k].to_json)
-        "#{k.to_json}: #{value}"
-      end
-
-      "{\n" + contents.join(",\n").gsub(/^/, '  ') + "\n}\n"
-    end
-
-    # Expose any metadata keys as callable reader methods.
-    def method_missing(name, *args)
-      return @data[name.to_s] if @data.key? name.to_s
-      super
-    end
-
-    private
-
-    # Do basic validation and parsing of the name parameter.
-    def process_name(data)
-      validate_name(data['name'])
-      author, @module_name = data['name'].split(/[-\/]/, 2)
-
-      data['author'] ||= author if @data['author'] == DEFAULTS['author']
-    end
-
-    # Do basic validation on the version parameter.
-    def process_version(data)
-      validate_version(data['version'])
-    end
-
-    # Do basic parsing of the source parameter.  If the source is hosted on
-    # GitHub, we can predict sensible defaults for both project_page and
-    # issues_url.
-    def process_source(data)
-      if data['source'] =~ %r[://]
-        source_uri = URI.parse(data['source'])
-      else
-        source_uri = URI.parse("http://#{data['source']}")
-      end
-
-      if source_uri.host =~ /^(www\.)?github\.com$/
-        source_uri.scheme = 'https'
-        source_uri.path.sub!(/\.git$/, '')
-        data['project_page'] ||= @data['project_page'] || source_uri.to_s
-        data['issues_url'] ||= @data['issues_url'] || source_uri.to_s.sub(/\/*$/, '') + '/issues'
-      end
-
-    rescue URI::Error
-      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
-
-      namespace, modname = name.split(/[-\/]/, 2)
-      modname = :namespace_missing if namespace == ''
-
-      err = case modname
-      when nil, '', :namespace_missing
-        "the field must be a namespaced module name"
-      when /[^a-z0-9_]/i
-        "the module name contains non-alphanumeric (or underscore) characters"
-      when /^[^a-z]/i
-        "the module name must begin with a letter"
-      else
-        "the namespace contains non-alphanumeric characters"
-      end
-
-      raise ArgumentError, "Invalid 'name' field in metadata.json: #{err}"
-    end
-
-    # Validates that the version string can be parsed by SemanticPuppet.
-    def validate_version(version)
-      return if SemanticPuppet::Version.valid?(version)
-
-      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 SemanticPuppet.
-    def validate_version_range(version_range)
-      SemanticPuppet::VersionRange.parse(version_range)
-    rescue ArgumentError => e
-      raise ArgumentError, "Invalid 'version_range' field in metadata.json: #{e}"
-    end
-  end
-end
-end

data/lib/shared/puppet_forge/connection.rb

@@ -1,64 +0,0 @@
-require 'shared/puppet_forge/version'
-require 'shared/puppet_forge/connection/connection_failure'
-
-require 'faraday'
-require 'faraday_middleware'
-
-module PuppetForge
-  # Provide a common mixin for adding a HTTP connection to classes.
-  #
-  # This module provides a common method for creating HTTP connections as well
-  # as reusing a single connection object between multiple classes. Including
-  # classes can invoke #conn to get a reasonably configured HTTP connection.
-  # Connection objects can be passed with the #conn= method.
-  #
-  # @example
-  #   class HTTPThing
-  #     include PuppetForge::Connection
-  #   end
-  #   thing = HTTPThing.new
-  #   thing.conn = thing.make_connection('https://non-standard-forge.site')
-  #
-  # @api private
-  module Connection
-
-    attr_writer :conn
-
-    USER_AGENT = "PuppetForge/#{PuppetForge::VERSION} Faraday/#{Faraday::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
-
-    def self.authorization=(token)
-      @authorization = token
-    end
-
-    def self.authorization
-      @authorization
-    end
-
-    # @return [Faraday::Connection] An existing Faraday connection if one was
-    #   already set, otherwise a new Faraday connection.
-    def conn
-      @conn ||= make_connection('https://forgeapi.puppetlabs.com')
-    end
-
-    # Generate a new Faraday connection for the given URL.
-    #
-    # @param url [String] the base URL for this connection
-    # @return [Faraday::Connection]
-    def make_connection(url, adapter_args = nil)
-      adapter_args ||= [Faraday.default_adapter]
-      options = { :headers => { :user_agent => USER_AGENT }}
-
-      if token = PuppetForge::Connection.authorization
-        options[:headers][:authorization] = token
-      end
-
-      Faraday.new(url, options) do |builder|
-        builder.response(:json, :content_type => /\bjson$/)
-        builder.response(:raise_error)
-        builder.use(:connection_failure)
-
-        builder.adapter(*adapter_args)
-      end
-    end
-  end
-end

data/lib/shared/puppet_forge/connection/connection_failure.rb

@@ -1,26 +0,0 @@
-require 'faraday'
-
-module PuppetForge
-  module Connection
-    # Wrap Faraday connection failures to include the host and optional proxy
-    # in use for the failed connection.
-    class ConnectionFailure < Faraday::Middleware
-      def call(env)
-        @app.call(env)
-      rescue Faraday::ConnectionFailed => e
-        baseurl = env[:url].dup
-        baseurl.path = ''
-        errmsg = "Unable to connect to #{baseurl.to_s}"
-        if proxy = env[:request][:proxy]
-          errmsg << " (using proxy #{proxy.uri.to_s})"
-        end
-        errmsg << ": #{e.message}"
-        m = Faraday::ConnectionFailed.new(errmsg)
-        m.set_backtrace(e.backtrace)
-        raise m
-      end
-    end
-  end
-end
-
-Faraday::Middleware.register_middleware(:connection_failure => lambda { PuppetForge::Connection::ConnectionFailure })

data/lib/shared/puppet_forge/error.rb

@@ -1,41 +0,0 @@
-module PuppetForge
-  class Error < RuntimeError
-    attr_accessor :original
-    def initialize(message, original=nil)
-      super(message)
-      @original = original
-    end
-  end
-
-  class ExecutionFailure < PuppetForge::Error
-  end
-
-  class InvalidPathInPackageError < PuppetForge::Error
-    def initialize(options)
-      @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
-  Package attempted to install file into
-  #{@entry_path.inspect} under #{@directory.inspect}.
-      MSG
-    end
-  end
-
-  class ModuleNotFound < PuppetForge::Error
-  end
-
-  class ModuleReleaseNotFound < PuppetForge::Error
-  end
-
-  class ModuleReleaseForbidden < PuppetForge::Error
-    def self.from_response(response)
-      body = JSON.parse(response[:body])
-      new(body["message"])
-    end
-  end
-end

data/lib/shared/puppet_forge/tar.rb

@@ -1,10 +0,0 @@
-
-module PuppetForge
-  class Tar
-    require 'shared/puppet_forge/tar/mini'
-
-    def self.instance
-      Mini.new
-    end
-  end
-end

data/lib/shared/puppet_forge/tar/mini.rb

@@ -1,81 +0,0 @@
-require 'zlib'
-require 'archive/tar/minitar'
-
-module PuppetForge
-  class Tar
-    class Mini
-
-      SYMLINK_FLAGS = [2]
-      VALID_TAR_FLAGS = (0..7)
-
-      # @return [Hash{:symbol => Array<String>}] a hash with file-category keys pointing to lists of filenames.
-      def unpack(sourcefile, destdir)
-        # directories need to be changed outside of the Minitar::unpack because directories don't have a :file_done action
-        dirlist = []
-        file_lists = {}
-        Zlib::GzipReader.open(sourcefile) do |reader|
-          file_lists = validate_files(reader)
-          Archive::Tar::Minitar.unpack(reader, destdir, file_lists[:valid]) do |action, name, stats|
-            case action
-            when :file_done
-              FileUtils.chmod('u+rw,g+r,a-st', "#{destdir}/#{name}")
-            when :file_start
-              validate_entry(destdir, name)
-            when :dir
-              validate_entry(destdir, name)
-              dirlist << "#{destdir}/#{name}"
-            end
-          end
-        end
-        dirlist.each {|d| File.chmod(0755, d)}
-        file_lists
-      end
-
-      def pack(sourcedir, destfile)
-        Zlib::GzipWriter.open(destfile) do |writer|
-          Archive::Tar::Minitar.pack(sourcedir, writer)
-        end
-      end
-
-      private
-
-      # Categorize all the files in tarfile as :valid, :invalid, or :symlink.
-      #
-      # :invalid files include 'x' and 'g' flags from the PAX standard but and any other non-standard tar flags.
-      #   tar format info: http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa500%2Ftaf.htm
-      #   pax format info: http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa500%2Fpxarchfm.htm
-      # :symlinks are not supported in Puppet modules
-      # :valid files are any of those that can be used in modules
-      # @param tarfile name of the tarfile
-      # @return [Hash{:symbol => Array<String>}] a hash with file-category keys pointing to lists of filenames.
-      def validate_files(tarfile)
-        file_lists = {:valid => [], :invalid => [], :symlinks => []}
-        Archive::Tar::Minitar.open(tarfile).each do |entry|
-          flag = entry.typeflag
-          if flag.nil? || flag =~ /[[:digit:]]/ && SYMLINK_FLAGS.include?(flag.to_i)
-            file_lists[:symlinks] << entry.name
-          elsif flag.nil? || flag =~ /[[:digit:]]/ && VALID_TAR_FLAGS.include?(flag.to_i)
-            file_lists[:valid] << entry.name
-          else
-            file_lists[:invalid] << entry.name 
-          end
-        end
-        file_lists
-      end
-
-      def validate_entry(destdir, path)
-        if Pathname.new(path).absolute?
-          raise PuppetForge::InvalidPathInPackageError, :entry_path => path, :directory => destdir
-        end
-
-        path = File.expand_path File.join(destdir, path)
-
-        if path !~ /\A#{Regexp.escape destdir}/
-          raise PuppetForge::InvalidPathInPackageError, :entry_path => path, :directory => destdir
-        end
-      end
-    end
-  end
-
-end
-