mirror of
https://github.com/capistrano/capistrano
synced 2023-03-27 23:21:18 -04:00
fixes most of #1404
remaining: lib/capistrano/configuration/question.rb:41:7: W: Do not suppress exceptions. rescue Errno::EIO ^^^^^^^^^^^^^^^^^ spec/support/Vagrantfile:8:47: W: Shadowing outer local variable - config. config.vm.define(role, primary: true) do |config| ^^^^^^
This commit is contained in:
parent
07ceeececb
commit
62246c997c
16 changed files with 35 additions and 30 deletions
|
@ -50,26 +50,26 @@ end
|
|||
|
||||
Then(/^the deploy\.rb file is created$/) do
|
||||
file = TestApp.test_app_path.join('config/deploy.rb')
|
||||
expect(File.exists?(file)).to be true
|
||||
expect(File.exist?(file)).to be true
|
||||
end
|
||||
|
||||
Then(/^the default stage files are created$/) do
|
||||
staging = TestApp.test_app_path.join('config/deploy/staging.rb')
|
||||
production = TestApp.test_app_path.join('config/deploy/production.rb')
|
||||
expect(File.exists?(staging)).to be true
|
||||
expect(File.exists?(production)).to be true
|
||||
expect(File.exist?(staging)).to be true
|
||||
expect(File.exist?(production)).to be true
|
||||
end
|
||||
|
||||
Then(/^the tasks folder is created$/) do
|
||||
path = TestApp.test_app_path.join('lib/capistrano/tasks')
|
||||
expect(Dir.exists?(path)).to be true
|
||||
expect(Dir.exist?(path)).to be true
|
||||
end
|
||||
|
||||
Then(/^the specified stage files are created$/) do
|
||||
qa = TestApp.test_app_path.join('config/deploy/qa.rb')
|
||||
production = TestApp.test_app_path.join('config/deploy/production.rb')
|
||||
expect(File.exists?(qa)).to be true
|
||||
expect(File.exists?(production)).to be true
|
||||
expect(File.exist?(qa)).to be true
|
||||
expect(File.exist?(production)).to be true
|
||||
end
|
||||
|
||||
Then(/^it creates the file with the remote_task prerequisite$/) do
|
||||
|
|
|
@ -15,7 +15,7 @@ module RemoteCommandHelpers
|
|||
%{[ -#{type} "#{path}" ]}
|
||||
end
|
||||
|
||||
def safely_remove_file(path)
|
||||
def safely_remove_file(_path)
|
||||
run_vagrant_command("rm #{test_file}") rescue VagrantHelpers::VagrantSSHCommandError
|
||||
end
|
||||
end
|
||||
|
|
|
@ -63,7 +63,8 @@ module Capistrano
|
|||
|
||||
def display_error_message(ex)
|
||||
unless options.backtrace
|
||||
if loc = Rake.application.find_rakefile_location
|
||||
loc = Rake.application.find_rakefile_location
|
||||
if loc
|
||||
whitelist = (@imported.dup << loc[0]).map{|f| File.absolute_path(f, loc[1])}
|
||||
pattern = %r@^(?!#{whitelist.map{|p| Regexp.quote(p)}.join('|')})@
|
||||
Rake.application.options.suppress_backtrace_pattern = pattern
|
||||
|
@ -101,7 +102,7 @@ module Capistrano
|
|||
def version
|
||||
['--version', '-V',
|
||||
"Display the program version.",
|
||||
lambda { |value|
|
||||
lambda { |_value|
|
||||
puts "Capistrano Version: #{Capistrano::VERSION} (Rake Version: #{RAKEVERSION})"
|
||||
exit
|
||||
}
|
||||
|
@ -111,7 +112,7 @@ module Capistrano
|
|||
def dry_run
|
||||
['--dry-run', '-n',
|
||||
"Do a dry run without executing actions",
|
||||
lambda { |value|
|
||||
lambda { |_value|
|
||||
Configuration.env.set(:sshkit_backend, SSHKit::Backend::Printer)
|
||||
}
|
||||
]
|
||||
|
|
|
@ -98,7 +98,7 @@ module Capistrano
|
|||
@properties[key]
|
||||
end
|
||||
|
||||
def respond_to?(method, include_all=false)
|
||||
def respond_to?(method, _include_all=false)
|
||||
@properties.has_key?(method)
|
||||
end
|
||||
|
||||
|
|
|
@ -9,7 +9,8 @@ module Capistrano
|
|||
|
||||
def add_host(host, properties={})
|
||||
new_host = Server[host]
|
||||
if server = servers.find { |s| s.matches? new_host }
|
||||
server = servers.find { |s| s.matches? new_host }
|
||||
if server
|
||||
server.user = new_host.user if new_host.user
|
||||
server.port = new_host.port if new_host.port
|
||||
server.with(properties)
|
||||
|
|
|
@ -8,7 +8,7 @@ class Capistrano::Git < Capistrano::SCM
|
|||
#
|
||||
def git(*args)
|
||||
args.unshift :git
|
||||
context.execute *args
|
||||
context.execute(*args)
|
||||
end
|
||||
|
||||
# The Capistrano default strategy for git. You should want to use this.
|
||||
|
@ -30,7 +30,8 @@ class Capistrano::Git < Capistrano::SCM
|
|||
end
|
||||
|
||||
def release
|
||||
if tree = fetch(:repo_tree)
|
||||
tree = fetch(:repo_tree)
|
||||
if tree
|
||||
tree = tree.slice %r#^/?(.*?)/?$#, 1
|
||||
components = tree.split('/').size
|
||||
git :archive, fetch(:branch), tree, "| tar -x --strip-components #{components} -f - -C", release_path
|
||||
|
|
|
@ -6,7 +6,7 @@ class Capistrano::Hg < Capistrano::SCM
|
|||
# execute hg in context with arguments
|
||||
def hg(*args)
|
||||
args.unshift(:hg)
|
||||
context.execute *args
|
||||
context.execute(*args)
|
||||
end
|
||||
|
||||
module DefaultStrategy
|
||||
|
@ -27,7 +27,8 @@ class Capistrano::Hg < Capistrano::SCM
|
|||
end
|
||||
|
||||
def release
|
||||
if tree = fetch(:repo_tree)
|
||||
tree = fetch(:repo_tree)
|
||||
if tree
|
||||
tree = tree.slice %r#^/?(.*?)/?$#, 1
|
||||
components = tree.split('/').size
|
||||
hg "archive --type tgz -p . -I", tree, "--rev", fetch(:branch), "| tar -x --strip-components #{components} -f - -C", release_path
|
||||
|
|
|
@ -25,7 +25,7 @@ module Capistrano
|
|||
|
||||
# Call test in context
|
||||
def test!(*args)
|
||||
context.test *args
|
||||
context.test(*args)
|
||||
end
|
||||
|
||||
# The repository URL according to the context
|
||||
|
|
|
@ -3,13 +3,13 @@ load File.expand_path("../tasks/svn.rake", __FILE__)
|
|||
require 'capistrano/scm'
|
||||
|
||||
class Capistrano::Svn < Capistrano::SCM
|
||||
|
||||
|
||||
# execute svn in context with arguments
|
||||
def svn(*args)
|
||||
args.unshift(:svn)
|
||||
args.push "--username #{fetch(:svn_username)}" if fetch(:svn_username)
|
||||
args.push "--password #{fetch(:svn_password)}" if fetch(:svn_password)
|
||||
context.execute *args
|
||||
context.execute(*args)
|
||||
end
|
||||
|
||||
module DefaultStrategy
|
||||
|
|
|
@ -5,7 +5,8 @@ task :console do
|
|||
loop do
|
||||
print "#{stage}> "
|
||||
|
||||
if input = $stdin.gets
|
||||
input = $stdin.gets
|
||||
if input
|
||||
command = input.chomp
|
||||
else
|
||||
command = 'exit'
|
||||
|
|
|
@ -59,7 +59,7 @@ namespace :deploy do
|
|||
desc 'Check directories of files to be linked exist in shared'
|
||||
task :make_linked_dirs do
|
||||
next unless any? :linked_files
|
||||
on release_roles :all do |host|
|
||||
on release_roles :all do
|
||||
execute :mkdir, '-p', linked_file_dirs(shared_path)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,7 +18,7 @@ task :install do
|
|||
entries += envs.split(',').map { |stage| {template: stage_rb, file: deploy_dir.join("#{stage}.rb")} }
|
||||
|
||||
entries.each do |entry|
|
||||
if File.exists?(entry[:file])
|
||||
if File.exist?(entry[:file])
|
||||
warn "[skip] #{entry[:file]} already exists"
|
||||
else
|
||||
File.open(entry[:file], 'w+') do |f|
|
||||
|
@ -30,7 +30,7 @@ task :install do
|
|||
|
||||
mkdir_p tasks_dir
|
||||
|
||||
if File.exists?('Capfile')
|
||||
if File.exist?('Capfile')
|
||||
warn "[skip] Capfile already exists"
|
||||
else
|
||||
FileUtils.cp(capfile, 'Capfile')
|
||||
|
|
|
@ -34,7 +34,7 @@ describe Capistrano::Application do
|
|||
end
|
||||
|
||||
it "overrides the rake method, and sets the sshkit_backend to SSHKit::Backend::Printer" do
|
||||
out, _ = capture_io do
|
||||
_out, _ = capture_io do
|
||||
flags '--dry-run', '-n'
|
||||
end
|
||||
sshkit_backend = Capistrano::Configuration.fetch(:sshkit_backend)
|
||||
|
@ -51,7 +51,7 @@ describe Capistrano::Application do
|
|||
|
||||
def command_line(*options)
|
||||
options.each { |opt| ARGV << opt }
|
||||
def subject.exit(*args)
|
||||
def subject.exit(*_args)
|
||||
throw(:system_exit, :exit)
|
||||
end
|
||||
subject.run
|
||||
|
|
|
@ -13,7 +13,7 @@ module Capistrano
|
|||
describe '#new' do
|
||||
it "won't create an invalid type of filter" do
|
||||
expect {
|
||||
f = Filter.new(:zarg)
|
||||
Filter.new(:zarg)
|
||||
}.to raise_error RuntimeError
|
||||
end
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ module Capistrano
|
|||
|
||||
let(:order) { [] }
|
||||
let!(:task) do
|
||||
Rake::Task.define_task('task', [:order]) do |t, args|
|
||||
Rake::Task.define_task('task', [:order]) do |_, args|
|
||||
args['order'].push 'task'
|
||||
end
|
||||
end
|
||||
|
@ -67,11 +67,11 @@ module Capistrano
|
|||
end
|
||||
|
||||
it 'invokes in proper order and with arguments and block' do
|
||||
task_enhancements.after('task', 'after_task_custom', :order) do |t, args|
|
||||
task_enhancements.after('task', 'after_task_custom', :order) do
|
||||
order.push 'after_task'
|
||||
end
|
||||
|
||||
task_enhancements.before('task', 'before_task_custom', :order) do |t, args|
|
||||
task_enhancements.before('task', 'before_task_custom', :order) do
|
||||
order.push 'before_task'
|
||||
end
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ task :am_i_root do
|
|||
ident = capture :id, '-a'
|
||||
info "I am #{ident}"
|
||||
end
|
||||
on roles(:all) do |host|
|
||||
on roles(:all) do
|
||||
ident = capture :id, '-a'
|
||||
info "I am #{ident}"
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue