repomd_parser 0.1.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651e3571a7eb4f5e890a8b8fab2cb1d2e1ffe9b446099f9b1ef7a4e1bfa1654e
-  data.tar.gz: cc198d24a1ac1aaf09a3ae5a9ca50fb06fe16b52311ab9ab7ecc8b29ef0af4e3
+  metadata.gz: 4f7ff99bff5d57e3ac804ae0bb0e9b400d063d3e3356d4728ebfa111af23b98f
+  data.tar.gz: 57e8cae44d279cb14d968b9593d38fc90acd7719df4599fe2504095121681d5f
 SHA512:
-  metadata.gz: d61636f109f8c67d526d3b4d88a531ccf49cf9b2f65e91c475884e9c435a126b7c3d8d1b992ebeca4e2be079d5f92d285edd1e3031480fdd0df99d92130791d6
-  data.tar.gz: c02f8e14053a30d28f6b3c216522cd6edc83099adac98553b099f68b0901f5d9922b0cc99e7e92934ed13be7d6ecb2d40a0435ba9ad563befec5b724f3074645
+  metadata.gz: 3a897e1c8b28083cb9a8a170a1f0284b18a64ca2f8f387588d730d0149cd740da7308bc7a62903f24a0d13133158042f62a69da19d8e274c3f4e1a4ae71a0a3a
+  data.tar.gz: 18edf9de4f6c9d4efeb0dca5a099604e088cd7f2db934f317a70ee8939cf7adfa239f0f60dd05bdbad356449834e19bb2903df893d0e1b59e42fb21b802bca72

data/README.md

@@ -20,10 +20,23 @@ Alternatively, install as `gem install repomd_parser`.
 
 Parses `repomd.xml` -- the main repository metadata file, which references other metadata files.
 
-`parse` method returns an array of `RepomdParser::Reference`. 
+`parse` and `parse_file` methods return an array of `RepomdParser::Reference`.
+
+##### Using the `parse` method
 
 ```ruby
-metadata_files = RepomdParser::RepomdXmlParser.new('repomd.xml').parse
+File.open('repomd.xml') do |fh|
+  metadata_files = RepomdParser::RepomdXmlParser.new.parse(fh)
+  metadata_files.each do |metadata_file|
+    printf "type: %10s, location: %s\n", metadata_file.type, metadata_file.location
+  end
+end
+```
+
+##### Using the `parse_file` method
+
+```ruby
+metadata_files = RepomdParser::RepomdXmlParser.new.parse_file('repomd.xml')
 metadata_files.each do |metadata_file|
   printf "type: %10s, location: %s\n", metadata_file.type, metadata_file.location 
 end
@@ -33,10 +46,23 @@ end
 
 Parses `primary.xml`, which contains information about RPM packages in the repository.
 
-`parse` method returns an array of `RepomdParser::Reference`.
+`parse` and `parse_file` methods return an array of `RepomdParser::Reference`.
+
+##### Using the `parse` method
+
+```ruby
+File.open('primary.xml') do |fh|
+  rpm_packages = RepomdParser::PrimaryXmlParser.new.parse(fh)
+  rpm_packages.each do |rpm|
+    printf "arch: %8s, location: %s\n", rpm.arch, rpm.location
+  end
+end
+```
+
+##### Using the `parse_file` method
 
 ```ruby
-rpm_packages = RepomdParser::PrimaryXmlParser.new('primary.xml').parse
+rpm_packages = RepomdParser::PrimaryXmlParser.new.parse_file('primary.xml')
 rpm_packages.each do |rpm|
   printf "arch: %8s, location: %s\n", rpm.arch, rpm.location
 end
@@ -46,15 +72,54 @@ end
 
 Parses `deltainfo.xml`, which contains information about delta-RPM packages in the repository.
 
-`parse` method returns an array of `RepomdParser::Reference`.
+`parse` and `parse_file` methods return an array of `RepomdParser::Reference`.
+
+##### Using the `parse` method
+
+```ruby
+File.open('deltainfo.xml') do |fh|
+  rpm_packages = RepomdParser::DeltainfoXmlParser.new.parse(fh)
+  rpm_packages.each do |rpm|
+    printf "arch: %8s, location: %s\n", rpm.arch, rpm.location
+  end
+end
+```
+
+##### Using the `parse_file` method
 
 ```ruby
-rpm_packages = RepomdParser::DeltainfoXmlParser.new('deltainfo.xml').parse
+rpm_packages = RepomdParser::DeltainfoXmlParser.new.parse_file('deltainfo.xml')
 rpm_packages.each do |rpm|
   printf "arch: %8s, location: %s\n", rpm.arch, rpm.location
 end
 ```
 
+#### Compressed file support
+
+The gzip and Zstandard compression formats are supported. The `parse_file`
+method automatically decompresses files based on the filename, e.g.:
+
+```ruby
+rpm_packages = RepomdParser::PrimaryXmlParser.new.parse_file('primary.xml.gz')
+rpm_packages.each do |rpm|
+  printf "arch: %8s, location: %s\n", rpm.arch, rpm.location
+end
+```
+
+The `RepomdParser.decompress_io` helper is provided to handle
+decompression of IO objects for use with the `parse` method:
+
+```ruby
+filename = 'primary.xml.gz'
+io = RepomdParser.decompress_io(File.open(filename), filename)
+
+rpm_packages = RepomdParser::PrimaryXmlParser.new.parse(io)
+rpm_packages.each do |rpm|
+  printf "arch: %8s, location: %s\n", rpm.arch, rpm.location
+end
+```
+
+
 #### RepomdParser::Reference
 
 Represents a file referenced in the metadata file. Has the following accessors:
@@ -75,7 +140,8 @@ RPM and DRPM files additionally have the following attributes:
 
 ## Caveats
 
-* Relies on the file extension to determine if the file is compressed (automatically decompresses `.gz` and `.zst` files)
+* File extension is used to determine file compression type (expected
+  extensions are `.gz` and `.zst` for gzip and Zstandard respectively)
 
 ## Development
 

data/lib/repomd_parser/base_parser.rb

@@ -16,30 +16,26 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require 'nokogiri'
-require 'zlib'
 
 class RepomdParser::BaseParser < Nokogiri::XML::SAX::Document
-  def initialize(filename)
-    super()
-    @referenced_files = []
-    @filename = filename
+  def parse_file(filename)
+    io = RepomdParser.decompress_io(File.open(filename), filename)
+    parse(io)
+  ensure
+    io.close
   end
 
-  def parse
-    Nokogiri::XML::SAX::Parser.new(self).parse(file_io_class.open(@filename))
-    @referenced_files
+  def parse(io_object)
+    @referenced_files = []
+    Nokogiri::XML::SAX::Parser.new(self).parse(io_object)
+    ret_val = @referenced_files
+    @referenced_files = nil
+
+    ret_val
   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

data/lib/repomd_parser/repomd_xml_parser.rb

@@ -16,13 +16,15 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 class RepomdParser::RepomdXmlParser
-  def initialize(filename)
-    @filename = filename
+  def parse_file(filename)
+    File.open(filename) do |fh|
+      parse(fh)
+    end
   end
 
-  def parse
+  def parse(io_object)
     files = []
-    xml = Nokogiri::XML(File.open(@filename))
+    xml = Nokogiri::XML(io_object)
 
     xml.xpath('/xmlns:repomd/xmlns:data').each do |data_node|
       type = data_node.attr('type').to_sym

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.6'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/repomd_parser/zstd_reader.rb

@@ -17,15 +17,15 @@
 
 require 'zstd-ruby'
 
-class RepomdParser::ZstdReader < File
-  def initialize(*args)
-    super(*args)
+class RepomdParser::ZstdReader
+  def initialize(io_object)
+    @io = io_object
     @stream = Zstd::StreamingDecompress.new
     @buffer = ''
   end
 
   def read(len = nil, out = nil)
-    @buffer << @stream.decompress(super(len)) while @buffer.size < len && !eof
+    @buffer << @stream.decompress(@io.read(len)) while @buffer.size < len && !@io.eof
 
     if @buffer.size > len
       out = @buffer[0..len]
@@ -37,4 +37,8 @@ class RepomdParser::ZstdReader < File
 
     out
   end
+
+  def close
+    @io.close
+  end
 end

data/lib/repomd_parser.rb

@@ -15,9 +15,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module RepomdParser
-end
-
 require 'repomd_parser/version'
 require 'repomd_parser/reference'
 require 'repomd_parser/base_parser'
@@ -25,3 +22,17 @@ require 'repomd_parser/repomd_xml_parser'
 require 'repomd_parser/deltainfo_xml_parser'
 require 'repomd_parser/primary_xml_parser'
 require 'repomd_parser/zstd_reader'
+
+require 'zlib'
+require 'bzip2/ffi'
+
+module RepomdParser
+  def self.decompress_io(io_object, filename)
+    case File.extname(filename)
+    when '.gz' then Zlib::GzipReader.new(io_object)
+    when '.zst' then RepomdParser::ZstdReader.new(io_object)
+    when '.bz2' then Bzip2::FFI::Reader.open(io_object)
+    else io_object
+    end
+  end
+end

data/repomd_parser.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '<= 1.25'
   spec.add_development_dependency 'rubocop-ast', '<= 1.17.0'
 
+  spec.add_dependency 'bzip2-ffi', '~> 1.1.1'
   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.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Kapelyukhin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 1.17.0
+- !ruby/object:Gem::Dependency
+  name: bzip2-ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement