zypper-upgraderepo 1.8.1 → 1.10.0

data/lib/zypper/upgraderepo.rb

@@ -1,19 +1,22 @@
-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'
+# frozen_string_literal: true
 
+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
   module Upgraderepo
-
+    #
+    # Facade class for all the operations.
+    #
     class Builder
       def initialize(options)
         @os_release = OsRelease.new(options)
-        @repos = RepositoryList.new(options).resolve_variables!(@os_release.current)
+        @repos = RepositoryList.new(options, RepositoryVariables.new(@os_release.current))
         @print_hint = options.hint
         @view_class = Zypper::Upgraderepo::View.const_get options.view.to_s.capitalize
 
@@ -23,11 +26,11 @@ module Zypper
       end
 
       def backup
-        filename = File.join(@backup_path, "repos-backup-#{Time.now.to_s.delete(': +-')[0..-5]}.tgz")
+        filename = File.join(@backup_path, "repos-backup-#{Time.now.to_s.delete(": +-")[0..-5]}.tgz")
 
         raise InvalidWritePermissions, filename unless File.writable? @backup_path
 
-        Minitar.pack(RepositoryList::REPOSITORY_PATH, Zlib::GzipWriter.new(File.open(filename, 'wb')))
+        Minitar.pack(RepositoryList::REPOSITORY_PATH, Zlib::GzipWriter.new(File.open(filename, "wb")))
 
         Messages.ok "Backup file generated at #{filename.bold.green}"
       end
@@ -38,7 +41,8 @@ module Zypper
       end
 
       def check_next
-        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        raise AlreadyUpgraded, "latest" if @os_release.last?
+
         @repos.upgrade!(@os_release.next)
         check_repos(@os_release.next)
       end
@@ -49,25 +53,69 @@ module Zypper
       end
 
       def check_last
-        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        raise AlreadyUpgraded, "latest" if @os_release.last?
+
         @repos.upgrade!(@os_release.last)
         check_repos(@os_release.last)
       end
 
+      def duplicates
+        dups = {}
+        dcount = 0
+        @view_class.duplicates_header(@repos.max_col)
+        @view_class.separator(@repos.max_col, "=", :yellow)
+        @repos.each_with_number do |repo, num|
+          uri = URI.parse(repo.url)
+          hostname = uri.hostname.split(".")[-2..-1].join(".")
+          idx = URI::HTTP.build(path: uri.path, host: hostname).to_s.gsub(%r{^http://}, "").gsub(%r{/$}, "")
+          dups[idx] ||= []
+          dups[idx] << { num: num, repo: repo }
+        end
+        dups.each do |_key, list|
+          next if list.count < 2
+
+          dcount += list.count.pred
+          list.each_with_index do |l, i|
+            @view_class.duplicates_item(l[:num], i.next, list.count, l[:repo], @repos.max_col)
+            @view_class.separator(@repos.max_col) unless i == list.count.pred
+          end
+          @view_class.separator(@repos.max_col, "=", :yellow)
+        end
+        @view_class.duplicates_footer(dcount, @repos.list.count)
+      end
+
+      def unused
+        ucount = 0
+        @view_class.unused_header(@repos.max_col)
+        @view_class.separator(@repos.max_col)
+        @repos.each_with_number do |repo, num|
+          packs = `zypper -q pa -i -r #{num} 2>/dev/null|grep "^i"|wc -l`.strip.to_i
+          next unless packs.zero?
+
+          ucount += 1
+          @view_class.unused_item(num, ucount, repo, @repos.max_col)
+          @view_class.separator(@repos.max_col)
+        end
+        @view_class.unused_footer(ucount, @repos.list.count)
+      end
+
       def upgrade_to_next
-        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        raise AlreadyUpgraded, "latest" if @os_release.last?
+
         @repos.upgrade!(@os_release.next)
         upgrade_repos(@os_release.next)
       end
 
       def upgrade_to
         raise AlreadyUpgraded, @os_release.custom if @os_release.current?(@os_release.custom)
+
         @repos.upgrade!(@os_release.custom)
         upgrade_repos(@os_release.custom)
       end
 
       def upgrade_to_last
-        raise AlreadyUpgraded, 'latest' if @os_release.last?
+        raise AlreadyUpgraded, "latest" if @os_release.last?
+
         @repos.upgrade!(@os_release.last)
         upgrade_repos(@os_release.last)
       end
@@ -91,13 +139,13 @@ module Zypper
         @view_class.header(@repos.max_col)
 
         @repos.each_with_number do |repo, num|
-
-          @view_class.separator
+          @view_class.separator @repos.max_col
 
           if repo.available?
             @view_class.available num, repo, @repos.max_col
           else
             raise UnableToUpgrade, { num: num, repo: repo } if @exit_on_fail
+
             if repo.redirected?
               @view_class.redirected num, repo, @repos.max_col, repo.redirected_to
             elsif repo.not_found?
@@ -110,19 +158,20 @@ module Zypper
               @view_class.forbidden num, repo, @repos.max_col
             elsif repo.timeout?
               @view_class.timeout num, repo, @repos.max_col
+            else
+              @view_class.server_error num, repo, @repos.max_col
             end
           end
         end
 
-        @view_class.footer
+        @view_class.footer @repos.max_col
       end
 
-      def upgrade_repos(version)
-        @view_class.header(@repos.max_col, true)
+      def upgrade_repos(_version)
+        @view_class.header(@repos.max_col, upgrade: true)
 
         @repos.each_with_number do |repo, num|
-
-          @view_class.separator
+          @view_class.separator @repos.max_col
 
           if repo.upgraded?
             @view_class.upgraded num, repo, @repos.max_col
@@ -131,13 +180,11 @@ module Zypper
           end
         end
 
-        @view_class.separator
+        @view_class.separator @repos.max_col
 
         @repos.save
-        Messages.ok 'Repositories upgraded!'
+        Messages.ok "Repositories upgraded!"
       end
-
     end
-
   end
 end

data/zypper-upgraderepo.gemspec

@@ -1,40 +1,38 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'zypper/upgraderepo/version'
+require_relative "lib/zypper/upgraderepo/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'zypper-upgraderepo'
-  spec.version       = Zypper::Upgraderepo::VERSION
-  spec.authors       = ['Fabio Mucciante']
-  spec.email         = ['fabio.mucciante@gmail.com']
+  spec.name = "zypper-upgraderepo"
+  spec.version = Zypper::Upgraderepo::VERSION
+  spec.authors = ["Fabio Mucciante"]
+  spec.email = ["fabio.mucciante@gmail.com"]
 
-  spec.summary       = %q{Zypper addon to check and upgrade local repositories.}
-  spec.description   = %q{This is just a complement to zypper command which helps to upgrade the local repositories before executing zypper dup.}
-  spec.homepage      = 'https://github.com/fabiomux/zypper-upgraderepo'
-  spec.license       = 'GPL-3.0'
+  spec.summary = "Zypper addon to check and upgrade local repositories."
+  spec.description = "A complement to the zypper CLI tool to upgrade the repositories before executing zypper dup."
+  spec.homepage = "https://github.com/fabiomux/zypper-upgraderepo"
+  spec.license = "GPL-3.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.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/#{spec.version}",
-    "homepage_uri"      => 'https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html',
-    #"mailing_list_uri"  => '',
-    "source_code_uri"   => 'https://github.com/fabiomux/zypper-upgraderepo',
-    "wiki_uri"          => 'https://github.com/fabiomux/zypper-upgraderepo/wiki'
+  spec.metadata = {
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => "https://github.com/fabiomux/zypper-upgraderepo",
+    "changelog_uri" => "https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html#changelog",
+    "wiki_uri" => "https://github.com/fabiomux/zypper-upgraderepo/wiki",
+    "rubygems_mfa_required" => "true"
   }
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|.github)/|(.gitignore|.travis.yml|CODE_OF_CONDUCT.md)$})
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.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'
-  spec.add_runtime_dependency 'minitar'
+  spec.add_runtime_dependency "iniparse"
+  spec.add_runtime_dependency "minitar"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,8 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This is just a complement to zypper command which helps to upgrade the
-  local repositories before executing zypper dup.
+description: A complement to the zypper CLI tool to upgrade the repositories before
+  executing zypper dup.
 email:
 - fabio.mucciante@gmail.com
 executables:
@@ -90,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -114,12 +115,11 @@ homepage: https://github.com/fabiomux/zypper-upgraderepo
 licenses:
 - GPL-3.0
 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.8.1
-  homepage_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html
+  homepage_uri: https://github.com/fabiomux/zypper-upgraderepo
   source_code_uri: https://github.com/fabiomux/zypper-upgraderepo
+  changelog_uri: https://freeaptitude.altervista.org/projects/zypper-upgraderepo.html#changelog
   wiki_uri: https://github.com/fabiomux/zypper-upgraderepo/wiki
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -128,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: Zypper addon to check and upgrade local repositories.