zypper-upgraderepo 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7760c0dd8fcc4192e55ad7f9334decff5dd9535ed3b04aa0158d57b4cc41b70
-  data.tar.gz: b908c0f8079154ca9a35fb6f961a8d5bd8cf33a7da9587a825a52897d3fed8d4
+  metadata.gz: c70f8e680b1c6c86d0c556a6761cb0738dc3b39422109a679ccaeee34d1a0d26
+  data.tar.gz: edc57ec51daa46b5443f4cf928af1884b5cbdbd5779b687eec38dd98d021f9ef
 SHA512:
-  metadata.gz: 74cbaff92a3951970ed4ba52f51bc4b0345c419f82f5cd4d25a8345dbf3bd27b79300752232ce549cbdce912b88ae2829c6fa1e8da8a7ea5a8d8687d4210e246
-  data.tar.gz: 2ebe8a63c1e2c5255a80c5ec99b2079f8b86f0ae9f892d9e48e22dac22d84f146391a0ade675108948d53ec4125d4127f5bc8e1f0f788a2a63dfe7121a0cda1f
+  metadata.gz: 15495fdd8f2619194293bc2ab113043c343c11f5aada78d8db338937f65365b9b475f4f7725dbcfe4f207df452705e80b8a8dd991338003982784db7154a4251
+  data.tar.gz: 6de4b17c55d6693f7c020eeb7226524e738be9ef1ca1e1e166cb0cfd14ecef53eef32952c371e75cd5d20c15fa1de88894b6dc63d12a1c1871f7f481489122be

data/Gemfile.lock

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

data/README.md

@@ -1,51 +1,64 @@
 # Zypper-Upgraderepo
 
-Zypper-Upgraderepo helps to check and upgrade the repositories used in your system
-without have to do it manually.
+Zypper-Upgraderepo helps to check and upgrade the repositories used in your system for the
+current, next or a custom valid version, reporting the errors and trying to find a replacement
+when possible.
 
-It can be used stand-alone or installed as _zypper_ plugin.
+It can be also be installed as Zypper plugin using the [Zypper Upgraderepo Plugin][zypper_upgraderepo_plugin].
 
 ## Installation
 
-Install it as:
+There are several options to install the service menus listed in this repository.
 
-    $ gem install zypper-upgraderepo
+### Rubygem
 
-If you want to install it as zypper plugin watch the _zypper-upgraderepo-plugin_ project linked below.
+Install it as a regular Ruby gem with:
+```shell
+$ gem install zypper-upgraderepo
+```
+
+### From the openSUSE Build Service repository
+
+This application has been packaged in my personal OBS repository so you can install It
+as a common RPM package:
+- Add the repository URL in your list;
+- install the package from Yast or Zypper.
+
+Being the repository URL slightly changing from a version to another, I included all the steps
+in the related [project page][project_page] on my blog.
 
 ## Usage
 
 To check the availability of the current repositories:
-
-    $ zypper-upgraderepo --check-current
+```shell
+$ zypper-upgraderepo
+```
 
 To check the availability of the next version repositories:
-
-    $ zypper-upgraderepo --check-next
+```shell
+$ zypper-upgraderepo --check-next
+```
 
 To upgrade the repositories to the next version:
-
-    $ sudo zypper-upgraderepo --upgrade
+```shell
+$ sudo zypper-upgraderepo --upgrade
+```
 
 ## Get help
 
 Where to start:
+```shell
+$ zypper-upgraderepo --help
+```
 
-    $ zypper-upgraderepo --help
-
-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
+## More Help:
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/fabiomux/zypper-upgraderepo. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+More info is available at:
+- the [Zypper-Upgraderepo GitHub wiki][zypper_upgraderepo_wiki];
+- the article [Upgrading with Zypper][upgrading_with_zypper] on Freeaptitude blog.
 
-## Code of Conduct
 
-Everyone interacting in the Zypper::Upgraderepo project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fabiomux/zypper-upgraderepo/blob/master/CODE_OF_CONDUCT.md).
+[zypper_upgraderepo_plugin]: https://github.com/fabiomux/zypper-upgraderepo-plugin "Zypper-Upgraderepo Plugin GitHub page"
+[project_page]: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html "Zypper-Upgraderepo project page"
+[zypper_upgraderepo_wiki]: https://github.com/fabiomux/zypper-upgraderepo/wiki "Zypper-Upgraderepo wiki page on GitHub"
+[upgrading_with_zypper]: https://freeaptitude.altervista.org/articles/upgrading-opensuse-with-zypper.html "Upgrading openSUSE with Zypper"

data/lib/zypper/upgraderepo/repository.rb

@@ -20,6 +20,7 @@ module Zypper
         @overrides = options.overrides
         @upgrade_options = {alias: options.alias, name: options.name}
         @list = []
+        @cpu_arch, @arch = `rpm --eval "%cpu_arch;%_arch"`.tr("\n", '').split(';')
 
         Dir.glob(File.join(REPOSITORY_PATH, '*.repo')).each do |i|
           r = Request.build(Repository.new(i), options.timeout)
@@ -31,7 +32,7 @@ module Zypper
 
         @list.sort_by! { |x| x[:repo].send(options.sort_by) } if options.sort_by != :alias
 
-        load_overrides(options.filename) if options.filename
+        load_overrides(options.overrides_filename) if options.overrides_filename
       end
 
       def only_enabled?
@@ -67,6 +68,8 @@ module Zypper
             r.url = r.url.gsub(/\$releasever_major/, version.split('.')[0])
                          .gsub(/\$releasever_minor/, version.split('.')[1])
                          .gsub(/\$releasever/, version)
+                         .gsub(/\$basearch/, @arch)
+                         .gsub(/\$arch/, @cpu_arch)
           end
         end
 
@@ -89,7 +92,7 @@ module Zypper
           if x = ini["repository_#{num}"]
             repo.enable!(x['enabled'])
             raise UnmatchingOverrides, { num: num, ini: x, repo: repo } if repo.url != x['old_url']
-            if (@repos.only_enabled?)
+            if (only_enabled?)
               raise MissingOverride, { num: num, ini: x } unless x['url'] || x['enabled'] =~ /no|false|0/i
             else
               raise MissingOverride, { num: num, ini: x } unless x['url']

data/lib/zypper/upgraderepo/traversable.rb

@@ -77,11 +77,11 @@ module Zypper
 
         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)

data/lib/zypper/upgraderepo/version.rb

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

data/lib/zypper/upgraderepo/view.rb

@@ -22,6 +22,11 @@ module Zypper
           self.info(repo)
         end
 
+        def self.forbidden(num, repo, max_col)
+          puts " #{num.to_s.rjust(2).bold.red} | Status: #{'Forbidden Path'.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}"
@@ -98,7 +103,11 @@ module Zypper
         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} |")
+          Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'Not Found'.bold.red}")
+        end
+
+        def self.forbidden(num, repo, max_col)
+          Messages.error("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, ' ')} | #{repo.enabled? ? ' Y ' : ' N '.yellow} | #{'Forbidden path'.bold.red}")
         end
 
         def self.alternative(num, repo, max_col, alt)
@@ -155,6 +164,9 @@ module Zypper
         def self.not_found(num, repo, max_col)
         end
 
+        def self.forbidden(num, repo, max_col)
+        end
+
         def self.alternative(num, repo, max_col, alt)
         end
 
@@ -198,6 +210,10 @@ module Zypper
           self.info num, 'Not Found', repo, false
         end
 
+        def self.forbidden(num, repo, max_col)
+          self.info num, 'Forbidden Path', repo, false
+        end
+
         def self.alternative(num, repo, max_col, alt)
           self.info num, 'Not Found', repo, false
           puts "hint=#{alt[:message]}"

data/lib/zypper/upgraderepo.rb

@@ -100,6 +100,8 @@ module Zypper
               else
                 @view_class.not_found num, repo, @repos.max_col
               end
+            elsif repo.forbidden?
+              @view_class.forbidden num, repo, @repos.max_col
             elsif repo.timeout?
               @view_class.timeout num, repo, @repos.max_col
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,7 @@ licenses:
 metadata:
   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/1.6.1
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.7.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