capistrano 3.11.0 → 3.19.1

data/spec/lib/capistrano/dsl_spec.rb

@@ -60,7 +60,7 @@ module Capistrano
           end
         end
 
-        it "prints helpful message to stderr" do
+        it "prints helpful message to stderr", capture_io: true do
           expect do
             expect do
               task.invoke
@@ -72,7 +72,7 @@ module Capistrano
 
     describe "#invoke" do
       context "reinvoking" do
-        it "will not reenable invoking task" do
+        it "will not re-enable invoking task", capture_io: true do
           counter = 0
 
           Rake::Task.define_task("A") do
@@ -85,7 +85,7 @@ module Capistrano
           end.to change { counter }.by(1)
         end
 
-        it "will print a message on stderr" do
+        it "will print a message on stderr", capture_io: true do
           Rake::Task.define_task("B")
 
           expect do
@@ -98,7 +98,7 @@ module Capistrano
 
     describe "#invoke!" do
       context "reinvoking" do
-        it "will reenable invoking task" do
+        it "will re-enable invoking task", capture_io: true do
           counter = 0
 
           Rake::Task.define_task("C") do
@@ -111,7 +111,7 @@ module Capistrano
           end.to change { counter }.by(2)
         end
 
-        it "will not print a message on stderr" do
+        it "will not print a message on stderr", capture_io: true do
           Rake::Task.define_task("D")
 
           expect do

data/spec/lib/capistrano/plugin_spec.rb

@@ -62,14 +62,14 @@ module Capistrano
       dummy.expects(:set_defaults).never
     end
 
-    it "calls set_defaults during load:defaults" do
+    it "calls set_defaults during load:defaults", capture_io: true do
       dummy = DummyPlugin.new
       dummy.expects(:set_defaults).once
       install_plugin(dummy)
       Rake::Task["load:defaults"].invoke
     end
 
-    it "is able to load tasks from a .rake file" do
+    it "is able to load tasks from a .rake file", capture_io: true do
       install_plugin(ExternalTasksPlugin)
       Rake::Task["plugin_test"].invoke
       expect(fetch(:plugin_result)).to eq("hello")

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.
@@ -28,13 +29,24 @@ module Capistrano
     end
 
     describe "#set_defaults" do
-      it "makes git_wrapper_path using application, stage, and local_user" do
+      it "makes git_wrapper_path using a random hex value" do
         env.set(:tmp_dir, "/tmp")
-        env.set(:application, "my_app")
-        env.set(:stage, "staging")
-        env.set(:local_user, "(Git Web User) via ShipIt")
         subject.set_defaults
-        expect(env.fetch(:git_wrapper_path)).to eq("/tmp/git-ssh-my_app-staging-(Git Web User) via ShipIt.sh")
+        expect(env.fetch(:git_wrapper_path)).to match(%r{/tmp/git-ssh-\h{20}\.sh})
+      end
+
+      it "makes git_max_concurrent_connections" do
+        subject.set_defaults
+        expect(env.fetch(:git_max_concurrent_connections)).to eq(10)
+        env.set(:git_max_concurrent_connections, 7)
+        expect(env.fetch(:git_max_concurrent_connections)).to eq(7)
+      end
+
+      it "makes git_wait_interval" do
+        subject.set_defaults
+        expect(env.fetch(:git_wait_interval)).to eq(0)
+        env.set(:git_wait_interval, 5)
+        expect(env.fetch(:git_wait_interval)).to eq(5)
       end
     end
 
@@ -158,5 +170,25 @@ module Capistrano
         expect(revision).to eq("81cec13b777ff46348693d327fc8e7832f79bf43")
       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")
+
+        backend.expects(:capture).with(:git, "rev-list --max-count=1 branch").returns("81cec13b777ff46348693d327fc8e7832f79bf43")
+        backend.expects(:execute).with(:git, :"verify-commit", "81cec13b777ff46348693d327fc8e7832f79bf43")
+
+        subject.verify_commit
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -13,4 +13,17 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
   config.mock_framework = :mocha
   config.order = "random"
+
+  config.around(:example, capture_io: true) do |example|
+    begin
+      Rake.application.options.trace_output = StringIO.new
+      $stdout = StringIO.new
+      $stderr = StringIO.new
+      example.run
+    ensure
+      Rake.application.options.trace_output = STDERR
+      $stdout = STDOUT
+      $stderr = STDERR
+    end
+  end
 end

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,9 +40,13 @@ module TestApp
     FileUtils.rm_rf(test_app_path)
     FileUtils.mkdir(test_app_path)
 
-    File.open(gemfile, "w+") do |file|
-      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"
@@ -95,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
@@ -117,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
@@ -185,12 +189,17 @@ module TestApp
     FileUtils.mv(config_path, location)
   end
 
-  def git_wrapper_path
-    "/tmp/git-ssh-my_app_name-#{stage}-#{current_user}.sh"
+  def git_wrapper_path_glob
+    "/tmp/git-ssh-*.sh"
   end
 
   def with_clean_bundler_env(&block)
     return yield unless defined?(Bundler)
-    Bundler.with_clean_env(&block)
+
+    if Bundler.respond_to?(:with_unbundled_env)
+      Bundler.with_unbundled_env(&block)
+    else
+      Bundler.with_clean_env(&block)
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.19.1
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -67,62 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: danger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.48.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.48.1
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -134,15 +78,20 @@ 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"
+- ".github/workflows/ci.yml"
+- ".github/workflows/release-drafter.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
-- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,6 +101,7 @@ files:
 - bin/cap
 - bin/capify
 - capistrano.gemspec
+- docker-compose.yml
 - features/configuration.feature
 - features/deploy.feature
 - features/deploy_failure.feature
@@ -163,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
@@ -256,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
@@ -265,11 +214,16 @@ files:
 - spec/support/tasks/plugin.rake
 - spec/support/tasks/root.rake
 - spec/support/test_app.rb
-homepage: http://capistranorb.com/
+homepage: https://capistranorb.com/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -284,9 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.5.8
+signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files:
@@ -301,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
@@ -336,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/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.1
-  - 2.3.1
-  - 2.2
-  - 2.1
-  - 2.0
-matrix:
-  # Rubinius periodically fails in general, and it always segfaults for RuboCop
-  # in particular. Until we figure out how to make it work consistently, allow
-  # it to fail without breaking the build.
-  allow_failures:
-    - rvm: rbx-2
-  include:
-    - rvm: rbx-2
-      script: bundle exec rake spec
-    # Run Danger only once, on 2.3.1
-    - rvm: 2.3.1
-      before_script: bundle exec danger
-
-script: bundle exec rake spec rubocop
-install: bundle install --jobs=1
-cache: bundler
-branches:
-  except:
-    - legacy-v2
-sudo: false

data/Dangerfile

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

data/features/support/vagrant_helpers.rb

@@ -1,35 +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
-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/precise64"
-      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