capistrano 3.9.0 → 3.15.0

data/README.md

@@ -88,6 +88,10 @@ Likewise, your server(s) will likely need supporting software installed before y
 
 Capistrano is designed to deploy using a single, non-privileged SSH user, using a *non-interactive* SSH session. If your deployment requires `sudo`, interactive prompts, authenticating as one user but running commands as another, you can probably accomplish this with Capistrano, but it may be difficult. Your automated deployments will be much smoother if you can avoid such requirements.
 
+#### Shells
+
+Capistrano 3 expects a POSIX shell like Bash or Sh. Shells like tcsh, csh, and such may work, but probably will not.
+
 ## Quick start
 
 ### Requirements
@@ -99,11 +103,11 @@ Capistrano is designed to deploy using a single, non-privileged SSH user, using
 
 ### Install the Capistrano gem
 
-Add Capistrano to your project's Gemfile:
+Add Capistrano to your project's Gemfile using `require: false`:
 
 ``` ruby
 group :development do
-  gem "capistrano", "~> 3.9"
+  gem "capistrano", "~> 3.14", require: false
 end
 ```
 
@@ -196,7 +200,7 @@ Contributions to Capistrano, in the form of code, documentation or idea, are gla
 
 MIT License (MIT)
 
-Copyright (c) 2012-2015 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

@@ -11,7 +11,7 @@
 2.  **Ensure all tests are passing by running `rake spec` and `rake features`.**
 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`.
-4. Update the version in the `./README.md` Gemfile example (`gem "capistrano", "~> X.Y"`).
-5. Update the `CHANGELOG`.
-6. Commit the changelog and version in a single commit, the message should be "Preparing vX.Y.Z"
+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 "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/Rakefile

@@ -10,3 +10,8 @@ Cucumber::Rake::Task.new(:features)
 
 desc "Run RuboCop checks"
 RuboCop::RakeTask.new
+
+Rake::Task["release"].enhance do
+  puts "Don't forget to publish the release on GitHub!"
+  system "open https://github.com/capistrano/capistrano/releases"
+end

data/capistrano.gemspec

@@ -11,8 +11,14 @@ Gem::Specification.new do |gem|
   gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com"]
   gem.description   = "Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH."
   gem.summary       = "Capistrano - Welcome to easy deployment with Ruby over SSH"
-  gem.homepage      = "http://capistranorb.com/"
-
+  gem.homepage      = "https://capistranorb.com/"
+  gem.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/"
+  }
   gem.files         = `git ls-files -z`.split("\x0").reject { |f| f =~ /^docs/ }
   gem.executables   = %w(cap capify)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -26,7 +32,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rake", ">= 10.0.0"
   gem.add_dependency "sshkit", ">= 1.9.0"
 
-  gem.add_development_dependency "danger"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rubocop", "0.48.1"

data/features/deploy.feature

@@ -60,6 +60,22 @@ Feature: Deploy
     Then 3 valid releases are kept
     And the invalid "new" release is ignored
 
+  Scenario: Cleanup after many failed releases doesn't remove last good release
+    Given config stage file has line "set :keep_releases, 2"
+    And I make 2 deployments
+    And an invalid release named "77777777777777"
+    And an invalid release named "88888888888888"
+    And an invalid release named "99999999999999"
+    When I run cap "deploy:cleanup"
+    Then 3 valid releases are kept
+    And the current directory will be a symlink to the release
+
+  Scenario: Cleanup when there are more releases than arguments can handle
+    Given config stage file has line "set :keep_releases, 3"
+    And 5000 valid existing releases
+    When I run cap "deploy:cleanup"
+    Then 3 valid releases are kept
+
   Scenario: Rolling Back
     Given I make 2 deployments
     When I run cap "deploy:rollback"

data/features/step_definitions/assertions.rb

@@ -5,7 +5,7 @@ Then(/^references in the remote repo are listed$/) do
 end
 
 Then(/^git wrapper permissions are 0700$/) do
-  permissions_test = %Q([ $(stat -c "%a" #{TestApp.git_wrapper_path.shellescape}) == "700" ])
+  permissions_test = %Q([ $(stat -c "%a" #{TestApp.git_wrapper_path_glob}) == "700" ])
   _stdout, _stderr, status = vagrant_cli_command("ssh -c #{permissions_test.shellescape}")
 
   expect(status).to be_success
@@ -66,7 +66,7 @@ Then(/^directory symlinks are created in the new release$/) do
 end
 
 Then(/^the current directory will be a symlink to the release$/) do
-  run_vagrant_command(test_symlink_exists(TestApp.current_path))
+  run_vagrant_command(exists?("e", TestApp.current_path))
 end
 
 Then(/^the deploy\.rb file is created$/) do

data/features/step_definitions/setup.rb

@@ -80,10 +80,12 @@ end
 
 Given(/^(\d+) valid existing releases$/) do |num|
   a_day = 86_400 # in seconds
-  offset = -(a_day * num.to_i)
-  num.to_i.times do
-    run_vagrant_command("mkdir -p #{TestApp.release_path(TestApp.timestamp(offset))}")
-    offset += a_day
+  (1...num).each_slice(100) do |num_batch|
+    dirs = num_batch.map do |i|
+      offset = -(a_day * i)
+      TestApp.release_path(TestApp.timestamp(offset))
+    end
+    run_vagrant_command("mkdir -p #{dirs.join(' ')}")
   end
 end
 

data/lib/capistrano/configuration/host_filter.rb

@@ -3,8 +3,7 @@ module Capistrano
     class HostFilter
       def initialize(values)
         av = Array(values).dup
-        av.map! { |v| v.is_a?(String) && v =~ /^(?<name>[-A-Za-z0-9.]+)(,\g<name>)*$/ ? v.split(",") : v }
-        av.flatten!
+        av = av.flat_map { |v| v.is_a?(String) && v =~ /^(?<name>[-A-Za-z0-9.]+)(,\g<name>)*$/ ? v.split(",") : v }
         @rex = regex_matcher(av)
       end
 

data/lib/capistrano/configuration/question.rb

@@ -18,6 +18,7 @@ module Capistrano
 
       def ask_question
         $stdout.print question
+        $stdout.flush
       end
 
       def value_or_default
@@ -35,10 +36,12 @@ module Capistrano
       end
 
       def gets
+        return unless stdin.tty?
+
         if echo?
-          $stdin.gets
+          stdin.gets
         else
-          $stdin.noecho(&:gets).tap { $stdout.print "\n" }
+          stdin.noecho(&:gets).tap { $stdout.print "\n" }
         end
       rescue Errno::EIO
         # when stdio gets closed
@@ -46,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)
@@ -56,6 +63,14 @@ module Capistrano
       def echo?
         (options || {}).fetch(:echo, true)
       end
+
+      def stdin
+        (options || {}).fetch(:stdin, $stdin)
+      end
+
+      def prompt
+        (options || {}).fetch(:prompt, nil)
+      end
     end
   end
 end

data/lib/capistrano/configuration/role_filter.rb

@@ -3,8 +3,7 @@ module Capistrano
     class RoleFilter
       def initialize(values)
         av = Array(values).dup
-        av.map! { |v| v.is_a?(String) ? v.split(",") : v }
-        av.flatten!
+        av = av.flat_map { |v| v.is_a?(String) ? v.split(",") : v }
         @rex = regex_matcher(av)
       end
 

data/lib/capistrano/configuration.rb

@@ -47,10 +47,14 @@ module Capistrano
     def any?(key)
       value = fetch(key)
       if value && value.respond_to?(:any?)
-        value.any?
-      else
-        !fetch(key).nil?
+        begin
+          return value.any?
+        rescue ArgumentError # rubocop:disable Lint/HandleExceptions
+          # Gracefully ignore values whose `any?` method doesn't accept 0 args
+        end
       end
+
+      !value.nil?
     end
 
     def is_question?(key)

data/lib/capistrano/doctor/servers_doctor.rb

@@ -56,7 +56,7 @@ module Capistrano
         private
 
         def find_whitespace_roles
-          servers.map(&:roles).map(&:to_a).flatten.uniq
+          servers.map(&:roles).flat_map(&:to_a).uniq
                  .select { |role| include_whitespace?(role) }
         end
       end

data/lib/capistrano/doctor/variables_doctor.rb

@@ -5,9 +5,16 @@ module Capistrano
     # Prints a table of all Capistrano variables and their current values. If
     # there are unrecognized variables, print warnings for them.
     class VariablesDoctor
-      # These are keys that have no default values in Capistrano, but are
-      # nonetheless expected to be set.
-      WHITELIST = %i(application repo_url repo_tree).freeze
+      # These are keys that are recognized by Capistrano, but do not have values
+      # set by default.
+      WHITELIST = %i(
+        application
+        current_directory
+        releases_directory
+        repo_url
+        repo_tree
+        shared_directory
+      ).freeze
       private_constant :WHITELIST
 
       include Capistrano::Doctor::OutputHelpers

data/lib/capistrano/dsl/paths.rb

@@ -15,7 +15,7 @@ module Capistrano
       end
 
       def releases_path
-        deploy_path.join("releases")
+        deploy_path.join(fetch(:releases_directory, "releases"))
       end
 
       def release_path
@@ -44,7 +44,7 @@ module Capistrano
       end
 
       def shared_path
-        deploy_path.join("shared")
+        deploy_path.join(fetch(:shared_directory, "shared"))
       end
 
       def revision_log

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,8 +12,12 @@ 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}",
+  no_current_release: "There is no current release present on %{host}",
   no_old_releases: "No old releases (keeping newest %{keep_releases}) on %{host}",
   linked_file_does_not_exist: "linked file %{file} does not exist on %{host}",
   cannot_rollback: "There are no older releases to rollback to",

data/lib/capistrano/immutable_task.rb

@@ -17,8 +17,9 @@ module Capistrano
 
     def enhance(*args, &block)
       $stderr.puts <<-MESSAGE
-WARNING: #{name} has already been invoked and can no longer be modified.
-Check that you haven't loaded a Capistrano plugin in deploy.rb by mistake.
+ERROR: #{name} has already been invoked and can no longer be modified.
+Check that you haven't loaded a Capistrano plugin in deploy.rb or a stage
+(e.g. deploy/production.rb) by mistake.
 Plugins must be loaded in the Capfile to initialize properly.
 MESSAGE
 

data/lib/capistrano/scm/git.rb

@@ -1,5 +1,6 @@
 require "capistrano/scm/plugin"
 require "cgi"
+require "securerandom"
 require "shellwords"
 require "uri"
 
@@ -7,10 +8,9 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
   def set_defaults
     set_if_empty :git_shallow_clone, false
     set_if_empty :git_wrapper_path, lambda {
-      # Try to avoid permissions issues when multiple users deploy the same app
-      # by using different file names in the same dir for each deployer and stage.
-      suffix = %i(application stage local_user).map { |key| fetch(key).to_s }.join("-")
-      "#{fetch(:tmp_dir)}/git-ssh-#{suffix}.sh"
+      # Use a unique name that won't collide with other deployments, and
+      # that cannot be guessed by other processes that have access to /tmp.
+      "#{fetch(:tmp_dir)}/git-ssh-#{SecureRandom.hex(10)}.sh"
     }
     set_if_empty :git_environmental_variables, lambda {
       {
@@ -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/tasks/deploy.rake

@@ -155,12 +155,22 @@ namespace :deploy do
 
       if valid.count >= fetch(:keep_releases)
         info t(:keeping_releases, host: host.to_s, keep_releases: fetch(:keep_releases), releases: valid.count)
-        directories = (valid - valid.last(fetch(:keep_releases)))
+        directories = (valid - valid.last(fetch(:keep_releases))).map do |release|
+          releases_path.join(release).to_s
+        end
+        if test("[ -d #{current_path} ]")
+          current_release = capture(:readlink, current_path).to_s
+          if directories.include?(current_release)
+            warn t(:wont_delete_current_release, host: host.to_s)
+            directories.delete(current_release)
+          end
+        else
+          debug t(:no_current_release, host: host.to_s)
+        end
         if directories.any?
-          directories_str = directories.map do |release|
-            releases_path.join(release)
-          end.join(" ")
-          execute :rm, "-rf", directories_str
+          directories.each_slice(100) do |directories_batch|
+            execute :rm, "-rf", *directories_batch
+          end
         else
           info t(:no_old_releases, host: host.to_s, keep_releases: fetch(:keep_releases))
         end
@@ -229,7 +239,7 @@ namespace :deploy do
   task :set_current_revision  do
     on release_roles(:all) do
       within release_path do
-        execute :echo, "\"#{fetch(:current_revision)}\" >> REVISION"
+        execute :echo, "\"#{fetch(:current_revision)}\" > REVISION"
       end
     end
   end

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

@@ -1,5 +1,5 @@
-# config valid only for current version of Capistrano
-lock "<%= Capistrano::VERSION %>"
+# config valid for current version and patch releases of Capistrano
+lock "~> <%= Capistrano::VERSION %>"
 
 set :application, "my_app_name"
 set :repo_url, "git@example.com:me/my_repo.git"
@@ -21,7 +21,7 @@ set :repo_url, "git@example.com:me/my_repo.git"
 # set :pty, true
 
 # Default value for :linked_files is []
-# append :linked_files, "config/database.yml", "config/secrets.yml"
+# append :linked_files, "config/database.yml"
 
 # Default value for linked_dirs is []
 # append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system"
@@ -34,3 +34,6 @@ set :repo_url, "git@example.com:me/my_repo.git"
 
 # Default value for keep_releases is 5
 # set :keep_releases, 5
+
+# Uncomment the following to require manually verifying the host key before first deploy.
+# set :ssh_options, verify_host_key: :secure

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.9.0".freeze
+  VERSION = "3.15.0".freeze
 end

data/spec/integration/dsl_spec.rb

@@ -356,14 +356,16 @@ describe Capistrano::DSL do
   end
 
   describe "asking for a variable" do
+    let(:stdin) { stub(tty?: true) }
+
     before do
-      dsl.ask(:scm, :svn)
+      dsl.ask(:scm, :svn, stdin: stdin)
       $stdout.stubs(:print)
     end
 
     context "variable is provided" do
       before do
-        $stdin.expects(:gets).returns("git")
+        stdin.expects(:gets).returns("git")
       end
 
       it "sets the input as the variable" do
@@ -373,7 +375,7 @@ describe Capistrano::DSL do
 
     context "variable is not provided" do
       before do
-        $stdin.expects(:gets).returns("")
+        stdin.expects(:gets).returns("")
       end
 
       it "sets the variable as the default" do

data/spec/lib/capistrano/application_spec.rb

@@ -5,46 +5,40 @@ describe Capistrano::Application do
 
   it "provides a --format option which enables the choice of output formatting"
 
-  let(:help_output) do
-    out, _err = capture_io do
-      flags "--help", "-h"
-    end
-    out
-  end
-
-  it "displays documentation URL as help banner" do
-    expect(help_output.lines.first).to match(/capistranorb.com/)
+  it "displays documentation URL as help banner", capture_io: true do
+    flags "--help", "-h"
+    expect($stdout.string.each_line.first).to match(/capistranorb.com/)
   end
 
   %w(quiet silent verbose).each do |switch|
-    it "doesn't include --#{switch} in help" do
-      expect(help_output).not_to match(/--#{switch}/)
+    it "doesn't include --#{switch} in help", capture_io: true do
+      flags "--help", "-h"
+      expect($stdout.string).not_to match(/--#{switch}/)
     end
   end
 
-  it "overrides the rake method, but still prints the rake version" do
-    out, _err = capture_io do
-      flags "--version", "-V"
-    end
+  it "overrides the rake method, but still prints the rake version", capture_io: true do
+    flags "--version", "-V"
+    out = $stdout.string
     expect(out).to match(/\bCapistrano Version\b/)
     expect(out).to match(/\b#{Capistrano::VERSION}\b/)
     expect(out).to match(/\bRake Version\b/)
     expect(out).to match(/\b#{Rake::VERSION}\b/)
   end
 
-  it "overrides the rake method, and sets the sshkit_backend to SSHKit::Backend::Printer" do
-    capture_io do
-      flags "--dry-run", "-n"
-    end
+  it "overrides the rake method, and sets the sshkit_backend to SSHKit::Backend::Printer", capture_io: true do
+    flags "--dry-run", "-n"
     sshkit_backend = Capistrano::Configuration.fetch(:sshkit_backend)
     expect(sshkit_backend).to eq(SSHKit::Backend::Printer)
   end
 
-  it "enables printing all config variables on command line parameter" do
-    capture_io do
+  it "enables printing all config variables on command line parameter", capture_io: true do
+    begin
       flags "--print-config-variables", "-p"
+      expect(Capistrano::Configuration.fetch(:print_config_variables)).to be true
+    ensure
+      Capistrano::Configuration.reset!
     end
-    expect(Capistrano::Configuration.fetch(:print_config_variables)).to be true
   end
 
   def flags(*sets)
@@ -63,22 +57,4 @@ describe Capistrano::Application do
     subject.run
     subject.options
   end
-
-  def capture_io
-    require "stringio"
-
-    orig_stdout = $stdout
-    orig_stderr = $stderr
-    captured_stdout = StringIO.new
-    captured_stderr = StringIO.new
-    $stdout = captured_stdout
-    $stderr = captured_stderr
-
-    yield
-
-    return captured_stdout.string, captured_stderr.string
-  ensure
-    $stdout = orig_stdout
-    $stderr = orig_stderr
-  end
 end

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

@@ -10,7 +10,7 @@ module Capistrano
          Server.new("server2"),
          Server.new("server3"),
          Server.new("server4"),
-         Server.new("server5")]
+         Server.new("server10")]
       end
 
       shared_examples "it filters hosts correctly" do |expected|
@@ -32,8 +32,8 @@ module Capistrano
         end
 
         context "with a comma separated string" do
-          let(:values) { "server1,server3" }
-          it_behaves_like "it filters hosts correctly", %w{server1 server3}
+          let(:values) { "server1,server10" }
+          it_behaves_like "it filters hosts correctly", %w{server1 server10}
         end
 
         context "with an array of strings" do
@@ -41,6 +41,11 @@ module Capistrano
           it_behaves_like "it filters hosts correctly", %w{server1 server3}
         end
 
+        context "with mixed splittable and unsplittable strings" do
+          let(:values) { %w{server1 server2,server3} }
+          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3}
+        end
+
         context "with a regexp" do
           let(:values) { "server[13]$" }
           it_behaves_like "it filters hosts correctly", %w{server1 server3}
@@ -48,12 +53,12 @@ module Capistrano
 
         context "with a regexp with line boundaries" do
           let(:values) { "^server" }
-          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server5}
+          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server10}
         end
 
         context "with a regexp with a comma" do
           let(:values) { 'server\d{1,3}$' }
-          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server5}
+          it_behaves_like "it filters hosts correctly", %w{server1 server2 server3 server4 server10}
         end
 
         context "without number" do

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

@@ -49,7 +49,7 @@ module Capistrano
           expect(task.prerequisites).to eq([:example_prerequisite])
         end
 
-        it "sets defaults when load:defaults is invoked" do
+        it "sets defaults when load:defaults is invoked", capture_io: true do
           expect(fetch(:example_variable)).to be_nil
           invoke "load:defaults"
           expect(fetch(:example_variable)).to eq("foo")