Hello community,
here is the log from the commit of package rubygem-capistrano for
openSUSE:Factory checked in at 2020-05-11 13:40:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-capistrano (Old)
and /work/SRC/openSUSE:Factory/.rubygem-capistrano.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-capistrano"
Mon May 11 13:40:29 2020 rev:34 rq:802328 version:3.14.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-capistrano/rubygem-capistrano.changes
2020-03-07 21:37:36.992246949 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-capistrano.new.2738/rubygem-capistrano.changes
2020-05-11 13:40:33.913019073 +0200
@@ -1,0 +2,6 @@
+Thu May 7 20:30:17 UTC 2020 - Stephan Kulow <co...@suse.com>
+
+- updated to version 3.14.0
+ see installed CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
capistrano-3.11.2.gem
New:
----
capistrano-3.14.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-capistrano.spec ++++++
--- /var/tmp/diff_new_pack.B04bpx/_old 2020-05-11 13:40:35.529022503 +0200
+++ /var/tmp/diff_new_pack.B04bpx/_new 2020-05-11 13:40:35.529022503 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-capistrano
-Version: 3.11.2
+Version: 3.14.0
Release: 0
%define mod_name capistrano
%define mod_full_name %{mod_name}-%{version}
++++++ capistrano-3.11.2.gem -> capistrano-3.14.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.github/pull_request_template.md
new/.github/pull_request_template.md
--- old/.github/pull_request_template.md 2019-09-29 03:34:13.000000000
+0200
+++ new/.github/pull_request_template.md 2020-05-06 03:37:37.000000000
+0200
@@ -13,14 +13,10 @@
- [ ] Did you run `bundle exec rubocop -a` to fix linter issues?
- [ ] If relevant, did you create a test?
- [ ] Did you confirm that the RSpec tests pass?
-- [ ] If you are fixing a bug or introducing a new feature, did you add a
CHANGELOG entry?
### Other Information
If there's anything else that's important and relevant to your pull
request, mention that information here.
-If you are updating any of the CHANGELOG files or are asked to update the
-CHANGELOG files by reviewers, please add the CHANGELOG entry at the top of the
file where indicated.
-
Thanks for helping improve Capistrano!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gemfile new/Gemfile
--- old/Gemfile 2019-09-29 03:34:13.000000000 +0200
+++ new/Gemfile 2020-05-06 03:37:37.000000000 +0200
@@ -26,11 +26,16 @@
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"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/LICENSE.txt new/LICENSE.txt
--- old/LICENSE.txt 2019-09-29 03:34:13.000000000 +0200
+++ new/LICENSE.txt 2020-05-06 03:37:37.000000000 +0200
@@ -1,6 +1,6 @@
MIT License (MIT)
-Copyright (c) 2012-2019 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2019-09-29 03:34:13.000000000 +0200
+++ new/README.md 2020-05-06 03:37:37.000000000 +0200
@@ -107,7 +107,7 @@
``` ruby
group :development do
- gem "capistrano", "~> 3.11", require: false
+ gem "capistrano", "~> 3.14", require: false
end
```
@@ -200,7 +200,7 @@
MIT License (MIT)
-Copyright (c) 2012-2019 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/RELEASING.md new/RELEASING.md
--- old/RELEASING.md 2019-09-29 03:34:13.000000000 +0200
+++ new/RELEASING.md 2020-05-06 03:37:37.000000000 +0200
@@ -12,6 +12,6 @@
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`.
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 "Preparing vX.Y.Z"
+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
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/configuration/question.rb
new/lib/capistrano/configuration/question.rb
--- old/lib/capistrano/configuration/question.rb 2019-09-29
03:34:13.000000000 +0200
+++ new/lib/capistrano/configuration/question.rb 2020-05-06
03:37:37.000000000 +0200
@@ -49,7 +49,11 @@
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 @@
def stdin
(options || {}).fetch(:stdin, $stdin)
end
+
+ def prompt
+ (options || {}).fetch(:prompt, nil)
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/i18n.rb new/lib/capistrano/i18n.rb
--- old/lib/capistrano/i18n.rb 2019-09-29 03:34:13.000000000 +0200
+++ new/lib/capistrano/i18n.rb 2020-05-06 03:37:37.000000000 +0200
@@ -12,6 +12,8 @@
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}",
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 2019-09-29 03:34:13.000000000 +0200
+++ new/lib/capistrano/scm/git.rb 2020-05-06 03:37:37.000000000 +0200
@@ -18,6 +18,8 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/scm/tasks/git.rake
new/lib/capistrano/scm/tasks/git.rake
--- old/lib/capistrano/scm/tasks/git.rake 2019-09-29 03:34:13.000000000
+0200
+++ new/lib/capistrano/scm/tasks/git.rake 2020-05-06 03:37:37.000000000
+0200
@@ -4,9 +4,9 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/capistrano/templates/stage.rb.erb
new/lib/capistrano/templates/stage.rb.erb
--- old/lib/capistrano/templates/stage.rb.erb 2019-09-29 03:34:13.000000000
+0200
+++ new/lib/capistrano/templates/stage.rb.erb 2020-05-06 03:37:37.000000000
+0200
@@ -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)
# }
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 2019-09-29 03:34:13.000000000 +0200
+++ new/lib/capistrano/version.rb 2020-05-06 03:37:37.000000000 +0200
@@ -1,3 +1,3 @@
module Capistrano
- VERSION = "3.11.2".freeze
+ VERSION = "3.14.0".freeze
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2019-09-29 03:34:13.000000000 +0200
+++ new/metadata 2020-05-06 03:37:37.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: capistrano
version: !ruby/object:Gem::Version
- version: 3.11.2
+ version: 3.14.0
platform: ruby
authors:
- Tom Clements
@@ -9,7 +9,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: airbrussh
@@ -277,7 +277,7 @@
- !ruby/object:Gem::Version
version: '0'
requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
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/question_spec.rb
new/spec/lib/capistrano/configuration/question_spec.rb
--- old/spec/lib/capistrano/configuration/question_spec.rb 2019-09-29
03:34:13.000000000 +0200
+++ new/spec/lib/capistrano/configuration/question_spec.rb 2020-05-06
03:37:37.000000000 +0200
@@ -6,6 +6,8 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/lib/capistrano/scm/git_spec.rb
new/spec/lib/capistrano/scm/git_spec.rb
--- old/spec/lib/capistrano/scm/git_spec.rb 2019-09-29 03:34:13.000000000
+0200
+++ new/spec/lib/capistrano/scm/git_spec.rb 2020-05-06 03:37:37.000000000
+0200
@@ -36,6 +36,20 @@
subject.set_defaults
expect(env.fetch(:git_wrapper_path)).to
eq("/tmp/git-ssh-my_app-staging-(Git Web User) via ShipIt.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
describe "#git" do
