zypper-upgraderepo 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70f8e680b1c6c86d0c556a6761cb0738dc3b39422109a679ccaeee34d1a0d26
-  data.tar.gz: edc57ec51daa46b5443f4cf928af1884b5cbdbd5779b687eec38dd98d021f9ef
+  metadata.gz: 3a50f5e64f656b77d574d69068ef2663d9387e9607b1a8f4fa54e4428caf980d
+  data.tar.gz: e0d52912c451b2d3fca3e230cbd601f1dde2ec8830ca2e7ebbee451b4f425844
 SHA512:
-  metadata.gz: 15495fdd8f2619194293bc2ab113043c343c11f5aada78d8db338937f65365b9b475f4f7725dbcfe4f207df452705e80b8a8dd991338003982784db7154a4251
-  data.tar.gz: 6de4b17c55d6693f7c020eeb7226524e738be9ef1ca1e1e166cb0cfd14ecef53eef32952c371e75cd5d20c15fa1de88894b6dc63d12a1c1871f7f481489122be
+  metadata.gz: 46fab3ffa2117323ca0fc13bf51dd6f699a7af3b949abfef30ebd57323c54659760846fd1e3ae33b711171e8fd6b8d9c2db970631c401b97031486c8c45e718f
+  data.tar.gz: 576992e8186033757a0b5d6fc2cba6a9ac061c0862ceac78f9a799e7a7ab0135229dfd09f55334485a2bc919dd98d83bfe91d5936571e0daff0d152385deda68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.7.0)
+    zypper-upgraderepo (1.7.1)
       iniparse
       minitar
 
@@ -12,19 +12,19 @@ GEM
     iniparse (1.5.0)
     minitar (0.9)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
 
 PLATFORMS
   ruby
@@ -36,4 +36,4 @@ DEPENDENCIES
   zypper-upgraderepo!
 
 BUNDLED WITH
-   2.2.19
+   2.4.3

data/README.md

@@ -29,26 +29,33 @@ in the related [project page][project_page] on 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)
+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.***
+
 To check the availability of the current repositories:
 ```shell
-$ zypper-upgraderepo
+$ upgraderepo
 ```
 
 To check the availability of the next version repositories:
 ```shell
-$ zypper-upgraderepo --check-next
+$ upgraderepo --check-next
 ```
 
 To upgrade the repositories to the next version:
 ```shell
-$ sudo zypper-upgraderepo --upgrade
+$ sudo upgraderepo --upgrade
 ```
 
 ## Get help
 
 Where to start:
 ```shell
-$ zypper-upgraderepo --help
+$ upgraderepo --help
 ```
 
 ## More Help:

data/lib/zypper/upgraderepo/cli.rb

@@ -34,7 +34,7 @@ module Zypper
           if ENV['ZYPPER_UPGRADEREPO']
             opt.banner = 'Usage: zypper upgraderepo [OPTIONS] [OPERATION]'
           else
-            opt.banner = 'Usage: zypper-upgraderepo [OPTIONS] [OPERATION]'
+            opt.banner = 'Usage: upgraderepo [OPTIONS] [OPERATION]'
           end
 
           opt.separator ''
@@ -67,6 +67,10 @@ module Zypper
             options.operation = :reset
           end
 
+          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|
             options.operation = :upgrade_to_next
           end
@@ -126,8 +130,8 @@ module Zypper
             options.only_enabled = true
           end
 
-          opt.on('--only-repo <NUMBER>[,NUMBER2,...]', 'Include only the repositories specified by NUMBER') do |o|
-            options.only_repo = o.split(',').map(&:to_i)
+          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|
@@ -153,7 +157,7 @@ module Zypper
             options.sort_by = :priority
           end
 
-          opt.on('--ini', 'Output the result in Ini format') do |o|
+          opt.on('--ini', 'Output the result as INI format') do |o|
             options.view = :ini
           end
 
@@ -165,6 +169,9 @@ module Zypper
             options.view = :report
           end
 
+          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 ''

data/lib/zypper/upgraderepo/os_release.rb

@@ -12,6 +12,10 @@ module Zypper
 
       UNSTABLE_VERSION = '15.5'
 
+      OS_RELEASE_FILE = '/etc/os-release'
+
+      SUSE_RELEASE_FILE = '/etc/SuSE-release'
+
       def initialize(options)
 
         if options.allow_unstable
@@ -20,10 +24,10 @@ module Zypper
           @unstable = true
         end
 
-        fname = if File.exist? '/etc/os-release'
-                  '/etc/os-release'
-                elsif File.exist? '/etc/SuSE-release'
-                  '/etc/SuSE-release'
+        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

data/lib/zypper/upgraderepo/repository.rb

@@ -22,7 +22,7 @@ module Zypper
         @list = []
         @cpu_arch, @arch = `rpm --eval "%cpu_arch;%_arch"`.tr("\n", '').split(';')
 
-        Dir.glob(File.join(REPOSITORY_PATH, '*.repo')).each do |i|
+        Dir.glob(File.join(self.class::REPOSITORY_PATH, '*.repo')).each do |i|
           r = Request.build(Repository.new(i), options.timeout)
           @list << r
         end
@@ -32,6 +32,8 @@ module Zypper
 
         @list.sort_by! { |x| x[:repo].send(options.sort_by) } if options.sort_by != :alias
 
+        @only_repo = select_repos(@only_repo) unless @only_repo.nil?
+
         load_overrides(options.overrides_filename) if options.overrides_filename
       end
 
@@ -65,12 +67,10 @@ module Zypper
       def resolve_variables!(version)
         each_with_number do |r|
           if r.url =~ /\$/
-            r.url = r.url.gsub(/\$releasever_major/, version.split('.')[0])
-                         .gsub(/\$releasever_minor/, version.split('.')[1])
-                         .gsub(/\$releasever/, version)
-                         .gsub(/\$basearch/, @arch)
-                         .gsub(/\$arch/, @cpu_arch)
+            r.url = expand_variables(r.url, version)
           end
+          r.name = expand_variables(r.name, version)
+          r.alias = expand_variables(r.alias, version)
         end
 
         self
@@ -85,6 +85,49 @@ module Zypper
 
       private
 
+      def select_repos(repos)
+        res = []
+        repos.each do |r|
+          if r.to_i > 0
+            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
+          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
+            @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.each do |l|
+              res.push l[:num]
+            end
+          else
+            n = r.strip
+            @list.select { |x| x[:repo].name.match?(Regexp.new(n, 'i')) }.each do |l|
+              res.push l[:num]
+            end
+          end
+        end
+
+        res.uniq
+      end
+
+      def expand_variables(str, version)
+       str.gsub(/\$releasever_major/, version.split('.')[0])
+          .gsub(/\$releasever_minor/, version.split('.')[1])
+          .gsub(/\$releasever/, version)
+          .gsub(/\$basearch/, @arch)
+          .gsub(/\$arch/, @cpu_arch)
+      end
+
       def load_overrides(filename)
         raise FileNotFound, filename unless File.exist?(filename)
         ini = IniParse.parse(File.read(filename))

data/lib/zypper/upgraderepo/request.rb

@@ -6,7 +6,6 @@ require_relative 'requests/http.rb'
 module Zypper
   module Upgraderepo
 
-
     class Request
 
       def self.build(repo, timeout)
@@ -14,7 +13,7 @@ module Zypper
 
         raise InvalidProtocol, repo unless @@registry.include? repo.protocol
 
-        Object.const_get(@@registry[repo.protocol]).new(repo, timeout)
+        Object.const_get(self.find_class(repo)).new(repo, timeout)
       end
 
       def self.protocols
@@ -26,17 +25,26 @@ module Zypper
       def self.load_requests
         res = {}
         Requests.constants.each do |klass|
-          Object.const_get("Zypper::Upgraderepo::Requests::#{klass}").register_protocol.each do |protocol|
-            res[protocol] = "Zypper::Upgraderepo::Requests::#{klass}"
+          obj = Object.const_get("Zypper::Upgraderepo::Requests::#{klass}")
+          obj.register_protocol.each do |protocol|
+            res[protocol] ||= {}
+            res[protocol][obj.domain] = "Zypper::Upgraderepo::Requests::#{klass}"
           end
         end
 
         res
       end
 
-    end
-
+      def self.find_class(repo)
+        domain = URI(repo.url).hostname
 
+        if @@registry[repo.protocol].has_key? domain
+          return @@registry[repo.protocol][domain]
+        else
+          return @@registry[repo.protocol]['default']
+        end
+      end
+    end
 
   end
 end

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

@@ -67,17 +67,21 @@ module Zypper
         http.request(request)
       end
 
-      def ping(uri = nil, head = true)
+      def ping(uri = nil, head = true, cache = true)
         begin
           if @page.nil? || uri
-            @page = get_request(uri, head)
+            if cache
+              @page = get_request(uri, head)
+            else
+              unpage = get_request(uri, head)
+            end
           end
         rescue SocketError
           raise NoConnection
         rescue Net::OpenTimeout
           @page = Net::HTTPRequestTimeOut.new('1.1', '', '')
         end
-        @page
+        cache ? @page : unpage
       end
 
     end
@@ -93,6 +97,8 @@ module Zypper
 
         def self.register_protocol; ['https', 'http'] end
 
+        def self.domain; 'default' end
+
         def evaluate_alternative(version)
           if not_found?
             return traverse_url(URI(url), version)
@@ -110,18 +116,28 @@ module Zypper
         end
 
         def has_repodata?(uri)
-          ping(repodata_uri(uri))
-          available?
+          ping(repodata_uri(uri), true, false).is_a?(Net::HTTPSuccess)
         end
 
-        def subfolders
-          res = ping.body.to_s.scan(Regexp.new('href=[\'\"][^\/\"]+\/[\'\"]')).delete_if do |x|
+        def subfolders(uri)
+          ping.body.to_s.scan(Regexp.new('href=[\'\"][^\/\"]+\/[\'\"]')).delete_if do |x|
             x =~ /^\// || x =~ /^\.\./ || x =~ /\:\/\// || x =~ /href=[\"\'](media\.1|boot|EFI)\/[\"\']/
           end.uniq.map do |d|
             d.scan(/href=[\"\']([^"]+)[\'\"]/).pop.pop
           end
+        end
+      end
+
+      class DownloadOpensuseOrgRequest < HttpRequest
+
+        def self.domain; 'download.opensuse.org' end
 
-          res
+        def subfolders(uri)
+          u = URI(uri.to_s)
+          u.path = "/download#{u.path}"
+          u.query = 'jsontable'
+          require 'json'
+          JSON.parse(ping(u, false).body.to_s)["data"].map { |x| x["name"] }
         end
       end
 

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

@@ -68,6 +68,8 @@ module Zypper
 
         def self.register_protocol; ['dir'] end
 
+        def self.domain; 'default' end
+
         def evaluate_alternative(version)
           if not_found?
             return traverse_url(URI(url), version)

data/lib/zypper/upgraderepo/traversable.rb

@@ -6,7 +6,9 @@ module Zypper
       def traverse_url(uri, version)
         ping(uri)
 
-        if forbidden?
+        if available? && !has_repodata?(uri)
+          return { url: '', message: 'This repository doesn\'t seem working and should be disabled.'}
+        elsif forbidden?
           res =  { url: url, message: 'Can\'t navigate through the repository!' }
         elsif available? && uri.to_s =~ /#{version}/
           res = traverse_url_forward(uri, version)
@@ -49,7 +51,7 @@ module Zypper
         uri.path += '/' if uri.path[-1] != '/'
         ping(uri, false)
 
-        subfolders.each do |dir|
+        subfolders(uri).each do |dir|
           u = URI(uri.to_s)
           u.path += dir
 

data/lib/zypper/upgraderepo/version.rb

@@ -1,5 +1,5 @@
 module Zypper
   module Upgraderepo
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
   end
 end

data/lib/zypper/upgraderepo/view.rb

@@ -215,7 +215,7 @@ module Zypper
         end
 
         def self.alternative(num, repo, max_col, alt)
-          self.info num, 'Not Found', repo, false
+          self.info num, 'Not Found', repo, false, alt[:url]
           puts "hint=#{alt[:message]}"
           puts "suggested_url=#{alt[:url]}" unless alt[:url].to_s.empty?
         end
@@ -254,12 +254,12 @@ module Zypper
 
         private
 
-        def self.info(num, status, repo, valid = true)
+        def self.info(num, status, repo, valid = true, suggested = '')
           @@number = num
           puts "[repository_#{num}]"
           puts "name=#{repo.name}"
           puts "alias=#{repo.alias}"
-          puts "old_url=#{repo.old_url}" if repo.upgraded?
+          puts "old_url=#{repo.old_url}" if repo.upgraded? || (!suggested.empty?)
           if valid
             if repo.unversioned? && repo.old_url
               puts <<-'HEADER'.gsub(/^ +/, '')
@@ -273,7 +273,7 @@ module Zypper
           elsif repo.enabled?
             puts <<-'HEADER'.gsub(/^ +/, '')
               # The interpolated URL is invalid, try overriding with the one suggested
-              # in the fields below or find it manually starting from the old_url.
+              # in the field below or find it manually starting from the old_url.
               # The alternatives are:
               # 1. Waiting for a repository upgrade;
               # 2. Change the provider for the related installed packages;
@@ -295,6 +295,71 @@ module Zypper
         end
       end
 
+
+      class Solved < Ini
+
+        def self.alternative(num, repo, max_col, alt)
+          self.info num, 'Not Found', repo, false, alt[:url]
+          puts "hint=#{alt[:message]}"
+          puts "suggested_url=#{alt[:url]}" unless alt[:url].to_s.empty?
+        end
+
+
+        private
+
+        def self.info(num, status, repo, valid = true, suggested = '')
+          @@number = num
+          puts "[repository_#{num}]"
+          puts "name=#{repo.name}"
+          puts "alias=#{repo.alias}"
+          puts "old_url=#{repo.old_url}" if repo.upgraded? || (!suggested.empty?)
+          if valid
+            if repo.unversioned? && repo.old_url
+              puts <<-'HEADER'.gsub(/^ +/, '')
+                # The repository is unversioned: its packages should be perfectly
+                # working regardless the distribution version, that because all the
+                # required dependencies are included in the repository itself and
+                # automatically picked up.
+              HEADER
+            end
+            puts "url=#{repo.url}"
+          elsif repo.enabled?
+            unless suggested.empty?
+              puts <<-'HEADER'.gsub(/^ +/, '')
+                # The interpolated URL is invalid, but the script found an alternative
+                # URL which will be used to override the old value.
+                # Unfortunately the script is not able to know if the found URL is exact,
+                # so review the result before accepting any change, and in case want
+                # to disable it, just turn the "enabled" field below to "No".
+                #
+              HEADER
+              puts "url=#{suggested}"
+              puts 'enabled=Yes'
+            else
+              puts <<-'HEADER'.gsub(/^ +/, '')
+                # The interpolated URL is invalid, and the script has not been able to find
+                # an alternative. The best thing to do here is to disable the repository.
+                # In case a valid alternative will be discovered, just replace its URL in
+                # the "url" field below and make sure to re-enable the repository by switching
+                # the "enabled" field to "Yes" again.
+                #
+              HEADER
+              puts "url=#{repo.old_url}"
+              puts 'enabled=No'
+            end
+          else
+            puts <<-'HEADER'.gsub(/^ +/, '')
+              # The interpolated URL is invalid, but being the repository disabled you can
+              # keep the old_url in the field below, it will be ignored anyway during the
+              # system update and upgrade process until the repository is enabled again.
+            HEADER
+            puts "url=#{suggested.empty? ? repo.old_url : suggested}"
+          end
+          puts "priority=#{repo.priority}"
+          puts "status=#{status}"
+        end
+      end
+
     end
   end
 end

data/lib/zypper/upgraderepo.rb

@@ -33,6 +33,7 @@ module Zypper
       end
 
       def check_current
+        @repos.upgrade!(@os_release.current)
         check_repos(@os_release.current)
       end
 
@@ -79,6 +80,11 @@ module Zypper
         @view_class.status(@os_release)
       end
 
+      def update
+        @repos.upgrade!(@os_release.current)
+        upgrade_repos(@os_release.current)
+      end
+
       private
 
       def check_repos(version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ description: This is just a complement to zypper command which helps to upgrade
 email:
 - fabio.mucciante@gmail.com
 executables:
-- zypper-upgraderepo
+- upgraderepo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -97,7 +97,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/zypper-upgraderepo
+- exe/upgraderepo
 - lib/zypper/upgraderepo.rb
 - lib/zypper/upgraderepo/cli.rb
 - lib/zypper/upgraderepo/os_release.rb
@@ -116,7 +116,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/fabiomux/zypper-upgraderepo/issues
   changelog_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html#changelog
-  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.7.0
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.8.0
   homepage_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html
   source_code_uri: https://github.com/fabiomux/zypper-upgraderepo
   wiki_uri: https://github.com/fabiomux/zypper-upgraderepo/wiki
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.19
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Zypper addon to check and upgrade local repositories.