Merge pull request #1780 from mattbrictson/rubocop-43

Fix guard-clause warnings reported by RuboCop 0.43

features/support/vagrant_helpers.rb

@@ -25,11 +25,9 @@ module VagrantHelpers
   end
 
   def run_vagrant_command(command)
-    if (status = vagrant_cli_command("ssh -c #{command.inspect}")).success?
+    status = vagrant_cli_command("ssh -c #{command.inspect}")
-      true
+    return true if status.success?
-    else
+    raise VagrantSSHCommandError, status
-      raise VagrantSSHCommandError, status
-    end
   end
 end
 

lib/capistrano/configuration/validated_variables.rb

@@ -91,10 +91,9 @@ module Capistrano
       end
 
       def assert_value_or_block_not_both(value, block)
-        unless value.nil? || block.nil?
+        return if value.nil? || block.nil?
-          raise Capistrano::ValidationError,
+        raise Capistrano::ValidationError,
-                "Value and block both passed to Configuration#set"
+              "Value and block both passed to Configuration#set"
-        end
       end
 
       class ValidatedQuestion < Question

lib/capistrano/version_validator.rb

@@ -5,11 +5,8 @@ module Capistrano
     end
 
     def verify
-      if match?
+      return self if match?
-        self
+      raise "Capfile locked at #{version}, but #{current_version} is loaded"
-      else
-        raise "Capfile locked at #{version}, but #{current_version} is loaded"
-      end
     end
 
     private