yumrepo 0.2 → 0.2.1

data/Changelog

@@ -0,0 +1,10 @@
+* Wed Jan 04 2012 - 0.2.1
+- @mstump: fixing tempfile leak for long running processes, exposed repo
+metadata (https://github.com/rubiojr/yumrepo/pull/4)
+
+* Thu Nov 10 2011 - 0.2
+- Beefier than ever thanks to @mstump
+- Tests now cover most of the code
+- yumrepo catching code bugfixes
+- Improved ruby 1.9 compatibility
+- New methods and classes added to cover missing functionality

data/Gemfile

@@ -10,6 +10,8 @@ group :development do
   gem 'nokogiri', '~> 1.5.0'
   gem 'bundler', '~> 1.0.0'
   gem 'jeweler', '~> 1.5.2'
+  gem 'i18n'
+  gem 'active_support'
   gem 'guard'
 end
 

data/Gemfile.lock

@@ -1,11 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    active_support (3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
     git (1.2.5)
     guard (0.8.4)
       thor (~> 0.14.6)
+    i18n (0.6.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -32,9 +36,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_support
   bundler (~> 1.0.0)
   fakeweb
   guard
+  i18n
   jeweler (~> 1.5.2)
   nokogiri (~> 1.5.0)
   rspec (~> 2.6)

data/lib/yumrepo.rb

@@ -9,10 +9,11 @@ require 'digest/md5'
 require 'fileutils'
 require 'logger'
 require 'tempfile'
+require 'active_support/core_ext'
 
 module YumRepo
 
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 
   def self.bench(msg)
     if defined? $yumrepo_perf_debug
@@ -117,17 +118,39 @@ module YumRepo
         pl << File.join(@url, p['href'])
       end
 
-      @primary_xml ||= _open_file("primary.xml.gz", @url_digest, pl.first)
+      if not @primary_xml or @primary_xml.closed?
+        @primary_xml = _open_file("primary.xml.gz", @url_digest, pl.first)
+      end
       @primary_xml
     end
 
+    def meta
+      def to_sym(h)
+        h.inject({}) { |result, (key, value)|
+          new_key = case key
+                    when String then key.to_sym
+                    else key
+                    end
+          new_value = case value
+                      when Hash then to_sym(value)
+                      else value
+                      end
+          result[new_key] = new_value
+          result
+        }
+      end
+      Hash[Hash.from_xml(@repomd.to_s)["repomd"]["data"].map {|h| [h["type"].to_sym, to_sym(h)] }]
+    end
+
     def other
       pl = []
       @repomd.xpath("/xmlns:repomd/xmlns:data[@type=\"other\"]/xmlns:location").each do |p|
         pl << File.join(@url, p['href'])
       end
 
-      @other_xml ||= _open_file("other.xml.gz", @url_digest, pl.first)
+      if not @other_xml or @other_xml.closed?
+        @other_xml = _open_file("other.xml.gz", @url_digest, pl.first)
+      end
       @other_xml
     end
 
@@ -141,8 +164,13 @@ module YumRepo
       end
 
       FileUtils.mkdir_p File.join(@settings.cache_path, cache_dir_name) if @settings.cache_enabled
-      f = File.open(cache_file_name, "w+") if @settings.cache_enabled
-      f ||= Tempfile.new(filename)
+      if @settings.cache_enabled
+        f = File.open(cache_file_name, "w+")
+      else
+        f = Tempfile.new(filename)
+        f.unlink # see tempfile documentation
+      end
+
       f.binmode
       @settings.log.debug "Caching #{filename} for #{data_url} at #{f.path}"
       f.puts open(data_url).read
@@ -156,22 +184,32 @@ module YumRepo
 
     def initialize(url)
       @url = url
-      @xml_file = Repomd.new(url).primary
       @packages = []
+      xml_file = Repomd.new(url).primary
 
-      buf = ''
-      YumRepo.bench("Zlib::GzipReader.read") do
-        buf = Zlib::GzipReader.new(@xml_file).read
-      end
+      begin
+        buf = ''
+        YumRepo.bench("Zlib::GzipReader.read") do
+          buf = Zlib::GzipReader.new(xml_file).read
+        end
 
-      YumRepo.bench("Building Package Objects") do
-        d = Nokogiri::XML::Reader(buf)
-        d.each do |n|
-          if n.name == 'package' and not n.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
-            @packages << Package.new(n.outer_xml)
+        YumRepo.bench("Building Package Objects") do
+          d = Nokogiri::XML::Reader(buf)
+          d.each do |n|
+            if n.name == 'package' and not n.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
+              @packages << Package.new(n.outer_xml)
+            end
           end
         end
+
+      ensure
+        if xml_file.respond_to?(:close!)
+          xml_file.close!
+        else
+          xml_file.close
+        end
       end
+
     end
 
     def each
@@ -258,21 +296,30 @@ module YumRepo
   class PackageChangelogList
     def initialize(url)
       @url = url
-      @xml_file = Repomd.new(url).other
       @changelogs = []
+      xml_file = Repomd.new(url).other
 
-      buf = ''
-      YumRepo.bench("Zlib::GzipReader.read") do
-        buf = Zlib::GzipReader.new(@xml_file).read
-      end
+      begin
+        buf = ''
+        YumRepo.bench("Zlib::GzipReader.read") do
+          buf = Zlib::GzipReader.new(xml_file).read
+        end
 
-      YumRepo.bench("Building PackageChangelog Objects") do
-        d = Nokogiri::XML::Reader(buf)
-        d.each do |n|
-          if n.name == 'package' and not n.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
-            @changelogs << PackageChangelog.new(n.outer_xml)
+        YumRepo.bench("Building PackageChangelog Objects") do
+          d = Nokogiri::XML::Reader(buf)
+          d.each do |n|
+            if n.name == 'package' and not n.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
+              @changelogs << PackageChangelog.new(n.outer_xml)
+            end
           end
         end
+
+      ensure
+        if xml_file.respond_to?(:close!)
+          xml_file.close!
+        else
+          xml_file.close
+        end
       end
     end
 

data/spec/yumrepo_spec.rb

@@ -10,6 +10,15 @@ describe YumRepo do
   YumRepo::Settings.instance.log_level = :error
   YumRepo::Settings.instance.cache_enabled = false
 
+
+  describe "meta" do
+    it "make sure we get a hash whose keys are symbols" do
+      repo = YumRepo::Repomd.new "http://centos.mirror.freedomvoice.com/6.0/os/SRPMS"
+      repo.meta[:primary].should_not == nil
+      repo.meta[:primary][:checksum].should == "7ae73bdcb5961b03a0ca22419bd8da19ddc8c241"
+    end
+  end
+
   describe "package list" do
     it "for test_data should have 5 entries" do
       pl = YumRepo::PackageList.new "http://centos.mirror.freedomvoice.com/6.0/os/SRPMS"

data/yumrepo.gemspec

@@ -5,25 +5,26 @@
 
 Gem::Specification.new do |s|
   s.name = "yumrepo"
-  s.version = "0.2"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]
-  s.date = "2011-11-09"
+  s.date = "2012-01-04"
   s.description = "YUM Repository Metadata handling library"
   s.email = "rubiojr@frameos.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
     ".rspec",
+    "Changelog",
     "Gemfile",
     "Gemfile.lock",
     "Guardfile",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "examples/basic.rb",
     "lib/yumrepo.rb",
@@ -47,6 +48,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<nokogiri>, ["~> 1.5.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<i18n>, [">= 0"])
+      s.add_development_dependency(%q<active_support>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -56,6 +59,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<active_support>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -66,6 +71,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<active_support>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yumrepo
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12472800 !ruby/object:Gem::Requirement
+  requirement: &23700700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *12472800
+  version_requirements: *23700700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12506340 !ruby/object:Gem::Requirement
+  requirement: &23698180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12506340
+  version_requirements: *23698180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12504180 !ruby/object:Gem::Requirement
+  requirement: &23696620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,32 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *12504180
+  version_requirements: *23696620
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &23693060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *23693060
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &23692100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *23692100
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12501300 !ruby/object:Gem::Requirement
+  requirement: &23691400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12501300
+  version_requirements: *23691400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12499020 !ruby/object:Gem::Requirement
+  requirement: &23690340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12499020
+  version_requirements: *23690340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12572780 !ruby/object:Gem::Requirement
+  requirement: &23689520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12572780
+  version_requirements: *23689520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &12647220 !ruby/object:Gem::Requirement
+  requirement: &23688660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12647220
+  version_requirements: *23688660
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &12723600 !ruby/object:Gem::Requirement
+  requirement: &23688000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12723600
+  version_requirements: *23688000
 description: YUM Repository Metadata handling library
 email: rubiojr@frameos.org
 executables: []
@@ -109,6 +131,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- Changelog
 - Gemfile
 - Gemfile.lock
 - Guardfile