enhancerepo 0.4.1 → 0.5.0

data/lib/enhance_repo/rpm_md/suse_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,7 +27,6 @@
 
 module EnhanceRepo
   module RpmMd
-
     class Property
       attr_accessor :name
       def initialize(name)
@@ -47,40 +48,38 @@ module EnhanceRepo
         @value = value
       end
 
-      def write(builder, pkgid)
+      def write(builder, _pkgid)
         builder.tag!(@name, @value)
       end
     end
 
     class DiskUsageProperty < Property
-
       def initialize(pkgid, rpmfile)
         super('diskusage')
         @pkgid = pkgid
         @rpmfile = rpmfile
       end
-      
-      def write(builder, pkgid)
-        dirsizes = Hash.new
-        dircount = Hash.new
+
+      def write(builder, _pkgid)
+        dirsizes = {}
+        dircount = {}
         `rpm -q --queryformat \"[%{FILENAMES} %{FILESIZES}\n]\" -p '#{@rpmfile}'`.each_line do |line|
           file, size = line.split
-          dirsizes[File.dirname(file)] = 0 if not dirsizes.has_key?(File.dirname(file))
-          dircount[File.dirname(file)] = 0 if not dircount.has_key?(File.dirname(file))
-          
+          dirsizes[File.dirname(file)] = 0 unless dirsizes.key?(File.dirname(file))
+          dircount[File.dirname(file)] = 0 unless dircount.key?(File.dirname(file))
+
           dirsizes[File.dirname(file)] += size.to_i
           dircount[File.dirname(file)] += 1
         end
 
         builder.diskusage do |b|
-          b.dirs do |b|
+          b.dirs do
             dirsizes.each do |k, v|
-              b.dir('name' => k, 'size' => v, 'count' => dircount[k] )
+              b.dir('name' => k, 'size' => v, 'count' => dircount[k])
             end
           end
-        end      
+        end
       end
-      
     end
 
     # represents SUSE extensions to
@@ -90,7 +89,6 @@ module EnhanceRepo
     # http://en.opensuse.org/Standards/Rpm_Metadata#SUSE_primary_data_.28susedata.xml.29
     #
     class SuseData < Data
-
       def initialize(dir)
         @dir = dir
         @diskusage_enabled = false
@@ -98,31 +96,27 @@ module EnhanceRepo
         # the following hash automatically creates a sub
         # hash for non found values
         # @properties = Hash.new { |h,v| h[v]= Hash.new }
-        @properties = Hash.new
-
+        @properties = {}
       end
 
       # add an attribute named name for a
       # package identified with pkgid
       def add_attribute(pkgid, prop)
-        if not @properties.has_key?(pkgid)
-          @properties.store(pkgid, Hash.new)
-        end
+        @properties.store(pkgid, {}) unless @properties.key?(pkgid)
         @properties[pkgid][prop.name] = prop
       end
-      
+
       def add_eulas
         # add eulas
         Dir["#{@dir}/**/*.eula"].each do |eulafile|
           base = File.basename(eulafile, '.eula')
           # =>  look for all rpms with that name in that dir
-          Dir["#{File.dirname(eulafile)}/#{base}*.rpm"].each do | rpmfile |
+          Dir["#{File.dirname(eulafile)}/#{base}*.rpm"].each do |rpmfile|
             pkgid = PackageId.new(rpmfile)
-            if pkgid.matches(base)
-              eulacontent = File.new(eulafile).read
-              add_attribute(pkgid, ValueProperty.new('eula', eulacontent))
-              log.info "Adding eula: #{eulafile.to_s} to #{pkgid.to_s}"
-            end
+            next unless pkgid.matches(base)
+            eulacontent = File.new(eulafile).read
+            add_attribute(pkgid, ValueProperty.new('eula', eulacontent))
+            log.info "Adding eula: #{eulafile} to #{pkgid}"
           end
         end
         # end of directory iteration
@@ -130,20 +124,19 @@ module EnhanceRepo
 
       def add_keywords
         # add keywords
-        log.info "Adding repository keywords"
+        log.info 'Adding repository keywords'
         Dir["#{@dir}/**/*.keywords"].each do |keywordfile|
           base = File.basename(keywordfile, '.keywords')
           # =>  look for all rpms with that name in that dir
-          Dir["#{File.dirname(keywordfile)}/#{base}*.rpm"].each do | rpmfile |
+          Dir["#{File.dirname(keywordfile)}/#{base}*.rpm"].each do |rpmfile|
             pkgid = PackageId.new(rpmfile)
-            if pkgid.matches(base)
-              f = File.new(keywordfile)
-              f.each_line do |line|
-                keyword = line.chop
-                add_attribute(pkgid, ValueProperty.new('keyword', keyword)) if not keyword.empty?
-              end
-              log.info "`-> adding keyword: #{keywordfile.to_s} to #{pkgid.to_s}"
+            next unless pkgid.matches(base)
+            f = File.new(keywordfile)
+            f.each_line do |line|
+              keyword = line.chop
+              add_attribute(pkgid, ValueProperty.new('keyword', keyword)) unless keyword.empty?
             end
+            log.info "`-> adding keyword: #{keywordfile} to #{pkgid}"
           end
         end
         # end of directory iteration
@@ -159,33 +152,31 @@ module EnhanceRepo
 
       # write an extension file like other.xml
       def write(file)
-        builder = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+        builder = Builder::XmlMarkup.new(target: file, indent: 2)
         builder.instruct!
-        xml = builder.tag!(name) do |b|
+        builder.tag!(name) do |b|
           @properties.each do |pkgid, props|
-            #log.info "Dumping package #{pkgid.to_s}"
-            b.package('pkgid' => pkgid.checksum, 'name' => pkgid.name) do |b|
-              b.version('ver' => pkgid.version.v, 'rel' => pkgid.version.r, 'arch' => pkgid.arch, 'epoch' => 0.to_s )
-              props.each do |propname, prop|
-                #log.info "   -> property #{prop.name}"
+            # log.info "Dumping package #{pkgid.to_s}"
+            b.package('pkgid' => pkgid.checksum, 'name' => pkgid.name) do
+              b.version('ver' => pkgid.version.v, 'rel' => pkgid.version.r, 'arch' => pkgid.arch, 'epoch' => 0.to_s)
+              props.each do |_propname, prop|
+                # log.info "   -> property #{prop.name}"
                 prop.write(builder, pkgid)
               end
-            end # end package tag
+            end
           end # iterate over properties
-        end #done builder
+        end
       end
-      
+
       def add_disk_usage
         @diskusage_enabled = true
-        log.info "Calculating disk usage..."
+        log.info 'Calculating disk usage...'
         # build the pkgid hash
         Dir["#{@dir}/**/*.rpm"].each do |rpmfile|
           pkgid = PackageId.new(rpmfile)
           add_attribute(pkgid, DiskUsageProperty.new(pkgid, rpmfile))
         end
       end
-      
     end
-
   end
 end

data/lib/enhance_repo/rpm_md/suse_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>
@@ -28,7 +30,6 @@ require 'builder'
 
 module EnhanceRepo
   module RpmMd
-    
     # represents SUSE extensions to repository
     # metadata (not associated with packages)
     #
@@ -36,7 +37,6 @@ module EnhanceRepo
     # http://en.opensuse.org/Standards/Rpm_Metadata#SUSE_repository_info_.28suseinfo.xml.29
     #
     class SuseInfo < Data
-
       # expiration time
       # the generated value is
       # still calculated from repomd.xml
@@ -53,36 +53,33 @@ module EnhanceRepo
       end
 
       def empty?
-        @expire.nil? and @products.empty? and @keywords.empty?
+        @expire.nil? && @products.empty? && @keywords.empty?
       end
-      
+
       def write(file)
-        builder = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+        builder = Builder::XmlMarkup.new(target: file, indent: 2)
         builder.instruct!
-        xml = builder.suseinfo do |b|
-
+        builder.suseinfo do
           # add expire tag
-          b.expire(@expire.to_i.to_s) if not @expire.nil?
+          b.expire(@expire.to_i.to_s) unless @expire.nil?
 
-          if not @keywords.empty?
-            b.keywords do |b|
+          unless @keywords.empty?
+            b.keywords do
               @keywords.each do |k|
                 b.k(k)
               end
             end
           end
 
-          if not @products.empty?
-            b.products do |b|
+          unless @products.empty?
+            b.products do
               @products.each do |p|
                 b.id(p)
               end
             end
           end
-
         end
       end
     end
-
   end
 end

data/lib/enhance_repo/rpm_md/update.rb

@@ -1,5 +1,7 @@
+# Encoding: utf-8
+
 #--
-# 
+#
 # enhancerepo is a rpm-md repository metadata tool.
 # Copyright (C) 2008, 2009 Novell Inc.
 # Copyright (C) 2009, Jordi Massager Pla <jordi.massagerpla@opensuse.org>
@@ -27,7 +29,7 @@
 #
 
 require 'rubygems'
-require 'active_support/core_ext/module/attr_accessor_with_default'
+require 'active_support/core_ext/module/attr_internal'
 require 'builder'
 require 'rexml/document'
 require 'yaml'
@@ -38,7 +40,6 @@ require 'enhance_repo/rpm_md/update_smart_fields'
 
 module EnhanceRepo
   module RpmMd
-
     #
     # Represents a reference to a external bugreport
     # feature or issue for a software update
@@ -55,41 +56,72 @@ module EnhanceRepo
       attr_accessor :title
 
       def to_s
-       "#{type}##{referenceid}"
+        "#{type}##{referenceid}"
       end
-      
+
       # initialize a reference, per default a novell
       # bugzilla type
       def initialize
-        @href = "http://bugzilla.novell.com"
-        @referenceid = "none"
-        @title = ""
-        @type = "bugzilla"
+        @href = 'http://bugzilla.novell.com'
+        @referenceid = 'none'
+        @title = ''
+        @type = 'bugzilla'
       end
     end
 
     # represents one update, which can consist of various packages
     # and references
     class Update
-
       # methods to automatically grab data from the
       # update description
       include UpdateSmartFields
-      
-      attr_accessor_with_default :updateid, "unknown"
-      attr_accessor_with_default :status, "stable"
-      attr_accessor_with_default :from, "#{ENV['USER']}@#{ENV['HOST']}"
-      attr_accessor_with_default :type, "optional"
-      attr_accessor_with_default :version, 1
-      attr_accessor_with_default :release, "unknown"
-      attr_accessor_with_default :issued, Time.now.to_i
-      attr_accessor_with_default :references, []
-      attr_accessor_with_default :description, ""
-      attr_accessor_with_default :title, "untitled update"
-      attr_accessor_with_default :packages, []
-      
-      def initialize
+
+      attr_writer :updateid
+      def updateid
+        @updateid ||= 'unknown'
+      end
+      attr_writer :status
+      def status
+        @status ||= 'stable'
+      end
+      attr_writer :from
+      def from
+        @from ||= "#{ENV['USER']}@#{ENV['HOST']}"
+      end
+      attr_writer :type
+      def type
+        @type ||= 'optional'
       end
+      attr_writer :version
+      def version
+        @version ||= 1
+      end
+      attr_writer :release
+      def release
+        @release ||= 'unknown'
+      end
+      attr_writer :issued
+      def issued
+        @issued ||= Time.now.to_i
+      end
+      attr_writer :references
+      def references
+        @references ||= []
+      end
+      attr_writer :description
+      def description
+        @description ||= ''
+      end
+      attr_writer :title
+      def title
+        @title ||= 'untitled update'
+      end
+      attr_writer :packages
+      def packages
+        @packages ||= []
+      end
+
+      def initialize; end
 
       # an update is not empty if it
       # updates something
@@ -101,14 +133,13 @@ module EnhanceRepo
         "update-#{updateid}-#{version}"
       end
 
-      
       # write a update out
       def write(file)
-        builder = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+        builder = Builder::XmlMarkup.new(target: file, indent: 2)
         append_to_builder(builder)
       end
-      
-      def append_to_builder(builder)  
+
+      def append_to_builder(builder)
         builder.update('status' => 'stable', 'from' => from, 'version' => version, 'type' => type) do |b|
           b.title(title)
           b.id(updateid)
@@ -116,26 +147,24 @@ module EnhanceRepo
           b.release(release)
           b.description(description)
           # serialize attr_reader :eferences
-          b.references do |b|
+          b.references do
             references.each do |r|
-              b.reference('href' => r.href, 'id' => r.referenceid, 'title' => r.title, 'type' => r.type )   
+              b.reference('href' => r.href, 'id' => r.referenceid, 'title' => r.title, 'type' => r.type)
             end
           end
           # done with references
-          b.pkglist do |b|
-            b.collection do |b|
+          b.pkglist do
+            b.collection do
               packages.each do |pkg|
-                b.package('name' => pkg.name, 'arch'=> pkg.arch, 'version'=>pkg.version.v, 'release'=>pkg.version.r) do |b|
+                b.package('name' => pkg.name, 'arch' => pkg.arch, 'version' => pkg.version.v, 'release' => pkg.version.r) do
                   b.filename(File.basename(pkg.path))
                 end
               end
             end # </collection>
-          end #</pkglist>
+          end # </pkglist>
           # done with the packagelist
         end
       end
-      
     end
-
   end
 end

data/lib/enhance_repo/rpm_md/update_info.rb

@@ -1,5 +1,7 @@
+# Encoding: utf-8
+
 #--
-# 
+#
 # enhancerepo is a rpm-md repository metadata tool.
 # Copyright (C) 2008, 2009 Novell Inc.
 # Copyright (C) 2009, Jordi Massager Pla <jordi.massagerpla@opensuse.org>
@@ -37,9 +39,7 @@ require 'enhance_repo/rpm_md/update'
 
 module EnhanceRepo
   module RpmMd
-
     class UpdateInfo < Data
-      
       def initialize(config)
         @dir = config.dir
         @basedir = config.updatesbasedir
@@ -59,7 +59,7 @@ module EnhanceRepo
       # add all updates in a repoparts directory
       # by default look in repoparts/
       # otherwise pass the :repoparts_path option
-      def read_repoparts(opts={})
+      def read_repoparts(opts = {})
         repoparts_path = opts[:repoparts_path] || File.join(@dir, 'repoparts')
         log.info "Reading update parts from #{repoparts_path}"
         Dir[File.join(repoparts_path, 'update-*.xml')].each do |updatefile|
@@ -75,14 +75,13 @@ module EnhanceRepo
       #
       # outputdir is the directory where to save the patch to.
       def generate_update(packages, outputdir)
-        
         # make a hash name -> array of packages
-        log.info "Generating update part to #{outputdir} for packages #{packages.join(", ")}"
+        log.info "Generating update part to #{outputdir} for packages #{packages.join(', ')}"
         package_index = {}
 
         # look all rpms in the old packages base directory plus
         # the ones in the current one
-        rpmfiles = [ Dir["#{@dir}/**/*.rpm"], @basedir.nil? ? [] : Dir["#{@basedir}/**/*.rpm"]].flatten
+        rpmfiles = [Dir["#{@dir}/**/*.rpm"], @basedir.nil? ? [] : Dir["#{@basedir}/**/*.rpm"]].flatten
         log.info "`-> #{rpmfiles.size} rpm packages"
         # reject unwanted files
         rpmfiles.reject! do |rpmfile|
@@ -99,18 +98,18 @@ module EnhanceRepo
 
         log.info "`-> #{rpmfiles.size} rpm packages were not discarded"
         log.debug "    #{rpmfiles.map { |x| File.basename(x) }.join(', ')}"
-        
+
         # now index all rpms per package name in a hash table
         # which goes from name => list of versions
         rpmfiles.each do |rpmfile|
           rpm = PackageId.new(rpmfile)
           # now that we have the real name, reject if it is not part
           # of the requested packages to generate updates for
-          next if not packages.include?(rpm.name)
-          
-          package_index[rpm.name] = Array.new if not package_index.has_key?(rpm.name)
+          next unless packages.include?(rpm.name)
+
+          package_index[rpm.name] = [] unless package_index.key?(rpm.name)
           # add the rpm if there is no other rpm with the same version
-          package_index[rpm.name] << rpm if not package_index[rpm.name].select { |x| x.version == rpm.version && x.name == rpm.name }.first
+          package_index[rpm.name] << rpm unless package_index[rpm.name].select { |x| x.version == rpm.version && x.name == rpm.name }.first
         end
 
         log.info "`-> indexed #{package_index.size} unique packages from #{rpmfiles.size} rpms"
@@ -118,7 +117,7 @@ module EnhanceRepo
         # do our package hash include every package?
         packages.reject! do |pkg|
           reject = false
-          if not package_index.has_key?(pkg)
+          unless package_index.key?(pkg)
             log.warn "`-> the package '#{pkg}' is not available in the repository."
             reject = true
           end
@@ -126,59 +125,58 @@ module EnhanceRepo
         end
 
         update = Update.new
-        
+
         packages.each do |pkgname|
           pkglist = package_index[pkgname]
           log.info "`-> #{pkglist.size} versions for '#{pkgname}'"
-          log.debug "    #{package_index[pkgname].map {|x| x.version}.join(", ")}"
+          log.debug "    #{package_index[pkgname].map(&:version).join(', ')}"
           # sort them by version
-          pkglist.sort! { |a,b| a.version <=> b.version }
+          pkglist.sort! { |a, b| a.version <=> b.version }
           pkglist.reverse!
           # now that the list is sorted, the new rpm is the first
 
           # if there is only one package then we don't need changelog
           if pkglist.size > 1
             # we know that there are no duplicate versions so we can
-            # take the first and the second            
+            # take the first and the second
             first = pkglist.shift
             second = pkglist.shift
             diff = first.changelog - second.changelog || []
-            #diff = first.changelog[0, first.changelog.size - second.changelog.size] || []                        
+            # diff = first.changelog[0, first.changelog.size - second.changelog.size] || []
             log.info "`-> found change #{first.ident} and #{second.ident}."
-            
+
             log.info "`-> '#{pkgname}' has #{diff.size} change entries (#{first.changelog.size}/#{second.changelog.size})"
             update.packages << first
             diff.each do |entry|
-              update.description << entry.text << "\n"          
+              update.description << entry.text << "\n"
             end
           else
             # jump to next pkgname
             next
           end
-          
         end
 
         # do not save it if there are no packages
         if update.empty?
 
         end
-        
+
         # before writing the update, figure out more
         # information
         update.smart_fill_blank_fields
 
         log.info "`-> update has #{update.references.size} references"
         log.debug "    #{update.references.join(',')} "
-        
-        filename = ""
+
+        filename = ''
 
         FileUtils.mkdir_p outputdir
         # increase version until version is available
-        while ( File.exists?(filename = File.join(outputdir, update.suggested_filename + ".xml") ))
+        while File.exist?(filename = File.join(outputdir, update.suggested_filename + '.xml'))
           update.version += 1
         end
         log.info "Saving update part to '#{filename}'."
-        
+
         File.open(filename, 'w') do |f|
           update.write(f)
         end
@@ -193,52 +191,50 @@ module EnhanceRepo
       #
       # outputdir is the directory where to save the patch to.
       def split_updates(outputdir)
-        FileUtils.mkdir_p outputdir        
+        FileUtils.mkdir_p outputdir
         updateinfofile = File.join(@dir, metadata_filename)
 
         # we can't split without an updateinfo file
-        raise "#{updateinfofile} does not exist" if not File.exist?(updateinfofile)
-        Zlib::GzipReader.open(updateinfofile) do |gz|        
+        raise "#{updateinfofile} does not exist" unless File.exist?(updateinfofile)
+        Zlib::GzipReader.open(updateinfofile) do |gz|
           document = REXML::Document.new(gz)
           root = document.root
-          root.each_element("update") do |updateElement|
+          root.each_element('update') do |updateElement|
             id = nil
-            updateElement.each_element("id") do |elementId|
+            updateElement.each_element('id') do |elementId|
               id = elementId.text
             end
-            if id == nil
+            if id.nil?
               log.warning 'No id found. Setting id to NON_ID_FOUND'
               id = 'NON_ID_FOUND'
             end
             version = 0
-            updatefilename = ""
-            while ( File.exists?(updatefilename = File.join(outputdir, "update-#{id}_splited_#{version.to_s}.xml") ) )
+            updatefilename = ''
+            while File.exist?(updatefilename = File.join(outputdir, "update-#{id}_splited_#{version}.xml"))
               version += 1
             end
             log.info "Saving update part to '#{updatefilename}'."
             File.open(updatefilename, 'w') do |updatefile|
               updatefile << updateElement
+              updatefile << "\n"
             end
           end
         end
       end
-      
+
       # write a update out
       def write(file)
-        builder = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+        builder = Builder::XmlMarkup.new(target: file, indent: 2)
         builder.instruct!
-        xml = builder.updates do |b|
+        builder.updates do |_b|
           @updates.each do |update|
             File.open(update) do |f|
               file << f.read
             end
-            #update.append_to_builder(b)
+            # update.append_to_builder(b)
           end
-        end #done builder
+        end # done builder
       end
-      
     end
-
-
   end
 end