zypper-upgraderepo 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70f8e680b1c6c86d0c556a6761cb0738dc3b39422109a679ccaeee34d1a0d26
-  data.tar.gz: edc57ec51daa46b5443f4cf928af1884b5cbdbd5779b687eec38dd98d021f9ef
+  metadata.gz: 3f063f691c5f780a94c2016e4be62f636c4e70e6f21377993b3a2b6c57d7ca59
+  data.tar.gz: 68b13bc527f0f87456a4613c2ed7c3ab23214991a6a8eea09c0d94b8da7c7c73
 SHA512:
-  metadata.gz: 15495fdd8f2619194293bc2ab113043c343c11f5aada78d8db338937f65365b9b475f4f7725dbcfe4f207df452705e80b8a8dd991338003982784db7154a4251
-  data.tar.gz: 6de4b17c55d6693f7c020eeb7226524e738be9ef1ca1e1e166cb0cfd14ecef53eef32952c371e75cd5d20c15fa1de88894b6dc63d12a1c1871f7f481489122be
+  metadata.gz: 78c01cb2796e0ada9252bccbbcf027b2e9f81e09d593f6b2f682c86d717e348c02ee58ba2008696edccc441288bb8ad569dc90d42d362c5acd94945d8580f82e
+  data.tar.gz: b406a9567d05634b2c4f906e5fb925b6d9ae78275f9f4fd42c920b1ea2bac696d14db2ac081b2f40ed7bd331eeb87e38a6ceec8563c0a2a6103985d8dd79d662

data/Gemfile.lock

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

data/lib/zypper/upgraderepo/repository.rb

@@ -65,12 +65,10 @@ module Zypper
       def resolve_variables!(version)
         each_with_number do |r|
           if r.url =~ /\$/
-            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)
+            r.url = expand_variables(r.url, version)
           end
+          r.name = expand_variables(r.name, version)
+          r.alias = expand_variables(r.alias, version)
         end
 
         self
@@ -85,6 +83,14 @@ module Zypper
 
       private
 
+      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)
         ini = IniParse.parse(File.read(filename))

data/lib/zypper/upgraderepo/request.rb

@@ -6,7 +6,6 @@ require_relative 'requests/http.rb'
 module Zypper
   module Upgraderepo
 
-
     class Request
 
       def self.build(repo, timeout)
@@ -14,7 +13,7 @@ module Zypper
 
         raise InvalidProtocol, repo unless @@registry.include? repo.protocol
 
-        Object.const_get(@@registry[repo.protocol]).new(repo, timeout)
+        Object.const_get(self.find_class(repo)).new(repo, timeout)
       end
 
       def self.protocols
@@ -26,17 +25,26 @@ module Zypper
       def self.load_requests
         res = {}
         Requests.constants.each do |klass|
-          Object.const_get("Zypper::Upgraderepo::Requests::#{klass}").register_protocol.each do |protocol|
-            res[protocol] = "Zypper::Upgraderepo::Requests::#{klass}"
+          obj = Object.const_get("Zypper::Upgraderepo::Requests::#{klass}")
+          obj.register_protocol.each do |protocol|
+            res[protocol] ||= {}
+            res[protocol][obj.domain] = "Zypper::Upgraderepo::Requests::#{klass}"
           end
         end
 
         res
       end
 
-    end
-
+      def self.find_class(repo)
+        domain = URI(repo.url).hostname
 
+        if @@registry[repo.protocol].has_key? domain
+          return @@registry[repo.protocol][domain]
+        else
+          return @@registry[repo.protocol]['default']
+        end
+      end
+    end
 
   end
 end

data/lib/zypper/upgraderepo/requests/http.rb

@@ -93,6 +93,8 @@ module Zypper
 
         def self.register_protocol; ['https', 'http'] end
 
+        def self.domain; 'default' end
+
         def evaluate_alternative(version)
           if not_found?
             return traverse_url(URI(url), version)
@@ -114,14 +116,25 @@ module Zypper
           available?
         end
 
-        def subfolders
-          res = ping.body.to_s.scan(Regexp.new('href=[\'\"][^\/\"]+\/[\'\"]')).delete_if do |x|
+        def subfolders(uri)
+          ping.body.to_s.scan(Regexp.new('href=[\'\"][^\/\"]+\/[\'\"]')).delete_if do |x|
             x =~ /^\// || x =~ /^\.\./ || x =~ /\:\/\// || x =~ /href=[\"\'](media\.1|boot|EFI)\/[\"\']/
           end.uniq.map do |d|
             d.scan(/href=[\"\']([^"]+)[\'\"]/).pop.pop
           end
+        end
+      end
+
+      class DownloadOpensuseOrgRequest < HttpRequest
+
+        def self.domain; 'download.opensuse.org' end
 
-          res
+        def subfolders(uri)
+          u = URI(uri.to_s)
+          u.path = "/download#{u.path}"
+          u.query = 'jsontable'
+          require 'json'
+          JSON.parse(ping(u, false).body.to_s)["data"].map { |x| x["name"] }
         end
       end
 

data/lib/zypper/upgraderepo/requests/local.rb

@@ -68,6 +68,8 @@ module Zypper
 
         def self.register_protocol; ['dir'] end
 
+        def self.domain; 'default' end
+
         def evaluate_alternative(version)
           if not_found?
             return traverse_url(URI(url), version)

data/lib/zypper/upgraderepo/traversable.rb

@@ -49,7 +49,7 @@ module Zypper
         uri.path += '/' if uri.path[-1] != '/'
         ping(uri, false)
 
-        subfolders.each do |dir|
+        subfolders(uri).each do |dir|
           u = URI(uri.to_s)
           u.path += dir
 

data/lib/zypper/upgraderepo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zypper-upgraderepo
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-29 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.7.0
+  documentation_uri: https://www.rubydoc.info/gems/zypper-upgraderepo/1.7.1
   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