zypper-upgraderepo 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a427fb24de5056e9425117be69b150cd225a9cf649d93f0ee8c5425951021824
-  data.tar.gz: a317a3f790c16151bb08a9cdffddd8e813f325adf0f49f5a5aac9760a4b28aee
+  metadata.gz: b13911becd258b1faf2a3a94c84a9899cd9d5bb8e0ac916e7aac7b7e687dfdc4
+  data.tar.gz: 563d2da75b66e61a72d3f5471d4bbe7d4a2910ec0fb5141811d68212bc69dd3a
 SHA512:
-  metadata.gz: 256f4cf0b63242db412d27328bdc0599b583e20dfbc194941963d4676f025033defadaeab0bb1f6cf3cbeaf2c0ebe64cdc78e3460c9693ac53454768d810cf91
-  data.tar.gz: '0408b1a8169c94fa1115b1f9fda5ce411718cac4d8afeb149dbdb3b5f2a76a89a57c97ebca951a7c440ffc2c96929985e94f60d353fd5302517d9a8f9f2aa141'
+  metadata.gz: b23a6b5f089b9c2d23d7c887489f72f1c421b6259f1a291efa9211506dc489ef85820ac52d9f4786ac908a74f55cd163aa0a7b40713e0d10873e3e3823ef66ff
+  data.tar.gz: 9adf8f0be93b9a7f2c349168535238ed6355f1f9c14968717e96168d1929216ac0a1917ab63c1d35136e4e131cbfe88fae8a3ea2d2784431a37f2a393af73b3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zypper-upgraderepo (1.2.0)
+    zypper-upgraderepo (1.3.0)
       iniparse
       minitar
 
@@ -9,31 +9,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    iniparse (1.4.4)
-    minitar (0.6.1)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    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.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  rake (~> 10.0)
+  bundler (~> 2.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   zypper-upgraderepo!
 
 BUNDLED WITH
-   1.17.1
+   2.1.4

data/lib/zypper/upgraderepo.rb

@@ -21,12 +21,16 @@ module Zypper
         @upgrade_options = { alias: options.alias, name: options.name }
 
         @backup_path = options.backup_path
+
+        @exit_on_fail = options.exit_on_fail
+
+        @filename = options.filename
       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
+        raise InvalidWritePermissions, filename unless File.writable? @backup_path
 
         Minitar.pack(RepositoryList::REPOSITORY_PATH, Zlib::GzipWriter.new(File.open(filename, 'wb')))
 
@@ -48,6 +52,11 @@ module Zypper
         check_repos(@os_release.custom)
       end
 
+      def check_from_file
+        load_overrides
+        check_repos(@os_release.next)
+      end
+
       def upgrade
         raise AlreadyUpgraded, 'latest' if @os_release.last?
         upgrade_repos(@os_release.next)
@@ -58,9 +67,28 @@ module Zypper
         upgrade_repos(@os_release.custom)
       end
 
+      def reset
+        upgrade_repos(@os_release.current)
+      end
+
+      def upgrade_from_file
+        load_overrides
+        upgrade_repos(@os_release.next)
+      end
+
 
       private
 
+      def load_overrides
+        ini = IniParse.parse(File.read(@filename))
+        @repos.each_with_index do |r, i|
+          x = ini["Repository_#{i.next}"]
+          raise UnmatchingOverrides, { num: i.next, ini: x, repo: r } if r.url != x['OldURL']
+          raise MissingOverride, { num: i.next, ini: x } unless x['URL']
+          @overrides[i.next] = x['URL']
+        end
+      end
+
       def check_repos(version)
         @view_class.header(@repos.max_col)
 
@@ -70,16 +98,19 @@ module Zypper
 
           if r.available?
             @view_class.available i.next, r, @repos.max_col
-          elsif r.redirected?
-            @view_class.redirected i.next, r, @repos.max_col, r.redirected_to
-          elsif r.not_found?
-            if @print_hint
-              @view_class.alternative i.next, r, @repos.max_col, r.evaluate_alternative(version)
-            else
-              @view_class.not_found i.next, r, @repos.max_col
+          else
+            raise UnableToUpgrade, {num: i.next, repo: r} if @exit_on_fail
+            if r.redirected?
+              @view_class.redirected i.next, r, @repos.max_col, r.redirected_to
+            elsif r.not_found?
+              if @print_hint
+                @view_class.alternative i.next, r, @repos.max_col, r.evaluate_alternative(version)
+              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
-          elsif r.timeout?
-            @view_class.timeout i.next, r, @repos.max_col
           end
         end
 

data/lib/zypper/upgraderepo/cli.rb

@@ -23,6 +23,8 @@ module Zypper
         options.view = :table
         options.only_repo = nil
         options.timeout = 10.0
+        options.exit_on_fail = false
+        options.filename = ''
 
         opt_parser = OptionParser.new do |opt|
 
@@ -54,6 +56,15 @@ module Zypper
             options.operation = :check_to
           end
 
+          opt.on('-f', '--check-from-file <FILENAME>', 'Check the URLs in the exported FILENAME') do |f|
+            options.filename = f
+            options.operation = :check_from_file
+          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
           end
@@ -63,9 +74,18 @@ module Zypper
             options.operation = :upgrade_to
           end
 
+          opt.on('-F', '--upgrade-from-file <FILENAME>', 'Upgrade from FILENAME') do |f|
+            options.filename = f
+            options.operation = :upgrade_from_file
+          end
+
           opt.separator ''
           opt.separator 'Options:'
 
+          opt.on('--exit-on-fail', 'Exit with error when a repository upgrade check fails') do |o|
+            options.exit_on_fail = true
+          end
+
           opt.on('--only-enabled', 'Include only the enabled repositories') do |o|
             options.only_enabled = true
           end
@@ -109,6 +129,14 @@ module Zypper
             options.sort_by = :priority
           end
 
+          opt.on('--ini', 'Output the result in Ini format') do |o|
+            options.view = :ini
+          end
+
+          opt.on('--quiet', 'Quiet mode, show only error messages') do |o|
+            options.view = :quiet
+          end
+
           opt.on('--report', 'View the data as report') do |o|
             options.view = :report
           end

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', '15.1']
+      OS_VERSIONS = ['13.1', '13.2', '42.1', '42.2', '42.3', '15.0', '15.1', '15.2']
 
 
       def initialize(options)

data/lib/zypper/upgraderepo/repository.rb

@@ -112,13 +112,22 @@ module Zypper
       end
 
       def save
-        raise InvalidPermissions, @filename unless File.writable? @filename
+        raise InvalidWritePermissions, @filename unless File.writable? @filename
+        process, pid = libzypp_process
+        raise SystemUpdateRunning, { pid: pid, process: process } if pid
         @repo.save(@filename)
       end
 
 
       private
 
+      def libzypp_process
+        libpath = `ldd /usr/bin/zypper | grep "libzypp.so"`.split(' => ')[1].split(' ').shift
+        process = `sudo lsof #{libpath} | tail -n 1`
+        process, pid = process.split(' ')
+        [process, pid]
+      end
+
       def get_key
         @repo.to_hash.keys.delete_if {|k| k == '0'}.pop
       end

data/lib/zypper/upgraderepo/request.rb

@@ -164,7 +164,7 @@ module Zypper
           uri = URI(url)
         end
 
-        uri.path = uri.path.gsub(/\/$/, '') + '/repodata/repomd.xml' 
+        uri.path = uri.path.gsub(/\/$/, '') + '/repodata/repomd.xml'
 
         uri
       end

data/lib/zypper/upgraderepo/utils.rb

@@ -61,12 +61,36 @@ module Zypper
       end
     end
 
-    class InvalidPermissions < StandardError
+    class InvalidWritePermissions < StandardError
       def initialize(filename)
         super "Don't have the right permission to write #{filename}"
       end
     end
 
+    class SystemUpdateRunning < StandardError
+      def initialize(args)
+        super "The application #{args[:process].bold} with pid #{args[:pid].bold} is running a system update!"
+      end
+    end
+
+    class UnableToUpgrade < StandardError
+      def initialize(args)
+        super "The repository n.#{args[:num].to_s.bold.red} named #{args[:repo].name.bold.red} can't be upgraded, a manual check is required!"
+      end
+    end
+
+    class MissingOverride < StandardError
+      def initialize(args)
+        super "The repository n.#{args[:num].to_s.bold.red} named #{args[:ini]['Name'].bold.red} doesn't contain the URL key!"
+      end
+    end
+
+    class UnmatchingOverrides < StandardError
+      def initialize(args)
+        super "The repository n.#{args[:num]} named #{args[:repo].name.bold.red} doesn't match with the repository named #{args[:ini]['Name'].bold.red} in the ini file"
+      end
+    end
+
     class AlreadyUpgraded < StandardError
       def initialize(version)
         super "The system is already upgraded to the #{version} version"

data/lib/zypper/upgraderepo/version.rb

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

data/lib/zypper/upgraderepo/view.rb

@@ -34,11 +34,7 @@ module Zypper
         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}"
+          puts " #{num.to_s.rjust(2).bold.green} | #{'Upgraded'.bold.green}"
           self.info(repo)
         end
 
@@ -51,7 +47,7 @@ module Zypper
           puts '-' * 90
         end
 
-        def self.header(max_col)
+        def self.header(max_col, upgrade = false)
           puts "  # | Report"
         end
 
@@ -120,7 +116,101 @@ module Zypper
         end
       end
 
-    end
 
+      class Quiet
+
+        def self.available(num, repo, max_col)
+        end
+
+        def self.redirected(num, repo, max_col, redirected)
+        end
+
+        def self.not_found(num, repo, max_col)
+        end
+
+        def self.alternative(num, repo, max_col, alt)
+        end
+
+        def self.timeout(num, repo, max_col)
+        end
+
+        def self.upgraded(num, repo, max_col) #, old_data)
+        end
+
+        def self.untouched(num, repo, max_col)
+        end
+
+        def self.separator
+        end
+
+        def self.header(max_col, upgrade = false)
+        end
+
+        def self.footer
+        end
+
+      end
+
+
+      class Ini
+
+        def self.available(num, repo, max_col)
+          self.info num, 'Ok', repo
+        end
+
+        def self.redirected(num, repo, max_col, redirected)
+          self.info num, 'Redirected', repo, false
+          puts "RedirectedTo=#{redirected}"
+        end
+
+        def self.not_found(num, repo, max_col)
+          self.info num, 'Not Found', repo, false
+        end
+
+        def self.alternative(num, repo, max_col, alt)
+          self.info num, 'Not Found', repo, false
+          puts "Hint=#{alt[:message]}"
+          puts "Suggested=#{alt[:url]}" unless alt[:url].to_s.empty?
+        end
+
+        def self.timeout(num, repo, max_col)
+          self.info num, 'Server Timeout', repo, false
+        end
+
+        def self.upgraded(num, repo, max_col)
+          self.info num, 'Upgraded', repo
+        end
+
+        def self.untouched(num, repo, max_col)
+          self.info num, 'Untouched', repo
+        end
+
+        def self.separator
+          puts ''
+        end
+
+        def self.header(max_col, upgrade = false)
+        end
+
+        def self.footer
+        end
+
+
+        private
+
+        def self.info(num, status, repo, valid = true)
+          @@number = num
+          puts "[Repository_#{num}]"
+          puts "Name=#{repo.name}"
+          puts "Alias=#{repo.alias}"
+          puts "OldURL=#{repo.old_url}"
+          puts "URL=#{repo.url}" if valid
+          puts "Priority=#{repo.priority}"
+          puts "Enabled=#{repo.enabled? ? 'Yes' : 'No'}"
+          puts "Status=#{status}"
+        end
+      end
+
+    end
   end
 end

data/zypper-upgraderepo.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,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.2.0
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.3.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
@@ -134,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Zypper addon to check and upgrade local repositories.