capistrano 3.8.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf003b9169b22ddd324533323c2ccd5a3873aec
-  data.tar.gz: 5fd9c7d79004cbc67c515903f280b74f80bd3c87
+  metadata.gz: 35f2b78fb4e59fac89010f9b933316eaf4d2242c
+  data.tar.gz: 1e41412f1e55f7e0d94e84acb198b96a29d5d054
 SHA512:
-  metadata.gz: a89eca74965d39609a504a1032356e66a762847d69ff6a45951585a3e1002f3575ab0a9837dc545fe7536f8b38297f83ad93e894ac454bda219e07b847c9797c
-  data.tar.gz: 2b0fa5af27a608a391476c31d57640e875b97408e503b279bca9fd0bf05b83aa54ab0dad693f51f29ede1261ed77ba76206d55189810f6d27ee3a62c1792228f
+  metadata.gz: 2786a1cf32881d164cc3836ec986a6e42acb19b8367bec59fa1c6250eb9b82e5e2ccee69f428edfe838f81b894ed96811ea3bcd02c41ca93f50536705596cfe3
+  data.tar.gz: d166e4c962b78ff8c06e93876283bde101286bc8964ac5b39fcd76f8717273c0b7d90786a5abb909cd96cc0b50ab1d71c1624d1abd3a277945e01a27bca299b2

data/.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
   DisplayStyleGuide: true
   TargetRubyVersion: 2.0
 
+Lint/AmbiguousBlockAssociation:
+  Enabled:
+    false
 Metrics/BlockLength:
   Exclude:
     - "spec/**/*"
@@ -13,6 +16,11 @@ Style/ClassAndModuleChildren:
   Enabled: false
 Style/DoubleNegation:
   Enabled: false
+Style/FileName:
+  Exclude:
+    - "Dangerfile"
+Style/IndentHeredoc:
+  Enabled: false
 Style/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 Style/StringLiterals:

data/CHANGELOG.md

@@ -10,17 +10,29 @@ gem "capistrano", :github => "capistrano/capistrano"
 
 ## master
 
-https://github.com/capistrano/capistrano/compare/v3.7.2...HEAD
+https://github.com/capistrano/capistrano/compare/v3.8.1...HEAD
 
 * Your contribution here!
 
+## `3.8.1` (2017-04-21)
+
+https://github.com/capistrano/capistrano/compare/v3.8.0...v3.8.1
+
+### Breaking changes:
+
+* None
+
+### Fixes:
+
+* [#1867](https://github.com/capistrano/capistrano/pull/1867): Allow `cap -T` to run without Capfile present - [@mattbrictson](https://github.com/mattbrictson)
+
 ## `3.8.0` (2017-03-10)
 
 https://github.com/capistrano/capistrano/compare/v3.7.2...v3.8.0
 
-### Potentially breaking changes:
+### Minor breaking changes:
 
-* [#1846](https://github.com/capistrano/capistrano/pull/1846): add_host will add a new host in a case where it used to incorrectly update an existing one (potentially breaking) [(@dbenamy)](https://github.com/dbenamy)
+* [#1846](https://github.com/capistrano/capistrano/pull/1846): add_host - When this method has already been called once for a given host and it is called a second time with a port, a new host will be added. Previously, the first host would have been updated. [(@dbenamy)](https://github.com/dbenamy)
 
 ### New features:
 

data/Rakefile

@@ -3,7 +3,7 @@ require "cucumber/rake/task"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
 
-task default: [:spec, :rubocop]
+task default: %i(spec rubocop)
 RSpec::Core::RakeTask.new
 
 Cucumber::Rake::Task.new(:features)

data/capistrano.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "capistrano/version"
@@ -28,5 +29,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "danger"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rubocop"
+  gem.add_development_dependency "rubocop", "0.48.1"
 end

data/features/installation.feature

@@ -1,16 +1,21 @@
 Feature: Installation
 
   Background:
-    Given a test app with the default configuration
+    Given a test app without any configuration
+
+  Scenario: The "install" task documentation can be viewed
+    When I run "cap -T"
+    Then the task is successful
+    And contains "cap install" in the output
 
   Scenario: With default stages
-    When I run cap "install"
+    When I run "cap install"
     Then the deploy.rb file is created
     And the default stage files are created
     And the tasks folder is created
 
   Scenario: With specified stages
-    When I run cap "install STAGES=qa,production"
+    When I run "cap install STAGES=qa,production"
     Then the deploy.rb file is created
     And the specified stage files are created
     And the tasks folder is created

data/features/step_definitions/setup.rb

@@ -2,6 +2,10 @@ Given(/^a test app with the default configuration$/) do
   TestApp.install
 end
 
+Given(/^a test app without any configuration$/) do
+  TestApp.create_test_app
+end
+
 Given(/^servers with the roles app and web$/) do
   begin
     vagrant_cli_command("up")

data/lib/capistrano/application.rb

@@ -96,7 +96,7 @@ module Capistrano
     end
 
     def load_imports
-      if options.show_tasks
+      if options.show_tasks && Rake::Task.task_defined?("load:defaults")
         invoke "load:defaults"
         set(:stage, "")
         Dir[deploy_config_path].each { |f| add_import f }

data/lib/capistrano/configuration/filter.rb

@@ -8,7 +8,7 @@ module Capistrano
   class Configuration
     class Filter
       def initialize(type, values=nil)
-        raise "Invalid filter type #{type}" unless [:host, :role].include? type
+        raise "Invalid filter type #{type}" unless %i(host role).include? type
         av = Array(values)
         @strategy = if av.empty? then EmptyFilter.new
                     elsif av.include?(:all) || av.include?("all") then NullFilter.new

data/lib/capistrano/defaults.rb

@@ -8,7 +8,7 @@ validate :application do |_key, value|
   end
 end
 
-[:git_strategy, :hg_strategy, :svn_strategy].each do |strategy|
+%i(git_strategy hg_strategy svn_strategy).each do |strategy|
   validate(strategy) do |key, _value|
     warn(
       "[Deprecation Warning] #{key} is deprecated and will be removed in "\

data/lib/capistrano/doctor/variables_doctor.rb

@@ -7,7 +7,7 @@ module Capistrano
     class VariablesDoctor
       # These are keys that have no default values in Capistrano, but are
       # nonetheless expected to be set.
-      WHITELIST = [:application, :repo_url, :repo_tree].freeze
+      WHITELIST = %i(application repo_url repo_tree).freeze
       private_constant :WHITELIST
 
       include Capistrano::Doctor::OutputHelpers

data/lib/capistrano/scm/git.rb

@@ -9,7 +9,7 @@ class Capistrano::SCM::Git < Capistrano::SCM::Plugin
     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 = [:application, :stage, :local_user].map { |key| fetch(key).to_s }.join("-")
+      suffix = %i(application stage local_user).map { |key| fetch(key).to_s }.join("-")
       "#{fetch(:tmp_dir)}/git-ssh-#{suffix}.sh"
     }
     set_if_empty :git_environmental_variables, lambda {

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.8.0".freeze
+  VERSION = "3.8.1".freeze
 end

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

@@ -5,7 +5,7 @@ module Capistrano
     describe Filter do
       let(:available) do
         [
-          Server.new("server1").add_roles([:web, :db]),
+          Server.new("server1").add_roles(%i(web db)),
           Server.new("server2").add_role(:web),
           Server.new("server3").add_role(:redis),
           Server.new("server4").add_role(:db),

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

@@ -7,7 +7,7 @@ module Capistrano
 
       let(:available) do
         [
-          Server.new("server1").add_roles([:web, :db]),
+          Server.new("server1").add_roles(%i(web db)),
           Server.new("server2").add_role(:web),
           Server.new("server3").add_role(:redis),
           Server.new("server4").add_role(:db),
@@ -41,7 +41,7 @@ module Capistrano
         end
 
         context "with multiple roles" do
-          let(:values) { [:web, :db] }
+          let(:values) { %i(web db) }
           it_behaves_like "it filters roles correctly", 3, %w{server1 server2 server4}
         end
 

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

@@ -13,7 +13,7 @@ module Capistrano
       end
 
       describe "adding roles" do
-        subject { server.add_roles([:things, :stuff]) }
+        subject { server.add_roles(%i(things stuff)) }
         it "adds the roles" do
           expect { subject }.to change { server.roles.size }.from(0).to(2)
         end

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

@@ -56,7 +56,7 @@ module Capistrano
 
       describe "collecting server roles" do
         let(:app) { Set.new([:app]) }
-        let(:web_app) { Set.new([:web, :app]) }
+        let(:web_app) { Set.new(%i(web app)) }
         let(:web) { Set.new([:web]) }
 
         before do
@@ -108,7 +108,7 @@ module Capistrano
         end
 
         it "returns the correct app and web servers" do
-          expect(servers.roles_for([:app, :web]).map(&:hostname)).to eq %w{1 2 3}
+          expect(servers.roles_for(%i(app web)).map(&:hostname)).to eq %w{1 2 3}
         end
 
         it "returns all servers" do
@@ -284,7 +284,7 @@ module Capistrano
           end
 
           context "when selecting specific roles" do
-            let(:roles) { [:app, :web] }
+            let(:roles) { %i(app web) }
             it "ignores it" do
               expect(subject).to eq %w{1 2 3 4}
             end
@@ -312,7 +312,7 @@ module Capistrano
           end
 
           context "when selecting specific roles" do
-            let(:roles) { [:app, :web] }
+            let(:roles) { %i(app web) }
             it "ignores it" do
               expect(subject).to eq %w{1 2 3 4}
             end

data/spec/lib/capistrano/configuration_spec.rb

@@ -238,7 +238,7 @@ module Capistrano
       end
 
       it "returns all set keys" do
-        expect(subject).to match_array [:key1, :key2]
+        expect(subject).to match_array %i(key1 key2)
       end
     end
 
@@ -255,7 +255,7 @@ module Capistrano
 
     describe "asking" do
       let(:question) { stub }
-      let(:options) { Hash.new }
+      let(:options) { {} }
 
       before do
         Configuration::Question.expects(:new).with(:branch, :default, options)

data/spec/support/test_app.rb

@@ -44,14 +44,14 @@ module TestApp
     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
@@ -91,14 +91,15 @@ module TestApp
   end
 
   def cap(task, subdirectory=nil)
-    run "bundle exec cap #{stage} #{task}", subdirectory
+    run "cap #{stage} #{task} --trace", subdirectory
   end
 
   def run(command, subdirectory=nil)
     output = nil
+    command = "bundle exec #{command}" unless command =~ /^bundle\b/
     dir = subdirectory ? test_app_path.join(subdirectory) : test_app_path
     Dir.chdir(dir) do
-      output = `#{command}`
+      output = with_clean_bundler_env { `#{command}` }
     end
     [$CHILD_STATUS.success?, output]
   end
@@ -187,4 +188,9 @@ module TestApp
   def git_wrapper_path
     "/tmp/git-ssh-my_app_name-#{stage}-#{current_user}.sh"
   end
+
+  def with_clean_bundler_env(&block)
+    return yield unless defined?(Bundler)
+    Bundler.with_clean_env(&block)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh
@@ -113,16 +113,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.48.1
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH