capistrano 3.17.0 → 3.20.0

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 without a pager" do
+        env.set(:branch, "branch")
+        backend.expects(:capture).with(:git, "--no-pager 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
@@ -12,10 +13,10 @@ module TestApp
   def default_config
     <<-CONFIG
       set :deploy_to, '#{deploy_to}'
-      set :repo_url, 'git://github.com/capistrano/capistrano.git'
+      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,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -78,17 +77,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".docker/Dockerfile"
+- ".docker/ssh_key_rsa"
+- ".docker/ssh_key_rsa.pub"
+- ".docker/ubuntu_setup.sh"
+- ".github/dependabot.yml"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
 - ".github/release-drafter.yml"
-- ".github/workflows/push.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/release-drafter.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
-- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -98,6 +102,7 @@ files:
 - bin/cap
 - bin/capify
 - capistrano.gemspec
+- docker-compose.yml
 - features/configuration.feature
 - features/deploy.feature
 - features/deploy_failure.feature
@@ -109,9 +114,11 @@ 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
+- gemfiles/legacy.gemfile
 - lib/Capfile
 - lib/capistrano.rb
 - lib/capistrano/all.rb
@@ -202,8 +209,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
@@ -220,7 +225,6 @@ metadata:
   source_code_uri: https://github.com/capistrano/capistrano
   homepage_uri: https://capistranorb.com/
   documentation_uri: https://capistranorb.com/
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,15 +232,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files:
@@ -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/.circleci/config.yml

@@ -1,113 +0,0 @@
-version: 2.1
-
-executors:
-  ruby:
-    parameters:
-      version:
-        description: "Ruby version number"
-        default: "3.1"
-        type: string
-    docker:
-      - image: ruby:<< parameters.version >>
-
-commands:
-  bundle_install:
-    description: Install Ruby dependencies with Bundler
-    parameters:
-      version:
-        description: "Ruby version number"
-        default: "3.1"
-        type: string
-    steps:
-      - restore_cache:
-          keys:
-            - bundle-v1-{{ arch }}-<< parameters.version >>
-      - run:
-          name: Install Ruby Dependencies
-          command: |
-            gem install bundler --conservative --no-document || gem install bundler -v '< 2' --no-document
-            bundle config --local path vendor/bundle
-            bundle check || (bundle install --jobs=4 --retry=3 && bundle clean)
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: bundle-v1-{{ arch }}-<< parameters.version >>-{{ checksum "Gemfile.lock" }}
-
-jobs:
-  danger:
-    executor: ruby
-    steps:
-      - checkout
-      - bundle_install
-      - run: bundle exec danger
-
-  rubocop:
-    executor: ruby
-    steps:
-      - checkout
-      - bundle_install
-      - run: bundle exec rubocop
-
-  spec:
-    parameters:
-      version:
-        description: "Ruby version number"
-        default: "3.1"
-        type: string
-    executor:
-      name: ruby
-      version: << parameters.version >>
-    steps:
-      - checkout
-      - bundle_install:
-          version: << parameters.version >>
-      - run: bundle exec rake spec
-
-workflows:
-  version: 2
-  commit-workflow:
-    jobs:
-      - danger
-      - rubocop
-      - spec:
-          matrix:
-            parameters:
-              version:
-                [
-                  "2.0",
-                  "2.1",
-                  "2.2",
-                  "2.3",
-                  "2.4",
-                  "2.5",
-                  "2.6",
-                  "2.7",
-                  "3.0",
-                  "3.1",
-                ]
-  cron-workflow:
-    jobs:
-      - rubocop
-      - spec:
-          matrix:
-            parameters:
-              version:
-                [
-                  "2.0",
-                  "2.1",
-                  "2.2",
-                  "2.3",
-                  "2.4",
-                  "2.5",
-                  "2.6",
-                  "2.7",
-                  "3.0",
-                  "3.1",
-                ]
-    triggers:
-      - schedule:
-          cron: "0 13 * * 6"
-          filters:
-            branches:
-              only:
-                - master

data/.github/workflows/push.yml

@@ -1,12 +0,0 @@
-on: push
-name: Push
-jobs:
-  draftRelease:
-    name: Draft Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: Draft Release
-        uses: toolmantim/release-drafter@v5.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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 = 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