zypper-upgraderepo 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a50f5e64f656b77d574d69068ef2663d9387e9607b1a8f4fa54e4428caf980d
-  data.tar.gz: e0d52912c451b2d3fca3e230cbd601f1dde2ec8830ca2e7ebbee451b4f425844
+  metadata.gz: 7ceec1a1b9750d49b3c32863595d7b83c615dc140458a65a55dc93b115d5e3f3
+  data.tar.gz: 857477ddec8c0457e0082583a98a68de4ee62ebca1e4972a578fceb6ba74ca57
 SHA512:
-  metadata.gz: 46fab3ffa2117323ca0fc13bf51dd6f699a7af3b949abfef30ebd57323c54659760846fd1e3ae33b711171e8fd6b8d9c2db970631c401b97031486c8c45e718f
-  data.tar.gz: 576992e8186033757a0b5d6fc2cba6a9ac061c0862ceac78f9a799e7a7ab0135229dfd09f55334485a2bc919dd98d83bfe91d5936571e0daff0d152385deda68
+  metadata.gz: 490758a8241038010a130c18b97d926744e289d6fe82462647b2d7fe149143e2efbb78dafd1b50cf769cdcde3a3d31099da87743ac77990d4be8aa8017113e4f
+  data.tar.gz: 51731e28707401f36a825e34d06ecce3753bfd96fa03a14c35997a6113b1c62ddfd142b54df6d27d8f81863afb560964209a42f020e6ff2b693c1f201adc3d90

data/.rubocop.yml

@@ -0,0 +1,79 @@
+AllCops:
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  SuggestExtensions: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120
+
+Naming/FileName:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Lint/DuplicateBranch:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: true
+  Exclude:
+  - './lib/**/cli.rb'
+  - './lib/**/repository.rb'
+
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+  - '*.gemspec'
+  - './lib/**/cli.rb'
+  - './lib/**/repository.rb'
+  - './spec/**/*'
+
+Metrics/PerceivedComplexity:
+  Enabled: true
+  Exclude:
+  - './lib/**/upgraderepo.rb'
+  - './lib/**/repository.rb'
+  - './lib/**/view.rb'
+  - './lib/**/traversable.rb'
+
+Metrics/CyclomaticComplexity:
+  Enabled: true
+  Exclude:
+  - './lib/**/upgraderepo.rb'
+  - './lib/**/repository.rb'
+  - './lib/**/view.rb'
+  - './lib/**/traversable.rb'
+
+Lint/UriEscapeUnescape:
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: true
+  Exclude:
+  - './lib/**/local.rb'
+
+Style/MixinUsage:
+  Enabled: true
+  Exclude:
+  - './spec/**/*'
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  Exclude:
+  - './bin/*'
+  - './exe/*'

data/Gemfile

@@ -1,6 +1,18 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in zypper-upgraderepo.gemspec
 gemspec
+
+gem "rake", "~> 13.0"
+
+gem "rspec", "~> 3.0"
+
+gem "rubocop", "~> 1.21"
+
+gem "rubocop-rake", "~> 0.6.0"
+
+gem "rubocop-rspec", "~> 2.18"

data/Gemfile.lock

@@ -1,30 +1,63 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.7.1)
+    zypper-upgraderepo (1.9.0)
       iniparse
       minitar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.5.0)
+    ast (2.4.2)
+    diff-lcs (1.5.1)
     iniparse (1.5.0)
+    json (2.7.2)
     minitar (0.9)
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    parallel (1.24.0)
+    parser (3.3.2.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.0)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -33,6 +66,9 @@ DEPENDENCIES
   bundler (~> 2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
+  rubocop (~> 1.21)
+  rubocop-rake (~> 0.6.0)
+  rubocop-rspec (~> 2.18)
   zypper-upgraderepo!
 
 BUNDLED WITH

data/README.md

@@ -6,9 +6,12 @@ when possible.
 
 It can be also be installed as Zypper plugin using the [Zypper Upgraderepo Plugin][zypper_upgraderepo_plugin].
 
+[![Ruby](https://github.com/fabiomux/zypper-upgraderepo/actions/workflows/main.yml/badge.svg)][wf_main]
+[![Gem Version](https://badge.fury.io/rb/zypper-upgraderepo.svg)][gem_version]
+
 ## Installation
 
-There are several options to install the service menus listed in this repository.
+There are a couple of options to install this application.
 
 ### Rubygem
 
@@ -25,7 +28,7 @@ as a common RPM package:
 - install the package from Yast or Zypper.
 
 Being the repository URL slightly changing from a version to another, I included all the steps
-in the related [project page][project_page] on my blog.
+in the related [project page][project_page] at my blog.
 
 ## Usage
 
@@ -69,3 +72,5 @@ More info is available at:
 [project_page]: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html "Zypper-Upgraderepo project page"
 [zypper_upgraderepo_wiki]: https://github.com/fabiomux/zypper-upgraderepo/wiki "Zypper-Upgraderepo wiki page on GitHub"
 [upgrading_with_zypper]: https://freeaptitude.altervista.org/articles/upgrading-opensuse-with-zypper.html "Upgrading openSUSE with Zypper"
+[wf_main]: https://github.com/fabiomux/zypper-upgraderepo/actions/workflows/main.yml
+[gem_version]: https://badge.fury.io/rb/zypper-upgraderepo

data/Rakefile

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+task default: %i[spec rubocop]

data/lib/zypper/upgraderepo/cli.rb

@@ -1,25 +1,33 @@
-require 'optparse'
-require 'ostruct'
-require 'zypper/upgraderepo'
-require 'zypper/upgraderepo/version'
+# frozen_string_literal: true
 
-module Zypper
+require "optparse"
+require "zypper/upgraderepo"
+require "zypper/upgraderepo/version"
 
+module Zypper
   module Upgraderepo
-
+    CliOptions = Struct.new(
+      :operation, :backup_path, :only_enabled, :alias, :name, :hint,
+      :overrides, :version, :sorting_by, :view, :only_repo, :timeout,
+      :exit_on_fail, :overrides_filename, :only_invalid, :only_protocols,
+      :allow_unstable
+    )
+
+    #
+    # Parsing the input data.
+    #
     class OptParseMain
-
-      def self.parse(args)
-        options = OpenStruct.new
+      def self.parse(_args)
+        options = CliOptions.new
         options.operation = :check_current
-        options.backup_path = ENV['HOME']
+        options.backup_path = Dir.home
         options.only_enabled = false
         options.alias = true
         options.name = true
         options.hint = true
         options.overrides = {}
         options.version = nil
-        options.sort_by = :alias
+        options.sorting_by = :alias
         options.view = :table
         options.only_repo = nil
         options.timeout = 10.0
@@ -30,187 +38,189 @@ module Zypper
         options.allow_unstable = false
 
         opt_parser = OptionParser.new do |opt|
+          opt.banner = if ENV["ZYPPER_UPGRADEREPO"]
+                         "Usage: zypper upgraderepo [OPTIONS] [OPERATION]"
+                       else
+                         "Usage: upgraderepo [OPTIONS] [OPERATION]"
+                       end
 
-          if ENV['ZYPPER_UPGRADEREPO']
-            opt.banner = 'Usage: zypper upgraderepo [OPTIONS] [OPERATION]'
-          else
-            opt.banner = 'Usage: upgraderepo [OPTIONS] [OPERATION]'
-          end
+          opt.separator ""
+          opt.separator "Operations:"
 
-          opt.separator ''
-          opt.separator 'Operations:'
-
-          opt.on('-b', '--backup <PATH>', 'Create a Tar backup of all the repositories under PATH') do |o|
+          opt.on("-b", "--backup <PATH>", "Create a Tar backup of all the repositories under PATH") do |o|
             options.operation = :backup
             options.only_enabled = false
             options.backup_path = o
           end
 
-          opt.on('-c', '--check-current', 'Check the repositories for the current version (Default)') do |o|
+          opt.on("-c", "--check-current", "Check the repositories for the current version (Default)") do |_o|
             options.operation = :check_current
           end
 
-          opt.on('-n', '--check-next', 'Check the repositories for the next version') do |o|
+          opt.on("-n", "--check-next", "Check the repositories for the next version") do |_o|
             options.operation = :check_next
           end
 
-          opt.on('-C', '--check-for <VERSION>', 'Check for a custom VERSION') do |v|
+          opt.on("-C", "--check-for <VERSION>", "Check for a custom VERSION") do |v|
             options.version = v
             options.operation = :check_for
           end
 
-          opt.on('-l', '--check-last', 'Check the repositories for the last version') do |o|
+          opt.on("-l", "--check-last", "Check the repositories for the last version") do |_o|
             options.operation = :check_last
           end
 
-          opt.on('-R', '--reset', 'Reset the repositories to the current OS version.') do |v|
+          opt.on("-R", "--reset", "Reset the repositories to the current OS version.") do |_v|
             options.operation = :reset
           end
 
-          opt.on('-t', '--update', 'Update the repositories to the current OS version') do |v|
+          opt.on("-t", "--update", "Update the repositories to the current OS version") do |_v|
             options.operation = :update
           end
 
-          opt.on('-u', '--upgrade', 'Upgrade to the next version available') do |o|
+          opt.on("-u", "--upgrade", "Upgrade to the next version available") do |_o|
             options.operation = :upgrade_to_next
           end
 
-          opt.on('-U', '--upgrade-to <VERSION>', 'Upgrade to a specific VERSION') do |v|
+          opt.on("-U", "--upgrade-to <VERSION>", "Upgrade to a specific VERSION") do |v|
             options.version = v
             options.operation = :upgrade_to
           end
 
-          opt.on('-L', '--upgrade-to-last', 'Upgrade to the last version available') do |o|
+          opt.on("-L", "--upgrade-to-last", "Upgrade to the last version available") do |_o|
             options.operation = :upgrade_to_last
           end
 
-          opt.on('-s', '--status', 'Prints the version status of the current and available releases') do |o|
+          opt.on("-s", "--status", "Prints the version status of the current and available releases") do |_o|
             options.operation = :status
           end
 
-          opt.separator ''
-          opt.separator 'Options:'
+          opt.separator ""
+          opt.separator "Options:"
 
-          opt.on('--allow-unstable', 'Consider the unstable version as a valid release version') do |o|
+          opt.on("--allow-unstable", "Consider the unstable version as a valid release version") do |_o|
             options.allow_unstable = true
           end
 
-          opt.on('--no-name', 'Don\'t upgrade the name') do |o|
+          opt.on("--no-name", "Don't upgrade the name") do |_o|
             options.name = false
           end
 
-          opt.on('--no-alias', 'Don\'t upgrade the alias') do |o|
+          opt.on("--no-alias", "Don't upgrade the alias") do |_o|
             options.alias = false
           end
 
-          opt.on('--no-hint', 'Don\'t find a working URL when the current is invalid') do |o|
+          opt.on("--no-hint", "Don't find a working URL when the current is invalid") do |_o|
             options.hint = false
           end
 
-          opt.on('--override-url <NUMBER>,<URL>', Array, 'Overwrite the repository NUMBER with URL') do |r|
+          opt.on("--override-url <NUMBER>,<URL>", Array, "Overwrite the repository NUMBER with URL") do |r|
             options.overrides[r[0].to_i] = r[1]
           end
 
-          opt.on('--load-overrides <FILENAME>', 'Check the URLs in the exported FILENAME') do |f|
+          opt.on("--load-overrides <FILENAME>", "Check the URLs in the exported FILENAME") do |f|
             options.overrides_filename = f
           end
 
-          opt.on('--exit-on-fail', 'Exit with error when a repository upgrade check fails') do |o|
+          opt.on("--exit-on-fail", "Exit with error when a repository upgrade check fails") do |_o|
             options.exit_on_fail = true
           end
 
-          opt.on('--timeout <SECONDS>', "Adjust the waiting SECONDS used to catch an HTTP Timeout Error (Default: #{options.timeout})") do |o|
+          opt.on("--timeout <SECONDS>",
+                 "Adjust the waiting SECONDS used to catch an HTTP Timeout Error (Default: #{options.timeout})") do |o|
             options.timeout = o.to_f
           end
 
-          opt.separator ''
-          opt.separator 'Filter options:'
+          opt.separator ""
+          opt.separator "Filter options:"
 
-          opt.on('--only-enabled', 'Include only the enabled repositories') do |o|
+          opt.on("--only-enabled", "Include only the enabled repositories") do |_o|
             options.only_enabled = true
           end
 
-          opt.on('--only-repo <NUMBER|NAME|@ALIAS|#URL|&ANY>[,NUMBER2|NAME2|@ALIAS2|#URL2|&ANY2,...]', 'Include only the repositories specified by a NUMBER or a string matching the NAME, @ALIAS, #URL, or &ANY of them') do |o|
-            options.only_repo = o.split(',')
+          opt.on("--only-repo <NUMBER|NAME|@ALIAS|#URL|&ANY>[,NUMBER2|NAME2|@ALIAS2|#URL2|&ANY2,...]",
+                 "Include only the repositories specified by a NUMBER or a string matching the NAME, " \
+                 "@ALIAS, #URL, or &ANY of them") do |o|
+            options.only_repo = o.split(",")
           end
 
-          opt.on('--only-invalid', 'Show only invalid repositories') do |o|
+          opt.on("--only-invalid", "Show only invalid repositories") do |_o|
             options.only_invalid = true
           end
 
-          opt.on('--only-protocols <PROTOCOL>[,<PROTOCOL2>,...]', Array, "Show only from protocols (supported: #{Request.protocols.join(',')})") do |o|
+          opt.on("--only-protocols <PROTOCOL>[,<PROTOCOL2>,...]", Array,
+                 "Show only from protocols (supported: #{Request.protocols.join(",")})") do |o|
             options.only_protocols = o
           end
 
-          opt.separator ''
-          opt.separator 'View options:'
+          opt.separator ""
+          opt.separator "View options:"
 
-          opt.on('--sort-by-alias', 'Sort repositories by alias (Default)') do |o|
-            options.sort_by = :alias
+          opt.on("--sort-by-alias", "Sort repositories by alias (Default)") do |_o|
+            options.sorting_by = :alias
           end
 
-          opt.on('--sort-by-name', 'Sort repositories by name') do |o|
-            options.sort_by = :name
+          opt.on("--sort-by-name", "Sort repositories by name") do |_o|
+            options.sorting_by = :name
           end
 
-          opt.on('--sort-by-priority', 'Sort repositories by priority') do |o|
-            options.sort_by = :priority
+          opt.on("--sort-by-priority", "Sort repositories by priority") do |_o|
+            options.sorting_by = :priority
           end
 
-          opt.on('--ini', 'Output the result as INI format') do |o|
+          opt.on("--ini", "Output the result as INI format") do |_o|
             options.view = :ini
           end
 
-          opt.on('--quiet', 'Quiet mode, show only error messages') do |o|
+          opt.on("--quiet", "Quiet mode, show only error messages") do |_o|
             options.view = :quiet
           end
 
-          opt.on('--report', 'View the data as report') do |o|
+          opt.on("--report", "View the data as report") do |_o|
             options.view = :report
           end
 
-          opt.on('--solved', 'Output as INI with the suggestions for the invalid repositories applied') do |o|
+          opt.on("--solved", "Output as INI with the suggestions for the invalid repositories applied") do |_o|
             options.view = :solved
           end
 
-          unless ENV['ZYPPER_UPGRADEREPO']
-            opt.separator ''
-            opt.separator 'Other:'
+          unless ENV["ZYPPER_UPGRADEREPO"]
+            opt.separator ""
+            opt.separator "Other:"
 
-            opt.on_tail('-h', '--help', 'Show this message') do |o|
+            opt.on_tail("-h", "--help", "Show this message") do |_o|
               puts opt
               exit
             end
 
-            opt.on_tail('-v', '--version', 'Show version') do |o|
+            opt.on_tail("-v", "--version", "Show version") do |_o|
               puts VERSION
               exit
             end
           end
-
         end
 
         if ARGV.empty?
-          puts opt_parser; exit
+          puts opt_parser
+          exit
         else
           opt_parser.parse!(ARGV)
         end
 
         options
       end
-
     end
 
-
+    #
+    # Interface class to run the application.
+    #
     class CLI
       def self.start
-        begin
-          options = OptParseMain.parse(ARGV)
-          Upgraderepo::Builder.new(options).send(options.operation)
-         rescue => e
-           Messages.error e
-           exit e.error_code
-         end
+        options = OptParseMain.parse(ARGV)
+        Upgraderepo::Builder.new(options).send(options.operation)
+      rescue StandardError => e
+        Messages.error e
+        exit e.error_code
       end
     end
   end

data/lib/zypper/upgraderepo/os_release.rb

@@ -1,25 +1,29 @@
-require 'iniparse'
+# frozen_string_literal: true
+
+require "iniparse"
 
 module Zypper
   module Upgraderepo
-
-
+    #
+    # Detect the current and next release.
+    #
     class OsRelease
-
       attr_reader :custom, :unstable
 
-      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0', '15.1', '15.2', '15.3', '15.4']
+      OS_VERSIONS = ["13.1", "13.2",
+                     "42.1", "42.2", "42.3",
+                     "15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6"].freeze
 
-      UNSTABLE_VERSION = '15.5'
+      UNSTABLE_VERSION = "16.0"
 
-      OS_RELEASE_FILE = '/etc/os-release'
+      OS_RELEASE_FILE = "/etc/os-release"
 
-      SUSE_RELEASE_FILE = '/etc/SuSE-release'
+      SUSE_RELEASE_FILE = "/etc/SuSE-release"
 
       def initialize(options)
-
         if options.allow_unstable
           raise NoUnstableVersionAvailable if UNSTABLE_VERSION.empty?
+
           OS_VERSIONS << UNSTABLE_VERSION
           @unstable = true
         end
@@ -32,12 +36,12 @@ module Zypper
                   raise ReleaseFileNotFound
                 end
         @release = IniParse.parse(File.read(fname))
-        @current_idx = OS_VERSIONS.index(@release['__anonymous__']['VERSION'].delete('"'))
+        @current_idx = OS_VERSIONS.index(@release["__anonymous__"]["VERSION"].delete('"'))
 
-        if options.version
-          raise InvalidVersion, options.version unless OS_VERSIONS.include?(options.version)
-          @custom = options.version
-        end
+        return unless options.version
+        raise InvalidVersion, options.version unless OS_VERSIONS.include?(options.version)
+
+        @custom = options.version
       end
 
       def current
@@ -49,23 +53,19 @@ module Zypper
       end
 
       def next
-        unless last?
-          OS_VERSIONS[@current_idx.next]
-        else
-          nil
-        end
+        return if last?
+
+        OS_VERSIONS[@current_idx.next]
       end
 
       def previous
-        unless first?
-          OS_VERSIONS[@current_idx.pred]
-        else
-          nil
-        end
+        return if first?
+
+        OS_VERSIONS[@current_idx.pred]
       end
 
       def fullname
-        @release['__anonymous__']['PRETTY_NAME'].gsub(/"/, '')
+        @release["__anonymous__"]["PRETTY_NAME"].gsub(/"/, "")
       end
 
       def seniority
@@ -73,7 +73,7 @@ module Zypper
       end
 
       def newer
-        if seniority > 0
+        if seniority.positive?
           OS_VERSIONS[@current_idx.next..-1]
         else
           []
@@ -85,7 +85,7 @@ module Zypper
       end
 
       def first?
-        @current_idx == 0
+        @current_idx.zero?
       end
 
       def valid?(version)
@@ -96,7 +96,5 @@ module Zypper
         OS_VERSIONS.index(version) == @current_idx
       end
     end
-
-
   end
 end