zypper-upgraderepo 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25eb50066963aad6a37ce7c2d79410d0ef30a68e8dbc302e4a09f6c9589c15de
-  data.tar.gz: ca2e0b7855cbd47ff45d41daef4ec3907e9813df77ead0ddd8e32fd37e4ff486
+  metadata.gz: d9e0bb83e66c339eaffe198c509e835a565db6075ab6afedd75eb5816c5176ce
+  data.tar.gz: 79f79f8f2fc1cdbea708cb5bf02d25b82d4be4ca83630962c02cdc01870b72d9
 SHA512:
-  metadata.gz: e5c58c0ea4564541da066b599c9e882015e019328c84330f0bad4ccb3dcf99089628a40a9a1b5d3b0661996db86ce99c85d71d77138a765cfcabb313a888c098
-  data.tar.gz: 6e4e59b92565921be94f45bc59efb7713cad2a5c40ce60096dd95195cc58401100411837470de7d76d0480d2284958f78a388bbd1f6135ade279a59d66e30cb0
+  metadata.gz: f4babf4d20fecf1d1306e1411ee28e2026ec1214523f879a99107982b0b62bbce621e61da4fa77f7b9c73799238001bee26978bc47a47a9bdadc92c49b0aa87d
+  data.tar.gz: 6bf20f0c92d33e58cf1fc088b4130c9ea3704b13b1ec2667cf6a859329573cf9a451b1f78a15cfac245c173ca23aaea1d509398a1006cb6a0df9d2e767f09cfe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.0.2)
+    zypper-upgraderepo (1.1.0)
       iniparse
       minitar
 

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

@@ -11,6 +11,7 @@ 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
       end
 
       def backup
@@ -23,7 +24,8 @@ 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
 
@@ -33,7 +35,8 @@ module Zypper
       end
 
       def upgrade
-        @repos.upgrade(@os_release.next) unless @os_release.last?
+        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        @repos.upgrade(@os_release.next)
         @repos.save
         Messages.ok 'Repositories upgraded!'
       end
@@ -48,22 +51,25 @@ module Zypper
       private
 
       def check_repos(version)
-        Messages.header(@repos.max_col)
+        @view_class.header(@repos.max_col)
+
         @repos.list.each_with_index do |r, i|
-          Messages.separator
+          @view_class.separator
+
           if r.available?
-            Messages.available i.next, r.name, r.url, @repos.max_col
+            @view_class.available i.next, r, @repos.max_col
           elsif r.redirected?
-            Messages.redirected i.next, r.name, r.url, @repos.max_col, r.redirected_to
+            @view_class.redirected i.next, r, @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)
+              @view_class.alternative i.next, r, @repos.max_col, r.evaluate_alternative(version)
             else
-              Messages.not_found i.next, r.name, r.url, @repos.max_col
+              @view_class.not_found i.next, r, @repos.max_col
             end
           end
         end
-        Messages.footer
+
+        @view_class.footer
       end
 
     end

data/lib/zypper/upgraderepo/cli.rb

@@ -13,12 +13,14 @@ 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
         
         opt_parser = OptionParser.new do |opt|
 
@@ -82,6 +84,22 @@ module Zypper
             options.overrides[r[0]] = r[1]
           end
 
+          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('--report-view', 'View the data as report') do |o|
+            options.view = :report
+          end
+
           unless ENV['ZYPPER_UPGRADEREPO']
             opt.separator ''
             opt.separator 'Other:'

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']
 
 
       def initialize(options)

data/lib/zypper/upgraderepo/repository.rb

@@ -17,12 +17,15 @@ module Zypper
         @list = []
         @backup_path = options.backup_path
 
-        Dir.glob('/etc/zypp/repos.d/*.repo').sort.each do |i|
+        Dir.glob('/etc/zypp/repos.d/*.repo').each do |i|
           r = Repository.new(i)
           next if options.only_enabled && (!r.enabled?)
           @list << r
         end
         @max_col = @list.max_by { |x| x.name.length }.name.length
+
+        @list.sort_by! { |x| x.alias }
+        @list.sort_by! { |x| x.send(options.sort_by) } if options.sort_by != :alias
       end
 
       def backup
@@ -78,6 +81,10 @@ module Zypper
         @repo[@key]['name'] = value
       end
 
+      def priority
+        @repo[@key]['priority'] || 99
+      end
+
       def url
         @repo[@key]['baseurl']
       end
@@ -152,20 +159,52 @@ module Zypper
         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)
+          return {url: uri.to_s, message: 'Override with this one' } if uri.path =~ Regexp.new(version) && !search_repo(version).empty?
 
-          path = ping.body.to_s.scan(Regexp.new("href=\"[^\"]*#{version}[^\"]*\"")).uniq
-          unless path.empty?
-            uri.path += "#{path.pop.scan(/href="(.*)"/).pop.pop }"
+          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
 
-          return {url: url, message: 'Can\'t find anything similar, try manually!' }
         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/utils.rb

@@ -44,22 +44,26 @@ module Zypper
         puts ' [W] '.bold.yellow + m
       end
 
-      def self.available(num, name, url, max_col)
-        Messages.ok("| #{num.to_s.rjust(2)} | #{name.ljust(max_col, ' ')} |")
+    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, name, url, max_col, redirected)
-        Messages.warning("| #{num.to_s.rjust(2)} | #{name.ljust(max_col, ' ')} | Redirection of #{url} ")
-        puts " #{' ' * 3} | #{' ' * 2} | #{ ' ' * max_col} | #{'To:'.bold.yellow} #{redirected}"
+      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, name, url, max_col)
-        Messages.error("| #{num.to_s.rjust(2)} | #{name.ljust(max_col, ' ')}")
+      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, name, url, max_col, res)
-        Messages.error("| #{num.to_s.rjust(2)} | #{name.ljust(max_col, ' ')} | #{res[:message].bold.yellow}")
-        puts " #{' ' * 3} | #{' ' * 2} | #{' ' * max_col} | #{res[:url]}" unless res[:url].to_s.empty?
+      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
@@ -67,7 +71,7 @@ module Zypper
       end
 
       def self.header(max_col)
-        puts " St. |  # | #{'Name'.ljust(max_col, ' ')} | Hint"
+        puts " St. |  # | #{'Name'.ljust(max_col, ' ')} | En. | Hint"
       end
 
       def self.footer
@@ -76,6 +80,56 @@ module Zypper
     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.'
@@ -96,7 +150,7 @@ module Zypper
 
     class AlreadyUpgraded < StandardError
       def initialize(version)
-        super "The system is already upgraded to #{version}"
+        super "The system is already upgraded to the #{version} version"
       end
     end
 

data/lib/zypper/upgraderepo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ licenses:
 - GPL-3.0
 metadata:
   bug_tracker_uri: https://github.com/fabiomux/zypper-upgraderepo/issues
-  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.0.2
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.1.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