rubocop: fixed "Use next to skip iteration"

yast · Nov 26, 2014 · dbe92c4 · dbe92c4
1 parent 0c59678
commit dbe92c4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -70,11 +70,6 @@ Style/MultilineOperationIndentation:
 Style/NegatedIf:
   Enabled: false
 
-# Offense count: 4
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Enabled: false
-
 Style/NumericLiterals:
   MinDigits: 6
 

diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -160,11 +160,11 @@ def register_base_system
           ret = nil unless Popup.ConfirmAbort(:painless)
         end
 
-        if ret == :skip && confirm_skipping
-          log.info "Skipping registration on user request"
-          @registration_skipped = true
-          return ret
-        end
+        next unless ret == :skip && confirm_skipping
+
+        log.info "Skipping registration on user request"
+        @registration_skipped = true
+        return ret
       end
 
       ret

diff --git a/src/lib/registration/sw_mgmt.rb b/src/lib/registration/sw_mgmt.rb
@@ -255,14 +255,14 @@ def self.set_repos_state(repos, enabled)
       return if enabled.nil?
 
       repos.each do |repo|
-        if repo["enabled"] != enabled
-          # remember the original state
-          repo_state = RepoState.new(repo["SrcId"], repo["enabled"])
-          RepoStateStorage.instance.repositories << repo_state
+        next if repo["enabled"] == enabled
 
-          log.info "Changing repository state: #{repo["name"]} enabled: #{enabled}"
-          Pkg.SourceSetEnabled(repo["SrcId"], enabled)
-        end
+        # remember the original state
+        repo_state = RepoState.new(repo["SrcId"], repo["enabled"])
+        RepoStateStorage.instance.repositories << repo_state
+
+        log.info "Changing repository state: #{repo["name"]} enabled: #{enabled}"
+        Pkg.SourceSetEnabled(repo["SrcId"], enabled)
       end
     end
 

diff --git a/src/lib/registration/ui/addon_eula_dialog.rb b/src/lib/registration/ui/addon_eula_dialog.rb
@@ -48,12 +48,13 @@ def run
         eula_ret = :accepted
 
         addons.each do |addon|
-          if addon.eula_url && !addon.eula_url.empty?
-            log.info "Addon '#{addon.name}' has an EULA at #{addon.eula_url}"
-            eula_ret = accept_eula(addon)
-            # any declined license needs to be handled separately
-            break if eula_ret != :accepted
-          end
+          next unless addon.eula_url && !addon.eula_url.empty?
+
+          log.info "Addon '#{addon.name}' has an EULA at #{addon.eula_url}"
+          eula_ret = accept_eula(addon)
+
+          # any declined license needs to be handled separately
+          break if eula_ret != :accepted
         end
 
         # go back or abort if any EULA has not been accepted, let the user

diff --git a/src/lib/registration/ui/local_server_dialog.rb b/src/lib/registration/ui/local_server_dialog.rb
@@ -54,11 +54,11 @@ def handle_dialog
           ui = Yast::UI.UserInput
           log.info "User input: #{ui}"
 
-          if ui == :ok && !valid_url?
-            # error message, the entered URL is not valid
-            Yast::Report.Error(_("Invalid URL."))
-            ui = nil
-          end
+          next unless ui == :ok && !valid_url?
+
+          # error message, the entered URL is not valid
+          Yast::Report.Error(_("Invalid URL."))
+          ui = nil
         end
 
         (ui == :ok) ? Yast::UI.QueryWidget(Id(:url), :Value) : nil