zypper-upgraderepo 1.0.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25eb50066963aad6a37ce7c2d79410d0ef30a68e8dbc302e4a09f6c9589c15de
-  data.tar.gz: ca2e0b7855cbd47ff45d41daef4ec3907e9813df77ead0ddd8e32fd37e4ff486
+  metadata.gz: 44bef40acdc725f7422911297413011d47e967d568497f74770ae162494a60dd
+  data.tar.gz: 4fa8b988dc188ee5deb97671ee31e99db1cf64efde819b8be2b5fef630b0b352
 SHA512:
-  metadata.gz: e5c58c0ea4564541da066b599c9e882015e019328c84330f0bad4ccb3dcf99089628a40a9a1b5d3b0661996db86ce99c85d71d77138a765cfcabb313a888c098
-  data.tar.gz: 6e4e59b92565921be94f45bc59efb7713cad2a5c40ce60096dd95195cc58401100411837470de7d76d0480d2284958f78a388bbd1f6135ade279a59d66e30cb0
+  metadata.gz: 6385cf9e04fcdd33ee544b64d64e16c123f750493d1a9b3b67eac84d167006debb05fada54488eaa7d5cbb414378d1ffd14e528d086cbe5b93af680ac643aa13
+  data.tar.gz: ca6a79d5387b76704b93994ff3e11bf0170f1950bbccad3335ff1564cde32d97edf55388c686858c75e594a3e46ac758ba2a66c1fadfba0b5b24157459240d31

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,39 +1,39 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.0.2)
+    zypper-upgraderepo (1.5.0)
       iniparse
       minitar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    iniparse (1.4.4)
-    minitar (0.6.1)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    diff-lcs (1.4.4)
+    iniparse (1.5.0)
+    minitar (0.9)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 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.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  rake (~> 10.0)
+  bundler (~> 2.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   zypper-upgraderepo!
 
 BUNDLED WITH
-   1.16.2
+   2.1.4

data/README.md

@@ -17,15 +17,15 @@ If you want to install it as zypper plugin watch the _zypper-upgraderepo-plugin_
 
 To check the availability of the current repositories:
 
-    $ zypper-upgraderepo -c
+    $ zypper-upgraderepo --check-current
 
 To check the availability of the next version repositories:
 
-    $ zypper-upgraderepo -n
+    $ zypper-upgraderepo --check-next
 
 To upgrade the repositories to the next version:
 
-    $ sudo zypper-upgraderepo -u
+    $ sudo zypper-upgraderepo --upgrade
 
 ## Get help
 
@@ -36,6 +36,10 @@ Where to start:
 More Help:
 
 - The wiki page: https://github.com/fabiomux/zypper-upgraderepo
+- openSUSE Lizards: https://lizards.opensuse.org/2018/08/07/zypper-upgraderepo-plugin-is-here/
+
+## Related projects
+
 - zypper-upgraderepo-plugin project: https://github.com/fabiomux/zypper-upgraderepo-plugin
 
 ## Contributing

data/lib/zypper/upgraderepo.rb

@@ -1,6 +1,10 @@
 require 'zypper/upgraderepo/repository'
+require 'zypper/upgraderepo/request'
 require 'zypper/upgraderepo/os_release'
 require 'zypper/upgraderepo/utils'
+require 'zypper/upgraderepo/view'
+require 'zlib'
+require 'minitar'
 
 
 module Zypper
@@ -9,13 +13,23 @@ module Zypper
     class Builder
       def initialize(options)
         @os_release = OsRelease.new(options)
-        @repos = RepositoryList.new(options)
+        @repos = RepositoryList.new(options).resolve_variables!(@os_release.current)
         @print_hint = options.hint
+        @view_class = Zypper::Upgraderepo::View.const_get options.view.to_s.capitalize
+
+        @backup_path = options.backup_path
+
+        @exit_on_fail = options.exit_on_fail
       end
 
       def backup
-        @repos.backup
-        Messages.ok 'Repository backup executed!'
+        filename = File.join(@backup_path, "repos-backup-#{Time.now.to_s.delete(': +-')[0..-5]}.tgz")
+
+        raise InvalidWritePermissions, filename unless File.writable? @backup_path
+
+        Minitar.pack(RepositoryList::REPOSITORY_PATH, Zlib::GzipWriter.new(File.open(filename, 'wb')))
+
+        Messages.ok "Backup file generated at #{filename.bold.green}"
       end
 
       def check_current
@@ -23,47 +37,81 @@ module Zypper
       end
 
       def check_next
-        @repos.upgrade(@os_release.next) unless @os_release.last?
+        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        @repos.upgrade!(@os_release.next)
         check_repos(@os_release.next)
       end
 
       def check_to
-        @repos.upgrade(@os_release.custom)
+        @repos.upgrade!(@os_release.custom)
         check_repos(@os_release.custom)
       end
 
       def upgrade
-        @repos.upgrade(@os_release.next) unless @os_release.last?
-        @repos.save
-        Messages.ok 'Repositories upgraded!'
+        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        @repos.upgrade!(@os_release.next)
+        upgrade_repos(@os_release.next)
       end
 
       def upgrade_to
-        @repos.upgrade(@os_release.custom)
-        @repos.save
-        Messages.ok 'Repositories upgraded!'
+        raise AlreadyUpgraded, @os_release.custom if @os_release.current?(@os_release.custom)
+        @repos.upgrade!(@os_release.custom)
+        upgrade_repos(@os_release.custom)
+      end
+
+      def reset
+        upgrade_repos(@os_release.current)
       end
 
 
       private
 
       def check_repos(version)
-        Messages.header(@repos.max_col)
-        @repos.list.each_with_index do |r, i|
-          Messages.separator
-          if r.available?
-            Messages.available i.next, r.name, r.url, @repos.max_col
-          elsif r.redirected?
-            Messages.redirected i.next, r.name, r.url, @repos.max_col, r.redirected_to
-          elsif r.not_found?
-            if @print_hint
-              Messages.alternative i.next, r.name, r.url, @repos.max_col, r.evaluate_alternative(version)
-            else
-              Messages.not_found i.next, r.name, r.url, @repos.max_col
+        @view_class.header(@repos.max_col)
+
+        @repos.each_with_number do |repo, num|
+
+          @view_class.separator
+
+          if repo.available?
+            @view_class.available num, repo, @repos.max_col
+          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.timeout?
+              @view_class.timeout num, repo, @repos.max_col
             end
           end
         end
-        Messages.footer
+
+        @view_class.footer
+      end
+
+      def upgrade_repos(version)
+        @view_class.header(@repos.max_col, true)
+
+        @repos.each_with_number do |repo, num|
+
+          @view_class.separator
+
+          if repo.upgraded?
+            @view_class.upgraded num, repo, @repos.max_col
+          else
+            @view_class.untouched num, repo, @repos.max_col
+          end
+        end
+
+        @view_class.separator
+
+        @repos.save
+        Messages.ok 'Repositories upgraded!'
       end
 
     end

data/lib/zypper/upgraderepo/cli.rb

@@ -13,13 +13,21 @@ module Zypper
         options = OpenStruct.new
         options.operation = :check_current
         options.backup_path = ENV['HOME']
-        options.only_enabled = true
+        options.only_enabled = false
         options.alias = true
         options.name = true
         options.hint = true
         options.overrides = {}
         options.version = nil
-        
+        options.sort_by = :alias
+        options.view = :table
+        options.only_repo = nil
+        options.timeout = 10.0
+        options.exit_on_fail = false
+        options.overrides_filename = nil
+        options.only_invalid = false
+        options.only_protocols = nil
+
         opt_parser = OptionParser.new do |opt|
 
           if ENV['ZYPPER_UPGRADEREPO']
@@ -50,6 +58,10 @@ module Zypper
             options.operation = :check_to
           end
 
+          opt.on('-R', '--reset', 'Reset the repositories to the current OS version.') do |v|
+            options.operation = :reset
+          end
+
           opt.on('-u', '--upgrade', 'Upgrade to the last version available') do |o|
             options.operation = :upgrade
           end
@@ -62,26 +74,81 @@ module Zypper
           opt.separator ''
           opt.separator 'Options:'
 
-          opt.on('--[no-]only-enabled', 'Include or not the disabled repositories') do |o|
-            options.only_enabled = o
+          opt.on('--no-name', 'Don\'t upgrade the name') do |o|
+            options.name = false
+          end
+
+          opt.on('--no-alias', 'Don\'t upgrade the alias') do |o|
+            options.alias = false
+          end
+
+          opt.on('--no-hint', 'Don\'t find a working URL when the current is invalid') do |o|
+            options.hint = false
+          end
+
+          opt.on('--override-url <NUMBER>,<URL>', Array, 'Overwrite the repository NUMBER with URL') do |r|
+            options.overrides[r[0].to_i] = r[1]
           end
 
-          opt.on('--[no-]name', 'Upgrade or not the name') do |o|
-            options.name = o
+          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('--[no-]alias', 'Upgrade or not the alias') do |o|
-            options.alias = o
+          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-]hint', 'Suggest a new url when the current is not found') do |o|
-            options.hint = o
+          opt.on('--only-invalid', 'Show only invalid repositories') do |o|
+            options.only_invalid = true
           end
 
-          opt.on('--override-url <NUMBER>,<URL>', Array, 'Overwrite the repository\'s url NUMBER with URL') do |r|
-            options.overrides[r[0]] = r[1]
+          opt.on('--only-protocols <PROTOCOL>[,<PROTOCOL2>,...]', Array, "Show only from protocols (supported: #{Request.protocols.join(',')})") do |o|
+            options.only_protocols = o
           end
 
+          opt.separator ''
+          opt.separator 'View options:'
+
+          opt.on('--sort-by-alias', 'Sort repositories by alias (Default)') do |o|
+            options.sort_by = :alias
+          end
+
+          opt.on('--sort-by-name', 'Sort repositories by name') do |o|
+            options.sort_by = :name
+          end
+
+          opt.on('--sort-by-priority', 'Sort repositories by priority') do |o|
+            options.sort_by = :priority
+          end
+
+          opt.on('--ini', 'Output the result in Ini format') do |o|
+            options.view = :ini
+          end
+
+          opt.on('--quiet', 'Quiet mode, show only error messages') do |o|
+            options.view = :quiet
+          end
+
+          opt.on('--report', 'View the data as report') do |o|
+            options.view = :report
+          end
+
+
           unless ENV['ZYPPER_UPGRADEREPO']
             opt.separator ''
             opt.separator 'Other:'
@@ -98,7 +165,7 @@ module Zypper
           end
 
         end
-        
+
         if ARGV.empty?
           puts opt_parser; exit
         else
@@ -111,14 +178,14 @@ module Zypper
     end
 
 
-    class CLI 
+    class CLI
       def self.start
         begin
           options = OptParseMain.parse(ARGV)
           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/os_release.rb

@@ -8,7 +8,7 @@ module Zypper
 
       attr_reader :custom
 
-      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0']
+      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0', '15.1', '15.2', '15.3']
 
 
       def initialize(options)
@@ -24,7 +24,6 @@ module Zypper
 
         if options.version
           raise InvalidVersion, options.version unless OS_VERSIONS.include?(options.version)
-          raise AlreadyUpgraded, options.version unless OS_VERSIONS.index(options.version) != @current_idx
           @custom = options.version
         end
       end
@@ -60,6 +59,10 @@ module Zypper
       def valid?(version)
         OS_VERSIONS.include? version
       end
+
+      def current?(version)
+        OS_VERSIONS.index(version) == @current_idx
+      end
     end
 
 

data/lib/zypper/upgraderepo/repository.rb

@@ -1,47 +1,76 @@
 require 'iniparse'
-require 'net/http'
-require 'zlib'
-require 'minitar'
 
 module Zypper
   module Upgraderepo
 
 
     class RepositoryList
+
+      REPOSITORY_PATH = '/etc/zypp/repos.d'
+
       attr_reader :list, :max_col
 
       def initialize(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
         @overrides = options.overrides
+        @upgrade_options = {alias: options.alias, name: options.name}
         @list = []
-        @backup_path = options.backup_path
 
-        Dir.glob('/etc/zypp/repos.d/*.repo').sort.each do |i|
-          r = Repository.new(i)
-          next if options.only_enabled && (!r.enabled?)
+        Dir.glob(File.join(REPOSITORY_PATH, '*.repo')).each do |i|
+          r = Request.build(Repository.new(i), options.timeout)
           @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 = @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 only_enabled?
+        @only_enabled
+      end
+
+      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 backup
-        filename = File.join(@backup_path, "repos-backup-#{Time.now.to_s.delete(': +-')[0..-5]}.tgz")
-        raise InvalidPermissions, filename unless File.writable? @backup_path
-        Minitar.pack('/etc/zypp/repos.d',
-                     Zlib::GzipWriter.new(File.open(filename, 'wb'))) 
+      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]
+
+        @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))
+
+          yield x[:repo], x[:num] if block_given?
+        end
       end
 
-      def upgrade(version)
-        @list.each_with_index do |repo, i|
-          if @overrides.has_key? i.next.to_s
-            repo.url = @overrides[i.next.to_s]
-          else
-            repo.url = repo.url.gsub(/\d\d\.\d/, version)
+      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)
           end
-          repo.alias = repo.alias.gsub(/\d\d\.\d/, version) if @alias
-          repo.name = repo.name.gsub(/\d\d\.\d/, version) if @name
         end
+
+        self
       end
 
       def save
@@ -49,23 +78,50 @@ 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
 
 
     class Repository
-      attr_reader :filename
- 
+      attr_reader :filename, :old_url, :old_alias, :old_name
+
       def initialize(filename)
         @filename = filename
         @repo = IniParse.parse(File.read(filename))
-        @key = get_key 
-        @res = nil
+        @key = get_key
+        @old_url = nil
+        @old_name = nil
+        @old_alias = nil
       end
 
       def enabled?
         @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
@@ -78,6 +134,10 @@ module Zypper
         @repo[@key]['name'] = value
       end
 
+      def priority
+        @repo[@key]['priority'] || 99
+      end
+
       def url
         @repo[@key]['baseurl']
       end
@@ -86,6 +146,18 @@ module Zypper
         @repo[@key]['baseurl'] = value
       end
 
+      def protocol
+        URI(url.to_s).scheme
+      end
+
+      def unversioned?
+        (url =~ /\d\d\.\d/).nil?
+      end
+
+      def versioned?
+        !unversioned?
+      end
+
       def alias
         @key
       end
@@ -95,75 +167,45 @@ module Zypper
         @key = get_key
       end
 
-      def available?
-        ping.is_a?(Net::HTTPSuccess)
-      end
+      def upgrade!(version, args = {})
+        @old_url ||= self.url
+        @old_alias ||= self.alias
+        @old_name ||= self.name
 
-      def redirected?
-        ping.is_a?(Net::HTTPRedirection)
-      end
+        if args[:url_override]
+          self.url = args[:url_override]
+        else
+          self.url = self.url.gsub(/\d\d\.\d/, version)
+        end
 
-      def redirected_to
-        ping['location']
+        self.alias = self.alias.gsub(/\d\d\.\d/, version) if args[:alias]
+        self.name = self.name.gsub(/\d\d\.\d/, version) if args[:name]
       end
 
-      def not_found?
-        ping.is_a?(Net::HTTPNotFound)
+      def upgraded?(item = :url)
+        (!self.send("old_#{item}").nil?) && (self.send("old_#{item}") != self.send(item))
       end
 
       def save
-        raise InvalidPermissions, @filename unless File.writable? @filename
-        @repo.save(@filename) 
+        raise InvalidWritePermissions, @filename unless File.writable? @filename
+        process, pid = libzypp_process
+        raise SystemUpdateRunning, { pid: pid, process: process } if pid
+        @repo.save(@filename)
       end
 
-      def evaluate_alternative(version)
-        if url =~ /dl\.google\.com/
-          return { url: '', message: 'Just Google security, use this repo anyway ;)'}
-        elsif not_found?
-          return traverse_url(URI(url.clone), version)
-        elsif redirected?
-          return { url: redirected_to, message: 'Redirected to:' }
-        end
-      end
 
       private
 
-      def ping(uri = URI(url), force = false)
-        begin
-          @res = Net::HTTP.get_response(uri) if @res.nil? || force
-        rescue SocketError
-          raise NoConnection
-        end
-        @res
+      def libzypp_process
+        libpath = `ldd /usr/bin/zypper | grep "libzypp.so"`.split(' => ')[1].split(' ').shift
+        process = `sudo lsof #{libpath} | tail -n 1`
+        process, pid = process.split(' ')
+        [process, pid]
       end
 
       def get_key
         @repo.to_hash.keys.delete_if {|k| k == '0'}.pop
       end
-
-      def traverse_url(uri, version)
-        uri.path = File.dirname(uri.path)
-
-        return {url: '', message: 'None, try to find it manually'} if uri.path == '/'
-         
-        uri.path += '/'
-        ping(uri, true)
-
-        if not_found? 
-          return traverse_url(uri, version)
-        elsif available?
-          return {url: uri.to_s, message: 'Override with this one' } if uri.path =~ Regexp.new(version)
-
-          path = ping.body.to_s.scan(Regexp.new("href=\"[^\"]*#{version}[^\"]*\"")).uniq
-          unless path.empty?
-            uri.path += "#{path.pop.scan(/href="(.*)"/).pop.pop }"
-            return {url: uri.to_s, message: 'Override with this one' } 
-          end
-
-          return {url: url, message: 'Can\'t find anything similar, try manually!' }
-        end
-          
-      end
     end