zypper-onlinesearch 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad78f10f0b8b3d5f8f58b2cbf8604fcdee5433a9ededa235ed425db62b608421
-  data.tar.gz: 4a443ce55c19a22f9c9af21012e3e3fed83e6f4dc3ee3d0e5f17983d61392725
+  metadata.gz: c1efabb18f7e49b9c21fc06a529bc07e67c73e15bb5ff43cbb574f4cfe69295b
+  data.tar.gz: 3a9e48f16004fc4b65b3d34336a1fb56bfd9729716262e1663239ee6a51d86ae
 SHA512:
-  metadata.gz: 5c7abbfeb7687b0634a90c6549a805a18679f46ef521fcb5081230abed094506d946bb55722a3fd863c54a1688d112aaa61ced74b0caf8b672b61f51ad5af3d3
-  data.tar.gz: 5726d0c8bee9a96f06ac16a1d1f22aaf34ab42446389ca9f5c75525c3ce9b3734990e57675ad2b82ae5b27b9dda64f29398b3551c49318e532ef78901245f441
+  metadata.gz: 3d8b1ddd8ed7fe055b357cab2016fcf65039b66261bb6c3f39b4a0600600656b70fd5c0ea8484421d20b1b21b7932a91e8053805d60ee069864f5ebd1ae37ef0
+  data.tar.gz: 47b3d94558eab162410fdb46d754b4a9e0aaa18db4a63334f2e741ce01f9233253b3954e031fc14eda6e9f198fb035fa92036f93072f1ad8bc2ddba10fa1d0e9

data/.rubocop.yml

@@ -56,9 +56,6 @@ Metrics/CyclomaticComplexity:
   - './lib/**/onlinesearch.rb'
   - './lib/**/data.rb'
 
-Lint/UriEscapeUnescape:
-  Enabled: false
-
 Metrics/ParameterLists:
   Enabled: true
   Exclude:
@@ -68,14 +65,3 @@ Security/MarshalLoad:
   Enabled: true
   Exclude:
   - './lib/**/cache.rb'
-
-Style/SingleLineMethods:
-  Enabled: true
-  Exclude:
-  - './lib/**/utils.rb'
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  Exclude:
-  - './bin/*'
-  - './exe/*'

data/Gemfile.lock

@@ -1,66 +1,79 @@
 PATH
   remote: .
   specs:
-    zypper-onlinesearch (1.1.1)
+    zypper-onlinesearch (1.3.0)
       iniparse
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    diff-lcs (1.5.0)
+    ast (2.4.3)
+    diff-lcs (1.6.2)
     iniparse (1.5.0)
-    json (2.6.3)
-    mini_portile2 (2.8.1)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    json (2.18.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
-    racc (1.6.2)
+      racc
+    prism (1.6.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    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-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.48.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.6)
+    rubocop (1.82.0)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       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)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
-      rubocop (~> 1.41)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.48.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.28.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.19.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.31.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux-gnu
 
 DEPENDENCIES
   rake (~> 13.0)
@@ -71,4 +84,4 @@ DEPENDENCIES
   zypper-onlinesearch!
 
 BUNDLED WITH
-   2.4.3
+   2.4.22

data/exe/onlinesearch

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "zypper/onlinesearch/cli"
 

data/lib/zypper/onlinesearch/cache.rb

@@ -44,7 +44,7 @@ module Zypper
       private
 
       def query_to_filename(query)
-        URI.encode query.delete("./")
+        URI::DEFAULT_PARSER.escape query.delete("./")
       end
     end
   end

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)
@@ -63,7 +69,7 @@ module Zypper
             cards.each do |c|
               url = expand_link(c.xpath(XPATH_URL).text)
               name = c.xpath(XPATH_NAME).text
-              name = File.basename(url) == name ? name : "#{File.basename(url)} (#{name})"
+              name = "#{File.basename(url)} (#{name})" if File.basename(url) != name
               res << { name: name, description: c.xpath(XPATH_DESC).text.strip.gsub(/\n|\ +/, " "), url: url }
             end
 
@@ -164,7 +170,7 @@ module Zypper
 
             @page.xpath(XPATH_UNSUPPORTED).each_with_index do |ver, i|
               extract(ver, res, :unsupported,
-                      XPATH_UNSUPPORTED_LABEL.gsub(/_n_/, i.next.to_s),
+                      XPATH_UNSUPPORTED_LABEL.gsub("_n_", i.next.to_s),
                       XPATH_UNSUPPORTED_VERSION, XPATH_UNSUPPORTED_LINK)
             end
 
@@ -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?
@@ -201,15 +208,15 @@ module Zypper
               link = expand_link(pack.xpath(xpath_link).text)
 
               if repo =~ /Expert Download/
-                res[:versions] << { distro: ver.text.gsub(/:/, " "), link: link, type: type,
-                                    repo: @old_repo, format: :extra, version: version }
+                res[:versions] << { distro: ver.text.gsub(":", " "), link: link, type: type,
+                                    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
@@ -242,11 +249,11 @@ 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
+              distro = pack.xpath(XPATH_DISTRO).text.gsub("_", " ")
+              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
@@ -314,23 +322,25 @@ module Zypper
 
           def data
             res = { versions: [] }
-            distro = @page.xpath(XPATH_LINK_DISTRO).text.gsub(/_/, " ")
+            distro = @page.xpath(XPATH_LINK_DISTRO).text.gsub("_", " ")
             @page.xpath(XPATH_LINK_BIN).each do |pack|
               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/request.rb

@@ -145,8 +145,8 @@ module Zypper
           URL = "https://software.opensuse.org/search"
 
           def initialize(query, cache, timeout, cookies = [])
-            super query, cache, timeout,
-                  cookies << "baseproject=ALL;search_devel=true;search_debug=false;search_lang=false"
+            super(query, cache, timeout,
+                  cookies << "baseproject=ALL;search_devel=true;search_debug=false;search_lang=false")
           end
 
           def uri
@@ -178,12 +178,12 @@ module Zypper
           URL = "https://software.opensuse.org/package/"
 
           def initialize(query, cache, timeout, cookies = [])
-            super query, cache, timeout,
-                  cookies << "baseproject=ALL;search_devel=true;search_debug=false;search_lang=false"
+            super(query, cache, timeout,
+                  cookies << "baseproject=ALL;search_devel=true;search_debug=false;search_lang=false")
           end
 
           def uri
-            URI(URL + URI.encode(@query))
+            URI(URL + URI::DEFAULT_PARSER.escape(@query))
           end
         end
 
@@ -194,7 +194,7 @@ module Zypper
           URL = "http://packman.links2linux.org/package/"
 
           def uri
-            URI(URL + URI.encode(@query))
+            URI(URL + URI::DEFAULT_PARSER.escape(@query))
           end
         end
       end
@@ -208,7 +208,7 @@ module Zypper
 
           def initialize(query, refresh, timeout = 60, cookies = [])
             query = URI(query).query
-            super query, refresh, timeout, cookies
+            super
           end
 
           def uri
@@ -224,11 +224,11 @@ module Zypper
 
           def initialize(query, refresh, timeout = 60, cookies = [])
             query = query.split("/")[-2..-1].join("/") if query =~ %r{://}
-            super query, refresh, timeout, cookies
+            super
           end
 
           def uri
-            URI(@query =~ %r{://} ? @query : "#{URL}#{URI.encode(@query)}")
+            URI(@query =~ %r{://} ? @query : "#{URL}#{URI::DEFAULT_PARSER.escape(@query)}")
           end
         end
       end

data/lib/zypper/onlinesearch/utils.rb

@@ -9,28 +9,93 @@ module Zypper
     # String class patch.
     #
     class ::String
-      def black;          "\033[30m#{self}\033[0m" end
-      def red;            "\033[31m#{self}\033[0m" end
-      def green;          "\033[32m#{self}\033[0m" end
-      def yellow;         "\033[33m#{self}\033[0m" end
-      def blue;           "\033[34m#{self}\033[0m" end
-      def magenta;        "\033[35m#{self}\033[0m" end
-      def cyan;           "\033[36m#{self}\033[0m" end
-      def gray;           "\033[37m#{self}\033[0m" end
-      def bg_black;       "\033[40m#{self}\0330m"  end
-      def bg_red;         "\033[41m#{self}\033[0m" end
-      def bg_green;       "\033[42m#{self}\033[0m" end
-      def bg_brown;       "\033[43m#{self}\033[0m" end
-      def bg_blue;        "\033[44m#{self}\033[0m" end
-      def bg_magenta;     "\033[45m#{self}\033[0m" end
-      def bg_cyan;        "\033[46m#{self}\033[0m" end
-      def bg_gray;        "\033[47m#{self}\033[0m" end
-      def bold;           "\033[1m#{self}\033[22m" end
-      def reverse_color;  "\033[7m#{self}\033[27m" end
-      def cr;             "\r#{self}" end
-      def clean;          "\e[K#{self}" end
-      def new_line;       "\n#{self}" end
-      def none;           self end
+      def black
+        "\033[30m#{self}\033[0m"
+      end
+
+      def red
+        "\033[31m#{self}\033[0m"
+      end
+
+      def green
+        "\033[32m#{self}\033[0m"
+      end
+
+      def yellow
+        "\033[33m#{self}\033[0m"
+      end
+
+      def blue
+        "\033[34m#{self}\033[0m"
+      end
+
+      def magenta
+        "\033[35m#{self}\033[0m"
+      end
+
+      def cyan
+        "\033[36m#{self}\033[0m"
+      end
+
+      def gray
+        "\033[37m#{self}\033[0m"
+      end
+
+      def bg_black
+        "\033[40m#{self}\0330m"
+      end
+
+      def bg_red
+        "\033[41m#{self}\033[0m"
+      end
+
+      def bg_green
+        "\033[42m#{self}\033[0m"
+      end
+
+      def bg_brown
+        "\033[43m#{self}\033[0m"
+      end
+
+      def bg_blue
+        "\033[44m#{self}\033[0m"
+      end
+
+      def bg_magenta
+        "\033[45m#{self}\033[0m"
+      end
+
+      def bg_cyan
+        "\033[46m#{self}\033[0m"
+      end
+
+      def bg_gray
+        "\033[47m#{self}\033[0m"
+      end
+
+      def bold
+        "\033[1m#{self}\033[22m"
+      end
+
+      def reverse_color
+        "\033[7m#{self}\033[27m"
+      end
+
+      def cr
+        "\r#{self}"
+      end
+
+      def clean
+        "\e[K#{self}"
+      end
+
+      def new_line
+        "\n#{self}"
+      end
+
+      def none
+        self
+      end
     end
 
     #
@@ -92,7 +157,7 @@ module Zypper
     #
     class QueryStringTooShort < StandardError
       def initialize(query)
-        super "The query string '#{query}' is too short, be sure to use more than 3 characters."
+        super("The query string '#{query}' is too short, be sure to use more than 3 characters.")
       end
 
       def error_code
@@ -105,7 +170,7 @@ module Zypper
     #
     class TooManyRedirections < StandardError
       def initialize(url)
-        super "#{url} generates too many redirections!"
+        super("#{url} generates too many redirections!")
       end
     end
 
@@ -114,7 +179,7 @@ module Zypper
     #
     class InvalidEngine < StandardError
       def initialize(engine)
-        super "#{engine} is not a valid engine!"
+        super("#{engine} is not a valid engine!")
       end
 
       def error_code
@@ -127,7 +192,7 @@ module Zypper
     #
     class MissingItemNumber < StandardError
       def initialize
-        super "No item number has been provided!"
+        super("No item number has been provided!")
       end
     end
 
@@ -136,7 +201,7 @@ module Zypper
     #
     class EmptyCache < StandardError
       def initialize
-        super "The cache folder is already empty!"
+        super("The cache folder is already empty!")
       end
     end
 
@@ -145,7 +210,7 @@ module Zypper
     #
     class NoConnection < StandardError
       def initialize
-        super "Internet connection has some trouble"
+        super("Internet connection has some trouble")
       end
 
       def error_code
@@ -158,7 +223,7 @@ module Zypper
     #
     class Interruption < StandardError
       def initialize
-        super "Ok ok... Exiting!"
+        super("Ok ok... Exiting!")
       end
     end
 

data/lib/zypper/onlinesearch/version.rb

@@ -2,6 +2,6 @@
 
 module Zypper
   module Onlinesearch
-    VERSION = "1.1.1"
+    VERSION = "1.3.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]
@@ -144,7 +144,7 @@ module Zypper
 
           def self.no_packages(compatible)
             separator
-            puts "#{" " * 3} - | No #{compatible ? "compatible" : ""} packages found!"
+            puts "#{" " * 3} - | No #{compatible ? "compatible" : nil.to_s} packages found!"
             separator
           end
 
@@ -262,9 +262,9 @@ module Zypper
         #
         class Table < Common
           def self.header(args)
-            super args
+            super
             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,16 +93,14 @@ 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,
                                          refresh: @search.refresh,
                                          query: pack[:link]
 
-                result.engines.each do |_k, v|
+                result.engines.each_value do |v|
                   next unless v.available?
 
                   v.to_data[:versions].each do |f|
@@ -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, format_and_arch: true)
                   end
                 end
+              elsif package_select?(pack, format_and_arch: true)
+                packages << pack
               end
             end
           end
@@ -137,7 +137,7 @@ module Zypper
                             refresh: @search.refresh,
                             cache_time: args[:cache_time]
 
-        if packages.count.positive?
+        if packages.any?
           @view_class.header first_col: packages.max_column(args[:first_col]),
                              second_col: packages.max_column(args[:second_col])
 
@@ -154,19 +154,23 @@ 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")))
+          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

data/zypper-onlinesearch.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "iniparse"
-  spec.add_runtime_dependency "nokogiri"
+  spec.add_dependency "iniparse"
+  spec.add_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zypper-onlinesearch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Fabio Mucciante
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -76,7 +75,6 @@ metadata:
   changelog_uri: https://freeaptitude.altervista.org/projects/zypper-onlinesearch.html#changelog
   wiki_uri: https://github.com/fabiomux/zypper-onlinesearch/wiki
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Zypper addon to search packages online through the openSUSE software search
   website.