capistrano 3.9.0 → 3.15.0

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

@@ -3,12 +3,14 @@ require "spec_helper"
 module Capistrano
   class Configuration
     describe Question do
-      let(:question) { Question.new(key, default, options) }
-      let(:question_without_echo) { Question.new(key, default, echo: false) }
-      let(:question_without_default) { Question.new(key, nil) }
+      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(:options) { nil }
+      let(:stdin) { stub(tty?: true) }
 
       describe ".new" do
         it "takes a key, default, options" do
@@ -22,15 +24,15 @@ module Capistrano
 
           it "returns the echoed value" do
             $stdout.expects(:print).with("Please enter branch (default): ")
-            $stdin.expects(:gets).returns(branch)
-            $stdin.expects(:noecho).never
+            stdin.expects(:gets).returns(branch)
+            stdin.expects(:noecho).never
 
             expect(question.call).to eq(branch)
           end
 
           it "returns the value but does not echo it" do
             $stdout.expects(:print).with("Please enter branch (default): ")
-            $stdin.expects(:noecho).returns(branch)
+            stdin.expects(:noecho).returns(branch)
             $stdout.expects(:print).with("\n")
 
             expect(question_without_echo.call).to eq(branch)
@@ -38,11 +40,27 @@ module Capistrano
 
           it "returns the value but has no default between parenthesis" do
             $stdout.expects(:print).with("Please enter branch: ")
-            $stdin.expects(:gets).returns(branch)
-            $stdin.expects(:noecho).never
+            stdin.expects(:gets).returns(branch)
+            stdin.expects(:noecho).never
 
             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
@@ -50,13 +68,24 @@ module Capistrano
 
           before do
             $stdout.expects(:print).with("Please enter branch (default): ")
-            $stdin.expects(:gets).returns("")
+            stdin.expects(:gets).returns("")
           end
 
           it "returns the default as the value" do
             expect(question.call).to eq(branch)
           end
         end
+
+        context "tty unavailable", capture_io: true do
+          before do
+            stdin.expects(:gets).never
+            stdin.expects(:tty?).returns(false)
+          end
+
+          it "returns the default as the value" do
+            expect(question.call).to eq(default)
+          end
+        end
       end
     end
   end

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

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "capistrano/scm"
 
 module Capistrano
   class Configuration
@@ -24,12 +25,12 @@ module Capistrano
           expect { resolver.resolve }.to output(/will not load the git scm/i).to_stderr
         end
 
-        it "activates the git scm" do
+        it "activates the git scm", capture_io: true do
           resolver.resolve
           expect(Rake::Task["git:wrapper"]).not_to be_nil
         end
 
-        it "sets :scm to :git" do
+        it "sets :scm to :git", capture_io: true do
           resolver.resolve
           expect(fetch(:scm)).to eq(:git)
         end

data/spec/lib/capistrano/doctor/environment_doctor_spec.rb

@@ -29,7 +29,7 @@ module Capistrano
           Rake::Task.clear
         end
 
-        it "has an doctor:environment task that calls EnvironmentDoctor" do
+        it "has an doctor:environment task that calls EnvironmentDoctor", capture_io: true do
           EnvironmentDoctor.any_instance.expects(:call)
           Rake::Task["doctor:environment"].invoke
         end

data/spec/lib/capistrano/doctor/gems_doctor_spec.rb

@@ -53,7 +53,7 @@ module Capistrano
           Rake::Task.clear
         end
 
-        it "has an doctor:gems task that calls GemsDoctor" do
+        it "has an doctor:gems task that calls GemsDoctor", capture_io: true do
           GemsDoctor.any_instance.expects(:call)
           Rake::Task["doctor:gems"].invoke
         end

data/spec/lib/capistrano/doctor/servers_doctor_spec.rb

@@ -71,7 +71,7 @@ module Capistrano
           Rake::Task.clear
         end
 
-        it "has an doctor:servers task that calls ServersDoctor" do
+        it "has an doctor:servers task that calls ServersDoctor", capture_io: true do
           ServersDoctor.any_instance.expects(:call)
           Rake::Task["doctor:servers"].invoke
         end

data/spec/lib/capistrano/doctor/variables_doctor_spec.rb

@@ -74,7 +74,7 @@ module Capistrano
           Rake::Task.clear
         end
 
-        it "has an doctor:variables task that calls VariablesDoctor" do
+        it "has an doctor:variables task that calls VariablesDoctor", capture_io: true do
           VariablesDoctor.any_instance.expects(:call)
           Rake::Task["doctor:variables"].invoke
         end

data/spec/lib/capistrano/dsl/paths_spec.rb

@@ -123,6 +123,36 @@ describe Capistrano::DSL::Paths do
     end
   end
 
+  describe "#releases_path" do
+    subject { paths.releases_path }
+
+    context "with custom releases directory" do
+      before do
+        paths.expects(:fetch).with(:releases_directory, "releases").returns("test123")
+        paths.expects(:fetch).with(:deploy_to).returns("/var/www")
+      end
+
+      it "returns the releases path with the custom directory" do
+        expect(subject.to_s).to eq "/var/www/test123"
+      end
+    end
+  end
+
+  describe "#shared_path" do
+    subject { paths.shared_path }
+
+    context "with custom shared directory" do
+      before do
+        paths.expects(:fetch).with(:shared_directory, "shared").returns("test123")
+        paths.expects(:fetch).with(:deploy_to).returns("/var/www")
+      end
+
+      it "returns the shared path with the custom directory" do
+        expect(subject.to_s).to eq "/var/www/test123"
+      end
+    end
+  end
+
   describe "#deploy_config_path" do
     subject { dsl.deploy_config_path.to_s }
 

data/spec/lib/capistrano/dsl/task_enhancements_spec.rb

@@ -35,7 +35,7 @@ module Capistrano
         end
       end
 
-      it "invokes in proper order if define after than before" do
+      it "invokes in proper order if define after than before", capture_io: true do
         task_enhancements.after("task", "after_task")
         task_enhancements.before("task", "before_task")
 
@@ -44,7 +44,7 @@ module Capistrano
         expect(order).to eq(%w(before_task task after_task))
       end
 
-      it "invokes in proper order if define before than after" do
+      it "invokes in proper order if define before than after", capture_io: true do
         task_enhancements.before("task", "before_task")
         task_enhancements.after("task", "after_task")
 
@@ -53,7 +53,7 @@ module Capistrano
         expect(order).to eq(%w(before_task task after_task))
       end
 
-      it "invokes in proper order when referring to as-yet undefined tasks" do
+      it "invokes in proper order when referring to as-yet undefined tasks", capture_io: true do
         task_enhancements.after("task", "not_loaded_task")
 
         Rake::Task.define_task("not_loaded_task") do
@@ -65,7 +65,7 @@ module Capistrano
         expect(order).to eq(%w(task not_loaded_task))
       end
 
-      it "invokes in proper order and with arguments and block" do
+      it "invokes in proper order and with arguments and block", capture_io: true do
         task_enhancements.after("task", "after_task_custom", :order) do |_t, _args|
           order.push "after_task"
         end
@@ -79,7 +79,7 @@ module Capistrano
         expect(order).to eq(%w(before_task task after_task))
       end
 
-      it "invokes using the correct namespace when defined within a namespace" do
+      it "invokes using the correct namespace when defined within a namespace", capture_io: true do
         Rake.application.in_namespace("namespace") do
           Rake::Task.define_task("task") do |t|
             order.push(t.name)
@@ -99,7 +99,7 @@ module Capistrano
         )
       end
 
-      it "raises a sensible error if the task isn't found" do
+      it "raises a sensible error if the task isn't found", capture_io: true do
         task_enhancements.after("task", "non_existent_task")
         expect { Rake::Task["task"].invoke order }.to raise_error(ArgumentError, 'Task "non_existent_task" not found')
       end

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 reenable 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 reenable 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/immutable_task_spec.rb

@@ -16,7 +16,7 @@ module Capistrano
       load_defaults.extend(Capistrano::ImmutableTask)
 
       $stderr.expects(:puts).with do |message|
-        message =~ /^WARNING: load:defaults has already been invoked/
+        message =~ /^ERROR: load:defaults has already been invoked/
       end
 
       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

@@ -28,13 +28,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
 

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

@@ -185,12 +185,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.9.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -67,20 +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
@@ -136,6 +122,8 @@ extra_rdoc_files: []
 files:
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
+- ".github/release-drafter.yml"
+- ".github/workflows/push.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -265,11 +253,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 +277,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files: