capistrano 3.18.1 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae53528854f57ad3fcd21f62cc4b8c39b9299acdc58fe133379874eec9ff8d7a
-  data.tar.gz: 96bb90b2185d9512db08f3688f47d5d0a0ae56b8105a2f55ae0049c58256a2f9
+  metadata.gz: 394b09ce3f7d404792341024337f15b508055a5cff92fe9c3b3db0b30a195f86
+  data.tar.gz: 94609866fe948bfa1e7f9ded8fc76f0622fc7123733285a82ac300dc772ccbef
 SHA512:
-  metadata.gz: b4d10e94df9a4e5b600a88337797dac5fb1c63458e2a8e567bfb25558fe0e1367ed579a001c7a42d17e135faba09a88aa18477fcfd8e63e27a471978e2d5c59b
-  data.tar.gz: f6cb277aea4838f5da7c16c9005fd3d17b9fac43ec46aa2c07ea32f2930bb6aa0b1403ef13459a9b7a351bdd2486765cfba0e2d1ff0fd63882159a38f6ae7879
+  metadata.gz: 03eca17ed3fd4484babfee22ed9bbb6a844eb79b6141471295a6cd15fe7423b01322fc57ec9c4771e08eebfd02ac51cca9ea8fb4df230dd1104ed94c739bad6a
+  data.tar.gz: e622bfb56fc09785b8ca7c1cbb156c2c78348209acfe3b5ca7137d53f16a762c96e89a3a71d80f7ba9dfc29cd1c845cce69e5df8ea045da429252ce07a0dac64

data/.docker/Dockerfile

@@ -0,0 +1,7 @@
+FROM ubuntu:22.04
+WORKDIR /provision
+COPY ./ssh_key_rsa.pub /root/.ssh/authorized_keys
+COPY ./ubuntu_setup.sh ./
+RUN ./ubuntu_setup.sh
+EXPOSE 22
+CMD ["/usr/sbin/sshd", "-D"]

data/.docker/ssh_key_rsa

@@ -0,0 +1,49 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+-----END OPENSSH PRIVATE KEY-----

data/.docker/ssh_key_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6wVCoBOGYS5qfXZGiKjuh7RWExlzrQ1Gml8Z3DDCggSEibh1WXJU9+rNKTqHmVoGy36iarPfjsGWw3IbiWiMOXD7crg3BCyRbksAdrVV/MIq6BiKqnGaQvOV9AE5RbA6W4/prkEKL/tdnpVaWpMbtthEo6H/IO3Ih+iXomni4NkUBjDjJf6sr8B/vI4aIcp0I5/uXNI3zIWVhQ6yBZ4hORs8jPBMpe7jMoFb5z8t6AUUfmIc66JiLmLX2hqYEreIB7rzlPOsDsOByADubyA/r3zYaA5kZxLbHT+sgQitjb4TATdoCxX6+utxVQeRZK4YrCR3D/aWzhmOgl5OHxO7ArWgICXC18icrvDdUACxOWKRaSe0WXw0nX1L0ZteKuYsvFAf0t0nNPStnWkxzRA4snzJCiptuWcjx8p7WY0Ph267ERq9rNFgMDmSsHaYMOnJAXr8WF00zFcVgAW6b3MBJSmBEtcz45RvMDv4XiMvzZiP/1+we+JXI1f5Y8LhyVtkeME5J7u6LrNUI5bvBMyDodMkmOonRdpL4iwOUXwpETX7i8fsr7+8YFw+JtXQ0iePq4V2PmmPNXThljhkhConwVnGsfV4qfuGaGJgMKJfK/E6hF8W9ejEH9BvmX7l75fyAK0zMq+n6ohOr4M4wVcz9G+s+5vSZ5JNwYTyVrAthtw== test@example.com

data/.docker/ubuntu_setup.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+export DEBIAN_FRONTEND=noninteractive
+
+# Create `deployer` user
+adduser --disabled-password deployer < /dev/null
+mkdir -p /home/deployer/.ssh
+cp /root/.ssh/authorized_keys /home/deployer/.ssh
+chown -R deployer:deployer /home/deployer/.ssh
+chmod 600 /home/deployer/.ssh/authorized_keys
+
+# Install and configure sshd
+apt -y update
+apt-get -y install openssh-server git
+{
+  echo "Port 22"
+  echo "PasswordAuthentication no"
+  echo "ChallengeResponseAuthentication no"
+} >> /etc/ssh/sshd_config
+mkdir /var/run/sshd
+chmod 0755 /var/run/sshd

data/.github/workflows/ci.yml

@@ -66,31 +66,11 @@ jobs:
           bundler-cache: true
       - name: rake rubocop
         run: bundle exec rake rubocop
-  danger:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "ruby" # latest-stable
-          bundler-cache: true
-      - name: danger
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
-        run: bundle exec danger
   features:
     needs: [spec, spec-legacy]
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v3
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.rubocop.yml

@@ -13,13 +13,13 @@ Metrics/BlockLength:
     - "lib/**/*.rake"
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
+Style/BracesAroundHashParameters:
+  Exclude:
+    - spec/integration/dsl_spec.rb
 Style/ClassAndModuleChildren:
   Enabled: false
 Style/DoubleNegation:
   Enabled: false
-Style/FileName:
-  Exclude:
-    - "Dangerfile"
 Style/IndentHeredoc:
   Enabled: false
 Style/SpaceAroundEqualsInParameterDefault:

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 documentation 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,11 +38,8 @@ $ 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
 ```
 
 ## Coding guidelines

data/Gemfile

@@ -38,10 +38,9 @@ if Gem::Requirement.new("< 2.2").satisfied_by?(Gem::Version.new(RUBY_VERSION))
   gem "rake", "< 13.0.0"
 end
 
-# We only run danger and rubocop on a new-ish ruby; no need to install them otherwise
+# 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 "danger"
   gem "psych", "< 4" # Ensures rubocop works on Ruby 3.1
   gem "racc"
   gem "rubocop", "0.48.1"

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
@@ -85,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

@@ -6,67 +6,77 @@ end
 
 Then(/^git wrapper permissions are 0700$/) do
   permissions_test = %Q([ $(stat -c "%a" #{TestApp.git_wrapper_path_glob}) == "700" ])
-  _stdout, _stderr, status = vagrant_cli_command("ssh -c #{permissions_test.shellescape}")
-
-  expect(status).to be_success
+  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
@@ -85,10 +82,10 @@ Given(/^(\d+) valid existing releases$/) do |num|
       offset = -(a_day * i)
       TestApp.release_path(TestApp.timestamp(offset))
     end
-    run_vagrant_command("mkdir -p #{dirs.join(' ')}")
+    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/scm/git.rb

@@ -26,6 +26,7 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
     after "deploy:new_release_path", "git:create_release"
     before "deploy:check", "git:check"
     before "deploy:set_current_revision", "git:set_current_revision"
+    before "deploy:set_current_revision_time", "git:set_current_revision_time"
   end
 
   def define_tasks
@@ -78,6 +79,10 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
     backend.capture(:git, "rev-list --max-count=1 #{fetch(:branch)}")
   end
 
+  def fetch_revision_time
+    backend.capture(:git, "log -1 --pretty=format:\"%ct\" #{fetch(:branch)}")
+  end
+
   def git(*args)
     args.unshift :git
     backend.execute(*args)

data/lib/capistrano/scm/tasks/git.rake

@@ -70,4 +70,15 @@ namespace :git do
       end
     end
   end
+
+  desc "Determine the unix timestamp that the revision that will be deployed was created"
+  task :set_current_revision_time do
+    on release_roles(:all), in: :groups, limit: fetch(:git_max_concurrent_connections), wait: fetch(:git_wait_interval) do
+      within repo_path do
+        with fetch(:git_environmental_variables) do
+          set :current_revision_time, git_plugin.fetch_revision_time
+        end
+      end
+    end
+  end
 end

data/lib/capistrano/tasks/deploy.rake

@@ -3,6 +3,7 @@ namespace :deploy do
     invoke "deploy:print_config_variables" if fetch(:print_config_variables, false)
     invoke "deploy:check"
     invoke "deploy:set_previous_revision"
+    invoke "deploy:set_previous_revision_time"
   end
 
   task :print_config_variables do
@@ -27,6 +28,7 @@ namespace :deploy do
 
   task updating: :new_release_path do
     invoke "deploy:set_current_revision"
+    invoke "deploy:set_current_revision_time"
     invoke "deploy:symlink:shared"
   end
 
@@ -236,7 +238,7 @@ namespace :deploy do
   end
 
   desc "Place a REVISION file with the current revision SHA in the current release path"
-  task :set_current_revision  do
+  task :set_current_revision do
     on release_roles(:all) do
       within release_path do
         execute :echo, "\"#{fetch(:current_revision)}\" > REVISION"
@@ -253,6 +255,26 @@ namespace :deploy do
     end
   end
 
+  desc "Place a REVISION_TIME file with the current revision commit time in the current release path"
+  task :set_current_revision_time do
+    on release_roles(:all) do
+      within release_path do
+        if fetch(:current_revision_time)
+          execute :echo, "\"#{fetch(:current_revision_time)}\" > REVISION_TIME"
+        end
+      end
+    end
+  end
+
+  task :set_previous_revision_time do
+    on release_roles(:all) do
+      target = release_path.join("REVISION_TIME")
+      if test "[ -f #{target} ]"
+        set(:previous_revision_time, capture(:cat, target, "2>/dev/null"))
+      end
+    end
+  end
+
   task :restart
   task :failed
 end

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.18.1".freeze
+  VERSION = "3.19.0".freeze
 end

data/spec/integration/dsl_spec.rb

@@ -592,8 +592,8 @@ describe Capistrano::DSL do
 
     it "yields the properties for a single role" do
       recipient = mock("recipient")
-      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
-      recipient.expects(:doit).with("example2.com", :redis, port: 6379, type: :master)
+      recipient.expects(:doit).with("example1.com", :redis, { port: 6379, type: :slave })
+      recipient.expects(:doit).with("example2.com", :redis, { port: 6379, type: :master })
       dsl.role_properties(:redis) do |host, role, props|
         recipient.doit(host, role, props)
       end
@@ -601,8 +601,8 @@ describe Capistrano::DSL do
 
     it "yields the properties for multiple roles" do
       recipient = mock("recipient")
-      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
-      recipient.expects(:doit).with("example2.com", :redis, port: 6379, type: :master)
+      recipient.expects(:doit).with("example1.com", :redis, { port: 6379, type: :slave })
+      recipient.expects(:doit).with("example2.com", :redis, { port: 6379, type: :master })
       recipient.expects(:doit).with("example3.com", :app, nil)
       dsl.role_properties(:redis, :app) do |host, role, props|
         recipient.doit(host, role, props)
@@ -611,10 +611,10 @@ describe Capistrano::DSL do
 
     it "yields the merged properties for multiple roles" do
       recipient = mock("recipient")
-      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
-      recipient.expects(:doit).with("example2.com", :redis, port: 6379, type: :master)
-      recipient.expects(:doit).with("example1.com", :web, port: 80)
-      recipient.expects(:doit).with("example2.com", :web, port: 81)
+      recipient.expects(:doit).with("example1.com", :redis, { port: 6379, type: :slave })
+      recipient.expects(:doit).with("example2.com", :redis, { port: 6379, type: :master })
+      recipient.expects(:doit).with("example1.com", :web, { port: 80 })
+      recipient.expects(:doit).with("example2.com", :web, { port: 81 })
       dsl.role_properties(:redis, :web) do |host, role, props|
         recipient.doit(host, role, props)
       end
@@ -622,8 +622,8 @@ describe Capistrano::DSL do
 
     it "honours a property filter before yielding" do
       recipient = mock("recipient")
-      recipient.expects(:doit).with("example1.com", :redis, port: 6379, type: :slave)
-      recipient.expects(:doit).with("example1.com", :web, port: 80)
+      recipient.expects(:doit).with("example1.com", :redis, { port: 6379, type: :slave })
+      recipient.expects(:doit).with("example1.com", :web, { port: 80 })
       dsl.role_properties(:redis, :web, select: :active) do |host, role, props|
         recipient.doit(host, role, props)
       end

data/spec/lib/capistrano/configuration/scm_resolver_spec.rb

@@ -12,6 +12,7 @@ module Capistrano
         Rake::Task.define_task("deploy:check")
         Rake::Task.define_task("deploy:new_release_path")
         Rake::Task.define_task("deploy:set_current_revision")
+        Rake::Task.define_task("deploy:set_current_revision_time")
         set :scm, SCMResolver::DEFAULT_GIT
       end
 

data/spec/lib/capistrano/scm/git_spec.rb

@@ -19,6 +19,7 @@ module Capistrano
       Rake::Task.define_task("deploy:new_release_path")
       Rake::Task.define_task("deploy:check")
       Rake::Task.define_task("deploy:set_current_revision")
+      Rake::Task.define_task("deploy:set_current_revision_time")
     end
 
     # Clean up any tasks or variables that the plugin defined.
@@ -170,6 +171,15 @@ module Capistrano
       end
     end
 
+    describe "#fetch_revision_time" do
+      it "should capture git log" do
+        env.set(:branch, "branch")
+        backend.expects(:capture).with(:git, "log -1 --pretty=format:\"%ct\" branch").returns("1715828406")
+        revision_time = subject.fetch_revision_time
+        expect(revision_time).to eq("1715828406")
+      end
+    end
+
     describe "#verify_commit" do
       it "should run git verify-commit" do
         env.set(:branch, "branch")

data/spec/support/test_app.rb

@@ -1,6 +1,7 @@
 require "English"
 require "fileutils"
 require "pathname"
+require "open3"
 
 module TestApp
   extend self
@@ -14,8 +15,8 @@ module TestApp
       set :deploy_to, '#{deploy_to}'
       set :repo_url, 'https://github.com/capistrano/capistrano.git'
       set :branch, 'master'
-      set :ssh_options, { keys: "\#{ENV['HOME']}/.vagrant.d/insecure_private_key", auth_methods: ['publickey'] }
-      server 'vagrant@localhost:2220', roles: %w{web app}
+      set :ssh_options, { keys: '#{File.expand_path('../../.docker/ssh_key_rsa', __dir__)}', auth_methods: ['publickey'] }
+      server 'deployer@localhost:2022', roles: %w{web app}
       set :linked_files, #{linked_files}
       set :linked_dirs, #{linked_dirs}
       set :format_options, log_file: nil
@@ -39,10 +40,13 @@ module TestApp
     FileUtils.rm_rf(test_app_path)
     FileUtils.mkdir(test_app_path)
 
-    File.open(gemfile, "w+") do |file|
-      file.write "source 'https://rubygems.org'\n"
-      file.write "gem 'capistrano', path: '#{path_to_cap}'"
-    end
+    File.write(gemfile, <<-GEMFILE.gsub(/^\s+/, ""))
+      source "https://rubygems.org"
+
+      gem "capistrano", path: #{path_to_cap.to_s.inspect}
+      gem "ed25519", ">= 1.2", "< 2.0"
+      gem "bcrypt_pbkdf", ">= 1.0", "< 2.0"
+    GEMFILE
 
     Dir.chdir(test_app_path) do
       run "bundle"
@@ -96,13 +100,12 @@ module TestApp
   end
 
   def run(command, subdirectory=nil)
-    output = nil
     command = "bundle exec #{command}" unless command =~ /^bundle\b/
     dir = subdirectory ? test_app_path.join(subdirectory) : test_app_path
-    Dir.chdir(dir) do
-      output = with_clean_bundler_env { `#{command}` }
+    output, status = Dir.chdir(dir) do
+      with_clean_bundler_env { Open3.capture2e(command) }
     end
-    [$CHILD_STATUS.success?, output]
+    [status.success?, output]
   end
 
   def stage
@@ -118,7 +121,7 @@ module TestApp
   end
 
   def deploy_to
-    Pathname.new("/home/vagrant/var/www/deploy")
+    Pathname.new("/home/deployer/var/www/deploy")
   end
 
   def shared_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.18.1
+  version: 3.19.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -78,6 +78,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".docker/Dockerfile"
+- ".docker/ssh_key_rsa"
+- ".docker/ssh_key_rsa.pub"
+- ".docker/ubuntu_setup.sh"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
 - ".github/release-drafter.yml"
@@ -88,7 +92,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
-- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -98,6 +101,7 @@ files:
 - bin/cap
 - bin/capify
 - capistrano.gemspec
+- docker-compose.yml
 - features/configuration.feature
 - features/deploy.feature
 - features/deploy_failure.feature
@@ -109,9 +113,10 @@ files:
 - features/step_definitions/cap_commands.rb
 - features/step_definitions/setup.rb
 - features/subdirectory.feature
+- features/support/docker_gateway.rb
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
-- features/support/vagrant_helpers.rb
+- features/support/remote_ssh_helpers.rb
 - lib/Capfile
 - lib/capistrano.rb
 - lib/capistrano/all.rb
@@ -202,8 +207,6 @@ files:
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
-- spec/support/.gitignore
-- spec/support/Vagrantfile
 - spec/support/matchers.rb
 - spec/support/tasks/database.rake
 - spec/support/tasks/fail.rake
@@ -235,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.8
 signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -251,9 +254,10 @@ test_files:
 - features/step_definitions/cap_commands.rb
 - features/step_definitions/setup.rb
 - features/subdirectory.feature
+- features/support/docker_gateway.rb
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
-- features/support/vagrant_helpers.rb
+- features/support/remote_ssh_helpers.rb
 - spec/integration/dsl_spec.rb
 - spec/integration_spec_helper.rb
 - spec/lib/capistrano/application_spec.rb
@@ -286,8 +290,6 @@ test_files:
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
-- spec/support/.gitignore
-- spec/support/Vagrantfile
 - spec/support/matchers.rb
 - spec/support/tasks/database.rake
 - spec/support/tasks/fail.rake

data/Dangerfile

@@ -1 +0,0 @@
-danger.import_dangerfile(github: "capistrano/danger", branch: "no-changelog")

data/features/support/vagrant_helpers.rb

@@ -1,41 +0,0 @@
-require "open3"
-
-module VagrantHelpers
-  extend self
-
-  class VagrantSSHCommandError < RuntimeError; end
-
-  at_exit do
-    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
-      vagrant_cli_command("destroy -f")
-    end
-  end
-
-  def vagrant_cli_command(command)
-    puts "[vagrant] #{command}"
-    stdout, stderr, status = Dir.chdir(VAGRANT_ROOT) do
-      Open3.capture3("#{VAGRANT_BIN} #{command}")
-    end
-
-    (stdout + stderr).each_line { |line| puts "[vagrant] #{line}" }
-
-    [stdout, stderr, status]
-  end
-
-  def run_vagrant_command(command)
-    stdout, stderr, status = vagrant_cli_command("ssh -c #{command.inspect}")
-    return [stdout, stderr] if status.success?
-    raise VagrantSSHCommandError, status
-  end
-
-  def puts(message)
-    # Attach log messages to the current cucumber feature (`log`),
-    # or simply puts to the console (`super`) if we are outside of cucumber.
-    respond_to?(:log) ? log(message) : super(message)
-  end
-end
-
-World(VagrantHelpers)

data/spec/support/.gitignore

@@ -1 +0,0 @@
-.vagrant

data/spec/support/Vagrantfile

@@ -1,23 +0,0 @@
-require "open-uri"
-
-Vagrant.configure("2") do |config|
-  config.ssh.insert_key = false
-
-  [:app].each_with_index do |role, i|
-    config.vm.define(role, primary: true) do |primary|
-      primary.vm.define role
-      primary.vm.box = "hashicorp/bionic64"
-      primary.vm.network "forwarded_port", guest: 22, host: "222#{i}".to_i
-      primary.vm.provision :shell, inline: "sudo apt-get -y install git-core"
-
-      vagrantkey = URI.open("https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub", "r", &:read)
-
-      primary.vm.provision :shell,
-                           inline: <<-INLINE
-          install -d -m 700 /root/.ssh
-          echo -e "#{vagrantkey}" > /root/.ssh/authorized_keys
-          chmod 0600 /root/.ssh/authorized_keys
-      INLINE
-    end
-  end
-end