zypper-upgraderepo 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44bef40acdc725f7422911297413011d47e967d568497f74770ae162494a60dd
-  data.tar.gz: 4fa8b988dc188ee5deb97671ee31e99db1cf64efde819b8be2b5fef630b0b352
+  metadata.gz: 16c361a53d2dfbdfec788a093bd3bf5b8bf0baaedbb2e3c744f1b8ccf9184af0
+  data.tar.gz: da0e38eef39182fa0049f3009bbb5ffb35d06cfb0395e8ac58db055e9148c62c
 SHA512:
-  metadata.gz: 6385cf9e04fcdd33ee544b64d64e16c123f750493d1a9b3b67eac84d167006debb05fada54488eaa7d5cbb414378d1ffd14e528d086cbe5b93af680ac643aa13
-  data.tar.gz: ca6a79d5387b76704b93994ff3e11bf0170f1950bbccad3335ff1564cde32d97edf55388c686858c75e594a3e46ac758ba2a66c1fadfba0b5b24157459240d31
+  metadata.gz: 26cac0292f39db0f6662924a7bcc14632ff0799af489eb9444c2b08acb4c3efe50e6dd09820d6395f0bb0cd4539c8a08bcb21f9595984e4fffa2fd72a49efdbd
+  data.tar.gz: 061ec093eaa6049a19ad15484e617400de8c1901e25f5a418053e0e66c1c24156eb498bc5502dbe54b06706e34f3f213d4411ca218ebec059df2362e7374fe37

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.5.0)
+    zypper-upgraderepo (1.6.0)
       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

@@ -27,6 +27,7 @@ module Zypper
         options.overrides_filename = nil
         options.only_invalid = false
         options.only_protocols = nil
+        options.allow_unstable = false
 
         opt_parser = OptionParser.new do |opt|
 
@@ -49,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|
@@ -71,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

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', '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

@@ -75,7 +75,7 @@ module Zypper
 
       def save
         @list.each do |i|
-          i.save
+          i[:repo].save
         end
       end
 

data/lib/zypper/upgraderepo/utils.rb

@@ -137,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.5.0"
+    VERSION = "1.6.0"
   end
 end

data/lib/zypper/upgraderepo/view.rb

@@ -56,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
 
@@ -119,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
 
 
@@ -154,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
 
 
@@ -200,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
 

data/lib/zypper/upgraderepo.rb

@@ -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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +120,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/fabiomux/zypper-upgraderepo/issues
   changelog_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html#changelogs
-  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.5.0
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.6.0
   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
@@ -139,7 +139,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.