capistrano 3.11.0 → 3.19.1

data/DEVELOPMENT.md

@@ -20,22 +20,16 @@ Everyone can help improve Capistrano. There are ways to contribute even if you a
 
 ## Contributing documentation
 
-Improvements and additions to Capistrano's documentation are very much appreciated. The official documention is stored in the `docs/` directory as Markdown files. These files are used to automatically generate the [capistranorb.com](http://capistranorb.com/) website, which is hosted by GitHub Pages. Feel free to make changes to this documentation as you see fit. Before opening a pull request, make sure your documentation renders correctly by previewing the website in your local environment. Refer to [docs/README.md][] for instructions.
+Improvements and additions to Capistrano's documentation are very much appreciated. The official documentation is stored in the `docs/` directory as Markdown files. These files are used to automatically generate the [capistranorb.com](https://capistranorb.com/) website, which is hosted by GitHub Pages. Feel free to make changes to this documentation as you see fit. Before opening a pull request, make sure your documentation renders correctly by previewing the website in your local environment. Refer to [docs/README.md][] for instructions.
 
 ## Setting up your development environment
 
-Capistrano is a Ruby project, so we expect you to have a functioning Ruby environment. To hack on Capistrano you will further need some specialized tools to run its test suite.
-
-Make sure to install:
-
-* [Bundler](https://bundler.io/)
-* [Vagrant](https://www.vagrantup.com/)
-* [VirtualBox](https://www.virtualbox.org/wiki/Downloads) (or another [Vagrant-supported](https://docs.vagrantup.com/v2/getting-started/providers.html) VM host)
+Capistrano is a Ruby project, so we expect you to have a functioning Ruby environment with the latest stable version of Ruby. To run Cucumber tests, you'll also need [Docker installed](https://docs.docker.com/get-docker/) and running.
 
 
 ### Running tests
 
-Capistrano has two test suites: an RSpec suite and a Cucumber suite. The RSpec suite handles quick feedback unit specs. The Cucumber suite is an integration suite that uses Vagrant to deploy to a real virtual server.
+Capistrano has two test suites: an RSpec suite and a Cucumber suite. The RSpec suite handles quick feedback unit specs. The Cucumber suite is an integration suite that uses a Docker container as an SSH server and deployment target.
 
 ```
 # Ensure all dependencies are installed
@@ -44,26 +38,17 @@ $ bundle install
 # Run the RSpec suite
 $ bundle exec rake spec
 
-# Run the Cucumber suite
+# Run the Cucumber suite (Docker must be running)
 $ bundle exec rake features
-
-# Run the Cucumber suite and leave the VM running (faster for subsequent runs)
-$ bundle exec rake features KEEP_RUNNING=1
 ```
 
-### Report failing Cucumber features!
-
-Currently, the Capistrano Travis build does *not* run the Cucumber suite. This means it is possible for a failing Cucumber feature to sneak in without being noticed by our continuous integration checks.
-
-**If you come across a failing Cucumber feature, this is a bug.** Please report it by opening a GitHub issue. Or even better: do your best to fix the feature and submit a pull request!
-
 ## Coding guidelines
 
 This project uses [RuboCop](https://github.com/bbatsov/rubocop) to enforce standard Ruby coding guidelines.
 
 * Test that your contributions pass with `rake rubocop`
 * Rubocop is also run as part of the full test suite with `rake`
-* Note the Travis build will fail and your PR cannot be merged if Rubocop finds errors
+* Note the CI build will fail and your PR cannot be merged if Rubocop finds errors
 
 ## Submitting a pull request
 

data/Gemfile

@@ -3,8 +3,45 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in capistrano.gemspec
 gemspec
 
+gem "mocha"
+gem "rspec"
+gem "rspec-core", "~> 3.4.4"
+
 group :cucumber do
-  gem "cucumber"
-  gem "rspec"
-  gem "rspec-core", "~> 3.4.4"
+  # Latest versions of cucumber don't support Ruby < 2.1
+  # rubocop:disable Bundler/DuplicatedGem
+  if Gem::Requirement.new("< 2.1").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+    gem "cucumber", "< 3.0.1"
+  else
+    gem "cucumber"
+  end
+  # rubocop:enable Bundler/DuplicatedGem
+end
+
+# Latest versions of net-ssh don't support Ruby < 2.2.6
+if Gem::Requirement.new("< 2.2.6").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  gem "net-ssh", "< 5.0.0"
+end
+
+# Latest versions of public_suffix don't support Ruby < 2.1
+if Gem::Requirement.new("< 2.1").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  gem "public_suffix", "< 3.0.0"
+end
+
+# Latest versions of i18n don't support Ruby < 2.4
+if Gem::Requirement.new("< 2.4").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  gem "i18n", "< 1.3.0"
+end
+
+# Latest versions of rake don't support Ruby < 2.2
+if Gem::Requirement.new("< 2.2").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  gem "rake", "< 13.0.0"
+end
+
+# We only run rubocop and its dependencies on a new-ish ruby; no need to install them otherwise
+if Gem::Requirement.new("> 2.4").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  gem "base64"
+  gem "psych", "< 4" # Ensures rubocop works on Ruby 3.1
+  gem "racc"
+  gem "rubocop", "0.48.1"
 end

data/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2012-2018 Tom Clements, Lee Hambley
+Copyright (c) 2012-2020 Tom Clements, Lee Hambley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
 
 # Capistrano: A deployment automation tool built on Ruby, Rake, and SSH.
 
-[![Gem Version](https://badge.fury.io/rb/capistrano.svg)](http://badge.fury.io/rb/capistrano) [![Build Status](https://travis-ci.org/capistrano/capistrano.svg?branch=master)](https://travis-ci.org/capistrano/capistrano) [![Code Climate](https://codeclimate.com/github/capistrano/capistrano/badges/gpa.svg)](https://codeclimate.com/github/capistrano/capistrano) [![CodersClan](https://img.shields.io/badge/get-support-blue.svg)](http://codersclan.net/?repo_id=325&source=small)
+[![Gem Version](https://badge.fury.io/rb/capistrano.svg)](http://badge.fury.io/rb/capistrano) [![Build Status](https://github.com/capistrano/capistrano/actions/workflows/ci.yml/badge.svg)](https://github.com/capistrano/capistrano/actions/workflows/ci.yml) [![Code Climate](https://codeclimate.com/github/capistrano/capistrano/badges/gpa.svg)](https://codeclimate.com/github/capistrano/capistrano) [![CodersClan](https://img.shields.io/badge/get-support-blue.svg)](http://codersclan.net/?repo_id=325&source=small)
 
 Capistrano is a framework for building automated deployment scripts. Although Capistrano itself is written in Ruby, it can easily be used to deploy projects of any language or framework, be it Rails, Java, or PHP.
 
@@ -107,7 +107,7 @@ Add Capistrano to your project's Gemfile using `require: false`:
 
 ``` ruby
 group :development do
-  gem "capistrano", "~> 3.11", require: false
+  gem "capistrano", "~> 3.17", require: false
 end
 ```
 
@@ -200,7 +200,7 @@ Contributions to Capistrano, in the form of code, documentation or idea, are gla
 
 MIT License (MIT)
 
-Copyright (c) 2012-2018 Tom Clements, Lee Hambley
+Copyright (c) 2012-2020 Tom Clements, Lee Hambley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/RELEASING.md

@@ -11,7 +11,7 @@
 2.  **Ensure all tests are passing by running `rake spec` and `rake features`.**
 3. Determine which would be the correct next version number according to [semver](http://semver.org/).
 4. Update the version in `./lib/capistrano/version.rb`.
-4. Update the version in the `./README.md` Gemfile example (`gem "capistrano", "~> X.Y"`).
-5. Update the `CHANGELOG`.
-6. Commit the changelog and version in a single commit, the message should be "Preparing vX.Y.Z"
+5. Update the version in the `./README.md` Gemfile example (`gem "capistrano", "~> X.Y"`).
+6. Commit the `version.rb` and `README.md` changes in a single commit, the message should be "Release vX.Y.Z"
 7. Run `rake release`; this will tag, push to GitHub, and publish to rubygems.org.
+8. Update the draft release on the [GitHub releases page](https://github.com/capistrano/capistrano/releases) to point to the new tag and publish the release

data/Rakefile

@@ -1,12 +1,20 @@
 require "bundler/gem_tasks"
 require "cucumber/rake/task"
 require "rspec/core/rake_task"
-require "rubocop/rake_task"
 
-task default: %i(spec rubocop)
-RSpec::Core::RakeTask.new
+begin
+  require "rubocop/rake_task"
+  desc "Run RuboCop checks"
+  RuboCop::RakeTask.new
+  task default: %i(spec rubocop)
+rescue LoadError
+  task default: :spec
+end
 
+RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new(:features)
 
-desc "Run RuboCop checks"
-RuboCop::RakeTask.new
+Rake::Task["release"].enhance do
+  puts "Don't forget to publish the release on GitHub!"
+  system "open https://github.com/capistrano/capistrano/releases"
+end

data/capistrano.gemspec

@@ -11,8 +11,14 @@ Gem::Specification.new do |gem|
   gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com"]
   gem.description   = "Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH."
   gem.summary       = "Capistrano - Welcome to easy deployment with Ruby over SSH"
-  gem.homepage      = "http://capistranorb.com/"
-
+  gem.homepage      = "https://capistranorb.com/"
+  gem.metadata      = {
+    "bug_tracker_uri" => "https://github.com/capistrano/capistrano/issues",
+    "changelog_uri" => "https://github.com/capistrano/capistrano/releases",
+    "source_code_uri" => "https://github.com/capistrano/capistrano",
+    "homepage_uri" => "https://capistranorb.com/",
+    "documentation_uri" => "https://capistranorb.com/"
+  }
   gem.files         = `git ls-files -z`.split("\x0").reject { |f| f =~ /^docs/ }
   gem.executables   = %w(cap capify)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -25,9 +31,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "i18n"
   gem.add_dependency "rake", ">= 10.0.0"
   gem.add_dependency "sshkit", ">= 1.9.0"
-
-  gem.add_development_dependency "danger"
-  gem.add_development_dependency "mocha"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rubocop", "0.48.1"
 end

data/docker-compose.yml

@@ -0,0 +1,8 @@
+name: capistrano
+
+services:
+  ssh_server:
+    build:
+      context: .docker
+    ports:
+      - "2022:22"

data/features/deploy.feature

@@ -40,6 +40,11 @@ Feature: Deploy
     Then the repo is cloned
     And the release is created
 
+  Scenario: REVISION and REVISION_TIME files are present
+    When I make 1 deployment
+    Then the REVISION file is created in the release
+    Then the REVISION_TIME file is created in the release
+
   Scenario: Symlink linked files
     When I run cap "deploy:symlink:linked_files deploy:symlink:release" as part of a release
     Then file symlinks are created in the new release
@@ -70,6 +75,12 @@ Feature: Deploy
     Then 3 valid releases are kept
     And the current directory will be a symlink to the release
 
+  Scenario: Cleanup when there are more releases than arguments can handle
+    Given config stage file has line "set :keep_releases, 3"
+    And 5000 valid existing releases
+    When I run cap "deploy:cleanup"
+    Then 3 valid releases are kept
+
   Scenario: Rolling Back
     Given I make 2 deployments
     When I run cap "deploy:rollback"
@@ -79,4 +90,3 @@ Feature: Deploy
     Given I make 3 deployments
     When I rollback to a specific release
     Then the current symlink points to that specific release
-

data/features/sshconnect.feature

@@ -8,4 +8,4 @@ Feature: SSH Connection
   Scenario: Switching from default user to root and back again
     When I run cap "am_i_root"
     Then the task is successful
-    And the output matches "I am uid=0\(root\)" followed by "I am uid=\d+\(vagrant\)"
+    And the output matches "I am uid=0\(root\)" followed by "I am uid=\d+\(deployer\)"

data/features/step_definitions/assertions.rb

@@ -5,68 +5,78 @@ Then(/^references in the remote repo are listed$/) do
 end
 
 Then(/^git wrapper permissions are 0700$/) do
-  permissions_test = %Q([ $(stat -c "%a" #{TestApp.git_wrapper_path.shellescape}) == "700" ])
-  _stdout, _stderr, status = vagrant_cli_command("ssh -c #{permissions_test.shellescape}")
-
-  expect(status).to be_success
+  permissions_test = %Q([ $(stat -c "%a" #{TestApp.git_wrapper_path_glob}) == "700" ])
+  expect { run_remote_ssh_command(permissions_test) }.not_to raise_error
 end
 
 Then(/^the shared path is created$/) do
-  run_vagrant_command(test_dir_exists(TestApp.shared_path))
+  run_remote_ssh_command(test_dir_exists(TestApp.shared_path))
 end
 
 Then(/^the releases path is created$/) do
-  run_vagrant_command(test_dir_exists(TestApp.releases_path))
+  run_remote_ssh_command(test_dir_exists(TestApp.releases_path))
 end
 
 Then(/^(\d+) valid releases are kept/) do |num|
   test = %Q([ $(ls -g #{TestApp.releases_path} | grep -E '[0-9]{14}' | wc -l) == "#{num}" ])
-  _, _, status = vagrant_cli_command("ssh -c #{test.shellescape}")
-  expect(status).to be_success
+  expect { run_remote_ssh_command(test) }.not_to raise_error
 end
 
 Then(/^the invalid (.+) release is ignored$/) do |filename|
   test = "ls -g #{TestApp.releases_path} | grep #{filename}"
-  _, _, status = vagrant_cli_command("ssh -c #{test.shellescape}")
-  expect(status).to be_success
+  expect { run_remote_ssh_command(test) }.not_to raise_error
 end
 
 Then(/^directories in :linked_dirs are created in shared$/) do
   TestApp.linked_dirs.each do |dir|
-    run_vagrant_command(test_dir_exists(TestApp.shared_path.join(dir)))
+    run_remote_ssh_command(test_dir_exists(TestApp.shared_path.join(dir)))
   end
 end
 
 Then(/^directories referenced in :linked_files are created in shared$/) do
   dirs = TestApp.linked_files.map { |path| TestApp.shared_path.join(path).dirname }
   dirs.each do |dir|
-    run_vagrant_command(test_dir_exists(dir))
+    run_remote_ssh_command(test_dir_exists(dir))
   end
 end
 
 Then(/^the repo is cloned$/) do
-  run_vagrant_command(test_dir_exists(TestApp.repo_path))
+  run_remote_ssh_command(test_dir_exists(TestApp.repo_path))
 end
 
 Then(/^the release is created$/) do
-  run_vagrant_command("ls -g #{TestApp.releases_path}")
+  stdout, _stderr = run_remote_ssh_command("ls #{TestApp.releases_path}")
+
+  expect(stdout.strip).to match(/\A#{Time.now.utc.strftime("%Y%m%d")}\d{6}\Z/)
+end
+
+Then(/^the REVISION file is created in the release$/) do
+  stdout, _stderr = run_remote_ssh_command("cat #{@release_paths[0]}/REVISION")
+
+  expect(stdout.strip).to match(/\h{40}/)
+end
+
+Then(/^the REVISION_TIME file is created in the release$/) do
+  stdout, _stderr = run_remote_ssh_command("cat #{@release_paths[0]}/REVISION_TIME")
+
+  expect(stdout.strip).to match(/\d{10}/)
 end
 
 Then(/^file symlinks are created in the new release$/) do
   TestApp.linked_files.each do |file|
-    run_vagrant_command(test_symlink_exists(TestApp.current_path.join(file)))
+    run_remote_ssh_command(test_symlink_exists(TestApp.current_path.join(file)))
   end
 end
 
 Then(/^directory symlinks are created in the new release$/) do
   pending
   TestApp.linked_dirs.each do |dir|
-    run_vagrant_command(test_symlink_exists(TestApp.release_path.join(dir)))
+    run_remote_ssh_command(test_symlink_exists(TestApp.release_path.join(dir)))
   end
 end
 
 Then(/^the current directory will be a symlink to the release$/) do
-  run_vagrant_command(exists?("e", TestApp.current_path))
+  run_remote_ssh_command(exists?("e", TestApp.current_path))
 end
 
 Then(/^the deploy\.rb file is created$/) do
@@ -95,7 +105,7 @@ end
 
 Then(/^it creates the file with the remote_task prerequisite$/) do
   TestApp.linked_files.each do |file|
-    run_vagrant_command(test_file_exists(TestApp.shared_path.join(file)))
+    run_remote_ssh_command(test_file_exists(TestApp.shared_path.join(file)))
   end
 end
 
@@ -113,18 +123,18 @@ end
 
 Then(/^the failure task will run$/) do
   failed = TestApp.shared_path.join("failed")
-  run_vagrant_command(test_file_exists(failed))
+  run_remote_ssh_command(test_file_exists(failed))
 end
 
 Then(/^the failure task will not run$/) do
   failed = TestApp.shared_path.join("failed")
-  expect { run_vagrant_command(test_file_exists(failed)) }
-    .to raise_error(VagrantHelpers::VagrantSSHCommandError)
+  expect { run_remote_ssh_command(test_file_exists(failed)) }
+    .to raise_error(RemoteSSHHelpers::RemoteSSHCommandError)
 end
 
 When(/^an error is raised$/) do
   error = TestApp.shared_path.join("fail")
-  run_vagrant_command(test_file_exists(error))
+  run_remote_ssh_command(test_file_exists(error))
 end
 
 Then(/contains "([^"]*)" in the output/) do |expected|
@@ -142,11 +152,11 @@ end
 Then(/the current symlink points to the previous release/) do
   previous_release_path = @release_paths[-2]
 
-  run_vagrant_command(symlinked?(TestApp.current_path, previous_release_path))
+  run_remote_ssh_command(symlinked?(TestApp.current_path, previous_release_path))
 end
 
 Then(/^the current symlink points to that specific release$/) do
   specific_release_path = TestApp.releases_path.join(@rollback_release)
 
-  run_vagrant_command(symlinked?(TestApp.current_path, specific_release_path))
+  run_remote_ssh_command(symlinked?(TestApp.current_path, specific_release_path))
 end

data/features/step_definitions/setup.rb

@@ -7,11 +7,8 @@ Given(/^a test app without any configuration$/) do
 end
 
 Given(/^servers with the roles app and web$/) do
-  begin
-    vagrant_cli_command("up")
-  rescue
-    nil
-  end
+  start_ssh_server
+  wait_for_ssh_server
 end
 
 Given(/^a linked file "(.*?)"$/) do |file|
@@ -21,8 +18,8 @@ end
 
 Given(/^file "(.*?)" exists in shared path$/) do |file|
   file_shared_path = TestApp.shared_path.join(file)
-  run_vagrant_command("mkdir -p #{file_shared_path.dirname}")
-  run_vagrant_command("touch #{file_shared_path}")
+  run_remote_ssh_command("mkdir -p #{file_shared_path.dirname}")
+  run_remote_ssh_command("touch #{file_shared_path}")
 end
 
 Given(/^all linked files exists in shared path$/) do
@@ -33,8 +30,8 @@ end
 
 Given(/^file "(.*?)" does not exist in shared path$/) do |file|
   file_shared_path = TestApp.shared_path.join(file)
-  run_vagrant_command("mkdir -p #{TestApp.shared_path}")
-  run_vagrant_command("touch #{file_shared_path} && rm #{file_shared_path}")
+  run_remote_ssh_command("mkdir -p #{TestApp.shared_path}")
+  run_remote_ssh_command("touch #{file_shared_path} && rm #{file_shared_path}")
 end
 
 Given(/^a custom task to generate a file$/) do
@@ -67,12 +64,12 @@ Given(/^a stage file named (.+)$/) do |filename|
   TestApp.write_local_stage_file(filename)
 end
 
-Given(/^I make (\d+) deployments$/) do |count|
+Given(/^I make (\d+) deployments?$/) do |count|
   step "all linked files exists in shared path"
 
   @release_paths = (1..count.to_i).map do
     TestApp.cap("deploy")
-    stdout, _stderr = run_vagrant_command("readlink #{TestApp.current_path}")
+    stdout, _stderr = run_remote_ssh_command("readlink #{TestApp.current_path}")
 
     stdout.strip
   end
@@ -80,13 +77,15 @@ end
 
 Given(/^(\d+) valid existing releases$/) do |num|
   a_day = 86_400 # in seconds
-  offset = -(a_day * num.to_i)
-  num.to_i.times do
-    run_vagrant_command("mkdir -p #{TestApp.release_path(TestApp.timestamp(offset))}")
-    offset += a_day
+  (1...num).each_slice(100) do |num_batch|
+    dirs = num_batch.map do |i|
+      offset = -(a_day * i)
+      TestApp.release_path(TestApp.timestamp(offset))
+    end
+    run_remote_ssh_command("mkdir -p #{dirs.join(' ')}")
   end
 end
 
 Given(/^an invalid release named "(.+)"$/) do |filename|
-  run_vagrant_command("mkdir -p #{TestApp.release_path(filename)}")
+  run_remote_ssh_command("mkdir -p #{TestApp.release_path(filename)}")
 end

data/features/support/docker_gateway.rb

@@ -0,0 +1,53 @@
+# Ensure Docker container is completely stopped when Ruby exits.
+at_exit do
+  DockerGateway.new.stop
+end
+
+# Manages the Docker-based SSH server that is declared in docker-compose.yml.
+class DockerGateway
+  def initialize(log_proc=$stderr.method(:puts))
+    @log_proc = log_proc
+  end
+
+  def start
+    run_compose_command("up -d")
+  end
+
+  def stop
+    run_compose_command("down")
+  end
+
+  def run_shell_command(command)
+    run_compose_command("exec ssh_server /bin/bash -c #{command.shellescape}")
+  end
+
+  private
+
+  def run_compose_command(command)
+    log "[docker compose] #{command}"
+    stdout, stderr, status = Open3.popen3("docker compose #{command}") do |stdin, stdout, stderr, wait_threads|
+      stdin << ""
+      stdin.close
+      out = Thread.new { read_lines(stdout, &$stdout.method(:puts)) }
+      err = Thread.new { stderr.read }
+      [out.value, err.value.to_s, wait_threads.value]
+    end
+
+    (stdout + stderr).each_line { |line| log "[docker compose] #{line}" }
+
+    [stdout, stderr, status]
+  end
+
+  def read_lines(io)
+    buffer = + ""
+    while (line = io.gets)
+      buffer << line
+      yield line
+    end
+    buffer
+  end
+
+  def log(message)
+    @log_proc.call(message)
+  end
+end

data/features/support/env.rb

@@ -1,11 +1 @@
-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"]
-    VagrantHelpers.run_vagrant_command("rm -rf /home/vagrant/var")
-  end
-end
-
 require_relative "../../spec/support/test_app"

data/features/support/remote_command_helpers.rb

@@ -12,7 +12,7 @@ module RemoteCommandHelpers
   end
 
   def exists?(type, path)
-    %Q{[ -#{type} "#{path}" ]}
+    %Q{[[ -#{type} "#{path}" ]]}
   end
 
   def symlinked?(symlink_path, target_path)
@@ -20,9 +20,9 @@ module RemoteCommandHelpers
   end
 
   def safely_remove_file(_path)
-    run_vagrant_command("rm #{test_file}")
+    run_remote_ssh_command("rm #{test_file}")
   rescue
-    VagrantHelpers::VagrantSSHCommandError
+    RemoteSSHHelpers::RemoteSSHCommandError
   end
 end
 

data/features/support/remote_ssh_helpers.rb

@@ -0,0 +1,33 @@
+require "open3"
+require "socket"
+require_relative "docker_gateway"
+
+module RemoteSSHHelpers
+  extend self
+
+  class RemoteSSHCommandError < RuntimeError; end
+
+  def start_ssh_server
+    docker_gateway.start
+  end
+
+  def wait_for_ssh_server(retries=3)
+    Socket.tcp("localhost", 2022, connect_timeout: 1).close
+  rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
+    retries -= 1
+    sleep(2) && retry if retries.positive?
+    raise
+  end
+
+  def run_remote_ssh_command(command)
+    stdout, stderr, status = docker_gateway.run_shell_command(command)
+    return [stdout, stderr] if status.success?
+    raise RemoteSSHCommandError, status
+  end
+
+  def docker_gateway
+    @docker_gateway ||= DockerGateway.new(method(:log))
+  end
+end
+
+World(RemoteSSHHelpers)

data/lib/capistrano/configuration/question.rb

@@ -36,12 +36,12 @@ module Capistrano
       end
 
       def gets
-        return unless $stdin.tty?
+        return unless stdin.tty?
 
         if echo?
-          $stdin.gets
+          stdin.gets
         else
-          $stdin.noecho(&:gets).tap { $stdout.print "\n" }
+          stdin.noecho(&:gets).tap { $stdout.print "\n" }
         end
       rescue Errno::EIO
         # when stdio gets closed
@@ -49,7 +49,11 @@ module Capistrano
       end
 
       def question
-        if default.nil?
+        if prompt && default.nil?
+          I18n.t(:question_prompt, key: prompt, scope: :capistrano)
+        elsif prompt
+          I18n.t(:question_prompt_default, key: prompt, default_value: default, scope: :capistrano)
+        elsif default.nil?
           I18n.t(:question, key: key, scope: :capistrano)
         else
           I18n.t(:question_default, key: key, default_value: default, scope: :capistrano)
@@ -59,6 +63,14 @@ module Capistrano
       def echo?
         (options || {}).fetch(:echo, true)
       end
+
+      def stdin
+        (options || {}).fetch(:stdin, $stdin)
+      end
+
+      def prompt
+        (options || {}).fetch(:prompt, nil)
+      end
     end
   end
 end

data/lib/capistrano/configuration/validated_variables.rb

@@ -68,7 +68,7 @@ module Capistrano
       # works as expected.
       #
       def assert_valid_later(key, callable)
-        validation_callback = lambda do
+        validation_callback = proc do
           value = callable.call
           assert_valid_now(key, value)
           value

data/lib/capistrano/doctor/variables_doctor.rb

@@ -10,6 +10,8 @@ module Capistrano
       WHITELIST = %i(
         application
         current_directory
+        linked_dirs
+        linked_files
         releases_directory
         repo_url
         repo_tree

data/lib/capistrano/dsl.rb

@@ -33,7 +33,7 @@ module Capistrano
     end
 
     def t(key, options={})
-      I18n.t(key, options.merge(scope: :capistrano))
+      I18n.t(key, **options.merge(scope: :capistrano))
     end
 
     def scm