capistrano 3.11.2 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95cdd3d0081c24ca53799c4581d720ab56417ddfa49450575eb1e6685111f3a8
-  data.tar.gz: d3ad3ee309f5b28d547ca66cc288cc09db552da8a1ff661b700a7c64a1301c5d
+  metadata.gz: 043f8c3dd4ea32b466125930ad359a67860c01276635d874027331c7cbd833c2
+  data.tar.gz: abd8062f97408bb47b7238979b8d34c12e247d09f8d67b57f622bbf6774aed17
 SHA512:
-  metadata.gz: 3bad690c28c420c53d86658b71ceb57dc5fda26f6d0caa4d02a3997bb523a5942698480db5c2d8b3134b439f5b7611a944c97a8000b73308a8d6119dd37dd2b5
-  data.tar.gz: e7ba13f36a3d6cfd8654f6bfbac46f32d6c7df099eb544d265e55411a6dde3cc8a8489ba969b8691042fa1b083e173c8a62baf2533048ecc2e3d3f855343a1c4
+  metadata.gz: f1a16d9d47f4e46f359a8efefff98552b0cbaba85ac56cb78675f051aba779d34bd0e1546ea92952a553ae3619ad4c7e5f1586133f831cff07b9c794027f768b
+  data.tar.gz: 4ff34f37f143133e8499dc9897222828d28cfb4a160fa0462a74b7180dda29c3efe7d98147d7d2134202360ad5503d77506827fd12b6b86e63d010c7dcbe8122

data/.github/pull_request_template.md

@@ -13,14 +13,10 @@ to keep the conversation linked together.
 - [ ] Did you run `bundle exec rubocop -a` to fix linter issues?
 - [ ] If relevant, did you create a test?
 - [ ] Did you confirm that the RSpec tests pass?
-- [ ] If you are fixing a bug or introducing a new feature, did you add a CHANGELOG entry?
 
 ### Other Information
 
 If there's anything else that's important and relevant to your pull
 request, mention that information here.
 
-If you are updating any of the CHANGELOG files or are asked to update the
-CHANGELOG files by reviewers, please add the CHANGELOG entry at the top of the file where indicated.
-
 Thanks for helping improve Capistrano!

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
+  - 2.4.10
   - 2.3.8
   - 2.2
   - 2.1
@@ -16,8 +17,8 @@ matrix:
   include:
     - rvm: rbx-2
       script: bundle exec rake spec
-    # Run Danger only once, on 2.5.3
-    - rvm: 2.5.5
+    # Run Danger only once, on 2.5.8
+    - rvm: 2.5.8
       before_script: bundle exec danger
 
 script: bundle exec rake spec rubocop

data/Gemfile

@@ -26,11 +26,16 @@ 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.1
-if Gem::Requirement.new("< 2.1").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+# 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 danger once on a new-ish ruby; no need to install it otherwise
 if Gem::Requirement.new("> 2.4").satisfied_by?(Gem::Version.new(RUBY_VERSION))
   gem "danger"

data/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2012-2019 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

@@ -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.14", 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-2019 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

@@ -12,6 +12,6 @@
 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`.
 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 "Preparing vX.Y.Z"
+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/lib/capistrano/configuration/question.rb

@@ -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)
@@ -63,6 +67,10 @@ module Capistrano
       def stdin
         (options || {}).fetch(:stdin, $stdin)
       end
+
+      def prompt
+        (options || {}).fetch(:prompt, nil)
+      end
     end
   end
 end

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

data/lib/capistrano/i18n.rb

@@ -12,6 +12,8 @@ en = {
   written_file: "create %{file}",
   question: "Please enter %{key}: ",
   question_default: "Please enter %{key} (%{default_value}): ",
+  question_prompt: "%{key}: ",
+  question_prompt_default: "%{key} (%{default_value}): ",
   keeping_releases: "Keeping %{keep_releases} of %{releases} deployed releases on %{host}",
   skip_cleanup: "Skipping cleanup of invalid releases on %{host}; unexpected foldername found (should be timestamp)",
   wont_delete_current_release: "Current release was marked for being removed but it's going to be skipped on %{host}",

data/lib/capistrano/scm/git.rb

@@ -18,6 +18,8 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
         git_ssh: fetch(:git_wrapper_path)
       }
     }
+    set_if_empty :git_max_concurrent_connections, 10
+    set_if_empty :git_wait_interval, 0
   end
 
   def register_hooks

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

@@ -4,9 +4,9 @@ git_plugin = self
 namespace :git do
   desc "Upload the git wrapper script, this script guarantees that we can script git without getting an interactive prompt"
   task :wrapper do
-    on release_roles :all do
+    on release_roles(:all), in: :groups, limit: fetch(:git_max_concurrent_connections), wait: fetch(:git_wait_interval) do
       execute :mkdir, "-p", File.dirname(fetch(:git_wrapper_path)).shellescape
-      upload! StringIO.new("#!/bin/sh -e\nexec /usr/bin/ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no \"$@\"\n"), fetch(:git_wrapper_path)
+      upload! StringIO.new("#!/bin/sh -e\nexec /usr/bin/env ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no \"$@\"\n"), fetch(:git_wrapper_path)
       execute :chmod, "700", fetch(:git_wrapper_path).shellescape
     end
   end
@@ -14,7 +14,7 @@ namespace :git do
   desc "Check that the repository is reachable"
   task check: :'git:wrapper' do
     fetch(:branch)
-    on release_roles :all do
+    on release_roles(:all), in: :groups, limit: fetch(:git_max_concurrent_connections), wait: fetch(:git_wait_interval) do
       with fetch(:git_environmental_variables) do
         git_plugin.check_repo_is_reachable
       end
@@ -23,7 +23,7 @@ namespace :git do
 
   desc "Clone the repo to the cache"
   task clone: :'git:wrapper' do
-    on release_roles :all do
+    on release_roles(:all), in: :groups, limit: fetch(:git_max_concurrent_connections), wait: fetch(:git_wait_interval) do
       if git_plugin.repo_mirror_exists?
         info t(:mirror_exists, at: repo_path)
       else
@@ -38,7 +38,7 @@ namespace :git do
 
   desc "Update the repo mirror to reflect the origin state"
   task update: :'git:clone' do
-    on release_roles :all 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
           git_plugin.update_mirror
@@ -49,7 +49,7 @@ namespace :git do
 
   desc "Copy repo to releases"
   task create_release: :'git:update' do
-    on release_roles :all do
+    on release_roles(:all), in: :groups, limit: fetch(:git_max_concurrent_connections), wait: fetch(:git_wait_interval) do
       with fetch(:git_environmental_variables) do
         within repo_path do
           execute :mkdir, "-p", release_path
@@ -61,7 +61,7 @@ namespace :git do
 
   desc "Determine the revision that will be deployed"
   task :set_current_revision do
-    on release_roles :all 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, git_plugin.fetch_revision

data/lib/capistrano/templates/stage.rb.erb

@@ -42,7 +42,7 @@
 # Global options
 # --------------
 #  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
+#    keys: %w(/home/user_name/.ssh/id_rsa),
 #    forward_agent: false,
 #    auth_methods: %w(password)
 #  }

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.11.2".freeze
+  VERSION = "3.14.1".freeze
 end

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

@@ -6,6 +6,8 @@ module Capistrano
       let(:question) { Question.new(key, default, stdin: stdin) }
       let(:question_without_echo) { Question.new(key, default, echo: false, stdin: stdin) }
       let(:question_without_default) { Question.new(key, nil, stdin: stdin) }
+      let(:question_prompt) { Question.new(key, default, stdin: stdin, prompt: "Your favorite branch") }
+      let(:question_prompt_without_default) { Question.new(key, nil, stdin: stdin, prompt: "Your favorite branch") }
       let(:default) { :default }
       let(:key) { :branch }
       let(:stdin) { stub(tty?: true) }
@@ -43,6 +45,22 @@ module Capistrano
 
             expect(question_without_default.call).to eq(branch)
           end
+
+          it "uses prompt and returns the value" do
+            $stdout.expects(:print).with("Your favorite branch (default): ")
+            stdin.expects(:gets).returns(branch)
+            stdin.expects(:noecho).never
+
+            expect(question_prompt.call).to eq(branch)
+          end
+
+          it "uses prompt and returns the value but has no default between parenthesis" do
+            $stdout.expects(:print).with("Your favorite branch: ")
+            stdin.expects(:gets).returns(branch)
+            stdin.expects(:noecho).never
+
+            expect(question_prompt_without_default.call).to eq(branch)
+          end
         end
 
         context "value is not entered" do

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

@@ -36,6 +36,20 @@ module Capistrano
         subject.set_defaults
         expect(env.fetch(:git_wrapper_path)).to eq("/tmp/git-ssh-my_app-staging-(Git Web User) via ShipIt.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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.11.2
+  version: 3.14.1
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -262,7 +262,7 @@ metadata:
   source_code_uri: https://github.com/capistrano/capistrano
   homepage_uri: https://capistranorb.com/
   documentation_uri: https://capistranorb.com/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -277,8 +277,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files: