capistrano 3.4.1 → 3.5.0

data/features/support/env.rb

@@ -1,11 +1,11 @@
-PROJECT_ROOT = File.expand_path('../../../', __FILE__)
-VAGRANT_ROOT = File.join(PROJECT_ROOT, 'spec/support')
-VAGRANT_BIN = ENV['VAGRANT_BIN'] || "vagrant"
+PROJECT_ROOT = File.expand_path("../../../", __FILE__)
+VAGRANT_ROOT = File.join(PROJECT_ROOT, "spec/support")
+VAGRANT_BIN = ENV["VAGRANT_BIN"] || "vagrant"
 
 at_exit do
-  if ENV['KEEP_RUNNING']
+  if ENV["KEEP_RUNNING"]
     VagrantHelpers.run_vagrant_command("rm -rf /home/vagrant/var")
   end
 end
 
-require_relative '../../spec/support/test_app'
+require_relative "../../spec/support/test_app"

data/features/support/remote_command_helpers.rb

@@ -1,22 +1,24 @@
 module RemoteCommandHelpers
   def test_dir_exists(path)
-    exists?('d', path)
+    exists?("d", path)
   end
 
   def test_symlink_exists(path)
-    exists?('L', path)
+    exists?("L", path)
   end
 
   def test_file_exists(path)
-    exists?('f', path)
+    exists?("f", path)
   end
 
   def exists?(type, path)
-    %{[ -#{type} "#{path}" ]}
+    %Q{[ -#{type} "#{path}" ]}
   end
 
-  def safely_remove_file(path)
-    run_vagrant_command("rm #{test_file}") rescue VagrantHelpers::VagrantSSHCommandError
+  def safely_remove_file(_path)
+    run_vagrant_command("rm #{test_file}")
+  rescue
+    VagrantHelpers::VagrantSSHCommandError
   end
 end
 

data/features/support/vagrant_helpers.rb

@@ -1,10 +1,12 @@
+require "English"
+
 module VagrantHelpers
   extend self
 
   class VagrantSSHCommandError < RuntimeError; end
 
   at_exit do
-    if ENV['KEEP_RUNNING']
+    if ENV["KEEP_RUNNING"]
       puts "Vagrant vm will be left up because KEEP_RUNNING is set."
       puts "Rerun without KEEP_RUNNING set to cleanup the vm."
     else
@@ -19,17 +21,16 @@ module VagrantHelpers
         puts "[vagrant] #{line}"
       end
     end
-    $?
+    $CHILD_STATUS
   end
 
   def run_vagrant_command(command)
     if (status = vagrant_cli_command("ssh -c #{command.inspect}")).success?
       true
     else
-      fail VagrantSSHCommandError, status
+      raise VagrantSSHCommandError, status
     end
   end
-
 end
 
 World(VagrantHelpers)

data/issue_template.md

@@ -0,0 +1,21 @@
+**Important:** GitHub issues are for feature requests or bug reports. The Capistrano team recommends you use [Stack Overflow](http://stackoverflow.com/questions/tagged/capistrano) for general questions. For more details, please see our [contribution policy](https://github.com/capistrano/capistrano/blob/master/CONTRIBUTING.md).
+
+---
+
+#### Steps to reproduce
+
+1. Lorem.
+2. Ipsum..
+3. Dolor...
+
+#### Expected behaviour
+
+Tell us what should happen
+
+#### Actual behaviour
+
+Tell us what happens instead
+
+#### Your configuration
+
+Paste Capistrano's `doctor` output here (`cap <stage> doctor`):

data/lib/Capfile

@@ -1,3 +1,7 @@
 #!/usr/bin/env cap
 include Capistrano::DSL
-require 'capistrano/install'
+require "capistrano/install"
+
+require "capistrano/harrow"
+require "capistrano/harrow/plugin"
+install_plugin Capistrano::Harrow::Plugin

data/lib/capistrano/all.rb

@@ -1,17 +1,16 @@
-require 'rake'
-require 'sshkit'
+require "rake"
+require "sshkit"
 
-require 'io/console'
+require "io/console"
 
 Rake.application.options.trace = true
 
-require 'capistrano/version'
-require 'capistrano/version_validator'
-require 'capistrano/i18n'
-require 'capistrano/dsl'
-require 'capistrano/application'
-require 'capistrano/configuration'
+require "capistrano/version"
+require "capistrano/version_validator"
+require "capistrano/i18n"
+require "capistrano/dsl"
+require "capistrano/application"
+require "capistrano/configuration"
 
 module Capistrano
-
 end

data/lib/capistrano/application.rb

@@ -1,6 +1,5 @@
 module Capistrano
   class Application < Rake::Application
-
     def initialize
       super
       @rakefiles = %w{capfile Capfile capfile.rb Capfile.rb} << capfile
@@ -21,11 +20,11 @@ module Capistrano
         switch =~ /--#{Regexp.union(not_applicable_to_capistrano)}/
       end
 
-      super.push(version, dry_run, roles, hostfilter)
+      super.push(version, dry_run, roles, hostfilter, print_config_variables)
     end
 
     def handle_options
-      options.rakelib = ['rakelib']
+      options.rakelib = ["rakelib"]
       options.trace_output = $stderr
 
       OptionParser.new do |opts|
@@ -48,11 +47,10 @@ module Capistrano
         end
 
         standard_rake_options.each { |args| opts.on(*args) }
-        opts.environment('RAKEOPT')
+        opts.environment("RAKEOPT")
       end.parse!
     end
 
-
     def top_level_tasks
       if tasks_without_stage_dependency.include?(@top_level_tasks.first)
         @top_level_tasks
@@ -63,13 +61,10 @@ module Capistrano
 
     def display_error_message(ex)
       unless options.backtrace
-        if loc = Rake.application.find_rakefile_location
-          whitelist = (@imported.dup << loc[0]).map{|f| File.absolute_path(f, loc[1])}
-          pattern = %r@^(?!#{whitelist.map{|p| Regexp.quote(p)}.join('|')})@
-          Rake.application.options.suppress_backtrace_pattern = pattern
-        end
+        Rake.application.options.suppress_backtrace_pattern = backtrace_pattern if backtrace_pattern
         trace "(Backtrace restricted to imported tasks)"
       end
+
       super
     end
 
@@ -83,10 +78,18 @@ module Capistrano
 
     private
 
+    def backtrace_pattern
+      loc = Rake.application.find_rakefile_location
+      return unless loc
+
+      whitelist = (@imported.dup << loc[0]).map { |f| File.absolute_path(f, loc[1]) }
+      /^(?!#{whitelist.map { |p| Regexp.quote(p) }.join('|')})/
+    end
+
     def load_imports
       if options.show_tasks
-        invoke 'load:defaults'
-        set(:stage, '')
+        invoke "load:defaults"
+        set(:stage, "")
         Dir[deploy_config_path].each { |f| add_import f }
       end
 
@@ -95,46 +98,53 @@ module Capistrano
 
     # allows the `cap install` task to load without a capfile
     def capfile
-      File.expand_path(File.join(File.dirname(__FILE__),'..','Capfile'))
+      File.expand_path(File.join(File.dirname(__FILE__), "..", "Capfile"))
     end
 
     def version
-      ['--version', '-V',
+      ["--version", "-V",
        "Display the program version.",
-       lambda { |value|
+       lambda do |_value|
          puts "Capistrano Version: #{Capistrano::VERSION} (Rake Version: #{Rake::VERSION})"
          exit
-       }
+       end
       ]
     end
 
     def dry_run
-      ['--dry-run', '-n',
+      ["--dry-run", "-n",
        "Do a dry run without executing actions",
-       lambda { |value|
+       lambda do |_value|
          Configuration.env.set(:sshkit_backend, SSHKit::Backend::Printer)
-       }
+       end
       ]
     end
 
     def roles
-      ['--roles ROLES', '-r',
+      ["--roles ROLES", "-r",
        "Run SSH commands only on hosts matching these roles",
-       lambda { |value|
+       lambda do |value|
          Configuration.env.add_cmdline_filter(:role, value)
-       }
+       end
       ]
     end
 
     def hostfilter
-      ['--hosts HOSTS', '-z',
+      ["--hosts HOSTS", "-z",
        "Run SSH commands only on matching hosts",
-       lambda { |value|
+       lambda do |value|
          Configuration.env.add_cmdline_filter(:host, value)
-       }
+       end
       ]
     end
 
+    def print_config_variables
+      ["--print-config-variables", "-p",
+       "Display the defined config variables before starting the deployment tasks.",
+       lambda do |_value|
+         Configuration.env.set(:print_config_variables, true)
+       end
+      ]
+    end
   end
-
 end

data/lib/capistrano/configuration.rb

@@ -1,15 +1,14 @@
-require_relative 'configuration/filter'
-require_relative 'configuration/question'
-require_relative 'configuration/server'
-require_relative 'configuration/servers'
+require_relative "configuration/filter"
+require_relative "configuration/question"
+require_relative "configuration/plugin_installer"
+require_relative "configuration/server"
+require_relative "configuration/servers"
+require_relative "configuration/variables"
 
 module Capistrano
-  class Configuration
-
-    def initialize(config = nil)
-      @config ||= config
-    end
+  class ValidationError < Exception; end
 
+  class Configuration
     def self.env
       @env ||= new
     end
@@ -18,38 +17,49 @@ module Capistrano
       @env = new
     end
 
+    extend Forwardable
+    attr_reader :variables
+    def_delegators :variables,
+                   :set, :fetch, :fetch_for, :delete, :keys, :validate
+
+    def initialize(values={})
+      @variables = Variables.new(values)
+    end
+
     def ask(key, default=nil, options={})
       question = Question.new(key, default, options)
       set(key, question)
     end
 
-    def set(key, value)
-      config[key] = value
+    def set_if_empty(key, value=nil, &block)
+      set(key, value, &block) unless keys.include?(key)
     end
 
-    def set_if_empty(key, value)
-      config[key] = value unless config.has_key? key
+    def append(key, *values)
+      set(key, Array(fetch(key)).concat(values))
     end
 
-    def delete(key)
-      config.delete(key)
+    def remove(key, *values)
+      set(key, Array(fetch(key)) - values)
     end
 
-    def fetch(key, default=nil, &block)
-      value = fetch_for(key, default, &block)
-      while callable_without_parameters?(value)
-        value = set(key, value.call)
+    def any?(key)
+      value = fetch(key)
+      if value && value.respond_to?(:any?)
+        value.any?
+      else
+        !fetch(key).nil?
       end
-      return value
     end
 
-    def keys
-      config.keys
+    def is_question?(key)
+      value = fetch_for(key, nil)
+      !value.nil? && value.is_a?(Question)
     end
 
     def role(name, hosts, options={})
       if name == :all
-        raise ArgumentError.new("#{name} reserved name for role. Please choose another name")
+        raise ArgumentError, "#{name} reserved name for role. Please choose another name"
       end
 
       servers.add_role(name, hosts, options)
@@ -79,14 +89,14 @@ module Capistrano
 
     def configure_backend
       backend.configure do |sshkit|
-        sshkit.format           = fetch(:format)
+        configure_sshkit_output(sshkit)
         sshkit.output_verbosity = fetch(:log_level)
         sshkit.default_env      = fetch(:default_env)
         sshkit.backend          = fetch(:sshkit_backend, SSHKit::Backend::Netssh)
         sshkit.backend.configure do |backend|
           backend.pty                = fetch(:pty)
           backend.connection_timeout = fetch(:connection_timeout)
-          backend.ssh_options        = (backend.ssh_options || {}).merge(fetch(:ssh_options,{}))
+          backend.ssh_options        = (backend.ssh_options || {}).merge(fetch(:ssh_options, {}))
         end
       end
     end
@@ -97,9 +107,11 @@ module Capistrano
 
     def setup_filters
       @filters = cmdline_filters.clone
-      @filters << Filter.new(:role, ENV['ROLES']) if ENV['ROLES']
-      @filters << Filter.new(:host, ENV['HOSTS']) if ENV['HOSTS']
-      fh = fetch_for(:filter,{})
+      @filters << Filter.new(:role, ENV["ROLES"]) if ENV["ROLES"]
+      @filters << Filter.new(:host, ENV["HOSTS"]) if ENV["HOSTS"]
+      fh = fetch_for(:filter, {}) || {}
+      @filters << Filter.new(:host, fh[:hosts]) if fh[:hosts]
+      @filters << Filter.new(:role, fh[:roles]) if fh[:roles]
       @filters << Filter.new(:host, fh[:host]) if fh[:host]
       @filters << Filter.new(:role, fh[:role]) if fh[:role]
     end
@@ -108,9 +120,17 @@ module Capistrano
       cmdline_filters << Filter.new(type, values)
     end
 
-    def filter list
+    def filter(list)
       setup_filters if @filters.nil?
-      @filters.reduce(list) { |l,f| f.filter l }
+      @filters.reduce(list) { |l, f| f.filter l }
+    end
+
+    def dry_run?
+      fetch(:sshkit_backend) == SSHKit::Backend::Printer
+    end
+
+    def install_plugin(plugin, load_hooks:true)
+      installer.install(plugin, load_hooks: load_hooks)
     end
 
     private
@@ -123,20 +143,15 @@ module Capistrano
       @servers ||= Servers.new
     end
 
-    def config
-      @config ||= Hash.new
+    def installer
+      @installer ||= PluginInstaller.new
     end
 
-    def fetch_for(key, default, &block)
-      if block_given?
-        config.fetch(key, &block)
-      else
-        config.fetch(key, default)
-      end
-    end
+    def configure_sshkit_output(sshkit)
+      format_args = [fetch(:format)]
+      format_args.push(fetch(:format_options)) if any?(:format_options)
 
-    def callable_without_parameters?(x)
-      x.respond_to?(:call) && ( !x.respond_to?(:arity) || x.arity == 0)
+      sshkit.use_format(*format_args)
     end
   end
 end

data/lib/capistrano/configuration/empty_filter.rb

@@ -0,0 +1,9 @@
+module Capistrano
+  class Configuration
+    class EmptyFilter
+      def filter(_servers)
+        []
+      end
+    end
+  end
+end