zypper-upgraderepo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e0bb83e66c339eaffe198c509e835a565db6075ab6afedd75eb5816c5176ce
-  data.tar.gz: 79f79f8f2fc1cdbea708cb5bf02d25b82d4be4ca83630962c02cdc01870b72d9
+  metadata.gz: a427fb24de5056e9425117be69b150cd225a9cf649d93f0ee8c5425951021824
+  data.tar.gz: a317a3f790c16151bb08a9cdffddd8e813f325adf0f49f5a5aac9760a4b28aee
 SHA512:
-  metadata.gz: f4babf4d20fecf1d1306e1411ee28e2026ec1214523f879a99107982b0b62bbce621e61da4fa77f7b9c73799238001bee26978bc47a47a9bdadc92c49b0aa87d
-  data.tar.gz: 6bf20f0c92d33e58cf1fc088b4130c9ea3704b13b1ec2667cf6a859329573cf9a451b1f78a15cfac245c173ca23aaea1d509398a1006cb6a0df9d2e767f09cfe
+  metadata.gz: 256f4cf0b63242db412d27328bdc0599b583e20dfbc194941963d4676f025033defadaeab0bb1f6cf3cbeaf2c0ebe64cdc78e3460c9693ac53454768d810cf91
+  data.tar.gz: '0408b1a8169c94fa1115b1f9fda5ce411718cac4d8afeb149dbdb3b5f2a76a89a57c97ebca951a7c440ffc2c96929985e94f60d353fd5302517d9a8f9f2aa141'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.1.0)
+    zypper-upgraderepo (1.2.0)
       iniparse
       minitar
 
@@ -36,4 +36,4 @@ DEPENDENCIES
   zypper-upgraderepo!
 
 BUNDLED WITH
-   1.16.2
+   1.17.1

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
@@ -11,12 +15,22 @@ module Zypper
         @os_release = OsRelease.new(options)
         @repos = RepositoryList.new(options)
         @print_hint = options.hint
-        @view_class = Object.const_get options.view.to_s.split(' ').map(&:capitalize).insert(0,'Zypper::Upgraderepo::').push('View').join
+        @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
       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 InvalidPermissions, 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
@@ -25,26 +39,23 @@ module Zypper
 
       def check_next
         raise AlreadyUpgraded, 'latest' if @os_release.last?
-        @repos.upgrade(@os_release.next) 
+        @repos.each_with_index { |r, i| r.upgrade(@os_release.next, @upgrade_options.merge(url_override: @overrides[i.next])) }
         check_repos(@os_release.next)
       end
 
       def check_to
-        @repos.upgrade(@os_release.custom)
+        @repos.each_with_index { |r, i| r.upgrade(@os_release.custom, @upgrade_options.merge(url_override: @overrides[i.next])) }
         check_repos(@os_release.custom)
       end
 
       def upgrade
         raise AlreadyUpgraded, 'latest' if @os_release.last?
-        @repos.upgrade(@os_release.next)
-        @repos.save
-        Messages.ok 'Repositories upgraded!'
+        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)
+        upgrade_repos(@os_release.custom)
       end
 
 
@@ -53,7 +64,8 @@ module Zypper
       def check_repos(version)
         @view_class.header(@repos.max_col)
 
-        @repos.list.each_with_index do |r, i|
+        @repos.each_with_index do |r, i|
+
           @view_class.separator
 
           if r.available?
@@ -66,12 +78,36 @@ module Zypper
             else
               @view_class.not_found i.next, r, @repos.max_col
             end
+          elsif r.timeout?
+            @view_class.timeout i.next, r, @repos.max_col
           end
         end
 
         @view_class.footer
       end
 
+      def upgrade_repos(version)
+        @view_class.header(@repos.max_col, true)
+
+        @repos.each_with_index do |repo, i|
+
+          @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
+          else
+            @view_class.untouched i.next, repo, @repos.max_col
+          end
+        end
+
+        @view_class.separator
+
+        @repos.save
+        Messages.ok 'Repositories upgraded!'
+      end
+
     end
 
   end

data/lib/zypper/upgraderepo/cli.rb

@@ -21,7 +21,9 @@ module Zypper
         options.version = nil
         options.sort_by = :alias
         options.view = :table
-        
+        options.only_repo = nil
+        options.timeout = 10.0
+
         opt_parser = OptionParser.new do |opt|
 
           if ENV['ZYPPER_UPGRADEREPO']
@@ -64,26 +66,37 @@ 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('--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', 'Upgrade or not the name') do |o|
-            options.name = o
+          opt.on('--no-name', 'Don\'t upgrade the name') do |o|
+            options.name = false
           end
 
-          opt.on('--[no-]alias', 'Upgrade or not the alias') do |o|
-            options.alias = o
+          opt.on('--no-alias', 'Don\'t upgrade the alias') do |o|
+            options.alias = false
           end
 
-          opt.on('--[no-]hint', 'Suggest a new url when the current is not found') do |o|
-            options.hint = 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|
-            options.overrides[r[0]] = r[1]
+            options.overrides[r[0].to_i] = r[1]
+          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 'View options:'
+
           opt.on('--sort-by-alias', 'Sort repositories by alias (Default)') do |o|
             options.sort_by = :alias
           end
@@ -96,10 +109,11 @@ module Zypper
             options.sort_by = :priority
           end
 
-          opt.on('--report-view', 'View the data as report') do |o|
+          opt.on('--report', 'View the data as report') do |o|
             options.view = :report
           end
 
+
           unless ENV['ZYPPER_UPGRADEREPO']
             opt.separator ''
             opt.separator 'Other:'
@@ -116,7 +130,7 @@ module Zypper
           end
 
         end
-        
+
         if ARGV.empty?
           puts opt_parser; exit
         else
@@ -129,7 +143,7 @@ module Zypper
     end
 
 
-    class CLI 
+    class CLI
       def self.start
         begin
           options = OptParseMain.parse(ARGV)

data/lib/zypper/upgraderepo/os_release.rb

@@ -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,24 +1,23 @@
 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
-        @overrides = options.overrides
+        @only_repo = options.only_repo
         @list = []
-        @backup_path = options.backup_path
 
-        Dir.glob('/etc/zypp/repos.d/*.repo').each do |i|
-          r = Repository.new(i)
+        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
@@ -28,22 +27,11 @@ module Zypper
         @list.sort_by! { |x| x.send(options.sort_by) } if options.sort_by != :alias
       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'))) 
-      end
-
-      def upgrade(version)
+      def each_with_index
         @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)
-          end
-          repo.alias = repo.alias.gsub(/\d\d\.\d/, version) if @alias
-          repo.name = repo.name.gsub(/\d\d\.\d/, version) if @name
+          next if @only_repo && !@only_repo.include?(i.next)
+
+          yield repo, i if block_given?
         end
       end
 
@@ -56,13 +44,15 @@ module Zypper
 
 
     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?
@@ -102,109 +92,38 @@ 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) 
+        @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
-      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) && !search_repo(version).empty?
-
-          path = search_path(version)
-          if path.empty?
-            return traverse_url(uri, version)
-          else
-            return traverse_url_forward(uri, version) if search_repo(version).empty?
-
-            uri.path += extract_path(path)
-            return {url: uri.to_s, message: 'Override with this one' } 
-          end
-
-        end
-          
-      end
-
-      def traverse_url_forward(uri, version)
-        ping(uri, true)
-
-        if search_repo(version).empty?
-
-          path = search_path(version)
-          if path.empty?
-            return {url: '', message: 'Can\'t find anything similar, try manually!' }
-          else
-            uri.path += extract_path(path)
-            return traverse_url_forward(uri, version)
-          end
-        else
-          return {url: uri.to_s, message: 'Override with this one' }
-        end
-      end
-
-      def search_path(version)
-        ping.body.to_s.scan(Regexp.new("href=\"[^\"]*#{version}[^\"]*\"")).delete_if { |x| x =~ Regexp.new("\"#{URI(url).path}\"") }.uniq
-      end
-
-      def search_repo(version)
-        ping.body.to_s.scan(Regexp.new("href=\"[^\"]*#{version}[^\"]*\.repo\"|repodata/")).uniq
-      end
-
-      def extract_path(path)
-        "#{path.pop.scan(/href="(.*)"/).pop.pop}"
-      end
-
     end
 
+
   end
 end

data/lib/zypper/upgraderepo/request.rb

@@ -0,0 +1,196 @@
+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
+
+
+      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
+          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/utils.rb

@@ -31,6 +31,8 @@ module Zypper
       def self.error(e)
         if e.class == String
           puts ' [E] '.bold.red + e
+        elsif e.class == Interruption
+          STDERR.puts e.message =~ /\(/ ? e.message.gsub(/.*\((.*)\).*/, '\1').green : e.message.green
         else
           STDERR.puts 'Error! '.bold.red + e.message
         end
@@ -46,96 +48,13 @@ module Zypper
 
     end
 
-    class TableView
-
-      def self.available(num, repo, max_col)
-        Messages.ok("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} |")
-      end
-
-      def self.redirected(num, repo, max_col, redirected)
-        Messages.warning("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'Redirection'.bold.yellow} of #{repo.url} ")
-        puts " #{' ' * 3} | #{' ' * 2} | #{ ' ' * max_col} | #{ ' ' * 3 } | #{'To:'.bold.yellow} #{redirected}"
-      end
-
-      def self.not_found(num, repo, max_col)
-        Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} |")
-      end
-
-      def self.alternative(num, repo, max_col, alt)
-        Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{alt[:message].bold.yellow}")
-        puts " #{' ' * 3} | #{' ' * 2} | #{' ' * max_col} | #{' ' * 3} | #{alt[:url]}" unless alt[:url].to_s.empty?
-      end
-
-      def self.separator
-        puts '-' * 90
-      end
-
-      def self.header(max_col)
-        puts " St. |  # | #{'Name'.ljust(max_col, ' ')} | En. | Hint"
-      end
-
-      def self.footer
-        self.separator
-      end
-    end
-
-
-    class ReportView
-      
-      def self.available(num, repo, max_col)
-        puts " #{num.to_s.rjust(2).bold.green} | Status: #{'Ok'.bold.green}"
-        self.info(repo)
-      end
-
-      def self.redirected(num, repo, max_col, redirected)
-        puts " #{num.to_s.rjust(2).bold.yellow} | Status: #{'Redirected'.bold.yellow}"
-        puts " #{' ' * 2} | #{'To:'.bold.yellow} #{redirected}"
-        self.info(repo)
-      end
-
-      def self.not_found(num, repo, max_col)
-        puts " #{num.to_s.rjust(2).bold.red} | Status: #{'Not Found'.bold.red}"
-        self.info(repo)
-      end
-
-      def self.alternative(num, repo, max_col, alt)
-        puts " #{num.to_s.rjust(2).bold.red} | Status: #{'Not Found'.bold.red}"
-        puts " #{' ' * 2} | Hint: #{alt[:message].bold.yellow}"
-        puts " #{' ' * 2} | #{'Suggested:'.bold.yellow} #{alt[:url]}" unless alt[:url].to_s.empty?
-        self.info(repo)
-      end
-
-      def self.separator
-        puts '-' * 90
-      end
-
-      def self.header(max_col)
-        puts "  # | Report"
-      end
-
-      def self.footer
-        self.separator
-      end
-
-      private
-
-      def self.info(repo)
-        puts " #{ ' ' * 2 } | Name: #{repo.name}"
-        puts " #{ ' ' * 2 } | Alias: #{repo.alias}"
-        puts " #{ ' ' * 2 } | Url: #{repo.url}"
-        puts " #{ ' ' * 2 } | Priority: #{repo.priority}"
-        puts " #{ ' ' * 2 } | #{repo.enabled? ? 'Enabled: Yes' : 'Enabled: No'.yellow}"
-        puts " #{ ' ' * 2 } | Filename: #{repo.filename}"
-      end
-    end
-
 
     class ReleaseFileNotFound < StandardError
       def initialize
         super 'The release file is not found.'
       end
     end
-    
+
     class InvalidVersion < StandardError
       def initialize(version)
         super "The version #{version} is not valid"
@@ -159,5 +78,15 @@ module Zypper
         super 'Internet connection has some trouble'
       end
     end
+
+    class Interruption < StandardError
+      def initialize
+        super 'Ok ok... Exiting!'
+      end
+    end
+
+    Signal.trap('INT') { raise Interruption }
+
+    Signal.trap('TERM') { raise Interruption }
   end
 end

data/lib/zypper/upgraderepo/version.rb

@@ -1,5 +1,5 @@
 module Zypper
   module Upgraderepo
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/zypper/upgraderepo/view.rb

@@ -0,0 +1,126 @@
+module Zypper
+  module Upgraderepo
+
+    module View
+
+      class Report
+
+        def self.available(num, repo, max_col)
+          puts " #{num.to_s.rjust(2).bold.green} | Status: #{'Ok'.bold.green}"
+          self.info(repo)
+        end
+
+        def self.redirected(num, repo, max_col, redirected)
+          puts " #{num.to_s.rjust(2).bold.yellow} | Status: #{'Redirected'.bold.yellow}"
+          puts " #{' ' * 2} | #{'To:'.bold.yellow} #{redirected}"
+          self.info(repo)
+        end
+
+        def self.not_found(num, repo, max_col)
+          puts " #{num.to_s.rjust(2).bold.red} | Status: #{'Not Found'.bold.red}"
+          self.info(repo)
+        end
+
+        def self.alternative(num, repo, max_col, alt)
+          puts " #{num.to_s.rjust(2).bold.red} | Status: #{'Not Found'.bold.red}"
+          puts " #{' ' * 2} | Hint: #{alt[:message].bold.yellow}"
+          puts " #{' ' * 2} | #{'Suggested:'.bold.yellow} #{alt[:url]}" unless alt[:url].to_s.empty?
+          self.info(repo)
+        end
+
+        def self.timeout(num, repo, max_col)
+          puts " #{num.to_s.rjust(2).bold.yellow} | Status: #{'Server Timeout'.bold.yellow}"
+          self.info(repo)
+        end
+
+        def self.upgraded(num, repo, max_col)
+          puts " #{num.to_s.rjust(2).bold.green} | #{'Upgraded'.bold.green}" #{'Upgraded from:'.bold.green} #{repo.old_url}"
+          #puts " #{' ' * 2} | Old Name: #{old_data[:name].yellow}" if old_data[:name] != repo.name
+          #puts " #{' ' * 2} | Old Alias: #{old_data[:alias].yellow}" if old_data[:alias] != repo.alias
+
+          #puts " #{' ' * 2} | Old URL: #{repo.old_url}"
+          self.info(repo)
+        end
+
+        def self.untouched(num, repo, max_col)
+          puts " #{num.to_s.rjust(2).bold.yellow} | #{'Untouched'.bold.yellow}"
+          self.info(repo)
+        end
+
+        def self.separator
+          puts '-' * 90
+        end
+
+        def self.header(max_col)
+          puts "  # | Report"
+        end
+
+        def self.footer
+          self.separator
+        end
+
+
+        private
+
+        def self.info(repo)
+          puts " #{ ' ' * 2 } | Name: #{repo.name} #{repo.upgraded?(:name) ? '(' + repo.old_name.yellow + ')' : '' }"
+          puts " #{ ' ' * 2 } | Alias: #{repo.alias} #{repo.upgraded?(:alias) ? '(' + repo.old_alias.yellow + ')' : ''}"
+          puts " #{ ' ' * 2 } | Url: #{repo.url}"
+          puts " #{ ' ' * 2 } |      (#{repo.old_url.yellow})" if repo.upgraded?
+          puts " #{ ' ' * 2 } | Priority: #{repo.priority}"
+          puts " #{ ' ' * 2 } | #{repo.enabled? ? 'Enabled: Yes' : 'Enabled: No'.yellow}"
+          puts " #{ ' ' * 2 } | Filename: #{repo.filename}"
+        end
+      end
+
+
+      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} |")
+        end
+
+        def self.redirected(num, repo, max_col, redirected)
+          Messages.warning("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'Redirection'.bold.yellow} of #{repo.url} ")
+          puts " #{' ' * 3} | #{' ' * 2} | #{ ' ' * max_col} | #{ ' ' * 3 } | #{'To:'.bold.yellow} #{redirected}"
+        end
+
+        def self.not_found(num, repo, max_col)
+          Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} |")
+        end
+
+        def self.alternative(num, repo, max_col, alt)
+          Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{alt[:message].bold.yellow}")
+          puts " #{' ' * 3} | #{' ' * 2} | #{' ' * max_col} | #{' ' * 3} | #{alt[:url]}" unless alt[:url].to_s.empty?
+        end
+
+        def self.timeout(num, repo, max_col)
+          Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'Server Timeout'.bold.yellow}")
+        end
+
+        def self.upgraded(num, repo, max_col) #, old_data)
+          Messages.ok("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'From:'.bold.green} #{repo.old_url}")
+          puts " #{' ' * 3} | #{' ' * 2} | #{' ' * max_col} | #{' ' * 3} | #{'To:'.bold.green} #{repo.url}"
+        end
+
+        def self.untouched(num, repo, max_col)
+          Messages.warning("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'Untouched:'.bold.yellow} #{repo.old_url}")
+        end
+
+        def self.separator
+          puts '-' * 90
+        end
+
+        def self.header(max_col, upgrade = false)
+          puts " St. |  # | #{'Name'.ljust(max_col, ' ')} | En. | #{upgrade ? 'Details' : 'Hint' }"
+        end
+
+        def self.footer
+          self.separator
+        end
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,15 +105,17 @@ files:
 - lib/zypper/upgraderepo/cli.rb
 - lib/zypper/upgraderepo/os_release.rb
 - lib/zypper/upgraderepo/repository.rb
+- lib/zypper/upgraderepo/request.rb
 - lib/zypper/upgraderepo/utils.rb
 - lib/zypper/upgraderepo/version.rb
+- lib/zypper/upgraderepo/view.rb
 - zypper-upgraderepo.gemspec
 homepage: https://github.com/fabiomux/zypper-upgraderepo
 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.1.0
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.2.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