Skip to content

Commit

Permalink
rubocop: fix loop warning
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Dec 28, 2023
1 parent daf8f26 commit 3d294b8
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 38 deletions.
16 changes: 0 additions & 16 deletions .rubocop.yml
Expand Up @@ -10,22 +10,6 @@ Naming/FileName:
Include:
- "library/*/src/lib/**/*.rb"

# TODO: enable it, just ENOTIME
# Offense count: 21
Lint/Loop:
Exclude:
- 'src/clients/files_auto.rb'
- 'src/clients/inst_autosetup.rb'
- 'src/clients/inst_autosetup_upgrade.rb'
- 'src/clients/report_auto.rb'
- 'src/clients/software_auto.rb'
- 'src/include/autoinstall/classes.rb'
- 'src/include/autoinstall/dialogs.rb'
- 'src/include/autoinstall/general_dialogs.rb'
- 'src/include/autoinstall/script_dialogs.rb'
- 'src/modules/Profile.rb'
- 'src/modules/ProfileLocation.rb'

# GeneralDialogs.AskDialog rules them all
Metrics/AbcSize:
Max: 455
Expand Down
20 changes: 12 additions & 8 deletions src/include/autoinstall/classes.rb
Expand Up @@ -123,7 +123,7 @@ def AddEditClasses(mode, name)
)
UI.ChangeWidget(Id(:name), :Enabled, false) if mode == :edit
ret = :none
begin
loop do
ret = Convert.to_symbol(UI.UserInput)
if ret == :save
if Convert.to_string(UI.QueryWidget(Id(:name), :Value)) == ""
Expand Down Expand Up @@ -172,7 +172,8 @@ def AddEditClasses(mode, name)
end
end
end
end until ret == :save || ret == :cancel
break if ret == :save || ret == :cancel
end

UI.CloseDialog

Expand Down Expand Up @@ -213,7 +214,7 @@ def ManageClasses

Wizard.HideAbortButton
ret = nil
begin
loop do
if Builtins.size(AutoinstClass.Classes) == 0
UI.ChangeWidget(Id(:edit), :Enabled, false)
UI.ChangeWidget(Id(:delete), :Enabled, false)
Expand Down Expand Up @@ -261,7 +262,8 @@ def ManageClasses

Wizard.SetContents(title, class_dialog_contents, help, true, true)
end
end until ret == :back || ret == :next
break if ret == :back || ret == :next
end

AutoinstClass.Save if ret == :next
Wizard.CloseDialog
Expand Down Expand Up @@ -479,7 +481,7 @@ def MergeDialog
Wizard.DisableNextButton

ret = nil
begin
loop do
ret = UI.UserInput
base = Convert.to_symbol(UI.QueryWidget(Id(:rbg), :CurrentButton))
n = 0
Expand Down Expand Up @@ -538,7 +540,8 @@ def MergeDialog

Wizard.EnableNextButton
end
end until ret == :next || ret == :back
break if ret == :next || ret == :back
end

Wizard.CloseDialog
Convert.to_symbol(ret)
Expand Down Expand Up @@ -591,7 +594,7 @@ def classConfiguration

ret = nil
_next = nil
begin
loop do
ret = UI.UserInput
n = 0
if ret == :next
Expand Down Expand Up @@ -624,7 +627,8 @@ def classConfiguration
Builtins.y2debug("Selected Profiles: %1", sorted_profiles)
AutoinstClass.profile_conf = deep_copy(sorted_profiles)
end
end until ret == :next || ret == :back
break if ret == :next || ret == :back
end
Convert.to_symbol(ret)
end
end
Expand Down
10 changes: 6 additions & 4 deletions src/include/autoinstall/dialogs.rb
Expand Up @@ -78,7 +78,7 @@ def Settings

changed = false
ret = :none
begin
loop do
ret = Convert.to_symbol(UI.UserInput)

new_rep = Convert.to_string(UI.QueryWidget(Id(:repository), :Value))
Expand Down Expand Up @@ -110,7 +110,8 @@ def Settings
AutoinstClass.classDirChanged(new_classdir)
end
end
end until ret == :back || ret == :next
break if ret == :back || ret == :next
end

Wizard.RestoreScreenShotName
AutoinstConfig.Save if changed
Expand Down Expand Up @@ -222,7 +223,7 @@ def cloneSystem
Wizard.SetNextButton(:next, Label.CreateButton)

ret = :none
begin
loop do
ret = Convert.to_symbol(UI.UserInput)
if ret == :next
AutoinstClone.additional = Convert.convert(
Expand All @@ -238,7 +239,8 @@ def cloneSystem
Profile.changed = true
Popup.ClearFeedback
end
end until ret == :next || ret == :back
break if ret == :next || ret == :back
end
Wizard.CloseDialog
ret
end
Expand Down
15 changes: 9 additions & 6 deletions src/include/autoinstall/general_dialogs.rb
Expand Up @@ -175,7 +175,7 @@ def ModeDialog
Wizard.SetNextButton(:next, Label.NextButton)

ret = nil
begin
loop do
ret = UI.UserInput
if ret == :next
confirm = Convert.to_boolean(UI.QueryWidget(Id(:confirm), :Value))
Expand Down Expand Up @@ -239,7 +239,8 @@ def ModeDialog
)
AutoinstGeneral.signature_handling = deep_copy(signature_handling)
end
end until ret == :next || ret == :back || ret == :cancel
break if ret == :next || ret == :back || ret == :cancel
end
Convert.to_symbol(ret)
end

Expand Down Expand Up @@ -384,7 +385,7 @@ def newQuestion(stage, dialog, askList, title, defaultValues)
UI.ChangeWidget(Id(:selValue), :Enabled, true)
UI.ChangeWidget(Id(:selection), :Enabled, true)
end
begin
loop do
if Builtins.size(
Convert.to_list(UI.QueryWidget(Id(:selection), :Items))
) == 0
Expand Down Expand Up @@ -529,7 +530,8 @@ def newQuestion(stage, dialog, askList, title, defaultValues)
end
end
end
end until ret == :abort || ret == :ok
break if ret == :abort || ret == :ok
end
UI.CloseDialog

deep_copy(askList)
Expand Down Expand Up @@ -716,7 +718,7 @@ def askDialog
ret = nil
dialog_id = -1
element_id = -1
begin
loop do
if Builtins.size(Convert.to_list(UI.QueryWidget(Id(:dialogs), :Items))) == 0
UI.ChangeWidget(Id(:addQuestion), :Enabled, false)
UI.ChangeWidget(Id(:editQuestion), :Enabled, false)
Expand Down Expand Up @@ -1063,7 +1065,8 @@ def askDialog
UI.ChangeWidget(Id(:dialogs), :CurrentItem, dialog_id)

AutoinstGeneral.askList = deep_copy(askList) if ret == :next
end until ret == :next || ret == :back || ret == :cancel
break if ret == :next || ret == :back || ret == :cancel
end
Convert.to_symbol(ret)
end

Expand Down
10 changes: 6 additions & 4 deletions src/include/autoinstall/script_dialogs.rb
Expand Up @@ -331,7 +331,7 @@ def ScriptDialog(mode, name)
UI.ChangeWidget(Id(:filename), :Enabled, false) if mode == :edit

ret = :none
begin
loop do
ret = Convert.to_symbol(UI.UserInput)
case ret
when :save
Expand Down Expand Up @@ -435,7 +435,8 @@ def ScriptDialog(mode, name)
else
UI.ChangeWidget(Id(:location), :Enabled, true)
end
end until ret == :save || ret == :cancel || ret == :back
break if ret == :save || ret == :cancel || ret == :back
end
ret
end

Expand All @@ -454,7 +455,7 @@ def ScriptsDialog
Wizard.HideAbortButton
Wizard.SetNextButton(:next, Label.FinishButton)
ret = nil
begin
loop do
ret = UI.UserInput

case ret
Expand Down Expand Up @@ -482,7 +483,8 @@ def ScriptsDialog
end
end
Wizard.SetContents(title, script_dialog_contents, help, true, true)
end until ret == :next || ret == :back || ret == :cancel
break if ret == :next || ret == :back || ret == :cancel
end

Convert.to_symbol(ret)
end
Expand Down

0 comments on commit 3d294b8

Please sign in to comment.