ruby-rpm 1.2.2 → 1.2.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require 'rake/gempackagetask'
 
 PKG_NAME='ruby-rpm'
-PKG_VERSION='1.2.2'
+PKG_VERSION='1.2.3'
 
 EXT_CONF='ext/rpm/extconf.rb'
 MAKEFILE="ext/rpm/Makefile"
@@ -78,12 +78,16 @@ SPEC = Gem::Specification.new do |s|
     s.required_ruby_version = '>= 1.8.1'
     s.extensions = "ext/rpm/extconf.rb"
     s.description = <<EOF
-Bindings for accessing RPM packages and databases from Ruby.
+Provides bindings for accessing RPM packages and databases from Ruby. It
+includes the low-level C API to talk to rpm as well as Ruby classes to
+model the various objects that RPM deals with (such as packages,
+dependencies, and files).
 EOF
 end
 
 Rake::GemPackageTask.new(SPEC) do |pkg|
     pkg.need_tar = true
+    pkg.need_zip = true
 end
 
 desc "Build (S)RPM for #{PKG_NAME}"
@@ -101,7 +105,7 @@ end
 desc "Release a version"
 task :dist => [ :rpm, :test ] do |t|
     puts "svn commit -m 'Release #{PKG_VERSION}' #{SPEC_FILE}"
-    puts "svn cp svn+ssh://lutter@rubyforge.org/var/svn/ruby-rpm/trunk svn+ssh://lutter@rubyforge.org/var/svn/ruby-rpm/tags/release-#{PKG_VERSION}"
+    puts "svn cp -m 'Tag release #{PKG_VERSION}' svn+ssh://lutter@rubyforge.org/var/svn/ruby-rpm/trunk svn+ssh://lutter@rubyforge.org/var/svn/ruby-rpm/tags/release-#{PKG_VERSION}"
     puts "Upload files"
     puts "Announce on rubyforge and freshmeat"
 end

data/ext/rpm/db.c

@@ -200,7 +200,8 @@ rpm_db_close(VALUE db)
 {
 	db_unref((rpm_db_t*)DATA_PTR(db));
 	DATA_PTR(db) = NULL;
-        return Qnil;
+    rb_gc();
+    return Qnil;
 }
 
 VALUE
@@ -974,6 +975,8 @@ rpm_db_init_iterator(VALUE db, VALUE key, VALUE val)
 		return Data_Wrap_Struct(rpm_cMatchIterator, NULL, mi_free, mi);
 	}
 	free(mi);
+    /* FIXME: returning nil here is a pain; for ruby, it would be nicer
+       to return an empty array */
 	return Qnil;
 }
 

data/ext/rpm/version.c

@@ -198,9 +198,9 @@ rpm_version_cmp(VALUE ver, VALUE other)
 
 	ve = rb_ivar_get(ver,id_e);
 	oe = rb_ivar_get(other,id_e);
-	if (!NIL_P(ve) && NIL_P(oe))
+	if (!NIL_P(ve) && NUM2INT(ve) > 0 && NIL_P(oe))
 		return INT2FIX(1);
-	else if (NIL_P(ve) && !NIL_P(oe))
+	else if (NIL_P(ve) && !NIL_P(oe) && NUM2INT(oe) > 0)
 		return INT2FIX(-1);
 	else if (!NIL_P(ve) && !NIL_P(oe)) {
 		if (NUM2INT(ve) < NUM2INT(oe))
@@ -319,6 +319,21 @@ rpm_version_inspect(VALUE ver)
 	return rb_str_new2(buf);
 }
 
+VALUE
+rpm_version_hash(VALUE ver)
+{
+    long h;
+    VALUE v, r, e;
+	v = rb_ivar_get(ver, id_v);
+	r = rb_ivar_get(ver, id_r);
+	e = rb_ivar_get(ver, id_e);
+    
+    h = NIL_P(e) ? 0 : NUM2INT(e);
+    h = (h << 1) ^ NUM2LONG(rb_hash(r));
+    h = (h << 1) ^ NUM2LONG(rb_hash(v));
+    return LONG2FIX(h);
+}
+
 void
 Init_rpm_version(void)
 {
@@ -334,6 +349,7 @@ Init_rpm_version(void)
 	rb_define_method(rpm_cVersion, "to_s", rpm_version_to_s, 0);
 	rb_define_method(rpm_cVersion, "to_vre", rpm_version_to_vre, 0);
 	rb_define_method(rpm_cVersion, "inspect", rpm_version_inspect, 0);
+    rb_define_method(rpm_cVersion, "hash", rpm_version_hash, 0);
 
 	id_v = rb_intern("version");
 	id_r = rb_intern("release");

data/spec/fedora/ruby-rpm.spec

@@ -4,7 +4,7 @@
 Summary: Ruby bindings for RPM
 Name: ruby-rpm
 
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPL
@@ -18,7 +18,10 @@ BuildRequires: rpm-devel >= 4.2.1
 BuildRequires: db4-devel
 
 %description
-Bindings for accessing RPM packages and databases from Ruby.
+Provides bindings for accessing RPM packages and databases from Ruby. It
+includes the low-level C API to talk to rpm as well as Ruby classes to
+model the various objects that RPM deals with (such as packages,
+dependencies, and files).
 
 %prep
 %setup -q

data/tests/test_version.rb

@@ -48,4 +48,13 @@ class RPM_Version_Tests < Test::Unit::TestCase
       assert_equal(3, v.e)
       assert_equal('#<RPM::Version v="1", r="2", e=3>', v.inspect)
   end
+
+  def test_epoch_none_zero
+      v1 = RPM::Version.new("1-2")
+      v2 = RPM::Version.new("0:1-2")
+      assert_equal(nil, v1.e)
+      assert_equal(0, v2.e)
+      assert( v1 == v2 )
+      assert_equal(v1.hash, v2.hash)
+  end
 end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-rpm
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2007-03-21 00:00:00 -07:00
+  version: 1.2.3
+date: 2007-05-07 00:00:00 -07:00
 summary: Ruby bindings for RPM
 require_paths: 
 - lib
 email: ruby-rpm-devel@rubyforge.org
 homepage: http://rubyforge.org/projects/ruby-rpm/
 rubyforge_project: 
-description: Bindings for accessing RPM packages and databases from Ruby.
+description: Provides bindings for accessing RPM packages and databases from Ruby. It includes the low-level C API to talk to rpm as well as Ruby classes to model the various objects that RPM deals with (such as packages, dependencies, and files).
 autorequire: rpm
 default_executable: 
 bindir: bin
@@ -37,26 +37,26 @@ files:
 - install.rb
 - doc/refm.rd.ja
 - lib/rpm.rb
-- ext/rpm/dependency.c
-- ext/rpm/rpm.c
+- ext/rpm/version.c
 - ext/rpm/file.c
 - ext/rpm/private.h
-- ext/rpm/source.c
 - ext/rpm/ruby-rpm.h
-- ext/rpm/db.c
 - ext/rpm/rpm40_compat.c
-- ext/rpm/version.c
+- ext/rpm/dependency.c
+- ext/rpm/package.c
+- ext/rpm/db.c
 - ext/rpm/rpm40_compat.h
+- ext/rpm/rpm.c
 - ext/rpm/spec.c
-- ext/rpm/package.c
+- ext/rpm/source.c
 - ext/rpm/MANIFEST
 - ext/rpm/extconf.rb
-- tests/test_dependency.rb
-- tests/test_rpm.rb
 - tests/test_file.rb
-- tests/test_source.rb
 - tests/test_db.rb
 - tests/test_version.rb
+- tests/test_rpm.rb
+- tests/test_dependency.rb
+- tests/test_source.rb
 - tests/test_ts.rb
 - tests/runner.rb
 - spec/fedora