repomd_parser 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e96fc8459331c46c5a95a479d50c93973db28675e71f37d367300ad921c5995
-  data.tar.gz: 0bc27934593e3e22225850446f537754e0ee7e0f1d190fdb27e51019dffd3771
+  metadata.gz: 651e3571a7eb4f5e890a8b8fab2cb1d2e1ffe9b446099f9b1ef7a4e1bfa1654e
+  data.tar.gz: cc198d24a1ac1aaf09a3ae5a9ca50fb06fe16b52311ab9ab7ecc8b29ef0af4e3
 SHA512:
-  metadata.gz: 10fc061b160790a2bf8a4f440dbbbdcc3cbbfbb9c70fd40616a16be1c7270040695a440eb65ae3a493ac5b6aac791c43002f580782a2a88eb2405ee5d4dce50c
-  data.tar.gz: 5905bf2dfcce585e9ebcadf452dab17ebb17a0dcf0e5d04f010042d982a4b0484204e4b56fdd48e142dc308022d58e028ea3b5076c93af775be6cddda0a648cd
+  metadata.gz: d61636f109f8c67d526d3b4d88a531ccf49cf9b2f65e91c475884e9c435a126b7c3d8d1b992ebeca4e2be079d5f92d285edd1e3031480fdd0df99d92130791d6
+  data.tar.gz: c02f8e14053a30d28f6b3c216522cd6edc83099adac98553b099f68b0901f5d9922b0cc99e7e92934ed13be7d6ecb2d40a0435ba9ad563befec5b724f3074645

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in repomd_parser.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# RepomdParser [![Build Status](https://travis-ci.org/ikapelyukhin/repomd-parser.svg?branch=master)](https://travis-ci.org/ikapelyukhin/repomd-parser)
+# RepomdParser
 
 RPM repository metadata parser.
 
@@ -75,11 +75,11 @@ RPM and DRPM files additionally have the following attributes:
 
 ## Caveats
 
-* Relies on the file name to determine if the file is compressed (automatically decompresses `.gz` files)
+* Relies on the file extension to determine if the file is compressed (automatically decompresses `.gz` and `.zst` files)
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/repomd_parser/base_parser.rb

@@ -19,30 +19,28 @@ require 'nokogiri'
 require 'zlib'
 
 class RepomdParser::BaseParser < Nokogiri::XML::SAX::Document
-
   def initialize(filename)
+    super()
     @referenced_files = []
     @filename = filename
   end
 
   def parse
-    if (File.extname(@filename) == '.gz')
-      Zlib::GzipReader.open(@filename) do |gz|
-        Nokogiri::XML::SAX::Parser.new(self).parse(gz)
-      end
-    else
-      File.open(@filename) do |fh|
-        Nokogiri::XML::SAX::Parser.new(self).parse(fh)
-      end
-    end
-
+    Nokogiri::XML::SAX::Parser.new(self).parse(file_io_class.open(@filename))
     @referenced_files
   end
 
   protected
 
+  def file_io_class
+    case File.extname(@filename)
+    when '.gz' then Zlib::GzipReader
+    when '.zst' then RepomdParser::ZstdReader
+    else File
+    end
+  end
+
   def get_attribute(attributes, name)
     attributes.select { |e| e[0] == name }.first[1]
   end
-
 end

data/lib/repomd_parser/deltainfo_xml_parser.rb

@@ -16,49 +16,45 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 class RepomdParser::DeltainfoXmlParser < RepomdParser::BaseParser
-
-  def initialize(filename)
-    super(filename)
-  end
-
   def start_element(name, attrs = [])
     @current_node = name.to_sym
-    if (name == 'newpackage')
+    case name
+    when 'newpackage'
       @package = {}
       @package[:version] = get_attribute(attrs, 'version')
       @package[:name] = get_attribute(attrs, 'name')
       @package[:arch] = get_attribute(attrs, 'arch')
-    elsif (name == 'delta')
+    when 'delta'
       @delta = {}
-    elsif (name == 'checksum')
+    when 'checksum'
       @delta[:checksum_type] = get_attribute(attrs, 'type')
     end
   end
 
   def characters(string)
-    if (@current_node == :filename)
+    case @current_node
+    when :filename
       @delta[:location] ||= ''
       @delta[:location] += string.strip
-    elsif (@current_node == :checksum)
+    when :checksum
       @delta[:checksum] ||= ''
       @delta[:checksum] += string.strip
-    elsif (@current_node == :size)
+    when :size
       @delta[:size] ||= ''
       @delta[:size] += string.strip
     end
   end
 
   def end_element(name)
-    if (name == 'delta')
-      @referenced_files << RepomdParser::Reference.new(
-        location: @delta[:location],
-        checksum_type: @delta[:checksum_type],
-        checksum: @delta[:checksum],
-        type: :drpm,
-        size: @delta[:size].to_i,
-        arch: @package[:arch],
-      )
-    end
-  end
+    return unless name == 'delta'
 
+    @referenced_files << RepomdParser::Reference.new(
+      location: @delta[:location],
+      checksum_type: @delta[:checksum_type],
+      checksum: @delta[:checksum],
+      type: :drpm,
+      size: @delta[:size].to_i,
+      arch: @package[:arch]
+    )
+  end
 end

data/lib/repomd_parser/primary_xml_parser.rb

@@ -16,54 +16,49 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 class RepomdParser::PrimaryXmlParser < RepomdParser::BaseParser
-
-  def initialize(filename)
-    super(filename)
-  end
-
   def start_element(name, attrs = [])
     @current_node = name.to_sym
-    if (name == 'package')
+    case name
+    when 'package'
       @package = {}
-    elsif (name == 'version')
+    when 'version'
       @package[:version] = get_attribute(attrs, 'ver')
       @package[:release] = get_attribute(attrs, 'rel')
-    elsif (name == 'location')
+    when 'location'
       @package[:location] = get_attribute(attrs, 'href')
-    elsif (name == 'checksum')
+    when 'checksum'
       @package[:checksum_type] = get_attribute(attrs, 'type')
-    elsif (name == 'size')
+    when 'size'
       @package[:size] = get_attribute(attrs, 'package').to_i
-    elsif (name == 'time')
+    when 'time'
       @package[:build_time] = get_attribute(attrs, 'build')
     end
   end
 
   def characters(string)
-    if (%i[name arch checksum summary description rpm:license].include? @current_node)
-      @package[@current_node] ||= ''
-      @package[@current_node] += string.strip
-    end
+    return unless %i[name arch checksum summary description rpm:license].include? @current_node
+
+    @package[@current_node] ||= ''
+    @package[@current_node] += string.strip
   end
 
   def end_element(name)
-    if (name == 'package')
-      @referenced_files << RepomdParser::Reference.new(
-        location: @package[:location],
-        checksum_type: @package[:checksum_type],
-        checksum: @package[:checksum],
-        type: :rpm,
-        size: @package[:size].to_i,
-        arch: @package[:arch],
-        version: @package[:version],
-        release: @package[:release],
-        name: @package[:name],
-        summary: @package[:summary],
-        description: @package[:description],
-        license: @package[:"rpm:license"],
-        build_time: Time.at(@package[:build_time].to_i).utc
-      )
-    end
-  end
+    return unless name == 'package'
 
+    @referenced_files << RepomdParser::Reference.new(
+      location: @package[:location],
+      checksum_type: @package[:checksum_type],
+      checksum: @package[:checksum],
+      type: :rpm,
+      size: @package[:size].to_i,
+      arch: @package[:arch],
+      version: @package[:version],
+      release: @package[:release],
+      name: @package[:name],
+      summary: @package[:summary],
+      description: @package[:description],
+      license: @package[:'rpm:license'],
+      build_time: Time.at(@package[:build_time].to_i).utc
+    )
+  end
 end

data/lib/repomd_parser/reference.rb

@@ -45,15 +45,15 @@ class RepomdParser::Reference
                  build_time: nil)
     local_variables.each do |local_var|
       method = "#{local_var}="
-      send(method, binding.local_variable_get(local_var)) if (respond_to?(method))
+      send(method, binding.local_variable_get(local_var)) if respond_to?(method)
     end
   end
 
   # Overloaded comparator for specs
-  def ==(obj)
+  def ==(other)
     result = true
     instance_variables.each do |instance_var|
-      result &&= (instance_variable_get(instance_var) == obj.instance_variable_get(instance_var))
+      result &&= (instance_variable_get(instance_var) == other.instance_variable_get(instance_var))
     end
     result
   end

data/lib/repomd_parser/repomd_xml_parser.rb

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 class RepomdParser::RepomdXmlParser
-
   def initialize(filename)
     @filename = filename
   end
@@ -48,5 +47,4 @@ class RepomdParser::RepomdXmlParser
 
     files
   end
-
 end

data/lib/repomd_parser/version.rb

@@ -16,5 +16,5 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 module RepomdParser
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'.freeze
 end

data/lib/repomd_parser/zstd_reader.rb

@@ -0,0 +1,40 @@
+# repomd_parser -- Ruby gem to parse RPM repository metadata
+# Copyright (C) 2024 Ivan Kapelyukhin
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require 'zstd-ruby'
+
+class RepomdParser::ZstdReader < File
+  def initialize(*args)
+    super(*args)
+    @stream = Zstd::StreamingDecompress.new
+    @buffer = ''
+  end
+
+  def read(len = nil, out = nil)
+    @buffer << @stream.decompress(super(len)) while @buffer.size < len && !eof
+
+    if @buffer.size > len
+      out = @buffer[0..len]
+      @buffer = @buffer[len..-1]
+    else
+      out = @buffer
+      @buffer = ''
+    end
+
+    out
+  end
+end

data/lib/repomd_parser.rb

@@ -24,3 +24,4 @@ require 'repomd_parser/base_parser'
 require 'repomd_parser/repomd_xml_parser'
 require 'repomd_parser/deltainfo_xml_parser'
 require 'repomd_parser/primary_xml_parser'
+require 'repomd_parser/zstd_reader'

data/repomd_parser.gemspec

@@ -1,31 +1,38 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "repomd_parser/version"
+require 'repomd_parser/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "repomd_parser"
+  spec.name          = 'repomd_parser'
   spec.version       = RepomdParser::VERSION
-  spec.authors       = ["Ivan Kapelyukhin"]
-  spec.email         = ["ikapelyukhin@suse.com"]
+  spec.authors       = ['Ivan Kapelyukhin']
+  spec.email         = ['ikapelyukhin@opensuse.org']
 
-  spec.summary       = %q{RPM repository metadata (RepoMD) parser}
-  spec.homepage      = "https://github.com/ikapelyukhin/repomd-parser"
+  spec.summary       = 'RPM repository metadata (RepoMD) parser'
+  spec.homepage      = 'https://github.com/ikapelyukhin/repomd-parser'
   spec.license       = 'GPL-2.0-or-later'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }.reject { |f| f.match(%r{^\.}) }
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }.reject { |f| f.match(/^\./) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5'
+
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
 
-  spec.add_development_dependency "bundler", ">= 1.16"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '>= 1.16'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
 
+  # Locked because of Ruby >= 2.5 dependency
+  spec.add_development_dependency 'rubocop', '<= 1.25'
+  spec.add_development_dependency 'rubocop-ast', '<= 1.17.0'
+
   spec.add_dependency 'nokogiri', '~> 1.8'
+  spec.add_dependency 'zstd-ruby', '~> 1.3', '>= 1.3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repomd_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ivan Kapelyukhin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: rubocop-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -80,9 +108,29 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-description: 
+- !ruby/object:Gem::Dependency
+  name: zstd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5.0
+description:
 email:
-- ikapelyukhin@suse.com
+- ikapelyukhin@opensuse.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,7 +139,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/setup
 - lib/repomd_parser.rb
 - lib/repomd_parser/base_parser.rb
 - lib/repomd_parser/deltainfo_xml_parser.rb
@@ -99,12 +146,14 @@ files:
 - lib/repomd_parser/reference.rb
 - lib/repomd_parser/repomd_xml_parser.rb
 - lib/repomd_parser/version.rb
+- lib/repomd_parser/zstd_reader.rb
 - repomd_parser.gemspec
 homepage: https://github.com/ikapelyukhin/repomd-parser
 licenses:
 - GPL-2.0-or-later
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,16 +161,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: RPM repository metadata (RepoMD) parser
 test_files: []

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here