capistrano 3.13.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71ad447b5231ffd0ce9b2cdfeac4f3a1ef81fe5750f0c6507011efb61da342aa
-  data.tar.gz: 737df44c0d61daa01736d5f3a7a348e8b5fa960db0906143cf84d4acf41ac94a
+  metadata.gz: 05d4d15902188667bafc9bbaa729506f5648ffb2adcd1f5705739977dd971db1
+  data.tar.gz: f75c361ed0aa048cce3d18870e089e7d73861b2f43caf05aa4282d009e06e199
 SHA512:
-  metadata.gz: ff9d18efd38e4e185154ffdef2873e6465a73c5fbedbdf972e52c78b60c9d3710d4bf5c158345804d88fa1661d17860243c0be931a4a0521a28edec2860b7633
-  data.tar.gz: 73e2a27610d97bb35f1db187c259646ef29687b253829c6d395e871c4d7d2de887c28de1bca7625c45fe4b62fa3c4fce7947bf4716642474fd3158ae8e61d261
+  metadata.gz: 287936297e0003a7deb6e56e822355a65d1d2b12dfa141a957de6cf4aeaf818220d7ab3f1fe55c3e9c381c58ef72f1837ba49b8f0637637af62373d0fa3f3e72
+  data.tar.gz: '08dadc7a9ae58638b5618203a6577de5f9cdab92c8f062977ea5758a915dcbd53d050a779373fde0d66a9173be58140f05ea03bda6ff20dc9c42c49ccab9e95d'

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/README.md

@@ -107,7 +107,7 @@ Add Capistrano to your project's Gemfile using `require: false`:
 
 ``` ruby
 group :development do
-  gem "capistrano", "~> 3.13", require: false
+  gem "capistrano", "~> 3.14", require: false
 end
 ```
 

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/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/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.13.0".freeze
+  VERSION = "3.14.0".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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh