zypper-upgraderepo 1.8.1 → 1.10.0

data/lib/zypper/upgraderepo/repository.rb

@@ -1,16 +1,51 @@
-require 'iniparse'
+# frozen_string_literal: true
+
+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.
+    #
     class RepositoryList
-
-      REPOSITORY_PATH = '/etc/zypp/repos.d'
+      REPOSITORY_PATH = "/etc/zypp/repos.d"
 
       attr_reader :list, :max_col
 
-      def initialize(options)
+      def initialize(options, variables)
         @alias = options.alias
         @name = options.name
         @only_repo = options.only_repo
@@ -18,19 +53,19 @@ module Zypper
         @only_invalid = options.only_invalid
         @only_protocols = options.only_protocols
         @overrides = options.overrides
-        @upgrade_options = {alias: options.alias, name: options.name}
+        @upgrade_options = { alias: options.alias, name: options.name }
         @list = []
-        @cpu_arch, @arch = `rpm --eval "%cpu_arch;%_arch"`.tr("\n", '').split(';')
 
-        Dir.glob(File.join(self.class::REPOSITORY_PATH, '*.repo')).each do |i|
-          r = Request.build(Repository.new(i), options.timeout)
+        @variables = variables
+        Dir.glob(File.join(self.class::REPOSITORY_PATH, "*.repo")).each do |i|
+          r = Request.build(Repository.new(i, @variables), options.timeout)
           @list << r
         end
         @max_col = @list.max_by { |r| r.name.length }.name.length
 
-        @list = @list.sort_by { |r| r.alias }.map.with_index(1) { |r, i| { num: i, repo: r } }
+        @list = @list.sort_by(&:alias).map.with_index(1) { |r, i| { num: i, repo: r } }
 
-        @list.sort_by! { |x| x[:repo].send(options.sort_by) } if options.sort_by != :alias
+        @list.sort_by! { |x| x[:repo].send(options.sorting_by) } if options.sorting_by != :alias
 
         @only_repo = select_repos(@only_repo) unless @only_repo.nil?
 
@@ -58,60 +93,48 @@ module Zypper
           next if only_repo && !only_repo.include?(x[:num])
           next if only_enabled && !x[:repo].enabled?
           next if only_invalid && x[:repo].available?
-          next if only_protocols && (!only_protocols.include?(x[:repo].protocol))
+          next if only_protocols && !only_protocols.include?(x[:repo].protocol)
 
           yield x[:repo], x[:num] if block_given?
         end
       end
 
-      def resolve_variables!(version)
-        each_with_number do |r|
-          if r.url =~ /\$/
-            r.url = expand_variables(r.url, version)
-          end
-          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
         end
       end
 
-
       private
 
       def select_repos(repos)
         res = []
         repos.each do |r|
-          if r.to_i > 0
+          if r.to_i.positive?
             res.push r.to_i
           elsif r =~ /^\ *@.*/
-            a = r.gsub(/@/, '').strip
-            @list.select { |x| x[:repo].alias.match?(Regexp.new(a, 'i')) }.each do |l|
+            a = r.gsub(/@/, "").strip
+            @list.select { |x| x[:repo].alias.match?(Regexp.new(a, "i")) }.each do |l|
               res.push l[:num]
             end
           elsif r =~ /^\ *\#.*/
-            u = r.gsub(/\#/, '').strip
-            @list.select { |x| x[:repo].url.match?(Regexp.new(u, 'i')) }.each do |l|
+            u = r.gsub(/\#/, "").strip
+            @list.select { |x| x[:repo].url.match?(Regexp.new(u, "i")) }.each do |l|
               res.push l[:num]
             end
-          elsif r =~ /^\ *\&.*/
-            s = r.gsub(/\&/, '').strip
-            @list.select do |x|
-              x[:repo].alias.match?(Regexp.new(s, 'i')) ||
-              x[:repo].name.match?(Regexp.new(s, 'i')) ||
-              x[:repo].url.match?(Regexp.new(s, 'i'))
-            end.each do |l|
+          elsif r =~ /^\ *&.*/
+            s = r.gsub(/&/, "").strip
+            sel = @list.select do |x|
+              x[:repo].alias.match?(Regexp.new(s, "i")) ||
+                x[:repo].name.match?(Regexp.new(s, "i")) ||
+                x[:repo].url.match?(Regexp.new(s, "i"))
+            end
+            sel.each do |l|
               res.push l[:num]
             end
           else
             n = r.strip
-            @list.select { |x| x[:repo].name.match?(Regexp.new(n, 'i')) }.each do |l|
+            @list.select { |x| x[:repo].name.match?(Regexp.new(n, "i")) }.each do |l|
               res.push l[:num]
             end
           end
@@ -120,76 +143,72 @@ 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)
+
         ini = IniParse.parse(File.read(filename))
         each_with_number(only_invalid: false) do |repo, num|
-          if x = ini["repository_#{num}"]
-            repo.enable!(x['enabled'])
-            raise UnmatchingOverrides, { num: num, ini: x, repo: repo } if repo.url != x['old_url']
-            if (only_enabled?)
-              raise MissingOverride, { num: num, ini: x } unless x['url'] || x['enabled'] =~ /no|false|0/i
-            else
-              raise MissingOverride, { num: num, ini: x } unless x['url']
-            end
-            @overrides[num] = x['url'] if x['url']
+          next unless (x = ini["repository_#{num}"])
+
+          repo.enable!(x["enabled"])
+          raise UnmatchingOverrides, { num: num, ini: x, repo: repo } if repo.url != x["old_url"]
+
+          if only_enabled?
+            raise MissingOverride, { num: num, ini: x } unless x["url"] || x["enabled"] =~ /no|false|0/i
+          else
+            raise MissingOverride, { num: num, ini: x } unless x["url"]
           end
+          @overrides[num] = x["url"] if x["url"]
         end
       end
-
     end
 
-
+    #
+    # Single repository class.
+    #
     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 = get_key
+        @key = read_key
         @old_url = nil
         @old_name = nil
         @old_alias = nil
+        resolve_variables!(variables)
       end
 
       def enabled?
-        @repo[@key]['enabled'].to_i == 1
+        @repo[@key]["enabled"].to_i == 1
       end
 
-      def enable!(value = true)
-        @repo[@key]['enabled'] = (value.to_s =~ /true|1|yes/i) ? 1 : 0
+      def enable!(value = nil)
+        @repo[@key]["enabled"] = (value || true).to_s =~ /true|1|yes/i ? 1 : 0
       end
 
       def type
-        @repo[@key]['type']
+        @repo[@key]["type"]
       end
 
       def name
-        @repo[@key]['name'] || @key
+        @repo[@key]["name"] || @key
       end
 
       def name=(value)
-        @repo[@key]['name'] = value
+        @repo[@key]["name"] = value
       end
 
       def priority
-        @repo[@key]['priority'] || 99
+        @repo[@key]["priority"] || 99
       end
 
       def url
-        @repo[@key]['baseurl']
+        @repo[@key]["baseurl"]
       end
 
       def url=(value)
-        @repo[@key]['baseurl'] = value
+        @repo[@key]["baseurl"] = value
       end
 
       def protocol
@@ -210,50 +229,53 @@ module Zypper
 
       def alias=(value)
         @repo = IniParse.parse(@repo.to_ini.sub(/\[[^\]]+\]/, "[#{value}]"))
-        @key = get_key
+        @key = read_key
       end
 
       def upgrade!(version, args = {})
-        @old_url ||= self.url
+        @old_url ||= url
         @old_alias ||= self.alias
-        @old_name ||= self.name
+        @old_name ||= name
 
-        if args[:url_override]
-          self.url = args[:url_override]
-        else
-          self.url = self.url.gsub(/\d\d\.\d/, version)
-        end
+        self.url = (args[:url_override] || url.gsub(/\d\d\.\d/, version))
 
         self.alias = self.alias.gsub(/\d\d\.\d/, version) if args[:alias]
-        self.name = self.name.gsub(/\d\d\.\d/, version) if args[:name]
+        self.name = name.gsub(/\d\d\.\d/, version) if args[:name]
       end
 
       def upgraded?(item = :url)
-        (!self.send("old_#{item}").nil?) && (self.send("old_#{item}") != self.send(item))
+        !send("old_#{item}").nil? && (send("old_#{item}") != send(item))
       end
 
       def save
         raise InvalidWritePermissions, @filename unless File.writable? @filename
+
         process, pid = libzypp_process
         raise SystemUpdateRunning, { pid: pid, process: process } if pid
+
         @repo.save(@filename)
       end
 
-
       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
+        libpath = `ldd /usr/bin/zypper | grep "libzypp.so"`.split(" => ")[1].split.shift
         process = `sudo lsof #{libpath} | tail -n 1`
-        process, pid = process.split(' ')
+        process, pid = process.split
         [process, pid]
       end
 
-      def get_key
-        @repo.to_hash.keys.delete_if {|k| k == '0'}.pop
+      def read_key
+        @repo.to_hash.keys.delete_if { |k| k == "0" }.pop
       end
     end
-
-
   end
 end

data/lib/zypper/upgraderepo/request.rb

@@ -1,27 +1,29 @@
-require 'delegate'
-require_relative 'traversable.rb'
-require_relative 'requests/local.rb'
-require_relative 'requests/http.rb'
+# frozen_string_literal: true
+
+require "delegate"
+require_relative "traversable"
+require_relative "requests/local"
+require_relative "requests/http"
 
 module Zypper
   module Upgraderepo
-
+    #
+    # Load the right class to handle the protool and
+    # achieve the request..
+    #
     class Request
-
       def self.build(repo, timeout)
-        @@registry ||= self.load_requests
+        @@registry ||= load_requests
 
         raise InvalidProtocol, repo unless @@registry.include? repo.protocol
 
-        Object.const_get(self.find_class(repo)).new(repo, timeout)
+        Object.const_get(find_class(repo)).new(repo, timeout)
       end
 
       def self.protocols
-        self.load_requests.keys
+        load_requests.keys
       end
 
-      private
-
       def self.load_requests
         res = {}
         Requests.constants.each do |klass|
@@ -38,13 +40,10 @@ module Zypper
       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
+        return @@registry[repo.protocol][domain] if @@registry[repo.protocol].key? domain
+
+        @@registry[repo.protocol]["default"]
       end
     end
-
   end
 end

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

@@ -1,14 +1,17 @@
-require 'delegate'
-require 'net/http'
+# frozen_string_literal: true
+
+require "delegate"
+require "net/http"
 
 module Zypper
   module Upgraderepo
-
+    #
+    # Base class for a Web page request.
+    #
     class PageRequest < SimpleDelegator
-
       attr_reader :page
 
-      USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:59.0) Gecko/20100101 Firefox/59.0'
+      USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:59.0) Gecko/20100101 Firefox/59.0"
 
       def initialize(obj, timeout = 60)
         super obj
@@ -24,7 +27,7 @@ module Zypper
       end
 
       def redirected_to
-        ping['location']
+        ping["location"]
       end
 
       def not_found?
@@ -47,27 +50,25 @@ module Zypper
         @page = nil
       end
 
-
       private
 
       def get_request(uri, head)
+        request = if head
+                    Net::HTTP::Head.new(uri.request_uri)
+                  else
+                    Net::HTTP::Get.new(uri.request_uri)
+                  end
 
-        if head
-          request = Net::HTTP::Head.new(uri.request_uri)
-        else
-          request = Net::HTTP::Get.new(uri.request_uri)
-        end
-
-        request['User-Agent'] = USER_AGENT
+        request["User-Agent"] = USER_AGENT
 
         http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = (uri.scheme == 'https')
+        http.use_ssl = (uri.scheme == "https")
         http.open_timeout = @timeout
 
         http.request(request)
       end
 
-      def ping(uri = nil, head = true, cache = true)
+      def ping(uri = nil, head: true, cache: true)
         begin
           if @page.nil? || uri
             if cache
@@ -79,69 +80,78 @@ module Zypper
         rescue SocketError
           raise NoConnection
         rescue Net::OpenTimeout
-          @page = Net::HTTPRequestTimeOut.new('1.1', '', '')
+          @page = Net::HTTPRequestTimeOut.new("1.1", "", "")
         end
         cache ? @page : unpage
       end
-
     end
 
-
     module Requests
-
+      #
+      # This is where the repository pages are scraped
+      # and analyzed to find newer versions.
+      #
       class HttpRequest < PageRequest
-
         include Traversable
 
-        def max_drop_back; 0; end
+        def max_drop_back
+          0
+        end
 
-        def self.register_protocol; ['https', 'http'] end
+        def self.register_protocol
+          %w[https http]
+        end
 
-        def self.domain; 'default' end
+        def self.domain
+          "default"
+        end
 
         def evaluate_alternative(version)
           if not_found?
-            return traverse_url(URI(url), version)
+            traverse_url(URI(url), version)
           elsif redirected?
-            return { url: redirected_to, message: 'Redirected to:' }
+            { url: redirected_to, message: "Redirected to:" }
           end
         end
 
-
         private
 
         def get_request(uri, head)
-          #super uri || URI(url), head
+          # super uri || URI(url), head
           super uri || repodata_uri, head
         end
 
-        def has_repodata?(uri)
-          ping(repodata_uri(uri), true, false).is_a?(Net::HTTPSuccess)
+        def repodata?(uri)
+          ping(repodata_uri(uri), head: true, cache: false).is_a?(Net::HTTPSuccess)
         end
 
-        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
+        def subfolders(_uri)
+          subf = ping.body.to_s.scan(Regexp.new('href=[\'\"][^\/\"]+\/[\'\"]')).delete_if do |x|
+            x =~ %r{^/} || x =~ /^\.\./ || x =~ %r{://} || x =~ %r{href=["'](media\.1|boot|EFI)/["']}
+          end
+          subf.uniq.map do |d|
+            d.scan(/href=["']([^"]+)['"]/).pop.pop
           end
         end
       end
 
+      #
+      # Custom scraping methods for the specific
+      # download.opensuse.org search engine.
+      #
       class DownloadOpensuseOrgRequest < HttpRequest
-
-        def self.domain; 'download.opensuse.org' end
+        def self.domain
+          "download.opensuse.org"
+        end
 
         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"] }
+          u.query = "jsontable"
+          require "json"
+          JSON.parse(ping(u, head: false).body.to_s)["data"].map { |x| x["name"] }
         end
       end
-
     end
-
   end
 end

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

@@ -1,14 +1,16 @@
-require 'delegate'
+# frozen_string_literal: true
+
+require "delegate"
 
 module Zypper
   module Upgraderepo
-
-
+    #
+    # Base class for a local directory request.
+    #
     class DirRequest < SimpleDelegator
-
       attr_reader :dir_path
 
-      def initialize(obj, timeout)
+      def initialize(obj, _timeout)
         super obj
       end
 
@@ -44,53 +46,57 @@ module Zypper
         @dir_path = nil
       end
 
-
       private
 
-      def ping(uri = nil, head = true)
+      def ping(uri = nil, head: true)
         @dir_path ||= URI(url).path
 
-        @dir_path = uri.to_s =~ /^\// ? uri.to_s : URI(uri.to_s).path if uri
+        @dir_path = uri.to_s =~ %r{^/} ? uri.to_s : URI(uri.to_s).path if uri
 
         URI.unescape(@dir_path)
       end
-
     end
 
-
     module Requests
-
+      #
+      # This is where the local repositories are
+      # analyzed to find newer versions.
+      #
       class LocalRequest < DirRequest
-
         include Traversable
 
-        def max_drop_back; 1 end
+        def max_drop_back
+          1
+        end
 
-        def self.register_protocol; ['dir'] end
+        def self.register_protocol
+          ["dir"]
+        end
 
-        def self.domain; 'default' end
+        def self.domain
+          "default"
+        end
 
         def evaluate_alternative(version)
           if not_found?
-            return traverse_url(URI(url), version)
+            traverse_url(URI(url), version)
           elsif redirected?
-            return { url: redirected_to, message: 'Linked to' }
+            { url: redirected_to, message: "Linked to" }
           end
         end
 
-
         private
 
-        def has_repodata?(uri)
+        def repodata?(uri)
           File.exist? URI.unescape(repodata_uri(uri).path)
         end
 
         def subfolders
-          Dir.glob(ping.gsub(/\/$/, '') + '/*/').map { |x| URI.escape(x.gsub(/\/$/, '').gsub(ping, '').gsub(/^\//, '')) }
+          Dir.glob("#{ping.gsub(%r{/$}, "")}/*/").map do |x|
+            URI.escape(x.gsub(%r{/$}, "").gsub(ping, "").gsub(%r{^/}, ""))
+          end
         end
       end
-
     end
-
   end
 end