zypper-upgraderepo 1.4.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4760ab0872714ea6449ab9f0ece3864e26c8c240f9b11633006fb12dd817499
-  data.tar.gz: 20adbb9f4e555758247171702c7adbd3513f94025cb4f02259b9c9fd2ed58de4
+  metadata.gz: d7760c0dd8fcc4192e55ad7f9334decff5dd9535ed3b04aa0158d57b4cc41b70
+  data.tar.gz: b908c0f8079154ca9a35fb6f961a8d5bd8cf33a7da9587a825a52897d3fed8d4
 SHA512:
-  metadata.gz: 8450283c28d80056aa8f9bc7c97f40e7778a728b200b04dacf38cd3697ab76da59332314f4de5d23328e11283d9365088d9d212cb5cfdab837b2954d306cb87e
-  data.tar.gz: 478fdd3fa080ae63049b077bc8ddf73a5d1d87655da3a1c17f0588c944766b09aba44b5f6b62ecbdd62cc641e7dcf0486a4a45ae25e04773502c3c99acc8546f
+  metadata.gz: 74cbaff92a3951970ed4ba52f51bc4b0345c419f82f5cd4d25a8345dbf3bd27b79300752232ce549cbdce912b88ae2829c6fa1e8da8a7ea5a8d8687d4210e246
+  data.tar.gz: 2ebe8a63c1e2c5255a80c5ec99b2079f8b86f0ae9f892d9e48e22dac22d84f146391a0ade675108948d53ec4125d4127f5bc8e1f0f788a2a63dfe7121a0cda1f

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.4.0)
+    zypper-upgraderepo (1.6.1)
       iniparse
       minitar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     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)
+    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.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
 
 PLATFORMS
   ruby
@@ -36,4 +36,4 @@ DEPENDENCIES
   zypper-upgraderepo!
 
 BUNDLED WITH
-   2.1.4
+   2.2.19

data/lib/zypper/upgraderepo/cli.rb

@@ -26,6 +26,8 @@ module Zypper
         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|
 
@@ -48,21 +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('-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 last version available') do |o|
-            options.operation = :upgrade
+          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|
@@ -70,9 +76,21 @@ module Zypper
             options.operation = :upgrade_to
           end
 
+          opt.on('-L', '--upgrade-to-last', 'Upgrade to the last version available') do |o|
+            options.operation = :upgrade_to_last
+          end
+
+          opt.on('-s', '--status', 'Prints the version status of the current and available releases') do |o|
+            options.operation = :status
+          end
+
           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|
             options.name = false
           end
@@ -116,6 +134,10 @@ module Zypper
             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:'
 

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', '15.2']
+      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0', '15.1', '15.2', '15.3', '15.4']
 
+      UNSTABLE_VERSION = '15.5'
 
       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

@@ -16,12 +16,13 @@ module Zypper
         @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)
+          r = Request.build(Repository.new(i), options.timeout)
           @list << r
         end
         @max_col = @list.max_by { |r| r.name.length }.name.length
@@ -48,19 +49,33 @@ module Zypper
         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 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
 
@@ -131,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

data/lib/zypper/upgraderepo/request.rb

@@ -1,200 +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
-
-      def cache!
-        @page = nil
-      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)
+      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
-
-        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
-          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

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

@@ -0,0 +1,131 @@
+require 'delegate'
+require 'net/http'
+
+module Zypper
+  module Upgraderepo
+
+    class PageRequest < SimpleDelegator
+
+      attr_reader :page
+
+      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
+        @timeout = timeout
+      end
+
+      def available?
+        ping.is_a?(Net::HTTPSuccess)
+      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
+
+      def cache!
+        @page = nil
+      end
+
+
+      private
+
+      def get_request(uri, head)
+
+        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
+
+
+    module Requests
+
+      class HttpRequest < PageRequest
+
+        include Traversable
+
+        def max_drop_back; 0; end
+
+        def self.register_protocol; ['https', 'http'] end
+
+        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 get_request(uri, head)
+          #super uri || URI(url), head
+          super uri || repodata_uri, head
+        end
+
+        def has_repodata?(uri)
+          ping(repodata_uri(uri))
+          available?
+        end
+
+        def subfolders
+          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
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,94 @@
+require 'delegate'
+
+module Zypper
+  module Upgraderepo
+
+
+    class DirRequest < SimpleDelegator
+
+      attr_reader :dir_path
+
+      def initialize(obj, timeout)
+        super obj
+      end
+
+      def available?
+        Dir.exist? ping
+      end
+
+      def redirected?
+        File.symlink? ping
+      end
+
+      def redirected_to
+        File.realpath ping
+      end
+
+      def not_found?
+        !available?
+      end
+
+      def forbidden?
+        File.readable? ping
+      end
+
+      def timeout?
+        false
+      end
+
+      def status
+        File.stat ping
+      end
+
+      def cache!
+        @dir_path = nil
+      end
+
+
+      private
+
+      def ping(uri = nil, head = true)
+        @dir_path ||= URI(url).path
+
+        @dir_path = uri.to_s =~ /^\// ? uri.to_s : URI(uri.to_s).path if uri
+
+        URI.unescape(@dir_path)
+      end
+
+    end
+
+
+    module Requests
+
+      class LocalRequest < DirRequest
+
+        include Traversable
+
+        def max_drop_back; 1 end
+
+        def self.register_protocol; ['dir'] end
+
+        def evaluate_alternative(version)
+          if not_found?
+            return traverse_url(URI(url), version)
+          elsif redirected?
+            return { url: redirected_to, message: 'Linked to' }
+          end
+        end
+
+
+        private
+
+        def has_repodata?(uri)
+          File.exist? URI.unescape(repodata_uri(uri).path)
+        end
+
+        def subfolders
+          Dir.glob(ping.gsub(/\/$/, '') + '/*/').map { |x| URI.escape(x.gsub(/\/$/, '').gsub(ping, '').gsub(/^\//, '')) }
+        end
+      end
+
+    end
+
+  end
+end

data/lib/zypper/upgraderepo/traversable.rb

@@ -0,0 +1,93 @@
+module Zypper
+  module Upgraderepo
+
+    module Traversable
+
+      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
+
+
+      private
+
+      def traverse_url_backward(uri, version)
+        uri.path = File.dirname(uri.path)
+
+        return nil if uri.path == '/' || uri.path == '.' || (versioned? && (drop_back_level(uri) > max_drop_back))
+
+        uri.path += '/' if uri.path[-1] != '/'
+        ping(uri, false)
+
+        if not_found?
+          return traverse_url_backward(uri, version)
+        elsif available?
+          if res = traverse_url_forward(uri, 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 has_repodata?(uri)
+
+          return traverse_url_backward(uri, version)
+        end
+
+        nil
+      end
+
+      def traverse_url_forward(uri, version)
+        uri.path += '/' if uri.path[-1] != '/'
+        ping(uri, false)
+
+        subfolders.each do |dir|
+          u = URI(uri.to_s)
+          u.path += dir
+
+          if has_repodata?(u)
+            if (versioned?) && (u.to_s =~ /#{version}/)
+              return { url: u.to_s, message: 'Override with this one' }
+            end
+          else
+            res = traverse_url_forward(u, version)
+            return res if res.class == Hash
+          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 drop_back_level(uri)
+        URI(url).path.split('/').index { |x| x =~ /\d\d.\d/ } - uri.path.split('/').count
+      end
+      
+      # to implement on each repository type class
+      #
+      # def has_repodata?(uri)
+      #
+      # def subfolders
+
+    end
+  end
+end

data/lib/zypper/upgraderepo/utils.rb

@@ -65,6 +65,12 @@ module Zypper
       end
     end
 
+    class InvalidProtocol < StandardError
+      def initialize(repo)
+        super "The repository #{repo.name} has an unknown protocol: #{repo.protocol}; disable it to continue."
+      end
+    end
+
     class InvalidVersion < StandardError
       def initialize(version)
         super "The version #{version} is not valid"
@@ -131,6 +137,16 @@ module Zypper
       end
     end
 
+    class NoUnstableVersionAvailable < StandardError
+      def initialize
+        super 'No unstable version is available, remove the --allow-unstable switch to continue'
+      end
+
+      def error_code
+        11
+      end
+    end
+
     class NoConnection < StandardError
       def initialize
         super 'Internet connection has some trouble'

data/lib/zypper/upgraderepo/version.rb

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

data/lib/zypper/upgraderepo/view.rb

@@ -7,6 +7,7 @@ module Zypper
 
         def self.available(num, repo, max_col)
           puts " #{num.to_s.rjust(2).bold.green} | Status: #{'Ok'.bold.green}"
+          puts " #{' ' * 2} | Hint: Unversioned repository" if repo.unversioned? && repo.old_url
           self.info(repo)
         end
 
@@ -55,6 +56,17 @@ module Zypper
           self.separator
         end
 
+        def self.status(os_release)
+          color = os_release.seniority == 0 ? :green : :yellow
+          puts '----------------------------------------------'
+          puts "Full name       | #{os_release.fullname.bold}"
+          puts '----------------------------------------------'
+          puts "Current release | #{os_release.current.send(color)}"
+          puts "Next release    | #{os_release.seniority > 0 ? os_release.next.bold.green : '-'}"
+          puts "Last release    | #{os_release.last.send(os_release.unstable ? :red : :clean)} (#{os_release.unstable ? 'Unstable'.bold.red : 'Stable'.bold.green})"
+          puts "Available       | #{os_release.seniority > 0 ? os_release.newer.map{ |i| i.bold }.join(', ') : '-' }"
+          puts '----------------------------------------------'
+        end
 
         private
 
@@ -73,7 +85,11 @@ module Zypper
       class Table
 
         def self.available(num, repo, max_col)
-          Messages.ok("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} |")
+          if repo.unversioned? && repo.old_url
+            Messages.ok("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | Unversioned repository")
+          else
+            Messages.ok("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} |")
+          end
         end
 
         def self.redirected(num, repo, max_col, redirected)
@@ -114,6 +130,17 @@ module Zypper
         def self.footer
           self.separator
         end
+
+        def self.status(os_release)
+          puts "---------------------------------------------------"
+          puts " System releases based on #{os_release.fullname.bold}"
+          puts "---------------------------------------------------"
+          puts " Current |  Next  |  Last  | Available"
+          puts "--------------------------------------------------"
+          puts "   #{os_release.current}  |  #{os_release.seniority > 0 ? os_release.next.bold.green : ' -  ' }  |  #{os_release.last.send(os_release.unstable ? :red : :clean)}  | #{os_release.seniority > 0 ? os_release.newer.join(', ') : '-'}"
+          puts "--------------------------------------------------"
+          Messages.warning "The #{'last'.bold.red} version should be considered #{'Unstable'.bold.red}" if os_release.unstable
+        end
       end
 
 
@@ -149,6 +176,10 @@ module Zypper
         def self.footer
         end
 
+        def self.status(os_release)
+          puts os_release.seniority.to_s + ' ' + os_release.newer.join(' ')
+        end
+
       end
 
 
@@ -195,6 +226,15 @@ module Zypper
         def self.footer
         end
 
+        def self.status(os_release)
+          puts '[os_release]'
+          puts "name=#{os_release.fullname}"
+          puts "current=#{os_release.current}"
+          puts "next=#{os_release.next}"
+          puts "last=#{os_release.last}"
+          puts "available=#{os_release.newer.join(' ')}"
+          puts "allow_unstable=#{os_release.unstable}"
+        end
 
         private
 
@@ -203,8 +243,16 @@ module Zypper
           puts "[repository_#{num}]"
           puts "name=#{repo.name}"
           puts "alias=#{repo.alias}"
-          puts "old_url=#{repo.old_url}"
+          puts "old_url=#{repo.old_url}" if repo.upgraded?
           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?
             puts <<-'HEADER'.gsub(/^ +/, '')

data/lib/zypper/upgraderepo.rb

@@ -13,7 +13,7 @@ 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
 
@@ -42,12 +42,18 @@ module Zypper
         check_repos(@os_release.next)
       end
 
-      def check_to
+      def check_for
         @repos.upgrade!(@os_release.custom)
         check_repos(@os_release.custom)
       end
 
-      def upgrade
+      def check_last
+        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        @repos.upgrade!(@os_release.last)
+        check_repos(@os_release.last)
+      end
+
+      def upgrade_to_next
         raise AlreadyUpgraded, 'latest' if @os_release.last?
         @repos.upgrade!(@os_release.next)
         upgrade_repos(@os_release.next)
@@ -59,10 +65,19 @@ module Zypper
         upgrade_repos(@os_release.custom)
       end
 
+      def upgrade_to_last
+        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        @repos.upgrade!(@os_release.last)
+        upgrade_repos(@os_release.last)
+      end
+
       def reset
         upgrade_repos(@os_release.current)
       end
 
+      def status
+        @view_class.status(@os_release)
+      end
 
       private
 

data/zypper-upgraderepo.gemspec

@@ -1,40 +1,40 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "zypper/upgraderepo/version"
+require 'zypper/upgraderepo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "zypper-upgraderepo"
+  spec.name          = 'zypper-upgraderepo'
   spec.version       = Zypper::Upgraderepo::VERSION
-  spec.authors       = ["Fabio Mucciante"]
-  spec.email         = ["fabio.mucciante@gmail.com"]
+  spec.authors       = ['Fabio Mucciante']
+  spec.email         = ['fabio.mucciante@gmail.com']
 
   spec.summary       = %q{Zypper addon to check and upgrade local repositories.}
   spec.description   = %q{This is just a complement to zypper command which helps to upgrade the local repositories before executing zypper dup.}
-  spec.homepage      = "https://github.com/fabiomux/zypper-upgraderepo"
-  spec.license       = "GPL-3.0"
+  spec.homepage      = 'https://github.com/fabiomux/zypper-upgraderepo'
+  spec.license       = 'GPL-3.0'
 
   spec.metadata      = {
-    "bug_tracker_uri"   => "https://github.com/fabiomux/zypper-upgraderepo/issues",
-    #"changelog_uri"     => "",
+    "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/#{spec.version}",
-    "homepage_uri"      => "https://github.com/fabiomux/zypper-upgraderepo",
-    #"mailing_list_uri"  => "",
-    "source_code_uri"   => "https://github.com/fabiomux/zypper-upgraderepo",
-    "wiki_uri"          => "https://github.com/fabiomux/zypper-upgraderepo/wiki"
+    "homepage_uri"      => 'https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html',
+    #"mailing_list_uri"  => '',
+    "source_code_uri"   => 'https://github.com/fabiomux/zypper-upgraderepo',
+    "wiki_uri"          => 'https://github.com/fabiomux/zypper-upgraderepo/wiki'
   }
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|.github)/|(.gitignore|.travis.yml|CODE_OF_CONDUCT.md)$})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  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_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_runtime_dependency 'iniparse'
+  spec.add_runtime_dependency 'minitar'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,11 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/FUNDING.yml"
-- ".gitignore"
 - ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -107,6 +103,9 @@ files:
 - lib/zypper/upgraderepo/os_release.rb
 - lib/zypper/upgraderepo/repository.rb
 - lib/zypper/upgraderepo/request.rb
+- lib/zypper/upgraderepo/requests/http.rb
+- lib/zypper/upgraderepo/requests/local.rb
+- lib/zypper/upgraderepo/traversable.rb
 - lib/zypper/upgraderepo/utils.rb
 - lib/zypper/upgraderepo/version.rb
 - lib/zypper/upgraderepo/view.rb
@@ -116,8 +115,9 @@ 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.4.0
-  homepage_uri: https://github.com/fabiomux/zypper-upgraderepo
+  changelog_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html#changelog
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.6.1
+  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
 post_install_message: 
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.19
 signing_key: 
 specification_version: 4
 summary: Zypper addon to check and upgrade local repositories.

data/.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# 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/.gitignore

@@ -1,11 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.5
-before_install: gem install bundler -v 1.16.1

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at fabio.mucciante@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/