enhancerepo 0.4.1 → 0.5.0

data/lib/enhance_repo/rpm_md/primary.rb

@@ -1,5 +1,7 @@
+# Encoding: utf-8
+
 #--
-# 
+#
 # enhancerepo is a rpm-md repository metadata tool.
 # Copyright (C) 2008, 2009 Novell Inc.
 # Author: Duncan Mac-Vicar P. <dmacvicar@suse.de>
@@ -32,92 +34,89 @@ module EnhanceRepo
     #
     class Primary < Data
       attr_accessor :indent
-      
+
       def initialize(dir)
         @indent = false
         @dir = dir
         @rpmfiles = []
       end
-      
+
       def read_packages
         Dir["#{@dir}/**/*.rpm"].each do |rpmfile|
           @rpmfiles << rpmfile
-        end  
+        end
       end
 
       def size
         @rpmfiles.size
       end
-      
+
       def empty?
         @rpmfiles.empty?
       end
 
       def write_package(file, rpmfile)
-        b = Builder::XmlMarkup.new(:target=>file, :indent=> @indent ? 2 : 0, :indent=> @indent ? 2 : 0)
-        b.package('type' => 'rpm') do | b |
+        b = Builder::XmlMarkup.new(target: file, indent: @indent ? 2 : 0)
+        b.package('type' => 'rpm') do
           pkgid = PackageId.new(rpmfile)
           b.name pkgid.name
           b.arch pkgid.arch
-          b.version('epoch' => pkgid.version.e.nil? ? "0" : pkgid.version.e.to_s, 'ver' => pkgid.version.v, 'rel' => pkgid.version.r)
-          b.checksum(pkgid.checksum, 'type'=>'sha', 'pkgid'=>'YES')
+          b.version('epoch' => pkgid.version.e.nil? ? '0' : pkgid.version.e.to_s, 'ver' => pkgid.version.v, 'rel' => pkgid.version.r)
+          b.checksum(pkgid.checksum, 'type' => EnhanceRepo::ConfigOpts.instance.digest_name, 'pkgid' => 'YES')
           b.summary pkgid[RPM::TAG_SUMMARY]
           b.description pkgid[RPM::TAG_DESCRIPTION]
           b.packager pkgid[RPM::TAG_PACKAGER]
           b.url pkgid[RPM::TAG_URL]
-          b.time('file'=>File.mtime(rpmfile).to_i, 'build'=>pkgid[RPM::TAG_BUILDTIME])
-          b.tag!('size', 'archive'=>pkgid[RPM::TAG_ARCHIVESIZE], 'installed'=>pkgid[RPM::TAG_SIZE], 'package'=>File.size(rpmfile))
-          b.location('href'=>File.basename(rpmfile))
+          b.time('file' => File.mtime(rpmfile).to_i, 'build' => pkgid[RPM::TAG_BUILDTIME])
+          b.tag!('size', 'archive' => pkgid[RPM::TAG_ARCHIVESIZE], 'installed' => pkgid[RPM::TAG_SIZE], 'package' => File.size(rpmfile))
+          b.location('href' => File.basename(rpmfile))
           # now the format tags
-          b.format do |b|
+          b.format do
             b.tag!('rpm:license', pkgid[RPM::TAG_LICENSE])
             b.tag!('rpm:vendor', pkgid[RPM::TAG_VENDOR])
             b.tag!('rpm:group', pkgid[RPM::TAG_GROUP])
             b.tag!('rpm:buildhost', pkgid[RPM::TAG_BUILDHOST])
             b.tag!('rpm:sourcerpm', pkgid[RPM::TAG_SOURCERPM])
-            #b.tag!('rpm:header-range', pkgid[RPM::TAG_SOURCERPM])
-            
+            # b.tag!('rpm:header-range', pkgid[RPM::TAG_SOURCERPM])
+
             # serialize dependencies
-            [:provides, :requires, :obsoletes, :conflicts, :obsoletes].each do |deptype|
-              b.tag!("rpm:#{deptype}") do |b|
-                pkgid.send(deptype).reverse.each { |dep|
+            %i[provides requires obsoletes conflicts obsoletes].each do |deptype|
+              b.tag!("rpm:#{deptype}") do
+                pkgid.send(deptype).reverse.each do |dep|
                   flag = nil
                   flag = 'LT' if dep.lt?
                   flag = 'GT' if dep.gt?
                   flag = 'EQ' if dep.eq?
                   flag = 'LE' if dep.le?
                   flag = 'GE' if dep.ge?
-                  attrs = {'name'=>dep.name}
-                  if not flag.nil?
-                    attrs['pre'] = 1 if (deptype == :requires) and dep.pre?
+                  attrs = { 'name' => dep.name }
+                  unless flag.nil?
+                    attrs['pre'] = 1 if (deptype == :requires) && dep.pre?
                     attrs['flags'] = flag
-                    attrs['ver'] =dep.version.v
-                    attrs['epoch'] = dep.version.e.nil? ? "0" : dep.version.e.to_s
-                    attrs['rel'] =dep.version.r
+                    attrs['ver'] = dep.version.v
+                    attrs['epoch'] = dep.version.e.nil? ? '0' : dep.version.e.to_s
+                    attrs['rel'] = dep.version.r
                   end
                   b.tag!('rpm:entry', attrs)
-                }
+                end
               end
-              #####
             end
-          end
+          end #####
           # done with format section
         end
         #  done package tag
       end
-      
+
       # write primary.xml
       def write(file)
-        builder = Builder::XmlMarkup.new(:target=>file, :indent=> @indent ? 2 : 0)
+        builder = Builder::XmlMarkup.new(target: file, indent: @indent ? 2 : 0)
         builder.instruct!
-        builder.tag!("metadata", 'xmlns' => 'http://linux.duke.edu/metadata/common', 'xmlns:rpm' => 'http://linux.duke.edu/metadata/rpm', 'xmlns:suse'=>'http://novell.com/package/metadata/suse/common', 'packages'=> @rpmfiles.size ) do |b|
+        builder.tag!('metadata', 'xmlns' => 'http://linux.duke.edu/metadata/common', 'xmlns:rpm' => 'http://linux.duke.edu/metadata/rpm', 'xmlns:suse' => 'http://novell.com/package/metadata/suse/common', 'packages' => @rpmfiles.size) do |_b|
           @rpmfiles.each do |rpmfile|
             write_package(file, rpmfile)
           end
-        end# next package
+        end # next package
       end
-      
     end
-
   end
 end

data/lib/enhance_repo/rpm_md/products.rb

@@ -1,5 +1,7 @@
+# Encoding: utf-8
+
 #--
-# 
+#
 # enhancerepo is a rpm-md repository metadata tool.
 # Copyright (C) 2008, 2009 Novell Inc.
 # Author: Duncan Mac-Vicar P. <dmacvicar@suse.de>
@@ -23,18 +25,15 @@
 #++
 #
 require 'rpm'
-require 'tempdir'
 require 'pathname'
 require 'nokogiri'
-require 'ftools'
+# require 'ftools'
 
 module EnhanceRepo
   module RpmMd
-
     # products.xml metadata generator
     # reads the release files from a repository
     class Products < Data
-      
       # Holder for products we read from the
       # release files
       class ProductData
@@ -47,17 +46,16 @@ module EnhanceRepo
         attr_accessor :summary
         attr_accessor :description
       end
-      
+
       def initialize(dir)
         @dir = dir
         @products = []
       end
 
       def rpm_extract_file(rpmpath, path)
-        Tempdir.open do |tmppath|
-          File.makedirs(tmppath)
+        Dir.mktmpdir do |tmppath|
           Dir.chdir(tmppath) do
-            `rpm2cpio '#{rpmpath}' | cpio -iv --make-directories #{File.join(".", path)} 2>/dev/null`
+            `rpm2cpio '#{rpmpath}' | cpio -iv --make-directories #{File.join('.', path)} 2>/dev/null`
           end
           File.open(File.join(tmppath, path)) do |f|
             yield f if block_given?
@@ -70,10 +68,10 @@ module EnhanceRepo
         products = []
         rpm_extract_file(rpmpath, path) do |f|
           doc = Nokogiri::XML(f)
-          #print doc.to_s
+          # print doc.to_s
           product = ProductData.new
           # set attributes of the product based on the xml data
-          [:name, :version, :release, :arch, :vendor, :summary, :description].each do |attr|
+          %i[name version release arch vendor summary description].each do |attr|
             product.send("#{attr}=".to_sym, doc.root.xpath("./#{attr}").text)
           end
           products << product
@@ -84,16 +82,16 @@ module EnhanceRepo
 
       # scan the products from the rpm files in the repository
       def read_packages
-#        log.info "Looking for product release packages"
+        #        log.info "Looking for product release packages"
         Dir["#{@dir}/**/*-release-*.rpm", "#{@dir}/**/*-migration-*.rpm"].each do |rpmfile|
           pkg = RPM::Package.new(rpmfile)
           # we dont care for packages not providing a product
-          next if pkg.provides.select{|x| x.name == "product()"}.empty?
+          next if pkg.provides.select { |x| x.name == 'product()' }.empty?
           log.info "Found product release package #{rpmfile}"
           # this package contains a product
           # go over each product file
-          pkg.files.map {|x| x.to_s }.each do |path|
-            next if not ( File.extname(path) == ".prod" && File.dirname(path) == "/etc/products.d" )
+          pkg.files.map(&:path).each do |path|
+            next unless File.extname(path) == '.prod' && File.dirname(path) == '/etc/products.d'
             # we have a product file. Extract it
             log.info "`-> product file : #{path}"
             products_in_file_in_rpm(File.expand_path(rpmfile), File.expand_path(path)) do |product|
@@ -111,7 +109,7 @@ module EnhanceRepo
       def size
         @products.size
       end
-      
+
       def write(io)
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.products do
@@ -120,23 +118,20 @@ module EnhanceRepo
                 xml.name product.name
                 version = RPM::Version.new("#{product.version}-#{product.release}")
                 epoch = version.e
-                epoch ||= "0"
-                xml.version :epoch => epoch, :ver => version.v, :rel => version.r
+                epoch ||= '0'
+                xml.version epoch: epoch, ver: version.v, rel: version.r
                 xml.arch product.arch
                 xml.vendor product.vendor
                 xml.summary product.summary
-                xml.description product.description                
+                xml.description product.description
               end
             end
           end
         end
         # write the result
-        #io.write(builder.to_xml)
-        io.write(builder.doc.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML))
+        # io.write(builder.to_xml)
+        io.write(builder.doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML))
       end
-
-      
     end
-    
   end
 end

data/lib/enhance_repo/rpm_md/repo.rb

@@ -1,5 +1,7 @@
+# Encoding: utf-8
+
 #--
-# 
+#
 # enhancerepo is a rpm-md repository metadata tool.
 # Copyright (C) 2008, 2009 Novell Inc.
 # Author: Duncan Mac-Vicar P. <dmacvicar@suse.de>
@@ -25,7 +27,6 @@
 require 'rubygems'
 require 'builder'
 require 'rexml/document'
-require 'digest/sha1'
 require 'zlib'
 require 'yaml'
 
@@ -35,6 +36,7 @@ require 'enhance_repo/rpm_md/primary'
 require 'enhance_repo/rpm_md/file_lists'
 require 'enhance_repo/rpm_md/other'
 require 'enhance_repo/rpm_md/update_info'
+require 'enhance_repo/rpm_md/patterns'
 require 'enhance_repo/rpm_md/suse_info'
 require 'enhance_repo/rpm_md/suse_data'
 require 'enhance_repo/rpm_md/delta_info'
@@ -43,17 +45,15 @@ require 'enhance_repo/rpm_md/index'
 
 module EnhanceRepo
   module RpmMd
-    
     include REXML
-    
-    class Repo
 
+    class Repo
       include Logger
-      
+
       attr_accessor :index
 
       # extensions
-      attr_reader :primary, :other, :filelists, :susedata, :suseinfo, :deltainfo, :updateinfo, :products
+      attr_reader :primary, :other, :filelists, :susedata, :suseinfo, :deltainfo, :updateinfo, :products, :patterns
       def initialize(config)
         @dir = config.dir
         @outputdir = config.outputdir
@@ -61,13 +61,11 @@ module EnhanceRepo
         @index = Index.new
         repomdfile = File.join(@dir, @index.metadata_filename)
         # populate the index
-        if File.exist?(repomdfile)
-          @index.read_file(File.new(repomdfile))
-        end
-        
+        @index.read_file(File.new(repomdfile)) if File.exist?(repomdfile)
+
         @primary = Primary.new(config.dir)
         @primary.indent = config.indent
-        
+
         @filelists = FileLists.new(config.dir)
         @other = Other.new(config.dir)
         @susedata = SuseData.new(config.dir)
@@ -75,17 +73,16 @@ module EnhanceRepo
         @suseinfo = SuseInfo.new(config.dir)
         @deltainfo = DeltaInfo.new(config.dir)
         @products = Products.new(config.dir)
+        @patterns = Patterns.new(config)
       end
 
       def sign(keyid)
         # check if the index is written to disk
         repomdfile = File.join(@dir, @index.metadata_filename)
-        if not File.exist?(repomdfile)
-          raise "#{repomdfile} does not exist."
-        end
+        raise "#{repomdfile} does not exist." unless File.exist?(repomdfile)
         # call gpg to sign the repository
         `gpg -sab -u #{keyid} -o '#{repomdfile}.asc' '#{repomdfile}'`
-        if not File.exists?("#{repomdfile}.asc")
+        if !File.exist?("#{repomdfile}.asc")
           log.info "Could't not generate signature #{repomdfile}.asc"
           exit(1)
         else
@@ -95,7 +92,7 @@ module EnhanceRepo
         # now export the public key
         `gpg --export -a -o '#{repomdfile}.key' #{keyid}`
 
-        if not File.exists?("#{repomdfile}.key")
+        if !File.exist?("#{repomdfile}.key")
           log.info "Could't not generate public key #{repomdfile}.key"
           exit(1)
         else
@@ -104,39 +101,38 @@ module EnhanceRepo
       end
 
       def write
-
         datas = [@primary, @filelists, @other, @updateinfo,
-                 @susedata, @suseinfo, @deltainfo, @products ]
+                 @susedata, @suseinfo, @deltainfo, @products, @patterns]
 
         # select the datas that are not empty
         # those need to be saved
-        non_empty_data = datas.reject { |x| x.empty? }
+        non_empty_data = datas.reject(&:empty?)
         # files present in the index, which were changed
         changed_files = []
         # files present on disk, but not in the index
         missing_files = []
         # files present in the index, but not on disk
         superflous_files = []
-        
+
         # now look for files that changed or dissapeared
         Dir.chdir(@dir) do
           # look all files except the index itself
-          metadata_files = Dir["repodata/*.xml*"].reject do |x|            
-            x  =~ /#{@index.metadata_filename}/ ||
-            x =~ /\.key$/ ||
-            x =~ /\.asc$/
+          metadata_files = Dir['repodata/*.xml*'].reject do |x|
+            x =~ /#{@index.metadata_filename}/ ||
+              x =~ /\.key$/ ||
+              x =~ /\.asc$/
           end
           # remove datas in the index not present in the disk
           @index.resources.reject! do |resource|
-            reject = ! metadata_files.include?(resource.location)
+            reject = !metadata_files.include?(resource.location)
             log.info "Removing not existing #{resource.location} from index" if reject
             reject
           end
-          
-          non_empty_files = non_empty_data.map { |x| x.metadata_filename }
+
+          non_empty_files = non_empty_data.map(&:metadata_filename)
           # ignore it if it is already in the non_empty_list
           # as it will be added to the index anyway
-          metadata_files.reject!{ |x| non_empty_files.include?(x) }
+          metadata_files.reject! { |x| non_empty_files.include?(x) }
           metadata_files.each do |metadata_file|
             # find the indexed resource for this file
             indexed_resource = @index.resources.select { |x| x.location == metadata_file }.first
@@ -151,7 +147,7 @@ module EnhanceRepo
             end
           end
         end
-        
+
         # write down changed datas
         non_empty_data.each do |data|
           write_gz_extension_file(data)
@@ -167,14 +163,17 @@ module EnhanceRepo
           log.info "Adding missing #{f} to #{@index.metadata_filename} index"
           @index.add_file_resource(File.join(@outputdir, f), f)
         end
-                
+
         changed_files.each do |f|
           log.info "Replacing changed #{f} on #{@index.metadata_filename} index"
           @index.add_file_resource(File.join(@outputdir, f), f)
         end
-        
+
         # now write the index
-        File.open((@outputdir + @index.metadata_filename), 'w') do |f|
+        unless File.exist?(File.dirname(File.join(@outputdir, @index.metadata_filename)))
+          FileUtils.mkdir_p(File.dirname(File.join(@outputdir, @index.metadata_filename)))
+        end
+        File.open(File.join(@outputdir, @index.metadata_filename), 'w') do |f|
           log.info "Saving #{@index.metadata_filename} .."
           @index.write(f)
         end
@@ -186,7 +185,7 @@ module EnhanceRepo
         filename = Pathname.new(File.join(@outputdir, data.metadata_filename))
         FileUtils.mkdir_p filename.dirname
         log.info "Saving #{filename} .."
-        if not filename.dirname.exist?
+        unless filename.dirname.exist?
           log.info "Creating non existing #{filename.dirname} .."
           filename.dirname.mkpath
         end
@@ -195,8 +194,6 @@ module EnhanceRepo
           data.write(gz)
         end
       end
-      
     end
-
   end
 end

data/lib/enhance_repo/rpm_md/resource.rb

@@ -1,5 +1,7 @@
+# Encoding: utf-8
+
 #--
-# 
+#
 # enhancerepo is a rpm-md repository metadata tool.
 # Copyright (C) 2008, 2009 Novell Inc.
 # Author: Duncan Mac-Vicar P. <dmacvicar@suse.de>
@@ -25,20 +27,18 @@
 
 module EnhanceRepo
   module RpmMd
-
     # represents a resource in repomd.xml
     class Resource
       attr_accessor :type
-      attr_accessor :location, :checksum, :timestamp, :openchecksum
+      attr_accessor :location, :checksum, :timestamp, :openchecksum, :size, :opensize, :database_version
 
       # define equality based on the location
       # as it has no sense to have two resources for the
-      #same location
+      # same location
       def ==(other)
         return (location == other.location) if other.is_a?(Resource)
         false
-      end      
+      end
     end
-    
   end
 end