zypper-upgraderepo 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13911becd258b1faf2a3a94c84a9899cd9d5bb8e0ac916e7aac7b7e687dfdc4
-  data.tar.gz: 563d2da75b66e61a72d3f5471d4bbe7d4a2910ec0fb5141811d68212bc69dd3a
+  metadata.gz: d4760ab0872714ea6449ab9f0ece3864e26c8c240f9b11633006fb12dd817499
+  data.tar.gz: 20adbb9f4e555758247171702c7adbd3513f94025cb4f02259b9c9fd2ed58de4
 SHA512:
-  metadata.gz: b23a6b5f089b9c2d23d7c887489f72f1c421b6259f1a291efa9211506dc489ef85820ac52d9f4786ac908a74f55cd163aa0a7b40713e0d10873e3e3823ef66ff
-  data.tar.gz: 9adf8f0be93b9a7f2c349168535238ed6355f1f9c14968717e96168d1929216ac0a1917ab63c1d35136e4e131cbfe88fae8a3ea2d2784431a37f2a393af73b3f
+  metadata.gz: 8450283c28d80056aa8f9bc7c97f40e7778a728b200b04dacf38cd3697ab76da59332314f4de5d23328e11283d9365088d9d212cb5cfdab837b2954d306cb87e
+  data.tar.gz: 478fdd3fa080ae63049b077bc8ddf73a5d1d87655da3a1c17f0588c944766b09aba44b5f6b62ecbdd62cc641e7dcf0486a4a45ae25e04773502c3c99acc8546f

data/.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: [fabiomux]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.buymeacoffee.com/DCkNYFg']

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.3.0)
+    zypper-upgraderepo (1.4.0)
       iniparse
       minitar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     iniparse (1.5.0)
     minitar (0.9)
     rake (13.0.1)
@@ -16,15 +16,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
 
 PLATFORMS
   ruby

data/lib/zypper/upgraderepo.rb

@@ -17,14 +17,9 @@ module Zypper
         @print_hint = options.hint
         @view_class = Zypper::Upgraderepo::View.const_get options.view.to_s.capitalize
 
-        @overrides = options.overrides
-        @upgrade_options = { alias: options.alias, name: options.name }
-
         @backup_path = options.backup_path
 
         @exit_on_fail = options.exit_on_fail
-
-        @filename = options.filename
       end
 
       def backup
@@ -43,27 +38,24 @@ module Zypper
 
       def check_next
         raise AlreadyUpgraded, 'latest' if @os_release.last?
-        @repos.each_with_index { |r, i| r.upgrade(@os_release.next, @upgrade_options.merge(url_override: @overrides[i.next])) }
+        @repos.upgrade!(@os_release.next)
         check_repos(@os_release.next)
       end
 
       def check_to
-        @repos.each_with_index { |r, i| r.upgrade(@os_release.custom, @upgrade_options.merge(url_override: @overrides[i.next])) }
+        @repos.upgrade!(@os_release.custom)
         check_repos(@os_release.custom)
       end
 
-      def check_from_file
-        load_overrides
-        check_repos(@os_release.next)
-      end
-
       def upgrade
         raise AlreadyUpgraded, 'latest' if @os_release.last?
+        @repos.upgrade!(@os_release.next)
         upgrade_repos(@os_release.next)
       end
 
       def upgrade_to
         raise AlreadyUpgraded, @os_release.custom if @os_release.current?(@os_release.custom)
+        @repos.upgrade!(@os_release.custom)
         upgrade_repos(@os_release.custom)
       end
 
@@ -71,45 +63,30 @@ module Zypper
         upgrade_repos(@os_release.current)
       end
 
-      def upgrade_from_file
-        load_overrides
-        upgrade_repos(@os_release.next)
-      end
-
 
       private
 
-      def load_overrides
-        ini = IniParse.parse(File.read(@filename))
-        @repos.each_with_index do |r, i|
-          x = ini["Repository_#{i.next}"]
-          raise UnmatchingOverrides, { num: i.next, ini: x, repo: r } if r.url != x['OldURL']
-          raise MissingOverride, { num: i.next, ini: x } unless x['URL']
-          @overrides[i.next] = x['URL']
-        end
-      end
-
       def check_repos(version)
         @view_class.header(@repos.max_col)
 
-        @repos.each_with_index do |r, i|
+        @repos.each_with_number do |repo, num|
 
           @view_class.separator
 
-          if r.available?
-            @view_class.available i.next, r, @repos.max_col
+          if repo.available?
+            @view_class.available num, repo, @repos.max_col
           else
-            raise UnableToUpgrade, {num: i.next, repo: r} if @exit_on_fail
-            if r.redirected?
-              @view_class.redirected i.next, r, @repos.max_col, r.redirected_to
-            elsif r.not_found?
+            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 i.next, r, @repos.max_col, r.evaluate_alternative(version)
+                @view_class.alternative num, repo, @repos.max_col, repo.evaluate_alternative(version)
               else
-                @view_class.not_found i.next, r, @repos.max_col
+                @view_class.not_found num, repo, @repos.max_col
               end
-            elsif r.timeout?
-              @view_class.timeout i.next, r, @repos.max_col
+            elsif repo.timeout?
+              @view_class.timeout num, repo, @repos.max_col
             end
           end
         end
@@ -120,16 +97,14 @@ module Zypper
       def upgrade_repos(version)
         @view_class.header(@repos.max_col, true)
 
-        @repos.each_with_index do |repo, i|
+        @repos.each_with_number do |repo, num|
 
           @view_class.separator
 
-          repo.upgrade(version, @upgrade_options.merge(url_override: @overrides[i.next]))
-
           if repo.upgraded?
-            @view_class.upgraded i.next, repo, @repos.max_col
+            @view_class.upgraded num, repo, @repos.max_col
           else
-            @view_class.untouched i.next, repo, @repos.max_col
+            @view_class.untouched num, repo, @repos.max_col
           end
         end
 

data/lib/zypper/upgraderepo/cli.rb

@@ -24,7 +24,8 @@ module Zypper
         options.only_repo = nil
         options.timeout = 10.0
         options.exit_on_fail = false
-        options.filename = ''
+        options.overrides_filename = nil
+        options.only_invalid = false
 
         opt_parser = OptionParser.new do |opt|
 
@@ -56,11 +57,6 @@ module Zypper
             options.operation = :check_to
           end
 
-          opt.on('-f', '--check-from-file <FILENAME>', 'Check the URLs in the exported FILENAME') do |f|
-            options.filename = f
-            options.operation = :check_from_file
-          end
-
           opt.on('-R', '--reset', 'Reset the repositories to the current OS version.') do |v|
             options.operation = :reset
           end
@@ -74,26 +70,9 @@ module Zypper
             options.operation = :upgrade_to
           end
 
-          opt.on('-F', '--upgrade-from-file <FILENAME>', 'Upgrade from FILENAME') do |f|
-            options.filename = f
-            options.operation = :upgrade_from_file
-          end
-
           opt.separator ''
           opt.separator 'Options:'
 
-          opt.on('--exit-on-fail', 'Exit with error when a repository upgrade check fails') do |o|
-            options.exit_on_fail = true
-          end
-
-          opt.on('--only-enabled', 'Include only the enabled repositories') do |o|
-            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)
-          end
-
           opt.on('--no-name', 'Don\'t upgrade the name') do |o|
             options.name = false
           end
@@ -102,18 +81,41 @@ module Zypper
             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\'s url 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|
+            options.overrides_filename = f
+          end
+
+          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|
             options.timeout = o.to_f
           end
 
+          opt.separator ''
+          opt.separator 'Filter options:'
+
+          opt.on('--only-enabled', 'Include only the enabled repositories') do |o|
+            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)
+          end
+
+          opt.on('--only-invalid', 'Show only invalid repositories') do |o|
+            options.only_invalid = true
+          end
+
           opt.separator ''
           opt.separator 'View options:'
 
@@ -178,7 +180,7 @@ module Zypper
           Upgraderepo::Builder.new(options).send(options.operation)
          rescue => e
            Messages.error e
-           exit 1
+           exit e.error_code
          end
       end
     end

data/lib/zypper/upgraderepo/repository.rb

@@ -14,24 +14,47 @@ module Zypper
         @alias = options.alias
         @name = options.name
         @only_repo = options.only_repo
+        @only_enabled = options.only_enabled
+        @only_invalid = options.only_invalid
+        @overrides = options.overrides
+        @upgrade_options = {alias: options.alias, name: options.name}
         @list = []
 
         Dir.glob(File.join(REPOSITORY_PATH, '*.repo')).each do |i|
           r = RepositoryRequest.new(Repository.new(i), options.timeout)
-          next if options.only_enabled && (!r.enabled?)
           @list << r
         end
-        @max_col = @list.max_by { |x| x.name.length }.name.length
+        @max_col = @list.max_by { |r| r.name.length }.name.length
 
-        @list.sort_by! { |x| x.alias }
-        @list.sort_by! { |x| x.send(options.sort_by) } if options.sort_by != :alias
+        @list = @list.sort_by { |r| r.alias }.map.with_index(1) { |r, i| { num: i, repo: r } }
+
+        @list.sort_by! { |x| x[:repo].send(options.sort_by) } if options.sort_by != :alias
+
+        load_overrides(options.filename) if options.filename
       end
 
-      def each_with_index
-        @list.each_with_index do |repo, i|
-          next if @only_repo && !@only_repo.include?(i.next)
+      def only_enabled?
+        @only_enabled
+      end
 
-          yield repo, i if block_given?
+      def upgrade!(version)
+        each_with_number(only_invalid: false) do |repo, num|
+          repo.upgrade! version, @upgrade_options.merge(url_override: @overrides[num])
+          repo.cache!
+        end
+      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]
+
+        @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?
+
+          yield x[:repo], x[:num] if block_given?
         end
       end
 
@@ -40,6 +63,27 @@ module Zypper
           i.save
         end
       end
+
+
+      private
+
+      def load_overrides(filename)
+        raise FileNotFound, filename unless File.exist?(filename)
+        ini = IniParse.parse(File.read(filename))
+        each_with_number(only_invalid: false) do |repo, num|
+          if x = ini["repository_#{num}"]
+            repo.enable!(x['enabled'])
+            raise UnmatchingOverrides, { num: num, ini: x, repo: repo } if repo.url != x['old_url']
+            if (@repos.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
+            @overrides[num] = x['url'] if x['url']
+          end
+        end
+      end
+
     end
 
 
@@ -59,6 +103,10 @@ module Zypper
         @repo[@key]['enabled'].to_i == 1
       end
 
+      def enable!(value = true)
+        @repo[@key]['enabled'] = (value.to_s =~ /true|1|yes/i) ? 1 : 0
+      end
+
       def type
         @repo[@key]['type']
       end
@@ -92,7 +140,7 @@ module Zypper
         @key = get_key
       end
 
-      def upgrade(version, args = {})
+      def upgrade!(version, args = {})
         @old_url ||= self.url
         @old_alias ||= self.alias
         @old_name ||= self.name

data/lib/zypper/upgraderepo/request.rb

@@ -44,6 +44,10 @@ module Zypper
         ping.class.to_s
       end
 
+      def cache!
+        @page = nil
+      end
+
 
       private
 

data/lib/zypper/upgraderepo/utils.rb

@@ -25,6 +25,11 @@ module Zypper
       def new_line;       "\n#{self}" end
     end
 
+    class ::StandardError
+      def error_code
+        1
+      end
+    end
 
     class Messages
 
@@ -48,6 +53,11 @@ module Zypper
 
     end
 
+    class FileNotFound < StandardError
+      def initialize(filename)
+        super "The File #{filename} doesn't exist."
+      end
+    end
 
     class ReleaseFileNotFound < StandardError
       def initialize
@@ -65,29 +75,49 @@ module Zypper
       def initialize(filename)
         super "Don't have the right permission to write #{filename}"
       end
+
+      def error_code
+        4
+      end
     end
 
     class SystemUpdateRunning < StandardError
       def initialize(args)
         super "The application #{args[:process].bold} with pid #{args[:pid].bold} is running a system update!"
       end
+
+      def error_code
+        5
+      end
     end
 
     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!"
       end
+
+      def error_code
+        7
+      end
     end
 
     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
+        8
       end
     end
 
     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
+        9
       end
     end
 
@@ -95,12 +125,20 @@ module Zypper
       def initialize(version)
         super "The system is already upgraded to the #{version} version"
       end
+
+      def error_code
+        2
+      end
     end
 
     class NoConnection < StandardError
       def initialize
         super 'Internet connection has some trouble'
       end
+
+      def error_code
+        6
+      end
     end
 
     class Interruption < StandardError

data/lib/zypper/upgraderepo/version.rb

@@ -1,5 +1,5 @@
 module Zypper
   module Upgraderepo
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/lib/zypper/upgraderepo/view.rb

@@ -160,7 +160,7 @@ module Zypper
 
         def self.redirected(num, repo, max_col, redirected)
           self.info num, 'Redirected', repo, false
-          puts "RedirectedTo=#{redirected}"
+          puts "redirected_to=#{redirected}"
         end
 
         def self.not_found(num, repo, max_col)
@@ -169,8 +169,8 @@ module Zypper
 
         def self.alternative(num, repo, max_col, alt)
           self.info num, 'Not Found', repo, false
-          puts "Hint=#{alt[:message]}"
-          puts "Suggested=#{alt[:url]}" unless alt[:url].to_s.empty?
+          puts "hint=#{alt[:message]}"
+          puts "suggested_url=#{alt[:url]}" unless alt[:url].to_s.empty?
         end
 
         def self.timeout(num, repo, max_col)
@@ -200,14 +200,34 @@ module Zypper
 
         def self.info(num, status, repo, valid = true)
           @@number = num
-          puts "[Repository_#{num}]"
-          puts "Name=#{repo.name}"
-          puts "Alias=#{repo.alias}"
-          puts "OldURL=#{repo.old_url}"
-          puts "URL=#{repo.url}" if valid
-          puts "Priority=#{repo.priority}"
-          puts "Enabled=#{repo.enabled? ? 'Yes' : 'No'}"
-          puts "Status=#{status}"
+          puts "[repository_#{num}]"
+          puts "name=#{repo.name}"
+          puts "alias=#{repo.alias}"
+          puts "old_url=#{repo.old_url}"
+          if valid
+            puts "url=#{repo.url}"
+          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.
+              # The alternatives are:
+              # 1. Waiting for a repository upgrade;
+              # 2. Change the provider for the related installed packages;
+              # 3. Disable the repository putting the enabled status to 'No'.
+              #
+              url=
+            HEADER
+          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
+              # normal update and upgrade process.
+            HEADER
+            puts "url=#{repo.old_url}"
+          end
+          puts "priority=#{repo.priority}"
+          puts "enabled=#{repo.enabled? ? 'Yes' : 'No'}"
+          puts "status=#{status}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -115,7 +116,7 @@ licenses:
 - GPL-3.0
 metadata:
   bug_tracker_uri: https://github.com/fabiomux/zypper-upgraderepo/issues
-  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.3.0
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.4.0
   homepage_uri: https://github.com/fabiomux/zypper-upgraderepo
   source_code_uri: https://github.com/fabiomux/zypper-upgraderepo
   wiki_uri: https://github.com/fabiomux/zypper-upgraderepo/wiki