capistrano 3.7.0 → 3.17.0

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

@@ -27,6 +27,28 @@ module Capistrano
       Capistrano::Configuration.reset!
     end
 
+    describe "#set_defaults" do
+      it "makes git_wrapper_path using a random hex value" do
+        env.set(:tmp_dir, "/tmp")
+        subject.set_defaults
+        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
+
     describe "#git" do
       it "should call execute git in the context, with arguments" do
         backend.expects(:execute).with(:git, :init)
@@ -46,7 +68,7 @@ module Capistrano
     describe "#check_repo_is_reachable" do
       it "should test the repo url" do
         env.set(:repo_url, "url")
-        backend.expects(:execute).with(:git, :'ls-remote --heads', "url").returns(true)
+        backend.expects(:execute).with(:git, :'ls-remote', "url", "HEAD").returns(true)
 
         subject.check_repo_is_reachable
       end
@@ -70,10 +92,27 @@ module Capistrano
 
         subject.clone_repo
       end
+
+      context "with username and password specified" do
+        before do
+          env.set(:git_http_username, "hello")
+          env.set(:git_http_password, "topsecret")
+          env.set(:repo_url, "https://example.com/repo.git")
+          env.set(:repo_path, "path")
+        end
+
+        it "should include the credentials in the url" do
+          backend.expects(:execute).with(:git, :clone, "--mirror", "https://hello:topsecret@example.com/repo.git", "path")
+          subject.clone_repo
+        end
+      end
     end
 
     describe "#update_mirror" do
       it "should run git update" do
+        env.set(:repo_url, "url")
+
+        backend.expects(:execute).with(:git, :remote, "set-url", "origin", "url")
         backend.expects(:execute).with(:git, :remote, :update, "--prune")
 
         subject.update_mirror
@@ -82,6 +121,9 @@ module Capistrano
       it "should run git update in shallow mode" do
         env.set(:git_shallow_clone, "1")
         env.set(:branch, "branch")
+        env.set(:repo_url, "url")
+
+        backend.expects(:execute).with(:git, :remote, "set-url", "origin", "url")
         backend.expects(:execute).with(:git, :fetch, "--depth", "1", "origin", "branch")
 
         subject.update_mirror
@@ -127,5 +169,16 @@ module Capistrano
         expect(revision).to eq("81cec13b777ff46348693d327fc8e7832f79bf43")
       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/lib/capistrano/scm/hg_spec.rb

@@ -85,8 +85,13 @@ module Capistrano
         env.set(:repo_tree, "tree")
         env.set(:branch, :branch)
         env.set(:release_path, "path")
+        env.set(:tmp_dir, "/tmp")
 
-        backend.expects(:execute).with(:hg, "archive --type tgz -p . -I", "tree", "--rev", :branch, "| tar -x --strip-components 1 -f - -C", "path")
+        SecureRandom.stubs(:hex).with(10).returns("random")
+        backend.expects(:execute).with(:hg, "archive -p . -I", "tree", "--rev", :branch, "/tmp/random.tar")
+        backend.expects(:execute).with(:mkdir, "-p", "path")
+        backend.expects(:execute).with(:tar, "-x --strip-components 1 -f", "/tmp/random.tar", "-C", "path")
+        backend.expects(:execute).with(:rm, "/tmp/random.tar")
 
         subject.archive_to_release_path
       end

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

@@ -71,6 +71,10 @@ module Capistrano
 
     describe "#update_mirror" do
       it "should run svn update" do
+        env.set(:repo_url, "url")
+        env.set(:repo_path, "path")
+        backend.expects(:capture).with(:svn, :info, "path").returns("URL: url\n")
+
         env.set(:svn_username, "someuser")
         env.set(:svn_password, "somepassword")
         backend.expects(:execute).with(:svn, :update, "--username someuser", "--password somepassword")
@@ -80,6 +84,10 @@ module Capistrano
 
       context "for specific revision" do
         it "should run svn update" do
+          env.set(:repo_url, "url")
+          env.set(:repo_path, "path")
+          backend.expects(:capture).with(:svn, :info, "path").returns("URL: url\n")
+
           env.set(:svn_username, "someuser")
           env.set(:svn_password, "somepassword")
           env.set(:svn_revision, "12345")
@@ -88,6 +96,19 @@ module Capistrano
           subject.update_mirror
         end
       end
+
+      it "should run svn switch if repo_url is changed" do
+        env.set(:repo_url, "url")
+        env.set(:repo_path, "path")
+        backend.expects(:capture).with(:svn, :info, "path").returns("URL: old_url\n")
+
+        env.set(:svn_username, "someuser")
+        env.set(:svn_password, "somepassword")
+        backend.expects(:execute).with(:svn, :switch, "url", "--username someuser", "--password somepassword")
+        backend.expects(:execute).with(:svn, :update, "--username someuser", "--password somepassword")
+
+        subject.update_mirror
+      end
     end
 
     describe "#archive_to_release_path" do

data/spec/lib/capistrano/version_validator_spec.rb

@@ -89,6 +89,29 @@ module Capistrano
             end
           end
         end
+
+        context "with multiple versions" do
+          let(:current_version) { "3.5.9" }
+
+          context "valid" do
+            let(:version) { [">= 3.5.0", "< 3.5.10"] }
+            it { is_expected.to be_truthy }
+          end
+
+          context "invalid" do
+            let(:version) { [">= 3.5.0", "< 3.5.8"] }
+            it "fails" do
+              expect { subject }.to raise_error(RuntimeError)
+            end
+          end
+
+          context "invalid" do
+            let(:version) { ["> 3.5.9", "< 3.5.13"] }
+            it "fails" do
+              expect { subject }.to raise_error(RuntimeError)
+            end
+          end
+        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/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant.configure("2") do |config|
   [: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.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"
 

data/spec/support/test_app.rb

@@ -19,6 +19,7 @@ module TestApp
       set :linked_files, #{linked_files}
       set :linked_dirs, #{linked_dirs}
       set :format_options, log_file: nil
+      set :local_user, #{current_user.inspect}
     CONFIG
   end
 
@@ -39,18 +40,19 @@ module TestApp
     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
 
     Dir.chdir(test_app_path) do
-      `bundle`
+      run "bundle"
     end
   end
 
   def install_test_app_with(config)
     create_test_app
     Dir.chdir(test_app_path) do
-      `bundle exec cap install STAGES=#{stage}`
+      run "cap install STAGES=#{stage}"
     end
     write_local_deploy_file(config)
   end
@@ -89,14 +91,16 @@ module TestApp
     File.open(shared_path.join(path), "w")
   end
 
-  def cap(task)
-    run "bundle exec cap #{stage} #{task}"
+  def cap(task, subdirectory=nil)
+    run "cap #{stage} #{task} --trace", subdirectory
   end
 
-  def run(command)
+  def run(command, subdirectory=nil)
     output = nil
-    Dir.chdir(test_app_path) do
-      output = `#{command}`
+    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}` }
     end
     [$CHILD_STATUS.success?, output]
   end
@@ -129,12 +133,12 @@ module TestApp
     deploy_to.join("releases")
   end
 
-  def release_path
-    releases_path.join(timestamp)
+  def release_path(t=timestamp)
+    releases_path.join(t)
   end
 
-  def timestamp
-    Time.now.utc.strftime("%Y%m%d%H%M%S")
+  def timestamp(offset=0)
+    (Time.now.utc + offset).strftime("%Y%m%d%H%M%S")
   end
 
   def repo_path
@@ -154,7 +158,7 @@ module TestApp
   end
 
   def current_user
-    `whoami`.chomp
+    "(GitHub Web Flow) via ShipIt"
   end
 
   def task_dir
@@ -182,7 +186,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)
+
+    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.7.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -67,76 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: capistrano-harrow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -148,11 +78,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
+- ".github/release-drafter.yml"
+- ".github/workflows/push.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
@@ -176,6 +108,7 @@ files:
 - features/step_definitions/assertions.rb
 - features/step_definitions/cap_commands.rb
 - features/step_definitions/setup.rb
+- features/subdirectory.feature
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
 - features/support/vagrant_helpers.rb
@@ -247,6 +180,7 @@ files:
 - spec/lib/capistrano/configuration/plugin_installer_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/role_filter_spec.rb
+- spec/lib/capistrano/configuration/scm_resolver_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
 - spec/lib/capistrano/configuration/servers_spec.rb
 - spec/lib/capistrano/configuration_spec.rb
@@ -277,11 +211,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
@@ -296,9 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files:
@@ -312,6 +250,7 @@ test_files:
 - features/step_definitions/assertions.rb
 - features/step_definitions/cap_commands.rb
 - features/step_definitions/setup.rb
+- features/subdirectory.feature
 - features/support/env.rb
 - features/support/remote_command_helpers.rb
 - features/support/vagrant_helpers.rb
@@ -325,6 +264,7 @@ test_files:
 - spec/lib/capistrano/configuration/plugin_installer_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/role_filter_spec.rb
+- spec/lib/capistrano/configuration/scm_resolver_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
 - spec/lib/capistrano/configuration/servers_spec.rb
 - spec/lib/capistrano/configuration_spec.rb

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-rvm:
-  - 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