Merge pull request #1610 from will-in-wi/rubocop_style_next

Enable Style/Next cop

Author: mikejohn857

.rubocop.yml

@@ -47,8 +47,6 @@ Style/AlignParameters:
   Enabled: false
 Style/IfUnlessModifier:
   Enabled: false
-Style/Next:
-  Enabled: false
 Style/Lambda:
   Enabled: false
 Style/EmptyLiteral:

lib/capistrano/tasks/deploy.rake

@@ -123,12 +123,11 @@ namespace :deploy do
         fetch(:linked_dirs).each do |dir|
           target = release_path.join(dir)
           source = shared_path.join(dir)
-          unless test "[ -L #{target} ]"
-            if test "[ -d #{target} ]"
-              execute :rm, "-rf", target
-            end
-            execute :ln, "-s", source, target
+          next if test "[ -L #{target} ]"
+          if test "[ -d #{target} ]"
+            execute :rm, "-rf", target
           end
+          execute :ln, "-s", source, target
         end
       end
     end
@@ -142,12 +141,11 @@ namespace :deploy do
         fetch(:linked_files).each do |file|
           target = release_path.join(file)
           source = shared_path.join(file)
-          unless test "[ -L #{target} ]"
-            if test "[ -f #{target} ]"
-              execute :rm, target
-            end
-            execute :ln, "-s", source, target
+          next if test "[ -L #{target} ]"
+          if test "[ -f #{target} ]"
+            execute :rm, target
           end
+          execute :ln, "-s", source, target
         end
       end
     end