zypper-upgraderepo 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ebc8e9633b6f8316573b56759c1044bd9db702cd4a2289508665420935e054
-  data.tar.gz: 89effc0e8a22e7f1019a2ac29337e5882b518f1c0de9dc7844b72cac0fa36608
+  metadata.gz: e33496c6f52e625ef76cdb05a0428921a5b382398a081d8c2e180d2d6954f11c
+  data.tar.gz: 1c2b1ec8862bc2d7e601ee7f81d69ccc0f40a57e5de7b9c2650ae375147cfb40
 SHA512:
-  metadata.gz: 36dcbddb43e6ec7ede6aace2f03f2ed2be72c0e870c54252cbeec70c0715daf91d88bd3868e9936b3f60d77ced08df655987428fcc13bb15d3fc094913e8ee47
-  data.tar.gz: 10bb399234182d2705e9e498891d67c3727a5f4de68ef40166451e3e9dfd4275cb3fe788fa83254917172f18baf7921d5909c7331a659c9d7e4104ed066f6ebf
+  metadata.gz: 1a99ec07a90c68575998a9fdefe6b7dca5faa3fcf60ccd9c3f48b5897a05917f37ff7dfdbb32af2f5ff700bf2036656ee5850d56894837c410002ddc44bf0ce0
+  data.tar.gz: a958c51806aa971129fb1da35fb693dd3438254831ed7894c745344941146ff83c5d858882c8c09e6c12f521f636ba7879d9f26da54eb0fc80e8a83f356b09ee

data/.rubocop.yml

@@ -1,11 +1,12 @@
+# plugins:
+  # - rubocop-rake
+  # - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
   SuggestExtensions: false
 
-Style/ClassVars:
-  Enabled: false
-
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
@@ -17,64 +18,33 @@ Style/StringLiteralsInInterpolation:
 Layout/LineLength:
   Max: 120
 
-Naming/FileName:
-  Enabled: false
-
 Metrics/MethodLength:
-  Enabled: false
+  Exclude:
+    - './lib/**/view.rb'
+    - './lib/**/cli.rb'
+    - './lib/**/traversable.rb'
 
 Metrics/AbcSize:
-  Enabled: false
-
-Lint/DuplicateBranch:
-  Enabled: false
+  Exclude:
+    - './lib/**/view.rb'
+    - './lib/**/traversable.rb'
+    - './lib/**/cli.rb'
 
 Metrics/ClassLength:
-  Enabled: true
   Exclude:
-  - './lib/**/cli.rb'
-  - './lib/**/repository.rb'
-  - './lib/**/upgraderepo.rb'
+    - './lib/**/cli.rb'
+    - './lib/**/upgraderepo.rb'
 
 Metrics/BlockLength:
-  Enabled: true
   Exclude:
-  - '*.gemspec'
-  - './lib/**/cli.rb'
-  - './lib/**/repository.rb'
-  - './spec/**/*'
+    - './lib/**/cli.rb'
 
 Metrics/PerceivedComplexity:
-  Enabled: true
   Exclude:
-  - './lib/**/upgraderepo.rb'
-  - './lib/**/repository.rb'
-  - './lib/**/view.rb'
-  - './lib/**/traversable.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/*'
+    - './lib/**/view.rb'
+    - './lib/**/traversable.rb'

data/Gemfile

@@ -7,6 +7,8 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in zypper-upgraderepo.gemspec
 gemspec
 
+gem "bundler", "~> 2.0"
+
 gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,66 +1,78 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.10.0)
+    zypper-upgraderepo (1.12.0)
       iniparse
       minitar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    diff-lcs (1.5.1)
+    ast (2.4.3)
+    diff-lcs (1.6.2)
     iniparse (1.5.0)
-    json (2.7.2)
-    minitar (0.9)
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    json (2.18.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    minitar (1.1.0)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    prism (1.6.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.0)
-      strscan
-    rspec (3.13.0)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.50.2)
+    rspec-support (3.13.6)
+    rubocop (1.82.0)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       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)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.48.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)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.48.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.28.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.31.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    strscan (3.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux-gnu
 
 DEPENDENCIES
   bundler (~> 2.0)
@@ -72,4 +84,4 @@ DEPENDENCIES
   zypper-upgraderepo!
 
 BUNDLED WITH
-   2.4.3
+   2.4.22

data/README.md

@@ -1,7 +1,7 @@
 # Zypper-Upgraderepo
 
-Zypper-Upgraderepo helps to check and upgrade the repositories used in your system for the
-current, next or a custom valid version, reporting the errors and trying to find a replacement
+Zypper-Upgraderepo helps to check and upgrade the configured repositories validating or looking for the
+current, next or a custom valid version, reporting the errors and trying to find an alternative URL
 when possible.
 
 It can be also be installed as Zypper plugin using the [Zypper Upgraderepo Plugin][zypper_upgraderepo_plugin].
@@ -32,24 +32,24 @@ in the related [project page][project_page] at my blog.
 
 ## Usage
 
-***Warning!!! The executables name prior the 1.8.0 version is zypper-upgraderepo, unfortunately the
-RPM package installation introduces annoying copies of the same executable having a version appended
-(zypper-upgraderepo.version, zypper-upgraderepo.rubyversion, zypper-upgraderepo.rubyversion.version)
+**Warning!!! The executables name prior the 1.8.0 version was zypper-upgraderepo, unfortunately the
+RPM package installation introduces annoying copies of the same executable with a Ruby version appended
+(zypper-upgraderepo.*version*, zypper-upgraderepo.*rubyversion*, zypper-upgraderepo.*rubyversion*.*version*)
 interpreted by zypper itself as different subcommands. So I considered more convenient to remove the
 zypper prefix from the original executable and let the sole zypper-upgraderepo-plugin package install
-it as a zypper plugin.***
+it as a zypper plugin.**
 
-To check the availability of the current repositories:
+To check the availability of the **current** repositories:
 ```shell
 $ upgraderepo
 ```
 
-To check the availability of the next version repositories:
+To check the availability of the **next** version repositories:
 ```shell
 $ upgraderepo --check-next
 ```
 
-To upgrade the repositories to the next version:
+To **upgrade** the repositories to the next version:
 ```shell
 $ sudo upgraderepo --upgrade
 ```
@@ -64,8 +64,8 @@ $ upgraderepo --help
 ## More Help:
 
 More info is available at:
-- the [Zypper-Upgraderepo GitHub wiki][zypper_upgraderepo_wiki];
-- the article [Upgrading with Zypper][upgrading_with_zypper] on Freeaptitude blog.
+- The [Zypper-Upgraderepo GitHub wiki][zypper_upgraderepo_wiki];
+- The [Upgrading with Zypper][upgrading_with_zypper] article on Freeaptitude blog.
 
 
 [zypper_upgraderepo_plugin]: https://github.com/fabiomux/zypper-upgraderepo-plugin "Zypper-Upgraderepo Plugin GitHub page"

data/bin/console

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require "bundler/setup"
 require "zypper/upgraderepo"
 

data/exe/upgraderepo

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require "zypper/upgraderepo/cli"
 
 Zypper::Upgraderepo::CLI.start

data/lib/zypper/upgraderepo/cli.rb

@@ -10,14 +10,14 @@ module Zypper
       :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
+      :allow_unstable, :only_used
     )
 
     #
     # Parsing the input data.
     #
     class OptParseMain
-      def self.parse(_args)
+      def self.parse(args)
         options = CliOptions.new
         options.operation = :check_current
         options.backup_path = Dir.home
@@ -36,6 +36,7 @@ module Zypper
         options.only_invalid = false
         options.only_protocols = nil
         options.allow_unstable = false
+        options.only_used = nil
 
         opt_parser = OptionParser.new do |opt|
           opt.banner = if ENV["ZYPPER_UPGRADEREPO"]
@@ -148,7 +149,7 @@ module Zypper
 
           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|
+                 "@ALIAS, #URL, or ?ANY of them") do |o|
             options.only_repo = o.split(",")
           end
 
@@ -161,6 +162,10 @@ module Zypper
             options.only_protocols = o
           end
 
+          opt.on("--only-used", "Show only used repositories") do |_o|
+            options.only_used = true
+          end
+
           opt.separator ""
           opt.separator "View options:"
 
@@ -208,11 +213,11 @@ module Zypper
           end
         end
 
-        if ARGV.empty?
+        if args.empty?
           puts opt_parser
           exit
         else
-          opt_parser.parse!(ARGV)
+          opt_parser.parse!(args)
         end
 
         options

data/lib/zypper/upgraderepo/os_release.rb

@@ -10,10 +10,6 @@ module Zypper
     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", "15.5", "15.6"].freeze
-
       UNSTABLE_VERSION = "16.0"
 
       OS_RELEASE_FILE = "/etc/os-release"
@@ -21,67 +17,60 @@ module Zypper
       SUSE_RELEASE_FILE = "/etc/SuSE-release"
 
       def initialize(options)
-        if options.allow_unstable
-          raise NoUnstableVersionAvailable if UNSTABLE_VERSION.empty?
+        @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",
+                        "16.0"]
 
-          OS_VERSIONS << UNSTABLE_VERSION
-          @unstable = true
-        end
+        load_unstable if options.allow_unstable
 
-        fname = if File.exist? self.class::OS_RELEASE_FILE
-                  self.class::OS_RELEASE_FILE
-                elsif File.exist? self.class::SUSE_RELEASE_FILE
-                  self.class::SUSE_RELEASE_FILE
-                else
-                  raise ReleaseFileNotFound
-                end
-        @release = IniParse.parse(File.read(fname))
-        @current_idx = OS_VERSIONS.index(@release["__anonymous__"]["VERSION"].delete('"'))
+        @release = IniParse.parse(File.read(release_filename))
+        @current_idx = @os_versions.index(@release["__anonymous__"]["VERSION"].delete('"'))
 
         return unless options.version
-        raise InvalidVersion, options.version unless OS_VERSIONS.include?(options.version)
+        raise InvalidVersion, options.version unless @os_versions.include?(options.version)
 
         @custom = options.version
       end
 
       def current
-        OS_VERSIONS[@current_idx]
+        @os_versions[@current_idx]
       end
 
       def last
-        OS_VERSIONS[-1]
+        @os_versions[-1]
       end
 
       def next
         return if last?
 
-        OS_VERSIONS[@current_idx.next]
+        @os_versions[@current_idx.next]
       end
 
       def previous
         return if first?
 
-        OS_VERSIONS[@current_idx.pred]
+        @os_versions[@current_idx.pred]
       end
 
       def fullname
-        @release["__anonymous__"]["PRETTY_NAME"].gsub(/"/, "")
+        @release["__anonymous__"]["PRETTY_NAME"].gsub('"', "")
       end
 
       def seniority
-        OS_VERSIONS.count - @current_idx.next
+        @os_versions.count - @current_idx.next
       end
 
       def newer
         if seniority.positive?
-          OS_VERSIONS[@current_idx.next..-1]
+          @os_versions[@current_idx.next..-1]
         else
           []
         end
       end
 
       def last?
-        @current_idx == (OS_VERSIONS.count - 1)
+        @current_idx == (@os_versions.count - 1)
       end
 
       def first?
@@ -89,11 +78,45 @@ module Zypper
       end
 
       def valid?(version)
-        OS_VERSIONS.include? version
+        @os_versions.include? version
       end
 
       def current?(version)
-        OS_VERSIONS.index(version) == @current_idx
+        @os_versions.index(version) == @current_idx
+      end
+
+      def requires_v2?(version)
+        if `uname -m` =~ /x86_64/
+          @os_versions.index(version) > 11
+        else
+          false
+        end
+      end
+
+      def v2?
+        flags = `cat /proc/cpuinfo`.split("\n").grep(/^flags.*:/).first.split
+        %w[cx16 lahf_lm popcnt sse4_1 sse4_2 ssse3].reduce(true) do |res, f|
+          flags.include?(f) && res
+        end
+      end
+
+      private
+
+      def release_filename
+        if File.exist? self.class::OS_RELEASE_FILE
+          self.class::OS_RELEASE_FILE
+        elsif File.exist? self.class::SUSE_RELEASE_FILE
+          self.class::SUSE_RELEASE_FILE
+        else
+          raise ReleaseFileNotFound
+        end
+      end
+
+      def load_unstable
+        raise NoUnstableVersionAvailable if UNSTABLE_VERSION.empty?
+
+        @os_versions << UNSTABLE_VERSION
+        @unstable = true
       end
     end
   end

data/lib/zypper/upgraderepo/repository.rb

@@ -40,32 +40,22 @@ module Zypper
     #
     # Handle the repository collection.
     #
+    # rubocop: disable Metrics/ClassLength
     class RepositoryList
       REPOSITORY_PATH = "/etc/zypp/repos.d"
 
       attr_reader :list, :max_col
 
       def initialize(options, variables)
-        @alias = options.alias
-        @name = options.name
-        @only_repo = options.only_repo
-        @only_enabled = options.only_enabled
-        @only_invalid = options.only_invalid
-        @only_protocols = options.only_protocols
-        @overrides = options.overrides
-        @upgrade_options = { alias: options.alias, name: options.name }
-        @list = []
+        initialize_options(options)
 
         @variables = variables
-        Dir.glob(File.join(self.class::REPOSITORY_PATH, "*.repo")).each do |i|
-          r = Request.build(Repository.new(i, @variables), options.timeout)
-          @list << r
-        end
-        @max_col = @list.max_by { |r| r.name.length }.name.length
 
-        @list = @list.sort_by(&:alias).map.with_index(1) { |r, i| { num: i, repo: r } }
+        initialize_list(options)
 
-        @list.sort_by! { |x| x[:repo].send(options.sorting_by) } if options.sorting_by != :alias
+        @max_col = @list.max_by { |r| r.name.length }.name.length
+
+        sort_list(options)
 
         @only_repo = select_repos(@only_repo) unless @only_repo.nil?
 
@@ -84,64 +74,145 @@ module Zypper
       end
 
       def each_with_number(options = {})
-        only_repo = options[:only_repo].nil? ? @only_repo : options[:only_repo]
-        only_enabled = options[:only_enabled].nil? ? @only_enabled : options[:only_enabled]
-        only_invalid = options[:only_invalid].nil? ? @only_invalid : options[:only_invalid]
-        only_protocols = options[:only_protocols].nil? ? @only_protocols : options[:only_protocols]
+        f_o = filter_options(options)
 
         @list.each do |x|
-          next if only_repo && !only_repo.include?(x[:num])
-          next if only_enabled && !x[:repo].enabled?
-          next if only_invalid && x[:repo].available?
-          next if only_protocols && !only_protocols.include?(x[:repo].protocol)
+          next if next_repo? x[:repo], x[:num], f_o
 
           yield x[:repo], x[:num] if block_given?
         end
       end
 
       def save
-        @list.each do |i|
-          i[:repo].save
+        each_with_number do |repo, _num|
+          repo.save
         end
       end
 
+      def duplicates
+        group_for_url.delete_if { |_, v| v.length < 2 }
+      end
+
       private
 
+      def initialize_list(options)
+        @list = []
+        Dir.glob(File.join(self.class::REPOSITORY_PATH, "*.repo")).each do |i|
+          r = Request.build(Repository.new(i, @variables), options.timeout)
+          @list << r
+        end
+      end
+
+      def sort_list(options)
+        @list = @list.sort_by(&:alias).map.with_index(1) { |r, i| { num: i, repo: r } }
+        @list.sort_by! { |x| x[:repo].send(options.sorting_by) } if options.sorting_by != :alias
+      end
+
+      def initialize_options(options)
+        @alias = options.alias
+        @name = options.name
+        @only_repo = options.only_repo
+        @only_enabled = options.only_enabled
+        @only_invalid = options.only_invalid
+        @only_protocols = options.only_protocols
+        @only_used = options.only_used
+        @overrides = options.overrides
+        @upgrade_options = { alias: options.alias, name: options.name }
+      end
+
+      def filter_options(options)
+        {
+          only_repo: options[:only_repo].nil? ? @only_repo : options[:only_repo],
+          only_enabled: options[:only_enabled].nil? ? @only_enabled : options[:only_enabled],
+          only_invalid: options[:only_invalid].nil? ? @only_invalid : options[:only_invalid],
+          only_protocols: options[:only_protocols].nil? ? @only_protocols : options[:only_protocols],
+          only_used: options[:only_used].nil? ? @only_used : options[:only_used]
+        }
+      end
+
+      # rubocop: disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+      def next_repo?(repo, num, options)
+        (options[:only_repo] && !options[:only_repo].include?(num)) ||
+          (options[:only_enabled] && !repo.enabled?) ||
+          (options[:only_invalid] && repo.available?) ||
+          (options[:only_protocols] && !options[:only_protocols].include?(repo.protocol)) ||
+          (options[:only_used] && repo.unused?)
+      end
+      # rubocop: enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+
+      def group_for_url
+        dups = {}
+        each_with_number do |repo, num|
+          uri = URI.parse(repo.url)
+          hostname = uri.hostname.split(".")[-2..-1].join(".")
+          idx = URI::HTTP.build(path: uri.path, host: hostname).to_s.gsub(%r{^http://}, "").gsub(%r{/$}, "")
+          dups[idx] ||= []
+          dups[idx] << { num: num, repo: repo }
+        end
+        dups
+      end
+
+      def select_for_name(str)
+        regexp = Regexp.new(str.strip, "i")
+        @list.select do |x|
+          yield x[:repo], x[:num] if x[:repo].name.match?(regexp) && block_given?
+        end
+      end
+
+      def select_for_alias(str)
+        regexp = Regexp.new(str.gsub("@", "").strip, "i")
+        @list.select do |x|
+          yield x[:repo], x[:num] if x[:repo].alias.match?(regexp)
+        end
+      end
+
+      def select_for_url(str)
+        regexp = Regexp.new(str.gsub("#", "").strip, "i")
+        @list.select do |x|
+          yield x[:repo], x[:num] if x[:repo].url.match?(regexp)
+        end
+      end
+
+      def select_for_any(str)
+        regexp = Regexp.new(str.gsub("?", "").strip, "i")
+        @list.select do |x|
+          yield x[:repo], x[:num] if x[:repo].name.match?(regexp) ||
+                                     x[:repo].alias.match?(regexp) ||
+                                     x[:repo].url.match?(regexp)
+        end
+      end
+
+      # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
       def select_repos(repos)
         res = []
         repos.each do |r|
           if r.to_i.positive?
             res.push r.to_i
           elsif r =~ /^\ *@.*/
-            a = r.gsub(/@/, "").strip
-            @list.select { |x| x[:repo].alias.match?(Regexp.new(a, "i")) }.each do |l|
-              res.push l[:num]
-            end
+            select_for_alias(r) { |_, num| res.push num }
           elsif r =~ /^\ *\#.*/
-            u = r.gsub(/\#/, "").strip
-            @list.select { |x| x[:repo].url.match?(Regexp.new(u, "i")) }.each do |l|
-              res.push l[:num]
-            end
-          elsif r =~ /^\ *&.*/
-            s = r.gsub(/&/, "").strip
-            sel = @list.select do |x|
-              x[:repo].alias.match?(Regexp.new(s, "i")) ||
-                x[:repo].name.match?(Regexp.new(s, "i")) ||
-                x[:repo].url.match?(Regexp.new(s, "i"))
-            end
-            sel.each do |l|
-              res.push l[:num]
-            end
+            select_for_url(r) { |_, num| res.push num }
+          elsif r =~ /^\ *\?.*/
+            select_for_any(r) { |_, num| res.push num }
           else
-            n = r.strip
-            @list.select { |x| x[:repo].name.match?(Regexp.new(n, "i")) }.each do |l|
-              res.push l[:num]
-            end
+            puts r
+            select_for_name(r) { |_, num| res.push num }
           end
         end
 
         res.uniq
       end
+      # rubocop: enable Metrics/AbcSize, Metrics/MethodLength
+
+      def check_for_override(repo, num, ini)
+        raise UnmatchingOverrides, { num: num, ini: ini, repo: repo } if repo.url != ini["old_url"]
+
+        if only_enabled?
+          raise MissingOverride, { num: num, ini: ini } unless ini["url"] || ini["enabled"] =~ /no|false|0/i
+        else
+          raise MissingOverride, { num: num, ini: ini } unless ini["url"]
+        end
+      end
 
       def load_overrides(filename)
         raise FileNotFound, filename unless File.exist?(filename)
@@ -151,17 +222,12 @@ module Zypper
           next unless (x = ini["repository_#{num}"])
 
           repo.enable!(x["enabled"])
-          raise UnmatchingOverrides, { num: num, ini: x, repo: repo } if repo.url != x["old_url"]
-
-          if only_enabled?
-            raise MissingOverride, { num: num, ini: x } unless x["url"] || x["enabled"] =~ /no|false|0/i
-          else
-            raise MissingOverride, { num: num, ini: x } unless x["url"]
-          end
+          check_for_override(repo, num, x)
           @overrides[num] = x["url"] if x["url"]
         end
       end
     end
+    # rubocop: enable Metrics/ClassLength
 
     #
     # Single repository class.
@@ -232,6 +298,7 @@ module Zypper
         @key = read_key
       end
 
+      # rubocop: disable Metrics/AbcSize
       def upgrade!(version, args = {})
         @old_url ||= url
         @old_alias ||= self.alias
@@ -242,6 +309,7 @@ module Zypper
         self.alias = self.alias.gsub(/\d\d\.\d/, version) if args[:alias]
         self.name = name.gsub(/\d\d\.\d/, version) if args[:name]
       end
+      # rubocop: enable Metrics/AbcSize
 
       def upgraded?(item = :url)
         !send("old_#{item}").nil? && (send("old_#{item}") != send(item))
@@ -256,6 +324,14 @@ module Zypper
         @repo.save(@filename)
       end
 
+      def unused?
+        `zypper -q pa -i -r "#{name}" 2>/dev/null|grep -c "^i"`.strip.to_i.zero?
+      end
+
+      def used?
+        !unused?
+      end
+
       private
 
       def resolve_variables!(variables)

data/lib/zypper/upgraderepo/request.rb

@@ -12,6 +12,7 @@ module Zypper
     # achieve the request..
     #
     class Request
+      # rubocop: disable Style/ClassVars
       def self.build(repo, timeout)
         @@registry ||= load_requests
 
@@ -19,6 +20,7 @@ module Zypper
 
         Object.const_get(find_class(repo)).new(repo, timeout)
       end
+      # rubocop: enable Style/ClassVars
 
       def self.protocols
         load_requests.keys

data/lib/zypper/upgraderepo/requests/http.rb

@@ -14,7 +14,7 @@ module Zypper
       USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:59.0) Gecko/20100101 Firefox/59.0"
 
       def initialize(obj, timeout = 60)
-        super obj
+        super(obj)
         @timeout = timeout
       end
 
@@ -68,6 +68,7 @@ module Zypper
         http.request(request)
       end
 
+      # rubocop: disable Metrics/MethodLength
       def ping(uri = nil, head: true, cache: true)
         begin
           if @page.nil? || uri
@@ -84,6 +85,7 @@ module Zypper
         end
         cache ? @page : unpage
       end
+      # rubocop: enable Metrics/MethodLength
     end
 
     module Requests
@@ -118,7 +120,7 @@ module Zypper
 
         def get_request(uri, head)
           # super uri || URI(url), head
-          super uri || repodata_uri, head
+          super(uri || repodata_uri, head)
         end
 
         def repodata?(uri)

data/lib/zypper/upgraderepo/requests/local.rb

@@ -11,7 +11,7 @@ module Zypper
       attr_reader :dir_path
 
       def initialize(obj, _timeout)
-        super obj
+        super(obj)
       end
 
       def available?
@@ -48,13 +48,15 @@ module Zypper
 
       private
 
+      # rubocop: disable Lint/UnusedMethodArgument
       def ping(uri = nil, head: true)
         @dir_path ||= URI(url).path
 
         @dir_path = uri.to_s =~ %r{^/} ? uri.to_s : URI(uri.to_s).path if uri
 
-        URI.unescape(@dir_path)
+        URI::DEFAULT_PARSER.unescape(@dir_path)
       end
+      # rubocop: enable Lint/UnusedMethodArgument
     end
 
     module Requests
@@ -88,12 +90,12 @@ module Zypper
         private
 
         def repodata?(uri)
-          File.exist? URI.unescape(repodata_uri(uri).path)
+          File.exist? URI::DEFAULT_PARSER.unescape(repodata_uri(uri).path)
         end
 
         def subfolders
           Dir.glob("#{ping.gsub(%r{/$}, "")}/*/").map do |x|
-            URI.escape(x.gsub(%r{/$}, "").gsub(ping, "").gsub(%r{^/}, ""))
+            URI::DEFAULT_PARSER.escape(x.gsub(%r{/$}, "").gsub(ping, "").gsub(%r{^/}, ""))
           end
         end
       end

data/lib/zypper/upgraderepo/utils.rb

@@ -111,6 +111,7 @@ module Zypper
     # Color the error message.
     #
     class Messages
+      # rubocop: disable Metrics/AbcSize
       def self.error(err)
         if err.instance_of?(String)
           puts " [E] ".bold.red + err
@@ -120,6 +121,7 @@ module Zypper
           warn "Error! ".bold.red + err.message
         end
       end
+      # rubocop: enable Metrics/AbcSize
 
       def self.ok(msg)
         puts " [V] ".bold.green + msg
@@ -135,7 +137,7 @@ module Zypper
     #
     class FileNotFound < StandardError
       def initialize(filename)
-        super "The File #{filename} doesn't exist."
+        super("The File #{filename} doesn't exist.")
       end
     end
 
@@ -144,7 +146,7 @@ module Zypper
     #
     class ReleaseFileNotFound < StandardError
       def initialize
-        super "The release file is not found."
+        super("The release file is not found.")
       end
     end
 
@@ -153,7 +155,7 @@ module Zypper
     #
     class InvalidProtocol < StandardError
       def initialize(repo)
-        super "The repository #{repo.name} has an unknown protocol: #{repo.protocol}; disable it to continue."
+        super("The repository #{repo.name} has an unknown protocol: #{repo.protocol}; disable it to continue.")
       end
     end
 
@@ -162,7 +164,7 @@ module Zypper
     #
     class InvalidVersion < StandardError
       def initialize(version)
-        super "The version #{version} is not valid"
+        super("The version #{version} is not valid")
       end
     end
 
@@ -171,7 +173,7 @@ module Zypper
     #
     class InvalidWritePermissions < StandardError
       def initialize(filename)
-        super "Don't have the right permission to write #{filename}"
+        super("Don't have the permissions to write #{filename}")
       end
 
       def error_code
@@ -184,7 +186,7 @@ module Zypper
     #
     class SystemUpdateRunning < StandardError
       def initialize(args)
-        super "The application #{args[:process].bold} with pid #{args[:pid].bold} is running a system update!"
+        super("The application #{args[:process].bold} with pid #{args[:pid].bold} is running a system update!")
       end
 
       def error_code
@@ -197,8 +199,8 @@ module Zypper
     #
     class UnableToUpgrade < StandardError
       def initialize(args)
-        super "The repository n.#{args[:num].to_s.bold.red} named #{args[:repo].name.bold.red} " \
-              "can't be upgraded, a manual check is required!"
+        super("The repository n.#{args[:num].to_s.bold.red} named #{args[:repo].name.bold.red} " \
+              "can't be upgraded, a manual check is required!")
       end
 
       def error_code
@@ -211,8 +213,8 @@ module Zypper
     #
     class MissingOverride < StandardError
       def initialize(args)
-        super "The repository n.#{args[:num].to_s.bold.red} named #{args[:ini]["name"].bold.red} " \
-              "doesn't contain the URL key!"
+        super("The repository n.#{args[:num].to_s.bold.red} named #{args[:ini]["name"].bold.red} " \
+              "doesn't contain the URL key!")
       end
 
       def error_code
@@ -225,8 +227,8 @@ module Zypper
     #
     class UnmatchingOverrides < StandardError
       def initialize(args)
-        super "The repository n.#{args[:num]} named #{args[:repo].name.bold.red} doesn't match with " \
-              "the repository named #{args[:ini]["name"].bold.red} in the ini file"
+        super("The repository n.#{args[:num]} named #{args[:repo].name.bold.red} doesn't match with " \
+              "the repository named #{args[:ini]["name"].bold.red} in the ini file")
       end
 
       def error_code
@@ -239,7 +241,7 @@ module Zypper
     #
     class AlreadyUpgraded < StandardError
       def initialize(version)
-        super "The system is already upgraded to the #{version} version"
+        super("The system is already upgraded to the #{version} version")
       end
 
       def error_code
@@ -252,7 +254,7 @@ module Zypper
     #
     class NoUnstableVersionAvailable < StandardError
       def initialize
-        super "No unstable version is available, remove the --allow-unstable switch to continue"
+        super("No unstable version is available, remove the --allow-unstable switch to continue")
       end
 
       def error_code
@@ -262,9 +264,10 @@ module Zypper
 
     #
     # No internet connection.
+    #
     class NoConnection < StandardError
       def initialize
-        super "Internet connection has some trouble"
+        super("Internet connection has some trouble")
       end
 
       def error_code
@@ -272,12 +275,25 @@ module Zypper
       end
     end
 
+    #
+    # No support for x86_64-v2 instructions.
+    #
+    class UnsupportedV2 < StandardError
+      def initialize
+        super("The CPU doesn't support the x86_64-v2 instruction set required by openSUSE 16.0 and sup.")
+      end
+
+      def error_code
+        16
+      end
+    end
+
     #
     # Ctrl + C message error.
     #
     class Interruption < StandardError
       def initialize
-        super "Ok ok... Exiting!"
+        super("Ok ok... Exiting!")
       end
     end
 

data/lib/zypper/upgraderepo/version.rb

@@ -2,6 +2,6 @@
 
 module Zypper
   module Upgraderepo
-    VERSION = "1.10.0"
+    VERSION = "1.12.0"
   end
 end

data/lib/zypper/upgraderepo/view.rb

@@ -61,7 +61,7 @@ module Zypper
           puts (char * (max_col + 20)).send(color)
         end
 
-        def self.header(_max_col, _upgrade: false)
+        def self.header(*)
           puts "  # | Report"
         end
 
@@ -83,8 +83,11 @@ module Zypper
         end
 
         def self.info(repo)
-          puts " #{" " * 2} | Name: #{repo.name} #{repo.upgraded?(:name) ? "(#{repo.old_name.yellow})" : ""}"
-          puts " #{" " * 2} | Alias: #{repo.alias} #{repo.upgraded?(:alias) ? "(#{repo.old_alias.yellow})" : ""}"
+          old_name = repo.upgraded?(:name) ? "(#{repo.old_name.yellow})" : ""
+          old_alias = repo.upgraded?(:alias) ? "(#{repo.old_alias.yellow})" : ""
+
+          puts " #{" " * 2} | Name: #{repo.name} #{old_name}"
+          puts " #{" " * 2} | Alias: #{repo.alias} #{old_alias}"
           puts " #{" " * 2} | Url: #{repo.url}"
           puts " #{" " * 2} |      (#{repo.old_url.yellow})" if repo.upgraded?
           puts " #{" " * 2} | Priority: #{repo.priority}"
@@ -345,7 +348,6 @@ module Zypper
         end
 
         def self.info(num, status, repo, valid: true, suggested: "")
-          @@number = num
           puts "[repository_#{num}]"
           puts "name=#{repo.name}"
           puts "alias=#{repo.alias}"
@@ -424,7 +426,6 @@ module Zypper
         end
 
         def self.info(num, status, repo, valid: true, suggested: "")
-          @@number = num
           puts "[repository_#{num}]"
           puts "name=#{repo.name}"
           puts "alias=#{repo.alias}"

data/lib/zypper/upgraderepo.rb

@@ -60,26 +60,12 @@ module Zypper
       end
 
       def duplicates
-        dups = {}
-        dcount = 0
         @view_class.duplicates_header(@repos.max_col)
         @view_class.separator(@repos.max_col, "=", :yellow)
-        @repos.each_with_number do |repo, num|
-          uri = URI.parse(repo.url)
-          hostname = uri.hostname.split(".")[-2..-1].join(".")
-          idx = URI::HTTP.build(path: uri.path, host: hostname).to_s.gsub(%r{^http://}, "").gsub(%r{/$}, "")
-          dups[idx] ||= []
-          dups[idx] << { num: num, repo: repo }
-        end
-        dups.each do |_key, list|
-          next if list.count < 2
-
+        dcount = 0
+        @repos.duplicates.each_value do |list|
           dcount += list.count.pred
-          list.each_with_index do |l, i|
-            @view_class.duplicates_item(l[:num], i.next, list.count, l[:repo], @repos.max_col)
-            @view_class.separator(@repos.max_col) unless i == list.count.pred
-          end
-          @view_class.separator(@repos.max_col, "=", :yellow)
+          print_duplicates list
         end
         @view_class.duplicates_footer(dcount, @repos.list.count)
       end
@@ -89,8 +75,7 @@ module Zypper
         @view_class.unused_header(@repos.max_col)
         @view_class.separator(@repos.max_col)
         @repos.each_with_number do |repo, num|
-          packs = `zypper -q pa -i -r #{num} 2>/dev/null|grep "^i"|wc -l`.strip.to_i
-          next unless packs.zero?
+          next unless repo.unused?
 
           ucount += 1
           @view_class.unused_item(num, ucount, repo, @repos.max_col)
@@ -135,7 +120,38 @@ module Zypper
 
       private
 
+      def print_duplicates(list)
+        list.each_with_index do |l, i|
+          @view_class.duplicates_item(l[:num], i.next, list.count, l[:repo], @repos.max_col)
+          @view_class.separator(@repos.max_col) unless i == list.count.pred
+        end
+        @view_class.separator(@repos.max_col, "=", :yellow)
+      end
+
+      # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
+      def print_checked_repo(num, repo, version)
+        if repo.redirected?
+          @view_class.redirected num, repo, @repos.max_col, repo.redirected_to
+        elsif repo.not_found?
+          if @print_hint
+            @view_class.alternative num, repo, @repos.max_col, repo.evaluate_alternative(version)
+          else
+            @view_class.not_found num, repo, @repos.max_col
+          end
+        elsif repo.forbidden?
+          @view_class.forbidden num, repo, @repos.max_col
+        elsif repo.timeout?
+          @view_class.timeout num, repo, @repos.max_col
+        else
+          @view_class.server_error num, repo, @repos.max_col
+        end
+      end
+      # rubocop: enable Metrics/AbcSize, Metrics/MethodLength
+
+      # rubocop: disable Metrics/MethodLength
       def check_repos(version)
+        check_requirements(version)
+
         @view_class.header(@repos.max_col)
 
         @repos.each_with_number do |repo, num|
@@ -146,28 +162,17 @@ module Zypper
           else
             raise UnableToUpgrade, { num: num, repo: repo } if @exit_on_fail
 
-            if repo.redirected?
-              @view_class.redirected num, repo, @repos.max_col, repo.redirected_to
-            elsif repo.not_found?
-              if @print_hint
-                @view_class.alternative num, repo, @repos.max_col, repo.evaluate_alternative(version)
-              else
-                @view_class.not_found num, repo, @repos.max_col
-              end
-            elsif repo.forbidden?
-              @view_class.forbidden num, repo, @repos.max_col
-            elsif repo.timeout?
-              @view_class.timeout num, repo, @repos.max_col
-            else
-              @view_class.server_error num, repo, @repos.max_col
-            end
+            print_checked_repo num, repo, version
           end
         end
-
         @view_class.footer @repos.max_col
       end
+      # rubocop: enable Metrics/MethodLength
+
+      # rubocop: disable Metrics/MethodLength
+      def upgrade_repos(version)
+        check_requirements(version)
 
-      def upgrade_repos(_version)
         @view_class.header(@repos.max_col, upgrade: true)
 
         @repos.each_with_number do |repo, num|
@@ -185,6 +190,13 @@ module Zypper
         @repos.save
         Messages.ok "Repositories upgraded!"
       end
+      # rubocop: enable Metrics/MethodLength
+
+      def check_requirements(version)
+        return unless @os_release.requires_v2?(version)
+
+        raise UnsupportedV2 unless @os_release.v2?
+      end
     end
   end
 end

data/zypper-upgraderepo.gemspec

@@ -29,10 +29,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-
-  spec.add_runtime_dependency "iniparse"
-  spec.add_runtime_dependency "minitar"
+  spec.add_dependency "iniparse"
+  spec.add_dependency "minitar"
 end

metadata

@@ -1,57 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Fabio Mucciante
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +77,6 @@ metadata:
   changelog_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html#changelog
   wiki_uri: https://github.com/fabiomux/zypper-upgraderepo/wiki
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Zypper addon to check and upgrade local repositories.
 test_files: []