enhancerepo 0.4.1 → 0.5.0

data/lib/enhance_repo/logger.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>
@@ -24,15 +26,14 @@
 #
 
 module EnhanceRepo
-
   def self.enable_logger
     # support both log4r and ruby logger
     begin
       require 'log4r'
       include Log4r
       @logger = Log4r::Logger.new 'enhancerepo'
-      console_format = Log4r::PatternFormatter.new(:pattern => "%l:\t %m")
-      @logger.add Log4r::StdoutOutputter.new('console', :formatter=>console_format)
+      console_format = Log4r::PatternFormatter.new(pattern: "%l:\t %m")
+      @logger.add Log4r::StdoutOutputter.new('console', formatter: console_format)
     rescue LoadError
       require 'logger'
       @logger = ::Logger.new(STDERR)
@@ -41,21 +42,25 @@ module EnhanceRepo
   end
 
   def self.using_log4r?
-    (! (Object.const_get(:Log4r) rescue nil).nil?)
+    !(begin
+         Object.const_get(:Log4r)
+       rescue
+         nil
+       end).nil?
   end
-  
+
   def self.enable_debug
     EnhanceRepo.logger.level = using_log4r? ? Log4r::DEBUG : ::Logger::DEBUG
   end
-  
+
   def self.logger
     @logger
   end
 
   def self.logger=(logger)
-      @logger = logger
+    @logger = logger
   end
-  
+
   # provide easy access to classes to the
   # global logger
   module Logger
@@ -63,5 +68,4 @@ module EnhanceRepo
       EnhanceRepo.logger
     end
   end
-  
 end

data/lib/enhance_repo/other.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>
@@ -30,7 +32,6 @@ module EnhanceRepo
   # http://en.opensuse.org/Standards/Rpm_Metadata
   #
   class Other
-
     def initialize(dir)
       @dir = dir
       @rpmfiles = []
@@ -39,7 +40,7 @@ module EnhanceRepo
     def read
       Dir["#{@dir}/**/*.rpm"].each do |rpmfile|
         @rpmfiles << rpmfile
-      end  
+      end
     end
 
     def empty?
@@ -47,34 +48,32 @@ module EnhanceRepo
     end
 
     def write_package(file, rpmfile)
-      b = Builder::XmlMarkup.new(:target=>file, :indent=>2, :initial=>2)
+      b = Builder::XmlMarkup.new(target: file, indent: 2, initial: 2)
       pkgid = PackageId.new(rpmfile)
       puts pkgid.rpm.methods.sort
       pkgid[RPM::TAG_CHANGELOGTEXT].each do |ch|
         puts ch
       end
       exit
-      b.package('pkgid'=>pkgid.checksum, 'name' => pkgid.name, 'arch'=>pkgid.arch ) do | b |
+      b.package('pkgid' => pkgid.checksum, 'name' => pkgid.name, 'arch' => pkgid.arch) do |b|
         b.version('epoch' => pkgid.version.e, 'ver' => pkgid.version.v, 'rel' => pkgid.version.r)
         pkgid.files.each do |f|
           b.file f
         end
       end
     end
-    
+
     # write filelists.xml
     def write(file)
-      #builder = Builder::XmlMarkup.new(:target=>file, :indent=>2)
-      #builder.instruct!
-      #xml = builder.tag!("otherdata", 'xmlns' => 'xmlns="http://linux.duke.edu/metadata/other"', 'packages'=> @rpmfiles.size ) do |b|
+      # builder = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+      # builder.instruct!
+      # xml = builder.tag!("otherdata", 'xmlns' => 'xmlns="http://linux.duke.edu/metadata/other"', 'packages'=> @rpmfiles.size ) do |b|
       @rpmfiles.each do |rpmfile|
         #  done package tag
         write_package(file, rpmfile)
       end
       # next package
-      #end
+      # end
     end
-    
   end
-
 end

data/lib/enhance_repo/package_id.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,28 +25,28 @@
 #++
 #
 
-require 'digest/sha1'
 require 'rpm'
 
 module EnhanceRepo
-
   # thin wrapper over rpm package
   class PackageId
     attr_accessor :checksum
     attr_accessor :path
     attr_accessor :rpm
-    
+
+    include Logger
+
     def initialize(rpmfile)
       @path = rpmfile
-      @rpm = RPM::Package.open(rpmfile)    
-      @checksum = Digest::SHA1.hexdigest(File.new(rpmfile).read)
+      @rpm = RPM::Package.open(rpmfile)
+      @checksum = EnhanceRepo::ConfigOpts.instance.digest_class.hexdigest(File.new(rpmfile).read)
     end
 
     # Forward other methods
     def method_missing(sym, *args)
       @rpm.send(sym, *args)
     end
-    
+
     def hash
       @checksum.hash
     end
@@ -52,7 +54,16 @@ module EnhanceRepo
     def eql?(other)
       @checksum == other.checksum
     end
-    
+
+    def arch
+      s = self[RPM::TAG_SOURCERPM]
+      if s.nil?
+        return 'src'
+      else
+        return @rpm.arch
+      end
+    end
+
     # match function at name and nvr level
     def matches(ident)
       # if the name matches, then it is sufficient
@@ -65,7 +76,7 @@ module EnhanceRepo
       return true if ident == "#{@rpm.name}-#{@rpm.version.v}-#{@rpm.version.r}"
       # and finally arch
       return true if ident == "#{@rpm.name}-#{@rpm.version.v}-#{@rpm.version.r}.#{@rpm.arch}"
-      return false
+      false
     end
 
     def to_s
@@ -73,9 +84,7 @@ module EnhanceRepo
     end
 
     def ident
-      "#{@rpm.to_s}.#{@rpm.arch}"
+      "#{@rpm}.#{@rpm.arch}"
     end
-    
   end
-
 end

data/lib/enhance_repo/pattern.rb

@@ -0,0 +1,50 @@
+# Encoding: utf-8
+
+require 'enhance_repo/rpm_md/pattern_writer'
+
+module EnhanceRepo
+  class Pattern
+    # include serialization
+    include RpmMd::PatternWriter
+
+    attr_accessor :name
+    attr_accessor :version
+    attr_accessor :release
+    attr_accessor :architecture
+    attr_accessor :summary
+    attr_accessor :description
+    attr_accessor :icon
+    attr_accessor :order
+    attr_accessor :visible
+    attr_accessor :category
+    attr_accessor :supplements
+    attr_accessor :conflicts
+    attr_accessor :provides
+    attr_accessor :requires
+    attr_accessor :recommends
+    attr_accessor :suggests
+    attr_accessor :extends
+    attr_accessor :includes
+
+    def initialize
+      @name        = ''
+      @version     = ''
+      @release     = ''
+      @architecture = 'noarch'
+      @summary     = {}
+      @description = {}
+      @icon        = nil
+      @order       = 0
+      @visible     = true
+      @category    = {}
+      @supplements = {}
+      @conflicts   = {}
+      @provides    = {}
+      @requires    = {}
+      @recommends  = {}
+      @suggests    = {}
+      @extends     = {}
+      @includes    = {}
+    end
+  end
+end

data/lib/enhance_repo/product_id.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>

data/lib/enhance_repo/rpm_md.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>

data/lib/enhance_repo/rpm_md/data.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,11 +27,10 @@
 
 module EnhanceRepo
   module RpmMd
-
     # represents a metadata unit
     class Data
       include Logger
-      
+
       # initialize the extra data with a name
       # or use the class name as default
       def initialize(name)
@@ -37,9 +38,9 @@ module EnhanceRepo
       end
 
       def name
-        defined?(@name) ? @name : self.class.to_s.split("::").last.downcase
+        defined?(@name) ? @name : self.class.to_s.split('::').last.downcase
       end
-      
+
       def metadata_filename
         "repodata/#{name}.xml#{should_compress? ? '.gz' : ''}"
       end
@@ -48,8 +49,6 @@ module EnhanceRepo
       def should_compress?
         true
       end
-      
     end
-    
   end
 end

data/lib/enhance_repo/rpm_md/delta_info.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,19 +34,18 @@ require 'pathname'
 
 module EnhanceRepo
   module RpmMd
-
     include REXML
 
     class DeltaRpm < PackageId
       attr_accessor :sequence, :sourcerpm
-      
+
       def initialize(filename)
         super(filename)
         `applydeltarpm -i '#{filename}'`.each_line do |line|
           key, value = line.chop.split(':')
-          value.gsub!(/ /, '')
-          @sequence = value if key == "sequence"
-          @sourcerpm = value if key == "source rpm"
+          value.delete!(' ')
+          @sequence = value if key == 'sequence'
+          @sourcerpm = value if key == 'source rpm'
         end
       end
 
@@ -55,26 +56,24 @@ module EnhanceRepo
       def eql?(other)
         ident == other.ident
       end
-      
     end
 
     class DeltaInfo < Data
-
       def initialize(dir)
         @dir = dir
         # here we store known deltas
         # we index by new package
         # and in every slot we store an
         # array with such deltas
-        @deltas = Hash.new
+        @deltas = {}
       end
 
       def delta_count
         @deltas.size
       end
-      
+
       def empty?
-        return @deltas.empty?
+        @deltas.empty?
       end
 
       # Create delta rpms for the last
@@ -94,78 +93,73 @@ module EnhanceRepo
       # options are :n => number of deltas (default 1)
       # and :outputdir => defaulting to the same
       # input directory
-      def create_deltas(opts={})
+      def create_deltas(opts = {})
         outputdir = opts[:outputdir] || @dir
         n = opts[:n] || 1
 
         log.info "Scanning rpms for delta generation (#{n} levels)"
-        #log.info "Creating deltarpms : level #{n}"
+        # log.info "Creating deltarpms : level #{n}"
         # make a hash name -> array of packages
-        pkgs = Hash.new
-        
+        pkgs = {}
+
         Dir["#{@dir}/**/*.rpm"].each do |rpmfile|
-          #puts "Delta: #{rpmfile}"
+          # puts "Delta: #{rpmfile}"
           rpm = PackageId.new(rpmfile)
-          
-          pkgs[rpm.name] = Array.new if not pkgs.has_key?(rpm.name)
+
+          pkgs[rpm.name] = [] unless pkgs.key?(rpm.name)
           pkgs[rpm.name] << rpm
         end
 
         # now that we have al packages, sort them by version
-        pkgs.each do |pkgname, pkglist|
-
-          pkglist.sort! { |a,b| a.version <=> b.version }
+        pkgs.each do |_pkgname, pkglist|
+          pkglist.sort! { |a, b| a.version <=> b.version }
           pkglist.reverse!
           # now that the list is sorted, the new rpm is the first
           newpkg = pkglist.shift
-          c = 0 
-          if not pkglist.empty?
-            for pkg in pkglist
-              break if c == n
-              # do not create a delta for the same package
-              next if newpkg.version == pkg.version
-              # do not create a delta for different archs
-              next if newpkg.arch != pkg.arch
-              oldpkg = pkg
-              # use the same dir as the new rpm
-              log.info "`-> creating delta - #{oldpkg.to_s} -> #{newpkg.to_s} (#{c+1}/#{n})"
-              # calculate directory where to save the delta. Use the newpkg
-              # relative to the origin directory,
-              # this only works because we know the rpm is inside @dir
-              subdir = Pathname.new(newpkg.path).relative_path_from(Pathname.new(@dir)).dirname              
-              # calculate the deltarpm name
-              deltafile = File.join(outputdir, subdir, delta_package_name(oldpkg,newpkg))
-              FileUtils.mkdir_p File.dirname(deltafile)
-              #puts "makedeltarpm #{oldpkg.path} #{newpkg.path} #{deltafile}"
-              `makedeltarpm '#{oldpkg.path}' '#{newpkg.path}' '#{deltafile}'`
-              c += 1
-            end
+          c = 0
+          next if pkglist.empty?
+          for pkg in pkglist
+            break if c == n
+            # do not create a delta for the same package
+            next if newpkg.version == pkg.version
+            # do not create a delta for different archs
+            next if newpkg.arch != pkg.arch
+            oldpkg = pkg
+            # use the same dir as the new rpm
+            log.info "`-> creating delta - #{oldpkg} -> #{newpkg} (#{c + 1}/#{n})"
+            # calculate directory where to save the delta. Use the newpkg
+            # relative to the origin directory,
+            # this only works because we know the rpm is inside @dir
+            subdir = Pathname.new(newpkg.path).relative_path_from(Pathname.new(@dir)).dirname
+            # calculate the deltarpm name
+            deltafile = File.join(outputdir, subdir, delta_package_name(oldpkg, newpkg))
+            FileUtils.mkdir_p File.dirname(deltafile)
+            # puts "makedeltarpm #{oldpkg.path} #{newpkg.path} #{deltafile}"
+            `makedeltarpm '#{oldpkg.path}' '#{newpkg.path}' '#{deltafile}'`
+            c += 1
           end
-          
         end
-
       end
 
       # figure out the name of a delta rpm
       def delta_package_name(oldpkg, newpkg)
-        deltarpm = ""
-        if ( oldpkg.version.v == newpkg.version.v )
-          # if the version is the same, then it is specified only once, and the range
-          # is used for the releases
-          deltarpm = "#{oldpkg.name}-#{oldpkg.version.v}-#{oldpkg.version.r}_#{newpkg.version.r}.#{oldpkg.arch}.delta.rpm"
-        else
-          deltarpm = "#{oldpkg.name}-#{oldpkg.version.v}_#{newpkg.version.v}-#{oldpkg.version.r}_#{newpkg.version.r}.#{oldpkg.arch}.delta.rpm"
-        end
+        deltarpm = ''
+        deltarpm = if oldpkg.version.v == newpkg.version.v
+                     # if the version is the same, then it is specified only once, and the range
+                     # is used for the releases
+                     "#{oldpkg.name}-#{oldpkg.version.v}-#{oldpkg.version.r}_#{newpkg.version.r}.#{oldpkg.arch}.delta.rpm"
+                   else
+                     "#{oldpkg.name}-#{oldpkg.version.v}_#{newpkg.version.v}-#{oldpkg.version.r}_#{newpkg.version.r}.#{oldpkg.arch}.delta.rpm"
+                   end
       end
-      
+
       def add_deltas
         Dir["#{@dir}/**/*.delta.rpm"].each do |deltafile|
           delta = DeltaRpm.new(deltafile)
-          #puts "Delta: #{deltafile} for '#{delta.ident}'"      
-          @deltas[delta] = Array.new if @deltas[delta].nil?
+          # puts "Delta: #{deltafile} for '#{delta.ident}'"
+          @deltas[delta] = [] if @deltas[delta].nil?
           @deltas[delta] << delta
         end
-
       end
 
       # write a update out
@@ -173,13 +167,13 @@ module EnhanceRepo
         builder = Nokogiri::XML::Builder.new do |b|
           b.deltainfo do
             @deltas.each do |ident, deltas|
-              b.newpackage( 'name' => ident.name, 'arch' => ident.arch,
-                            'version' => ident.version.v,
-                            'release' => ident.version.r ) do |b|
+              b.newpackage('name' => ident.name, 'arch' => ident.arch,
+                           'version' => ident.version.v,
+                           'release' => ident.version.r) do
                 deltas.each do |delta|
                   # get the edition by getting the name out
                   version = RPM::Version.new(delta.sourcerpm.gsub(/#{Regexp.escape(delta.name)}-/, ''))
-                  b.delta('oldepoch'=>0, 'oldversion'=>version.v, 'oldrelease'=>version.r) do |b|
+                  b.delta('oldepoch' => 0, 'oldversion' => version.v, 'oldrelease' => version.r) do
                     # remove the base dir, make it relative
                     delta_abs_path = Pathname.new(delta.path).realpath
                     base_dir_abs_path = Pathname.new(@dir).realpath
@@ -187,19 +181,16 @@ module EnhanceRepo
                     b.filename relative_path
                     b.sequence(delta.sequence)
                     b.size(File.size(delta.path))
-                    b.checksum(delta.checksum, 'type'=>'sha')
+                    b.checksum(delta.checksum, 'type' => EnhanceRepo::ConfigOpts.instance.digest_name)
                   end # </delta>
                 end
               end # </newpackage>
             end # each delta
-          end #</deltainfo>
+          end # </deltainfo>
         end
         # ready builder
-        file.write(builder.doc.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML))
+        file.write(builder.doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML))
       end
-      
     end
-
-
   end
 end