zypper-upgraderepo 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ceec1a1b9750d49b3c32863595d7b83c615dc140458a65a55dc93b115d5e3f3
-  data.tar.gz: 857477ddec8c0457e0082583a98a68de4ee62ebca1e4972a578fceb6ba74ca57
+  metadata.gz: 32ebc8e9633b6f8316573b56759c1044bd9db702cd4a2289508665420935e054
+  data.tar.gz: 89effc0e8a22e7f1019a2ac29337e5882b518f1c0de9dc7844b72cac0fa36608
 SHA512:
-  metadata.gz: 490758a8241038010a130c18b97d926744e289d6fe82462647b2d7fe149143e2efbb78dafd1b50cf769cdcde3a3d31099da87743ac77990d4be8aa8017113e4f
-  data.tar.gz: 51731e28707401f36a825e34d06ecce3753bfd96fa03a14c35997a6113b1c62ddfd142b54df6d27d8f81863afb560964209a42f020e6ff2b693c1f201adc3d90
+  metadata.gz: 36dcbddb43e6ec7ede6aace2f03f2ed2be72c0e870c54252cbeec70c0715daf91d88bd3868e9936b3f60d77ced08df655987428fcc13bb15d3fc094913e8ee47
+  data.tar.gz: 10bb399234182d2705e9e498891d67c3727a5f4de68ef40166451e3e9dfd4275cb3fe788fa83254917172f18baf7921d5909c7331a659c9d7e4104ed066f6ebf

data/.rubocop.yml

@@ -34,6 +34,7 @@ Metrics/ClassLength:
   Exclude:
   - './lib/**/cli.rb'
   - './lib/**/repository.rb'
+  - './lib/**/upgraderepo.rb'
 
 Metrics/BlockLength:
   Enabled: true

data/Gemfile.lock

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

data/lib/zypper/upgraderepo/cli.rb

@@ -95,6 +95,14 @@ module Zypper
             options.operation = :status
           end
 
+          opt.on("-d", "--duplicates", "Detect the duplicates comparing the URL addresses") do |_o|
+            options.operation = :duplicates
+          end
+
+          opt.on("-z", "--unused", "Prints the unused repositories with zero packages installed") do |_o|
+            options.operation = :unused
+          end
+
           opt.separator ""
           opt.separator "Options:"
 
@@ -110,7 +118,7 @@ module Zypper
             options.alias = false
           end
 
-          opt.on("--no-hint", "Don't find a working URL when the current is invalid") do |_o|
+          opt.on("--no-hint", "Don't find a working URL when the current is not valid") do |_o|
             options.hint = false
           end
 
@@ -118,7 +126,7 @@ module Zypper
             options.overrides[r[0].to_i] = r[1]
           end
 
-          opt.on("--load-overrides <FILENAME>", "Check the URLs in the exported FILENAME") do |f|
+          opt.on("--load-overrides <FILENAME>", "Load the repositories' overrides from FILENAME") do |f|
             options.overrides_filename = f
           end
 
@@ -156,19 +164,19 @@ module Zypper
           opt.separator ""
           opt.separator "View options:"
 
-          opt.on("--sort-by-alias", "Sort repositories by alias (Default)") do |_o|
+          opt.on("--sort-by-alias", "Sort the repositories by alias (Default)") do |_o|
             options.sorting_by = :alias
           end
 
-          opt.on("--sort-by-name", "Sort repositories by name") do |_o|
+          opt.on("--sort-by-name", "Sort the repositories by name") do |_o|
             options.sorting_by = :name
           end
 
-          opt.on("--sort-by-priority", "Sort repositories by priority") do |_o|
+          opt.on("--sort-by-priority", "Sort the repositories by priority") do |_o|
             options.sorting_by = :priority
           end
 
-          opt.on("--ini", "Output the result as INI format") do |_o|
+          opt.on("--ini", "Output the result in the INI format") do |_o|
             options.view = :ini
           end
 
@@ -176,11 +184,11 @@ module Zypper
             options.view = :quiet
           end
 
-          opt.on("--report", "View the data as report") do |_o|
+          opt.on("--report", "View the data as a report") do |_o|
             options.view = :report
           end
 
-          opt.on("--solved", "Output as INI with the suggestions for the invalid repositories applied") do |_o|
+          opt.on("--solved", "Output as INI and the URLs' suggestions applied") do |_o|
             options.view = :solved
           end
 
@@ -193,7 +201,7 @@ module Zypper
               exit
             end
 
-            opt.on_tail("-v", "--version", "Show version") do |_o|
+            opt.on_tail("-v", "--version", "Show the version") do |_o|
               puts VERSION
               exit
             end

data/lib/zypper/upgraderepo/repository.rb

@@ -4,6 +4,39 @@ require "iniparse"
 
 module Zypper
   module Upgraderepo
+    #
+    # Calculate and apply the variables that can be
+    # declared within the repository metadata.
+    #
+    class RepositoryVariables
+      VARIABLE_PATH = "/etc/zypp/vars.d"
+
+      VAR_CPU_ARCH, VAR_ARCH = `rpm --eval "%cpu_arch;%_arch"`.tr("\n", "").split(";")
+
+      attr_reader :variables
+
+      def initialize(version)
+        @variables = {
+          releasever_major: version.split(".")[0],
+          releasever_minor: version.split(".")[1],
+          releasever: version,
+          basearch: VAR_ARCH,
+          arch: VAR_CPU_ARCH
+        }
+
+        Dir.glob(File.join(self.class::VARIABLE_PATH, "*")).each do |i|
+          @variables[File.basename(i).to_sym] = File.read(i).strip
+        end
+      end
+
+      def apply(str)
+        str.gsub(/\${?([a-zA-Z0-9_]+)}?/) do
+          last = Regexp.last_match(1)
+          @variables[last.to_sym] || "<Unknown var: $#{last}>"
+        end
+      end
+    end
+
     #
     # Handle the repository collection.
     #
@@ -12,7 +45,7 @@ module Zypper
 
       attr_reader :list, :max_col
 
-      def initialize(options)
+      def initialize(options, variables)
         @alias = options.alias
         @name = options.name
         @only_repo = options.only_repo
@@ -22,10 +55,10 @@ 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(";")
 
+        @variables = variables
         Dir.glob(File.join(self.class::REPOSITORY_PATH, "*.repo")).each do |i|
-          r = Request.build(Repository.new(i), options.timeout)
+          r = Request.build(Repository.new(i, @variables), options.timeout)
           @list << r
         end
         @max_col = @list.max_by { |r| r.name.length }.name.length
@@ -66,16 +99,6 @@ module Zypper
         end
       end
 
-      def resolve_variables!(version)
-        each_with_number do |r|
-          r.url = expand_variables(r.url, version) if r.url =~ /\$/
-          r.name = expand_variables(r.name, version)
-          r.alias = expand_variables(r.alias, version)
-        end
-
-        self
-      end
-
       def save
         @list.each do |i|
           i[:repo].save
@@ -120,14 +143,6 @@ module Zypper
         res.uniq
       end
 
-      def expand_variables(str, version)
-        str.gsub(/\$releasever_major/, version.split(".")[0])
-           .gsub(/\$releasever_minor/, version.split(".")[1])
-           .gsub(/\$releasever/, version)
-           .gsub(/\$basearch/, @arch)
-           .gsub(/\$arch/, @cpu_arch)
-      end
-
       def load_overrides(filename)
         raise FileNotFound, filename unless File.exist?(filename)
 
@@ -154,13 +169,14 @@ module Zypper
     class Repository
       attr_reader :filename, :old_url, :old_alias, :old_name
 
-      def initialize(filename)
+      def initialize(filename, variables)
         @filename = filename
         @repo = IniParse.parse(File.read(filename))
         @key = read_key
         @old_url = nil
         @old_name = nil
         @old_alias = nil
+        resolve_variables!(variables)
       end
 
       def enabled?
@@ -242,6 +258,14 @@ module Zypper
 
       private
 
+      def resolve_variables!(variables)
+        self.url = variables.apply(url) if url =~ /\$/
+        self.name = variables.apply(name) if name =~ /\$/
+        self.alias = variables.apply(self.alias) if self.alias =~ /\$/
+
+        self
+      end
+
       def libzypp_process
         libpath = `ldd /usr/bin/zypper | grep "libzypp.so"`.split(" => ")[1].split.shift
         process = `sudo lsof #{libpath} | tail -n 1`

data/lib/zypper/upgraderepo/utils.rb

@@ -92,6 +92,10 @@ module Zypper
       def new_line
         "\n#{self}"
       end
+
+      def none
+        self
+      end
     end
 
     #

data/lib/zypper/upgraderepo/version.rb

@@ -2,6 +2,6 @@
 
 module Zypper
   module Upgraderepo
-    VERSION = "1.9.0"
+    VERSION = "1.10.0"
   end
 end

data/lib/zypper/upgraderepo/view.rb

@@ -57,8 +57,8 @@ module Zypper
           info(repo)
         end
 
-        def self.separator(max_col)
-          puts "-" * (max_col + 20)
+        def self.separator(max_col, char = "-", color = :none)
+          puts (char * (max_col + 20)).send(color)
         end
 
         def self.header(_max_col, _upgrade: false)
@@ -91,6 +91,32 @@ module Zypper
           puts " #{" " * 2} | #{repo.enabled? ? "Enabled: Yes" : "Enabled: No".yellow}"
           puts " #{" " * 2} | Filename: #{repo.filename}"
         end
+
+        def self.duplicates_header(_max_col)
+          puts "  # | Duplicated repositories"
+        end
+
+        def self.duplicates_item(num, dnum, dcount, repo, _max_col)
+          puts " #{num.to_s.rjust(2).bold.yellow} | Duplicated repository n.#{dnum.to_s.bold}/#{dcount.to_s.bold}"
+          info(repo)
+        end
+
+        def self.duplicates_footer(dcount, total)
+          puts "Total duplicated repositories: #{dcount.to_s.bold.yellow}/#{total}"
+        end
+
+        def self.unused_header(_max_col)
+          puts "  # | Unused repositories"
+        end
+
+        def self.unused_item(num, unum, repo, _max_col)
+          puts " #{num.to_s.rjust(2).bold.yellow} | Unused repository n.#{unum.to_s.bold}"
+          info(repo)
+        end
+
+        def self.unused_footer(ucount, total)
+          puts "Total unused repositories: #{ucount.to_s.bold.yellow}/#{total}"
+        end
       end
 
       #
@@ -150,8 +176,8 @@ module Zypper
                          "| #{repo.enabled? ? " Y " : " N ".yellow} | #{"Error:".bold.red} #{repo.status}")
         end
 
-        def self.separator(max_col)
-          puts "-" * (max_col + 20)
+        def self.separator(max_col, char = "-", color = :none)
+          puts (char * (max_col + 20)).send(color)
         end
 
         def self.header(max_col, upgrade: false)
@@ -177,6 +203,34 @@ module Zypper
 
           Messages.warning "The #{"last".bold.red} version should be considered #{"Unstable".bold.red}"
         end
+
+        def self.duplicates_header(max_col)
+          puts " St. |  # | #{"Name".ljust(max_col, " ")} | En. | Details"
+        end
+
+        def self.duplicates_item(num, dnum, dcount, repo, max_col)
+          Messages.warning("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, " ")} " \
+                           "| #{repo.enabled? ? " Y " : " N ".yellow} " \
+                           "| Duplicate n.#{dnum.to_s.bold}/#{dcount.to_s.bold} ")
+        end
+
+        def self.duplicates_footer(dcount, total)
+          puts "Total duplicated repositories: #{dcount.to_s.bold.yellow}/#{total}"
+        end
+
+        def self.unused_header(max_col)
+          puts " St. |  # | #{"Name".ljust(max_col, " ")} | En. | Details"
+        end
+
+        def self.unused_item(num, unum, repo, max_col)
+          Messages.warning("| #{num.to_s.rjust(2)} | #{repo.name.ljust(max_col, " ")} " \
+                           "| #{repo.enabled? ? " Y " : " N ".yellow} " \
+                           "| Unused n.#{unum.to_s.bold}")
+        end
+
+        def self.unused_footer(ucount, total)
+          puts "Total unused repositories: #{ucount.to_s.bold.yellow}/#{total}"
+        end
       end
 
       #
@@ -201,7 +255,7 @@ module Zypper
 
         def self.server_error(num, repo, max_col); end
 
-        def self.separator(_max_col); end
+        def self.separator(_max_col, _char = "-", _color = :none); end
 
         def self.header(max_col, upgrade: false); end
 
@@ -210,6 +264,22 @@ module Zypper
         def self.status(os_release)
           puts "#{os_release.seniority} #{os_release.newer.join(" ")}"
         end
+
+        def self.duplicates_header(_max_col); end
+
+        def self.duplicates_item(num, dnum, _dcount, _repo, _max_col)
+          puts "#{dnum}:#{num} "
+        end
+
+        def self.duplicates_footer(dcount, total); end
+
+        def self.unused_header(_max_col); end
+
+        def self.unused_item(num, _unum, _repo, _max_col)
+          puts num
+        end
+
+        def self.unused_footer(ucount, total); end
       end
 
       #
@@ -256,7 +326,7 @@ module Zypper
           puts "error=#{repo.status}"
         end
 
-        def self.separator(_max_col)
+        def self.separator(_max_col, _char = "-", _color = :none)
           puts ""
         end
 
@@ -313,6 +383,34 @@ module Zypper
           puts "enabled=#{repo.enabled? ? "Yes" : "No"}"
           puts "status=#{status}"
         end
+
+        def self.duplicates_header(_max_col); end
+
+        def self.duplicates_item(num, dnum, dcount, repo, _max_col)
+          puts "[repository_#{num}]" if dnum == 1
+          puts "number_#{dnum}_#{dcount}=#{num}"
+          puts "name_#{dnum}_#{dcount}=#{repo.name}"
+          puts "alias_#{dnum}_#{dcount}=#{repo.alias}"
+          puts "url_#{dnum}_#{dcount}=#{repo.url}"
+          puts "priority_#{dnum}_#{dcount}=#{repo.priority}"
+          puts "enabled_#{dnum}_#{dcount}=#{repo.enabled? ? "Yes" : "No"}"
+        end
+
+        def self.duplicates_footer(dcount, total); end
+
+        def self.unused_header(_max_col); end
+
+        def self.unused_item(num, _unum, repo, _max_col)
+          puts "[repository_#{num}]"
+          puts "number=#{num}"
+          puts "name=#{repo.name}"
+          puts "alias=#{repo.alias}"
+          puts "url=#{repo.url}"
+          puts "priority=#{repo.priority}"
+          puts "enabled=#{repo.enabled? ? "Yes" : "No"}"
+        end
+
+        def self.unused_footer(ucount, total); end
       end
 
       #

data/lib/zypper/upgraderepo.rb

@@ -16,7 +16,7 @@ module Zypper
     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
 
@@ -59,6 +59,46 @@ module Zypper
         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?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler