r10k 1.5.1 → 2.0.0

data/lib/r10k/cli/environment.rb

@@ -1,28 +0,0 @@
-require 'r10k/cli'
-require 'cri'
-
-module R10K::CLI
-  module Environment
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'environment'
-        usage 'environment <subcommand>'
-        summary 'DEPRECATED: Operate on a specific environment'
-
-        required :c, :config, 'Specify a configuration file'
-
-        be_hidden
-
-        run do |opts, args, cmd|
-          puts cmd.help(:verbose => opts[:verbose])
-          exit 0
-        end
-      end
-    end
-  end
-  self.command.add_command(Environment.command)
-end
-
-require 'r10k/cli/environment/list'
-require 'r10k/cli/environment/deploy'
-require 'r10k/cli/environment/stale'

data/lib/r10k/cli/environment/deploy.rb

@@ -1,26 +0,0 @@
-require 'r10k/cli/environment'
-require 'r10k/cli/deploy'
-require 'cri'
-
-module R10K::CLI::Environment
-  module Deploy
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'deploy'
-        usage 'deploy <environment> <...>'
-        summary 'DEPRECATED: Deploy an environment'
-
-        flag :r, :recurse, 'Recursively update submodules'
-        flag :u, :update, "Enable or disable cache updating"
-
-        be_hidden
-
-        run do |opts, args, cmd|
-          logger.warn "This command is deprecated; please use `r10k deploy environment`"
-          R10K::CLI::Deploy::Environment.command.block.call(opts,args,cmd)
-        end
-      end
-    end
-  end
-  self.command.add_command(Deploy.command)
-end

data/lib/r10k/cli/environment/list.rb

@@ -1,23 +0,0 @@
-require 'r10k/cli/environment'
-require 'r10k/cli/deploy'
-require 'cri'
-
-module R10K::CLI::Environment
-  module List
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'list'
-        usage 'list'
-        summary 'DEPRECATED: List all available environments'
-
-        be_hidden
-
-        run do |opts, args, cmd|
-          logger.warn "This command is deprecated; please use `r10k deploy display`"
-          R10K::CLI::Deploy::Display.command.block.call(opts,args,cmd)
-        end
-      end
-    end
-  end
-  self.command.add_command(List.command)
-end

data/lib/r10k/cli/environment/stale.rb

@@ -1,24 +0,0 @@
-require 'r10k/cli/environment'
-require 'r10k/deployment'
-require 'cri'
-
-module R10K::CLI::Environment
-  module Stale
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'stale'
-        usage 'stale <directory> [directory ...]'
-        summary 'REMOVED: List all stale environments'
-
-        description "This command has been removed in 1.0.0"
-        be_hidden
-
-        run do |opts, args, cmd|
-          $stderr.puts "#{cmd.name} has been removed in 1.0.0"
-          exit 1
-        end
-      end
-    end
-  end
-  self.command.add_command(Stale.command)
-end

data/lib/r10k/cli/module.rb

@@ -1,29 +0,0 @@
-require 'r10k/cli'
-require 'cri'
-
-module R10K::CLI
-  module Module
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'module'
-        usage 'module <subcommand>'
-        summary 'DEPRECATED: Operate on a specific puppet module'
-
-        be_hidden
-
-        required :c, :config, 'Specify a configuration file'
-
-        required :e, :environment, 'Specify a particular environment'
-
-        run do |opts, args, cmd|
-          puts cmd.help(:verbose => opts[:verbose])
-          exit 0
-        end
-      end
-    end
-  end
-  self.command.add_command(Module.command)
-end
-
-require 'r10k/cli/module/deploy'
-require 'r10k/cli/module/list'

data/lib/r10k/cli/module/deploy.rb

@@ -1,27 +0,0 @@
-require 'r10k/cli/module'
-require 'r10k/deployment'
-require 'cri'
-
-require 'fileutils'
-
-module R10K::CLI::Module
-  module Deploy
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'deploy'
-        usage 'deploy [module name] <module name> ...'
-        summary 'DEPRECATED: Deploy a module'
-
-        be_hidden
-
-        flag :u, :update, "Update module cache"
-
-        run do |opts, args, cmd|
-          logger.warn "This command is deprecated; please use `r10k deploy module`"
-          R10K::CLI::Deploy::Module.command.block.call(opts,args,cmd)
-        end
-      end
-    end
-  end
-  self.command.add_command(Deploy.command)
-end

data/lib/r10k/cli/module/list.rb

@@ -1,24 +0,0 @@
-require 'r10k/cli/module'
-require 'r10k/cli/deploy'
-require 'cri'
-
-module R10K::CLI::Module
-  module List
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'list'
-        usage 'list'
-        summary 'DEPRECATED: List modules that are instantiated in environments'
-
-        be_hidden
-
-        run do |opts, args, cmd|
-          logger.warn "This command is deprecated; please use `r10k deploy display`"
-          R10K::CLI::Deploy::Display.command.block.call(opts,args,cmd)
-        end
-      end
-    end
-  end
-  self.command.add_command(List.command)
-end
-

data/lib/r10k/cli/synchronize.rb

@@ -1,27 +0,0 @@
-require 'r10k/cli/deploy'
-
-require 'cri'
-
-module R10K::CLI
-  module Synchronize
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'synchronize'
-        usage 'synchronize <options>'
-        summary 'DEPRECATED: Fully synchronize all environments'
-
-        required :c, :config, 'Specify a configuration file'
-
-        be_hidden
-
-        run do |opts, args, cmd|
-          logger.warn "#{cmd.name} is deprecated; please use `r10k deploy environment --puppetfile`"
-
-          opts.merge!({:puppetfile => true})
-          R10K::CLI::Deploy::Environment.command.block.call(opts,args,cmd)
-        end
-      end
-    end
-  end
-  self.command.add_command(Synchronize.command)
-end

data/lib/r10k/deployment/basedir.rb

@@ -1,4 +0,0 @@
-require 'r10k/util/basedir'
-
-# @deprecated
-R10K::Deployment::Basedir = R10K::Util::Basedir

data/lib/r10k/deployment/environment.rb

@@ -1,20 +0,0 @@
-require 'r10k/deployment'
-require 'r10k/environment'
-
-class R10K::Deployment::Environment
-
-  # @param [String] ref
-  # @param [String] remote
-  # @param [String] basedir
-  # @param [String] dirname The directory to clone the root into, defaults to ref
-  # @param [String] source_name An additional string which may be used with ref to build dirname
-  #
-  # @deprecated
-  # @return [R10K::Environment::Git]
-  def self.new(ref, remote, basedir, dirname = nil, source_name = "")
-    alternate_name =  source_name.empty? ? ref : source_name + "_" + ref
-    dirname = dirname || alternate_name
-
-    R10K::Environment::Git.new(ref, basedir, dirname, {:remote => remote, :ref => ref})
-  end
-end

data/lib/r10k/deployment/source.rb

@@ -1,37 +0,0 @@
-require 'r10k/source'
-require 'r10k/util/symbolize_keys'
-
-module R10K
-class Deployment
-# :nocov:
-class Source
-  # Create a new source from a hash representation
-  #
-  # @param name [String] The name of the source
-  # @param opts [Hash] The properties to use for the source
-  #
-  # @option opts [String] :remote The git remote for the given source
-  # @option opts [String] :basedir The directory to create environments in
-  # @option opts [true, false] :prefix Whether the environment names should
-  #   be prefixed by the source name. Defaults to false.
-  #
-  # @deprecated
-  # @return [R10K::Source::Base]
-  def self.vivify(name, attrs)
-    R10K::Util::SymbolizeKeys.symbolize_keys!(attrs)
-
-    remote  = attrs.delete(:remote)
-    basedir = attrs.delete(:basedir)
-    prefix  = attrs.delete(:prefix)
-
-    raise ArgumentError, "Unrecognized attributes for #{self.name}: #{attrs.inspect}" unless attrs.empty?
-    new(name, remote, basedir, prefix)
-  end
-
-  def self.new(name, remote, basedir, prefix)
-    R10K::Source::Git.new(name, basedir, {:prefix => prefix, :remote => remote})
-  end
-end
-end
-# :nocov:
-end

data/lib/r10k/git/commit.rb

@@ -1,22 +0,0 @@
-require 'r10k/git/ref'
-require 'r10k/git/repository'
-
-# commit: A 40-byte hex representation of a SHA1 referencing a specific commit
-# @see https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html
-# @api private
-class R10K::Git::Commit < R10K::Git::Ref
-
-  # @!attribute [r] commit
-  #   @return [String] The git commit
-  attr_reader :commit
-  alias :ref :commit
-
-  def initialize(commit, repository = nil)
-    @commit = commit
-    @repository = repository
-  end
-
-  def fetch?
-    ! resolvable?
-  end
-end

data/lib/r10k/git/head.rb

@@ -1,36 +0,0 @@
-require 'r10k/git'
-require 'r10k/git/ref'
-require 'r10k/git/repository'
-
-
-# head: A named reference to the commit at the tip of a branch. Heads are
-# stored in a file in $GIT_DIR/refs/heads/ directory. except when using packed
-#
-# @deprecated This has been replaced by the ShellGit provider and the
-#   StatefulRepository class and will be removed in 2.0.0
-#
-# @see https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html
-# @api private
-class R10K::Git::Head < R10K::Git::Ref
-
-  # @!attribute [r] head
-  #   @return [String] The git head
-  attr_reader :head
-  alias :ref :head
-
-  def initialize(head, repository = nil)
-    @head = head
-    @repository = repository
-  end
-
-  # def sha1
-  #   TODO ensure that @head is an actual head as opposed to a tag or other
-  #   hooliganism.
-  #end
-
-  # If we are tracking a branch, we should always try to fetch a newer version
-  # of that branch.
-  def fetch?
-    true
-  end
-end

data/lib/r10k/git/ref.rb

@@ -1,66 +0,0 @@
-require 'r10k/git'
-require 'r10k/git/repository'
-
-# ref: A 40-byte hex representation of a SHA1 or a name that denotes a
-# particular object. They may be stored in a file under $GIT_DIR/refs/
-# directory, or in the $GIT_DIR/packed-refs file.
-#
-# @deprecated This has been replaced by the ShellGit provider and the
-#   StatefulRepository class and will be removed in 2.0.0
-#
-# @see https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html
-# @api private
-class R10K::Git::Ref
-
-  # @!attribute [r] ref
-  #   @return [String] The git reference
-  attr_reader :ref
-
-  # @!attribute [rw] repository
-  #   @return [R10K::Git::Repository] A git repository that can be used to
-  #     resolve the git reference to a commit.
-  attr_accessor :repository
-
-  def initialize(ref, repository = nil)
-    @ref = ref
-    @repository = repository
-  end
-
-  # Can we locate the commit in the related repository?
-  def resolvable?
-    sha1
-    true
-  rescue R10K::Git::UnresolvableRefError
-    false
-  end
-
-  # Should we try to fetch this ref?
-  #
-  # Since we don't know the type of this ref, we have to assume that it might
-  # be a branch and always update accordingly.
-  def fetch?
-    true
-  end
-
-  def sha1
-    if @repository.nil?
-      raise ArgumentError, "Cannot resolve #{self.inspect}: no associated git repository"
-    else
-      @repository.rev_parse(ref)
-    end
-  end
-
-  def ==(other)
-    other.is_a?(R10K::Git::Ref) && other.sha1 == self.sha1
-  rescue ArgumentError, R10K::Git::UnresolvableRefError
-    false
-  end
-
-  def to_s
-    ref
-  end
-
-  def inspect
-    "#<#{self.class}: #{to_s}>"
-  end
-end

data/lib/r10k/git/remote_head.rb

@@ -1,19 +0,0 @@
-require 'r10k/git'
-
-# :nocov:
-#
-# @deprecated This has been replaced by the ShellGit provider and the
-#   StatefulRepository class and will be removed in 2.0.0
-#
-# @api private
-class R10K::Git::RemoteHead < R10K::Git::Head
-
-  def sha1
-    if @repository.nil?
-      raise ArgumentError, "Cannot resolve #{self.inspect}: no associated git repository"
-    else
-      @repository.resolve_head("refs/remotes/cache/#{@head}")
-    end
-  end
-end
-# :nocov:

data/lib/r10k/git/repository.rb

@@ -1,158 +0,0 @@
-require 'r10k/git'
-require 'r10k/util/subprocess'
-
-# Define an abstract base class for git repositories.
-#
-# @deprecated This has been replaced by the ShellGit provider and the
-#   StatefulRepository class and will be removed in 2.0.0
-#
-# :nocov:
-class R10K::Git::Repository
-
-  # @!attribute [r] remote
-  #   @return [String] The URL to the git repository
-  attr_reader :remote
-
-  # @!attribute [r] basedir
-  #   @return [String] The directory containing the repository
-  attr_reader :basedir
-
-  # @!attribute [r] dirname
-  #   @return [String] The name of the directory
-  attr_reader :dirname
-
-  # @!attribute [r] git_dir
-  #   Set the path to the git directory. For git repositories with working copies
-  #   this will be `$working_dir/.git`; for bare repositories this will be
-  #   `bare-repo.git`
-  #   @return [String] The path to the git directory
-  attr_reader :git_dir
-
-  # Resolve a ref to a git commit. The given pattern can be a commit, tag,
-  # or a local or remote branch
-  #
-  # @param [String] pattern
-  #
-  # @return [String] The dereferenced hash of `pattern`
-  def resolve_ref(pattern)
-    commit   = resolve_tag(pattern)
-    commit ||= resolve_remote_head(pattern)
-    commit ||= resolve_head(pattern)
-    commit ||= resolve_commit(pattern)
-
-    if commit
-      commit.chomp
-    else
-      raise R10K::Git::UnresolvableRefError.new("Could not resolve Git ref '#{ref}'", :ref => pattern, :git_dir => git_dir)
-    end
-  end
-  alias rev_parse resolve_ref
-
-  def resolve_tag(pattern)
-    output = git ['show-ref', '--tags', '-s', pattern], :git_dir => git_dir, :raise_on_fail => false
-
-    if output.success?
-      output.stdout.lines.first
-    end
-  end
-
-  def resolve_head(pattern)
-    output = git ['show-ref', '--heads', '-s', pattern], :git_dir => git_dir, :raise_on_fail => false
-
-    if output.success?
-      output.stdout.lines.first
-    end
-  end
-
-  def resolve_remote_head(pattern, remote = 'origin')
-    pattern = "refs/remotes/#{remote}/#{pattern}"
-    output = git ['show-ref', '-s', pattern], :git_dir => git_dir, :raise_on_fail => false
-
-    if output.success?
-      output.stdout.lines.first
-    end
-  end
-
-  # Define the same interface for resolving refs.
-  def resolve_commit(pattern)
-    output = git ['rev-parse', "#{pattern}^{commit}"], :git_dir => git_dir, :raise_on_fail => false
-
-    if output.success?
-      output.stdout.chomp
-    end
-  end
-
-  # @return [Hash<String, String>] A hash of remote names and fetch URLs
-  # @api private
-  def remotes
-    output = git ['remote', '-v'], :git_dir => git_dir
-
-    ret = {}
-    output.stdout.each_line do |line|
-      next if line.match(/\(push\)/)
-      name, url, _ = line.split(/\s+/)
-      ret[name] = url
-    end
-
-    ret
-  end
-
-  def tags
-    entries = []
-    output = git(['tag', '-l'], :git_dir => @git_dir).stdout
-    output.each_line { |line| entries << line.chomp }
-    entries
-  end
-
-  private
-
-  # Fetch objects and refs from the given git remote
-  #
-  # @param remote [#to_s] The remote name to fetch from
-  def fetch(remote = 'origin')
-    git ['fetch', '--prune', remote], :git_dir => @git_dir
-  end
-
-  # Wrap git commands
-  #
-  # @param cmd [Array<String>] cmd The arguments for the git prompt
-  # @param opts [Hash] opts
-  #
-  # @option opts [String] :path
-  # @option opts [String] :git_dir
-  # @option opts [String] :work_tree
-  # @option opts [String] :raise_on_fail
-  #
-  # @raise [R10K::ExecutionFailure] If the executed command exited with a
-  #   nonzero exit code.
-  #
-  # @return [String] The git command output
-  def git(cmd, opts = {})
-    raise_on_fail = opts.fetch(:raise_on_fail, true)
-
-    argv = %w{git}
-
-    if opts[:path]
-      argv << "--git-dir"   << File.join(opts[:path], '.git')
-      argv << "--work-tree" << opts[:path]
-    else
-      if opts[:git_dir]
-        argv << "--git-dir" << opts[:git_dir]
-      end
-      if opts[:work_tree]
-        argv << "--work-tree" << opts[:work_tree]
-      end
-    end
-
-    argv.concat(cmd)
-
-    subproc = R10K::Util::Subprocess.new(argv)
-    subproc.raise_on_fail = raise_on_fail
-    subproc.logger = self.logger
-
-    result = subproc.execute
-
-    result
-  end
-end
-# :nocov: