Make RuboCop happy

yast · Oct 20, 2021 · 11c7ba3 · 11c7ba3
1 parent 2b2c857
commit 11c7ba3
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 26 deletions.
diff --git a/devel/test_addon_selector.rb b/devel/test_addon_selector.rb
@@ -7,22 +7,55 @@
 require "y2packager/dialogs/addon_selector"
 
 new_repos = [
-  ["sle-basesystem-module", "Basesystem Module", "Basesystem-Module 15-0", "/Basesystem"],
-  ["sle-desktop-applications-module", "Desktop Applications Module", "Desktop-Applications-Module 15-0", "/Desktop-Applications"],
-  ["sle-desktop-productivity-module", "Desktop Productivity Module", "Desktop-Productivity-Module 15-0", "/Desktop-Productivity"],
-  ["sle-development-module", "Development Tools Module", "Development-Tools-Module 15-0", "/Development-Tools"],
-  ["sle-ha-module", "High Availability Module", "HA-Module 15-0", "/HA"],
-  ["sle-hpc-module", "High Performance Computing Module", "HPC-Module 15-0", "/HPC"],
-  ["sle-legacy-module", "Legacy Module", "Legacy-Module 15-0", "/Legacy"],
-  ["sle-public-cloud-module", "Public Cloud Module", "Public-Cloud-Module 15-0", "/Public-Cloud"],
-  ["sle-sap-applications-module", "SAP Applications Module", "SAP-Applications-Module 15-0", "/SAP-Applications"],
-  ["sle-scripting-module", "Scripting Module", "Scripting-Module 15-0", "/Scripting"],
-  ["sle-server-applications-module", "Server Applications Module", "Server-Applications-Module 15-0", "/Server-Applications"]
+  [
+    "sle-basesystem-module", "Basesystem Module",
+    "Basesystem-Module 15-0", "/Basesystem"
+  ],
+  [
+    "sle-desktop-applications-module", "Desktop Applications Module",
+    "Desktop-Applications-Module 15-0", "/Desktop-Applications"
+  ],
+  [
+    "sle-desktop-productivity-module", "Desktop Productivity Module",
+    "Desktop-Productivity-Module 15-0", "/Desktop-Productivity"
+  ],
+  [
+    "sle-development-module", "Development Tools Module",
+    "Development-Tools-Module 15-0", "/Development-Tools"
+  ],
+  [
+    "sle-ha-module", "High Availability Module",
+    "HA-Module 15-0", "/HA"
+  ],
+  [
+    "sle-hpc-module", "High Performance Computing Module",
+    "HPC-Module 15-0", "/HPC"
+  ],
+  [
+    "sle-legacy-module", "Legacy Module",
+    "Legacy-Module 15-0", "/Legacy"
+  ],
+  [
+    "sle-public-cloud-module", "Public Cloud Module",
+    "Public-Cloud-Module 15-0", "/Public-Cloud"
+  ],
+  [
+    "sle-sap-applications-module", "SAP Applications Module",
+    "SAP-Applications-Module 15-0", "/SAP-Applications"
+  ],
+  [
+    "sle-scripting-module", "Scripting Module",
+    "Scripting-Module 15-0", "/Scripting"
+  ],
+  [
+    "sle-server-applications-module", "Server Applications Module",
+    "Server-Applications-Module 15-0", "/Server-Applications"
+  ]
 ]
 
 puts "Repositories to select: " + new_repos.inspect
 
-products = new_repos.map do |name, display_name, media_name, dir|
+products = new_repos.map do |name, display_name, _media_name, dir|
   Y2Packager::RepoProductSpec.new(
     name: name, display_name: display_name, media_name: display_name, dir: dir, base: false
   )

diff --git a/src/include/packager/repositories_include.rb b/src/include/packager/repositories_include.rb
@@ -388,7 +388,7 @@ def scan_products(_expanded_url, original_url)
 
         found_products << Y2Packager::RepoProductSpec.new(
           name: url_path, # FIXME: how is this addon selected?
-          dir: "/"
+          dir:  "/"
         )
       end
 

diff --git a/src/lib/y2packager/clients/inst_repositories_initialization.rb b/src/lib/y2packager/clients/inst_repositories_initialization.rb
@@ -110,7 +110,9 @@ def init_installation_repositories
       # @see Yast::WorkflowManager.merge_product_workflow
       def merge_and_run_workflow
         Yast::WorkflowManager.SetBaseWorkflow(false)
-        Yast::WorkflowManager.merge_product_workflow(Y2Packager::ProductSpec.selected_base.to_product)
+        Yast::WorkflowManager.merge_product_workflow(
+          Y2Packager::ProductSpec.selected_base.to_product
+        )
         Yast::ProductControl.RunFrom(Yast::ProductControl.CurrentStep + 1, true)
       end
 

diff --git a/src/lib/y2packager/repo_product_spec.rb b/src/lib/y2packager/repo_product_spec.rb
@@ -50,12 +50,12 @@ class RepoProductSpec < ProductSpec
     def initialize(name:, version: nil, arch: nil, display_name: nil, order: nil, base: true,
       depends_on: [], dir:, media_name: nil, description: nil)
       super(
-        name: name,
-        version: version,
+        name:         name,
+        version:      version,
         display_name: display_name,
-        arch: arch || Yast::Arch.architecture,
-        order: order,
-        base: base
+        arch:         arch || Yast::Arch.architecture,
+        order:        order,
+        base:         base
       )
 
       @depends_on = depends_on

diff --git a/test/addon_selector_test.rb b/test/addon_selector_test.rb
@@ -8,10 +8,10 @@
 describe Y2Packager::Dialogs::AddonSelector do
   let(:media_products) do
     [
-      Y2Packager::RepoProductSpec.new(name: "SLE-15-Module-Basesystem 15.3-0",
-        dir: "/Basesystem", name: "sle-module-basesystem", base: false),
-      Y2Packager::RepoProductSpec.new(name: "SLE-15-Module-Legacy 15.3-0",
-        dir: "/Legacy", name: "sle-module-legacy", base: false)
+      Y2Packager::RepoProductSpec.new(name: "sle-module-basesystem", dir: "/Basesystem",
+        base: false, media_name: "SLE-15-Module-Basesystem 15.3-0"),
+      Y2Packager::RepoProductSpec.new(name: "sle-module-legacy", dir: "/Legacy",
+        base: false, media_name: "SLE-15-Module-Legacy 15.3-0")
     ]
   end
 

diff --git a/test/lib/repo_product_spec_test.rb b/test/lib/repo_product_spec_test.rb
@@ -28,7 +28,7 @@
       version: "15.3", order: 1, base: true, depends_on: [], dir: "/SLES-15.3",
       media_name: "Basesystem-Module 15.3-0", description: "Basesystem Description"
     )
-    end
+  end
 
   describe ".new" do
     before do
@@ -38,8 +38,8 @@
     context "when only name and dir are specified" do
       it "sets default values" do
         product_spec = described_class.new(
-          name: "sle-module-basesystem",
-          dir: "/Basesystem-Module",
+          name:       "sle-module-basesystem",
+          dir:        "/Basesystem-Module",
           media_name: "Basesystem-Module 15.3-0"
         )
         expect(product_spec.name).to eq("sle-module-basesystem")