mirror of
https://github.com/capistrano/capistrano
synced 2023-03-27 23:21:18 -04:00
Fix guard-clause warnings reported by RuboCop 0.43
This commit is contained in:
parent
289787aba2
commit
c1ae23dd00
3 changed files with 8 additions and 14 deletions
|
@ -25,11 +25,9 @@ module VagrantHelpers
|
|||
end
|
||||
|
||||
def run_vagrant_command(command)
|
||||
if (status = vagrant_cli_command("ssh -c #{command.inspect}")).success?
|
||||
true
|
||||
else
|
||||
raise VagrantSSHCommandError, status
|
||||
end
|
||||
status = vagrant_cli_command("ssh -c #{command.inspect}")
|
||||
return true if status.success?
|
||||
raise VagrantSSHCommandError, status
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -91,10 +91,9 @@ module Capistrano
|
|||
end
|
||||
|
||||
def assert_value_or_block_not_both(value, block)
|
||||
unless value.nil? || block.nil?
|
||||
raise Capistrano::ValidationError,
|
||||
"Value and block both passed to Configuration#set"
|
||||
end
|
||||
return if value.nil? || block.nil?
|
||||
raise Capistrano::ValidationError,
|
||||
"Value and block both passed to Configuration#set"
|
||||
end
|
||||
|
||||
class ValidatedQuestion < Question
|
||||
|
|
|
@ -5,11 +5,8 @@ module Capistrano
|
|||
end
|
||||
|
||||
def verify
|
||||
if match?
|
||||
self
|
||||
else
|
||||
raise "Capfile locked at #{version}, but #{current_version} is loaded"
|
||||
end
|
||||
return self if match?
|
||||
raise "Capfile locked at #{version}, but #{current_version} is loaded"
|
||||
end
|
||||
|
||||
private
|
||||
|
|
Loading…
Reference in a new issue