Hello community,
here is the log from the commit of package rubygem-capistrano for
openSUSE:Factory checked in at 2017-06-08 14:59:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-capistrano (Old)
and /work/SRC/openSUSE:Factory/.rubygem-capistrano.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-capistrano"
Thu Jun 8 14:59:33 2017 rev:27 rq:497667 version:3.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-capistrano/rubygem-capistrano.changes
2017-04-11 09:32:22.725439049 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-capistrano.new/rubygem-capistrano.changes
2017-06-08 14:59:37.895572920 +0200
@@ -1,0 +2,6 @@
+Tue May 23 09:44:05 UTC 2017 - [email protected]
+
+- updated to version 3.8.1
+ see installed CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
capistrano-3.8.0.gem
New:
----
capistrano-3.8.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-capistrano.spec ++++++
--- /var/tmp/diff_new_pack.9Hgo5H/_old 2017-06-08 14:59:38.507486559 +0200
+++ /var/tmp/diff_new_pack.9Hgo5H/_new 2017-06-08 14:59:38.507486559 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-capistrano
-Version: 3.8.0
+Version: 3.8.1
Release: 0
%define mod_name capistrano
%define mod_full_name %{mod_name}-%{version}
++++++ capistrano-3.8.0.gem -> capistrano-3.8.1.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.rubocop.yml new/.rubocop.yml
--- old/.rubocop.yml 2017-03-10 18:05:32.000000000 +0100
+++ new/.rubocop.yml 2017-04-21 17:16:10.000000000 +0200
@@ -3,6 +3,9 @@
DisplayStyleGuide: true
TargetRubyVersion: 2.0
+Lint/AmbiguousBlockAssociation:
+ Enabled:
+ false
Metrics/BlockLength:
Exclude:
- "spec/**/*"
@@ -13,6 +16,11 @@
Enabled: false
Style/DoubleNegation:
Enabled: false
+Style/FileName:
+ Exclude:
+ - "Dangerfile"
+Style/IndentHeredoc:
+ Enabled: false
Style/SpaceAroundEqualsInParameterDefault:
EnforcedStyle: no_space
Style/StringLiterals:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2017-03-10 18:05:32.000000000 +0100
+++ new/CHANGELOG.md 2017-04-21 17:16:10.000000000 +0200
@@ -10,17 +10,29 @@
## 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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 2017-03-10 18:05:32.000000000 +0100
+++ new/Rakefile 2017-04-21 17:16:10.000000000 +0200
@@ -3,7 +3,7 @@
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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/capistrano.gemspec new/capistrano.gemspec
--- old/capistrano.gemspec 2017-03-10 18:05:32.000000000 +0100
+++ new/capistrano.gemspec 2017-04-21 17:16:10.000000000 +0200
@@ -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.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
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/installation.feature
new/features/installation.feature
--- old/features/installation.feature 2017-03-10 18:05:32.000000000 +0100
+++ new/features/installation.feature 2017-04-21 17:16:10.000000000 +0200
@@ -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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/step_definitions/setup.rb
new/features/step_definitions/setup.rb
--- old/features/step_definitions/setup.rb 2017-03-10 18:05:32.000000000
+0100
+++ new/features/step_definitions/setup.rb 2017-04-21 17:16:10.000000000
+0200
@@ -2,6 +2,10 @@
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")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/application.rb
new/lib/capistrano/application.rb
--- old/lib/capistrano/application.rb 2017-03-10 18:05:32.000000000 +0100
+++ new/lib/capistrano/application.rb 2017-04-21 17:16:10.000000000 +0200
@@ -96,7 +96,7 @@
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 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/configuration/filter.rb
new/lib/capistrano/configuration/filter.rb
--- old/lib/capistrano/configuration/filter.rb 2017-03-10 18:05:32.000000000
+0100
+++ new/lib/capistrano/configuration/filter.rb 2017-04-21 17:16:10.000000000
+0200
@@ -8,7 +8,7 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/defaults.rb
new/lib/capistrano/defaults.rb
--- old/lib/capistrano/defaults.rb 2017-03-10 18:05:32.000000000 +0100
+++ new/lib/capistrano/defaults.rb 2017-04-21 17:16:10.000000000 +0200
@@ -8,7 +8,7 @@
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 "\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/doctor/variables_doctor.rb
new/lib/capistrano/doctor/variables_doctor.rb
--- old/lib/capistrano/doctor/variables_doctor.rb 2017-03-10
18:05:32.000000000 +0100
+++ new/lib/capistrano/doctor/variables_doctor.rb 2017-04-21
17:16:10.000000000 +0200
@@ -7,7 +7,7 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/scm/git.rb
new/lib/capistrano/scm/git.rb
--- old/lib/capistrano/scm/git.rb 2017-03-10 18:05:32.000000000 +0100
+++ new/lib/capistrano/scm/git.rb 2017-04-21 17:16:10.000000000 +0200
@@ -9,7 +9,7 @@
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 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/version.rb
new/lib/capistrano/version.rb
--- old/lib/capistrano/version.rb 2017-03-10 18:05:32.000000000 +0100
+++ new/lib/capistrano/version.rb 2017-04-21 17:16:10.000000000 +0200
@@ -1,3 +1,3 @@
module Capistrano
- VERSION = "3.8.0".freeze
+ VERSION = "3.8.1".freeze
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-03-10 18:05:32.000000000 +0100
+++ new/metadata 2017-04-21 17:16:10.000000000 +0200
@@ -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 @@
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 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/lib/capistrano/configuration/filter_spec.rb
new/spec/lib/capistrano/configuration/filter_spec.rb
--- old/spec/lib/capistrano/configuration/filter_spec.rb 2017-03-10
18:05:32.000000000 +0100
+++ new/spec/lib/capistrano/configuration/filter_spec.rb 2017-04-21
17:16:10.000000000 +0200
@@ -5,7 +5,7 @@
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),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec/lib/capistrano/configuration/role_filter_spec.rb
new/spec/lib/capistrano/configuration/role_filter_spec.rb
--- old/spec/lib/capistrano/configuration/role_filter_spec.rb 2017-03-10
18:05:32.000000000 +0100
+++ new/spec/lib/capistrano/configuration/role_filter_spec.rb 2017-04-21
17:16:10.000000000 +0200
@@ -7,7 +7,7 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/lib/capistrano/configuration/server_spec.rb
new/spec/lib/capistrano/configuration/server_spec.rb
--- old/spec/lib/capistrano/configuration/server_spec.rb 2017-03-10
18:05:32.000000000 +0100
+++ new/spec/lib/capistrano/configuration/server_spec.rb 2017-04-21
17:16:10.000000000 +0200
@@ -13,7 +13,7 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/lib/capistrano/configuration/servers_spec.rb
new/spec/lib/capistrano/configuration/servers_spec.rb
--- old/spec/lib/capistrano/configuration/servers_spec.rb 2017-03-10
18:05:32.000000000 +0100
+++ new/spec/lib/capistrano/configuration/servers_spec.rb 2017-04-21
17:16:10.000000000 +0200
@@ -56,7 +56,7 @@
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 @@
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 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/lib/capistrano/configuration_spec.rb
new/spec/lib/capistrano/configuration_spec.rb
--- old/spec/lib/capistrano/configuration_spec.rb 2017-03-10
18:05:32.000000000 +0100
+++ new/spec/lib/capistrano/configuration_spec.rb 2017-04-21
17:16:10.000000000 +0200
@@ -238,7 +238,7 @@
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 @@
describe "asking" do
let(:question) { stub }
- let(:options) { Hash.new }
+ let(:options) { {} }
before do
Configuration::Question.expects(:new).with(:branch, :default, options)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/support/test_app.rb new/spec/support/test_app.rb
--- old/spec/support/test_app.rb 2017-03-10 18:05:32.000000000 +0100
+++ new/spec/support/test_app.rb 2017-04-21 17:16:10.000000000 +0200
@@ -44,14 +44,14 @@
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 @@
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 @@
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
