zypper-onlinesearch 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad78f10f0b8b3d5f8f58b2cbf8604fcdee5433a9ededa235ed425db62b608421
-  data.tar.gz: 4a443ce55c19a22f9c9af21012e3e3fed83e6f4dc3ee3d0e5f17983d61392725
+  metadata.gz: 9dc869b470d64f775fc321bd9b677a08a6f166d8d48e8341dc897d58cf3ee3cb
+  data.tar.gz: d9afc178408c4d609ba9e6c2f885e9b9a7a1fff389f9dcd2117aa4eadc1b2ecc
 SHA512:
-  metadata.gz: 5c7abbfeb7687b0634a90c6549a805a18679f46ef521fcb5081230abed094506d946bb55722a3fd863c54a1688d112aaa61ced74b0caf8b672b61f51ad5af3d3
-  data.tar.gz: 5726d0c8bee9a96f06ac16a1d1f22aaf34ab42446389ca9f5c75525c3ce9b3734990e57675ad2b82ae5b27b9dda64f29398b3551c49318e532ef78901245f441
+  metadata.gz: 7f1345be095db1d73c03e2368a9bc5c4dcdee5036eef66c0e355cb0a8ab6704f2218f277056abe1773c8ec2f559ee9f962441cf77dc0729f8adf5f2b063cf452
+  data.tar.gz: 01d0bfdc95141355f6bbf51ce1c790e6582226dc08dced07155e7dd515af9e3e642da2ac87d870d4d209f70ca9358e97901710869df2f27f269521bd0769e34b

data/.rubocop.yml

@@ -79,3 +79,6 @@ Style/FrozenStringLiteralComment:
   Exclude:
   - './bin/*'
   - './exe/*'
+
+Style/OptionalBooleanParameter:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zypper-onlinesearch (1.1.1)
+    zypper-onlinesearch (1.2.0)
       iniparse
       nokogiri
 
@@ -11,53 +11,54 @@ GEM
     ast (2.4.2)
     diff-lcs (1.5.0)
     iniparse (1.5.0)
-    json (2.6.3)
-    mini_portile2 (2.8.1)
+    json (2.7.1)
+    mini_portile2 (2.8.5)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
-    racc (1.6.2)
+      racc
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.48.1)
+    rspec-support (3.12.1)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.19.0)
+    rubocop-rspec (2.20.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby

data/lib/zypper/onlinesearch/cli.rb

@@ -11,14 +11,14 @@ module Zypper
     #
     class OptParseMain
       def self.parse(args)
-        options = Struct.new(:operation, :query, :refresh, :engine, :timeout, :formats,
+        options = Struct.new(:operation, :query, :refresh, :engine, :timeout, :arch,
                              :distributions, :types, :number, :view, :format).new
         options.operation = :search
         options.query = ""
         options.refresh = false
         options.engine = :all # :opensuse, :packman
         options.timeout = 20
-        options.formats = :compatible # :all
+        options.arch = :compatible # :all
         options.distributions = :compatible # :all
         options.types = %i[supported community experimental unsupported]
         options.number = 0
@@ -86,8 +86,8 @@ module Zypper
           opt.separator ""
           opt.separator '"Page" and "Links" options:'
 
-          opt.on("--all-formats", "Show all the available formats") do
-            options.formats = :all
+          opt.on("--all-architectures", "Show all the available architectures") do
+            options.arch = :all
           end
 
           opt.on("--all-distributions", "Show all the available distributions") do
@@ -117,6 +117,10 @@ module Zypper
             options.format = o.to_sym
           end
 
+          opt.on("--architecture ARCHITECTURE", "Filter for packages with the specified ARCHITECTURE") do |o|
+            options.arch = o.to_sym
+          end
+
           opt.on("--urls", "Show only the urls without headers") do
             options.view = :urls
           end

data/lib/zypper/onlinesearch/data.rb

@@ -8,27 +8,33 @@ module Zypper
     # Base class for page scraping.
     #
     class PageData
-      FORMATS = {
+      ARCHS = {
         aarch64: "ARM v8.x 64-bit",
         aarch64_ilp32: "ARM v8.x 64-bit ilp32 mode",
         all: "All",
         armv6l: "ARM v6",
         armv7l: "ARM v7",
-        extra: "Extra",
         i586: "Intel 32-bit",
         i686: "Intel Pentium 32-bit",
-        lang: "Language",
         lsrc: "Language source",
         noarch: "No architecture",
         ppc64le: "PowerPC 64-bit little-endian",
         ppc64: "PowerPC 64-bit",
         ppc: "PowerPC",
-        repo: "Repository",
         riscv64: "Risc v64",
         s390x: "IBM System/390",
         src: "Source",
-        x86_64: "Intel/AMD 64-bit",
-        ymp: "1 Click Install"
+        x86_64: "Intel/AMD 64-bit"
+      }.freeze
+
+      FORMATS = {
+        all: "All",
+        extra: "Extra",
+        lang: "Language",
+        repo: "Repository",
+        src: "Source",
+        ymp: "1 Click Install",
+        rpm: "RPM"
       }.freeze
 
       def initialize(page)
@@ -175,7 +181,8 @@ module Zypper
 
           def extract(ver, res, type, xpath_group, xpath_version, xpath_link)
             repo = ""
-            format = ""
+            format = :none
+            arch = :noarch
             version = nil
 
             ver.xpath(xpath_group).each do |pack|
@@ -187,8 +194,8 @@ module Zypper
                 @old_version = version
               end
 
-              if format? pack.text.strip
-                format = PageData::FORMATS.key(pack.text.strip)
+              if pack.text.strip =~ /1 Click Install/
+                format = :ymp
               else
                 repo = pack.text.strip
                 if repo.empty?
@@ -202,14 +209,14 @@ module Zypper
 
               if repo =~ /Expert Download/
                 res[:versions] << { distro: ver.text.gsub(/:/, " "), link: link, type: type,
-                                    repo: @old_repo, format: :extra, version: version }
+                                    repo: @old_repo, format: :extra, arch: arch, version: version }
                 next
               end
 
               next if format.to_s.empty? || link.include?("/package/show/")
 
               res[:versions] << { distro: ver.text, link: link, type: type, repo: repo,
-                                  format: format, version: version }
+                                  format: format, arch: arch, version: version }
             end
           end
 
@@ -230,7 +237,7 @@ module Zypper
           XPATH_PACKAGES = '//td[@id="package-details-left"]//tbody/tr'
           XPATH_VERSION = ".//td[1]"
           XPATH_DISTRO = ".//td[2]"
-          XPATH_FORMAT = ".//td[3]"
+          XPATH_ARCH = ".//td[3]"
           XPATH_LINK = ".//a/@href"
 
           def data
@@ -243,10 +250,10 @@ module Zypper
             @page.xpath(XPATH_PACKAGES).each do |pack|
               version = pack.xpath(XPATH_VERSION).text.split("-")[0].to_s
               distro = pack.xpath(XPATH_DISTRO).text.gsub(/_/, " ")
-              format = pack.xpath(XPATH_FORMAT).text.strip.to_sym
+              arch = pack.xpath(XPATH_ARCH).text.strip.to_sym
               link = pack.xpath(XPATH_LINK).text
 
-              res[:versions] << { format: format, version: version, distro: distro,
+              res[:versions] << { format: :extra, arch: arch, version: version, distro: distro,
                                   type: :supported, link: "http://packman.links2linux.org#{link}",
                                   repo: "Packman" }
             end
@@ -272,7 +279,7 @@ module Zypper
           def data
             res = { versions: [] }
 
-            extract(res, -1, XPATH_REPO, XPATH_REPO_DISTRO, XPATH_REPO_LINK)
+            extract(res, :noarch, XPATH_REPO, XPATH_REPO_DISTRO, XPATH_REPO_LINK)
             extract(res, -2, XPATH_PACKAGE_GROUP, XPATH_PACKAGE_DISTRO, XPATH_PACKAGE_LINK)
 
             res
@@ -280,7 +287,7 @@ module Zypper
 
           private
 
-          def extract(res, format_idx, xpath_group, xpath_distro, xpath_link)
+          def extract(res, arch_idx, xpath_group, xpath_distro, xpath_link)
             @page.xpath(xpath_group).each do |section|
               distro = ""
               section.xpath(xpath_distro).each do |subsection|
@@ -293,7 +300,8 @@ module Zypper
                 link = link.gsub("\n", " ").scan(%r{(https://[^ \n]+)}).pop.pop
                 res[:versions] << {
                   distro: distro,
-                  format: File.basename(link).split(".")[format_idx].to_sym,
+                  format: File.basename(link).split(".")[-1].to_sym,
+                  arch: arch_idx.is_a?(Integer) ? File.basename(link).split(".")[arch_idx].to_sym : arch_idx,
                   link: link
                 }
               end
@@ -319,18 +327,20 @@ module Zypper
               link = pack.text
               res[:versions] << {
                 distro: distro,
-                format: File.basename(link).split(".")[-2].to_sym,
+                format: File.basename(link).split(".")[-1].to_sym,
+                arch: File.basename(link).split(".")[-2].to_sym,
                 link: URL + link
               }
             end
 
             link = res[:versions].last[:link]
-            is_lang = (File.basename(link) =~ /-lang/) && (res[:versions].last[:format] == :noarch)
+            is_lang = (File.basename(link) =~ /-lang/) && (res[:versions].last[:arch] == :noarch)
 
             link = @page.xpath(XPATH_LINK_SRC).text
             res[:versions] << {
               distro: distro,
-              format: is_lang ? :lsrc : File.basename(link).split(".")[-2].to_sym,
+              format: File.basename(link).split(".")[-1].to_sym,
+              arch: is_lang ? :lsrc : File.basename(link).split(".")[-2].to_sym,
               link: URL + link
             }
 
@@ -339,6 +349,7 @@ module Zypper
               res[:versions] << {
                 distro: distro,
                 format: :ymp,
+                arch: :noarch,
                 link: URL + link
               }
             end

data/lib/zypper/onlinesearch/version.rb

@@ -2,6 +2,6 @@
 
 module Zypper
   module Onlinesearch
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/lib/zypper/onlinesearch/view.rb

@@ -124,7 +124,7 @@ module Zypper
           def self.general(args)
             engine = args[:engine].bold.red
             distro = args[:distro].bold.blue
-            arch = PageData::FORMATS[args[:architecture]].bold
+            arch = PageData::ARCHS[args[:architecture]].bold
             cache = if args[:refresh]
                       "Off".bold
                     elsif args[:cache_time]
@@ -135,7 +135,7 @@ module Zypper
 
             puts ""
             puts "=" * SEPARATOR_LENGTH
-            puts "#{"Parameters: ".bold} Engine: #{engine} | OS: #{distro} | Architecture: #{arch} | Cache: #{cache}"
+            puts "#{"Parameters: ".bold} Engine: #{engine} | OS: #{distro} | Arch.: #{arch} | Cache: #{cache}"
             puts "=" * SEPARATOR_LENGTH
             puts "#{"Name:        ".bold}#{args[:name]}"
             puts "#{"Summary:     ".bold}#{args[:short_description]}" if args[:short_description]
@@ -264,7 +264,7 @@ module Zypper
           def self.header(args)
             super args
             separator
-            puts "#{" " * 3} # | Format | Link"
+            puts "#{" " * 3} # | Format |    Arch | Link"
             separator
           end
 
@@ -273,7 +273,11 @@ module Zypper
           def self.link(args)
             nl = args[:num].to_s.length
             fl = args[:pack][:format].to_s.length
-            puts "#{" " * (5 - nl)}#{args[:num]} | #{" " * (6 - fl)}#{args[:pack][:format]} | #{args[:pack][:link]}"
+            al = args[:pack][:arch].to_s.length
+            # rubocop:disable Style/LineEndConcatenation
+            puts "#{" " * (5 - nl)}#{args[:num]} | #{" " * (6 - fl)}#{args[:pack][:format]} |" +
+                 "#{" " * (8 - al)}#{args[:pack][:arch]} | #{args[:pack][:link]}"
+            # rubocop:enable Style/LineEndConcatenation
             separator
           end
         end
@@ -289,16 +293,14 @@ module Zypper
           end
 
           def self.link(args)
-            alt_format = if args[:pack][:format].to_s == PageData::FORMATS[args[:pack][:format]]
-                           ""
-                         else
-                           " (#{PageData::FORMATS[args[:pack][:format]]})"
-                         end
             n_length = args[:num].to_s.length
-            puts "#{" " * (5 - n_length)}#{args[:num]} | Format: #{args[:pack][:format].to_s.bold}#{alt_format}"
+            alt_format = PageData::FORMATS[args[:pack][:format]]
+            alt_arch = PageData::ARCHS[args[:pack][:arch]]
+
+            puts "#{" " * (5 - n_length)}#{args[:num]} | Format: #{args[:pack][:format].to_s.bold} (#{alt_format})"
+            puts "#{" " * 5} | Architecture: #{args[:pack][:arch]} (#{alt_arch})"
             puts "#{" " * 5} | Distribution: #{args[:pack][:distro]}"
             puts "#{" " * 5} | Link: #{args[:pack][:link]}"
-
             separator
           end
         end

data/lib/zypper/onlinesearch.rb

@@ -22,7 +22,7 @@ module Zypper
                                   refresh: options.refresh,
                                   query: options.query
         @release = Release.new
-        @formats = options.formats
+        @arch = options.arch
         @distributions = options.distributions
         @format = options.format
         @types = options.types
@@ -93,9 +93,7 @@ module Zypper
 
             collection = collection.pop
             collection.each do |pack|
-              if (pack[:link] =~ /rpm$/) || (pack[:format] == :ymp)
-                packages << pack
-              else
+              if pack[:format] == :extra
                 result = RequestList.new operation: :links,
                                          engine: engine,
                                          timeout: @search.timeout,
@@ -110,9 +108,11 @@ module Zypper
                     f[:repo] = pack[:repo]
                     f[:version] ||= pack[:version]
                     f[:distro] ||= pack[:distro]
-                    packages << f if package_select?(f)
+                    packages << f if package_select?(f, true)
                   end
                 end
+              elsif package_select?(pack, true)
+                packages << pack
               end
             end
           end
@@ -154,19 +154,24 @@ module Zypper
       end
 
       def architecture
-        @formats == :compatible ? @release.arch : :all
+        @arch == :compatible ? @release.arch : :all
       end
 
-      def package_select?(package)
-        res = true
-        res = [:ymp, :src, :extra, @release.arch].include?(package[:format]) if @formats == :compatible
-        res &&= (@format == package[:format]) unless @format == :all
+      def package_select?(package, format_and_arch = false)
+        res = if @arch == :compatible
+                [:src, :noarch, @release.arch].include?(package[:arch])
+              else
+                format_and_arch ? (@arch == package[:arch]) : true
+              end
+
         if @distributions == :compatible
           res &&= ((package[:distro] == :current) ||
                    package[:distro].match?(Regexp.new(@release.pretty_name, "i")))
         end
         res = false unless @types.include?(package[:type])
 
+        res &&= (@format == package[:format]) if @format != :all && format_and_arch
+
         res
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-onlinesearch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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 search packages online through the openSUSE software search