zypper-upgraderepo 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ebc8e9633b6f8316573b56759c1044bd9db702cd4a2289508665420935e054
-  data.tar.gz: 89effc0e8a22e7f1019a2ac29337e5882b518f1c0de9dc7844b72cac0fa36608
+  metadata.gz: e642faca5400e4b8ed243726b9349740a1211207245d9cc9e72ee391bc12a71d
+  data.tar.gz: f4d8995a91cc4149db25129004e682afba03ffded92f4d812f980e2460bc839c
 SHA512:
-  metadata.gz: 36dcbddb43e6ec7ede6aace2f03f2ed2be72c0e870c54252cbeec70c0715daf91d88bd3868e9936b3f60d77ced08df655987428fcc13bb15d3fc094913e8ee47
-  data.tar.gz: 10bb399234182d2705e9e498891d67c3727a5f4de68ef40166451e3e9dfd4275cb3fe788fa83254917172f18baf7921d5909c7331a659c9d7e4104ed066f6ebf
+  metadata.gz: 2d1e4c172bb8ce5cced6fd2fbfc932274b669aec69881d9b6069c9eefe308fd75b4ea78ecf385a8bb22550fbc7a4f1806b586e7ff8272d599f5f3a5cfebd0d86
+  data.tar.gz: c8d2563ba33b03e6417ad91f15a7f911c4f8438aad414b9558b859a821a4d88cfb9af4c2903c94e3bf2385c972ae872495449c763e2f0bbb745a485d5fba45ba

data/.rubocop.yml

@@ -60,21 +60,7 @@ Metrics/CyclomaticComplexity:
   - './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

@@ -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,63 +1,75 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.10.0)
+    zypper-upgraderepo (1.11.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.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    minitar (0.12.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    prism (1.4.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.0)
+    regexp_parser (2.10.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.4)
       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.5)
       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.4)
+    rubocop (1.76.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.45.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.45.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.27.1)
+      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.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby

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/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,10 +17,15 @@ module Zypper
       SUSE_RELEASE_FILE = "/etc/SuSE-release"
 
       def initialize(options)
+        @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"]
+
         if options.allow_unstable
           raise NoUnstableVersionAvailable if UNSTABLE_VERSION.empty?
 
-          OS_VERSIONS << UNSTABLE_VERSION
+          @os_versions << UNSTABLE_VERSION
           @unstable = true
         end
 
@@ -36,52 +37,52 @@ 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('"'))
 
         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 +90,11 @@ 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
     end
   end

data/lib/zypper/upgraderepo/repository.rb

@@ -100,8 +100,8 @@ module Zypper
       end
 
       def save
-        @list.each do |i|
-          i[:repo].save
+        each_with_number do |repo, _num|
+          repo.save
         end
       end
 
@@ -118,12 +118,12 @@ module Zypper
               res.push l[:num]
             end
           elsif r =~ /^\ *\#.*/
-            u = r.gsub(/\#/, "").strip
+            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
+            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")) ||

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
 
@@ -118,7 +118,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

@@ -135,7 +135,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 +144,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 +153,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 +162,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 +171,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 +184,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 +197,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 +211,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 +225,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 +239,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 +252,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
@@ -264,7 +264,7 @@ 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
@@ -277,7 +277,7 @@ module Zypper
     #
     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.11.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}"

data/lib/zypper/upgraderepo.rb

@@ -71,7 +71,7 @@ module Zypper
           dups[idx] ||= []
           dups[idx] << { num: num, repo: repo }
         end
-        dups.each do |_key, list|
+        dups.each_value do |list|
           next if list.count < 2
 
           dcount += list.count.pred

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,15 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2025-11-11 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
@@ -135,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Zypper addon to check and upgrade local repositories.