zypper-upgraderepo 1.2.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a427fb24de5056e9425117be69b150cd225a9cf649d93f0ee8c5425951021824
-  data.tar.gz: a317a3f790c16151bb08a9cdffddd8e813f325adf0f49f5a5aac9760a4b28aee
+  metadata.gz: 16c361a53d2dfbdfec788a093bd3bf5b8bf0baaedbb2e3c744f1b8ccf9184af0
+  data.tar.gz: da0e38eef39182fa0049f3009bbb5ffb35d06cfb0395e8ac58db055e9148c62c
 SHA512:
-  metadata.gz: 256f4cf0b63242db412d27328bdc0599b583e20dfbc194941963d4676f025033defadaeab0bb1f6cf3cbeaf2c0ebe64cdc78e3460c9693ac53454768d810cf91
-  data.tar.gz: '0408b1a8169c94fa1115b1f9fda5ce411718cac4d8afeb149dbdb3b5f2a76a89a57c97ebca951a7c440ffc2c96929985e94f60d353fd5302517d9a8f9f2aa141'
+  metadata.gz: 26cac0292f39db0f6662924a7bcc14632ff0799af489eb9444c2b08acb4c3efe50e6dd09820d6395f0bb0cd4539c8a08bcb21f9595984e4fffa2fd72a49efdbd
+  data.tar.gz: 061ec093eaa6049a19ad15484e617400de8c1901e25f5a418053e0e66c1c24156eb498bc5502dbe54b06706e34f3f213d4411ca218ebec059df2362e7374fe37

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.2.0)
+    zypper-upgraderepo (1.6.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.5.0)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  rake (~> 10.0)
+  bundler (~> 2.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   zypper-upgraderepo!
 
 BUNDLED WITH
-   1.17.1
+   2.2.19

data/lib/zypper/upgraderepo/cli.rb

@@ -23,6 +23,11 @@ module Zypper
         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
+        options.allow_unstable = false
 
         opt_parser = OptionParser.new do |opt|
 
@@ -45,17 +50,25 @@ module Zypper
             options.operation = :check_current
           end
 
-          opt.on('-N', '--check-next', 'Check the repositories for the next version') do |o|
+          opt.on('-n', '--check-next', 'Check the repositories for the next version') do |o|
             options.operation = :check_next
           end
 
-          opt.on('-C', '--check-to <VERSION>', 'Check for a custom VERSION') do |v|
+          opt.on('-C', '--check-for <VERSION>', 'Check for a custom VERSION') do |v|
             options.version = v
-            options.operation = :check_to
+            options.operation = :check_for
           end
 
-          opt.on('-u', '--upgrade', 'Upgrade to the last version available') do |o|
-            options.operation = :upgrade
+          opt.on('-l', '--check-last', 'Check the repositories for the last version') do |o|
+            options.operation = :check_last
+          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 next version available') do |o|
+            options.operation = :upgrade_to_next
           end
 
           opt.on('-U', '--upgrade-to <VERSION>', 'Upgrade to a specific VERSION') do |v|
@@ -63,15 +76,19 @@ module Zypper
             options.operation = :upgrade_to
           end
 
-          opt.separator ''
-          opt.separator 'Options:'
+          opt.on('-L', '--upgrade-to-last', 'Upgrade to the last version available') do |o|
+            options.operation = :upgrade_to_last
+          end
 
-          opt.on('--only-enabled', 'Include only the enabled repositories') do |o|
-            options.only_enabled = true
+          opt.on('-s', '--status', 'Prints the version status of the current and available releases') do |o|
+            options.operation = :status
           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.separator ''
+          opt.separator 'Options:'
+
+          opt.on('--allow-unstable', 'Consider the unstable version as a valid release version') do |o|
+            options.allow_unstable = true
           end
 
           opt.on('--no-name', 'Don\'t upgrade the name') do |o|
@@ -82,18 +99,45 @@ 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.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:'
 
@@ -109,6 +153,14 @@ module Zypper
             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
@@ -150,7 +202,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/os_release.rb

@@ -6,12 +6,20 @@ module Zypper
 
     class OsRelease
 
-      attr_reader :custom
+      attr_reader :custom, :unstable
 
-      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0', '15.1']
+      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0', '15.1', '15.2', '15.3']
 
+      UNSTABLE_VERSION = '15.4'
 
       def initialize(options)
+
+        if options.allow_unstable
+          raise NoUnstableVersionAvailable if UNSTABLE_VERSION.empty?
+          OS_VERSIONS << UNSTABLE_VERSION
+          @unstable = true
+        end
+
         fname = if File.exist? '/etc/os-release'
                   '/etc/os-release'
                 elsif File.exist? '/etc/SuSE-release'
@@ -32,6 +40,10 @@ module Zypper
         OS_VERSIONS[@current_idx]
       end
 
+      def last
+        OS_VERSIONS[-1]
+      end
+
       def next
         unless last?
           OS_VERSIONS[@current_idx.next]
@@ -48,6 +60,22 @@ module Zypper
         end
       end
 
+      def fullname
+        @release['__anonymous__']['PRETTY_NAME'].gsub(/"/, '')
+      end
+
+      def seniority
+        OS_VERSIONS.count - @current_idx.next
+      end
+
+      def newer
+        if seniority > 0
+          OS_VERSIONS[@current_idx.next..-1]
+        else
+          []
+        end
+      end
+
       def last?
         @current_idx == (OS_VERSIONS.count - 1)
       end

data/lib/zypper/upgraderepo/repository.rb

@@ -14,32 +14,91 @@ module Zypper
         @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 = []
 
         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?)
+          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.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 only_enabled?
+        @only_enabled
       end
 
-      def each_with_index
-        @list.each_with_index do |repo, i|
-          next if @only_repo && !@only_repo.include?(i.next)
+      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]
+        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 repo, i if block_given?
+          yield x[:repo], x[:num] if block_given?
         end
       end
 
+      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
+        end
+
+        self
+      end
+
       def save
         @list.each do |i|
-          i.save
+          i[:repo].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 +118,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
@@ -83,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
@@ -92,7 +167,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
@@ -112,13 +187,22 @@ module Zypper
       end
 
       def save
-        raise InvalidPermissions, @filename unless File.writable? @filename
+        raise InvalidWritePermissions, @filename unless File.writable? @filename
+        process, pid = libzypp_process
+        raise SystemUpdateRunning, { pid: pid, process: process } if pid
         @repo.save(@filename)
       end
 
 
       private
 
+      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

data/lib/zypper/upgraderepo/request.rb

@@ -1,196 +1,42 @@
 require 'delegate'
-require 'net/http'
+require_relative 'traversable.rb'
+require_relative 'requests/local.rb'
+require_relative 'requests/http.rb'
 
 module Zypper
   module Upgraderepo
 
 
-    class PageRequest < SimpleDelegator
+    class Request
 
-      attr_reader :page
+      def self.build(repo, timeout)
+        @@registry ||= self.load_requests
 
-      USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:59.0) Gecko/20100101 Firefox/59.0'
+        raise InvalidProtocol, repo unless @@registry.include? repo.protocol
 
-      def initialize(obj, timeout = 60)
-        super obj
-        @timeout = timeout
+        Object.const_get(@@registry[repo.protocol]).new(repo, timeout)
       end
 
-      def available?
-        ping.is_a?(Net::HTTPSuccess)
+      def self.protocols
+        self.load_requests.keys
       end
 
-      def redirected?
-        ping.is_a?(Net::HTTPRedirection)
-      end
-
-      def redirected_to
-        ping['location']
-      end
-
-      def not_found?
-        ping.is_a?(Net::HTTPNotFound)
-      end
-
-      def forbidden?
-        ping.is_a?(Net::HTTPForbidden)
-      end
-
-      def timeout?
-        ping.is_a?(Net::HTTPRequestTimeOut)
-      end
-
-      def status
-        ping.class.to_s
-      end
-
-
-      private
-
-      def get_request(uri, head)
-        uri ||= repodata_uri
-
-        if head
-          request = Net::HTTP::Head.new(uri.request_uri)
-        else
-          request = Net::HTTP::Get.new(uri.request_uri)
-        end
-
-        request['User-Agent'] = USER_AGENT
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = (uri.scheme == "https")
-        http.open_timeout = @timeout
-
-        http.request(request)
-      end
-
-      def ping(uri = nil, head = true)
-        begin
-          if @page.nil? || uri
-            @page = get_request(uri, head)
-          end
-        rescue SocketError
-          raise NoConnection
-        rescue Net::OpenTimeout
-          @page = Net::HTTPRequestTimeOut.new('1.1', '', '')
-        end
-        @page
-      end
-
-    end
-
-
-    class RepositoryRequest < PageRequest
-
-      def evaluate_alternative(version)
-
-        if not_found?
-          return traverse_url(URI(url), version)
-        elsif redirected?
-          return { url: redirected_to, message: 'Redirected to:' }
-        end
-      end
-
-
       private
 
-      def traverse_url(uri, version)
-        ping(uri)
-
-        if forbidden?
-          res =  { url: url, message: 'Can\'t navigate through the repository!' }
-        elsif available? && uri.to_s =~ /#{version}/
-          res = traverse_url_forward(uri, version)
-        else
-          res = traverse_url_backward(uri, version)
-        end
-
-        res || { url: '', message: 'Can\'t find a valid alternative, try manually!' }
-      end
-
-      def traverse_url_backward(uri, version)
-        uri.path = File.dirname(uri.path)
-
-        return nil if uri.path == '/' || uri.path == '.'
-
-        uri.path += '/' if uri.path[-1] != '/'
-        ping(uri, false)
-
-        if not_found?
-          return traverse_url_backward(uri, version)
-        elsif available?
-
-          if uri.path =~ /#{version}/ && repodata?
-            return {url: uri.to_s, message: 'Override with this one' }
-          elsif res = traverse_url_forward(uri, version, !(uri.path =~ /#{version}/))
-            return res
-          else
-            return traverse_url_backward(uri, version)
-          end
-
-        elsif forbidden?
-          return { url: uri.to_s, message: 'Try to replace with this one' } if repodata?(uri)
-
-          return traverse_url_backward(uri, version)
-        end
-
-        nil
-      end
-
-      def traverse_url_forward(uri, version, check_version = false)
-        uri.path += '/' if uri.path[-1] != '/'
-        ping(uri, false)
-
-        subfolders(version, check_version).each do |dir|
-          u = URI(uri.to_s)
-          u.path += dir
-
-          if repodata?(u)
-            return {url: u.to_s, message: 'Override with this one' }
-          else
-            res = traverse_url_forward(u, version)
-            return res if res.class == Hash
+      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}"
           end
         end
 
-        nil
-      end
-
-      def repodata_uri(uri = nil)
-        if uri
-          uri = URI(uri.to_s)
-        else
-          uri = URI(url)
-        end
-
-        uri.path = uri.path.gsub(/\/$/, '') + '/repodata/repomd.xml' 
-
-        uri
-      end
-
-      def repodata?(uri = nil)
-        if uri.nil?
-          return ping.body.to_s.scan(Regexp.new("href=\"repodata/")).empty?
-        else
-          ping(repodata_uri(uri))
-          return available?
-        end
-      end
-
-      def subfolders(version, check_version)
-        res = 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
-
-        res = res.delete_if { |x| !(x =~ /#{version}/) } if check_version
-
         res
       end
+
     end
 
 
+
   end
 end