rpm 0.0.2 → 0.0.3

data/lib/rpm/version.rb

@@ -98,20 +98,19 @@ module RPM
     #
     def <=>(other)
       RPM::Utils.check_type(other, RPM::Version)
-      ret = RPM::FFI.rpmvercmp(to_vre_epoch_zero, other.to_vre_epoch_zero)
+      ret = RPM::C.rpmvercmp(to_vre_epoch_zero, other.to_vre_epoch_zero)
     end
 
     # @param [Version] other Version to compare against
     # @return [Boolean] true if the version is newer than +other+
     def newer?(other)
-      (self <=> other) > 0
+      self > other
     end
 
-
     # @param [Version] other Version to compare against
     # @return [Boolean] true if the version is older than +other+
     def older?(other)
-      ! newer?(other)
+      self < other
     end
 
     # String representation in the form "v-r"

data/lib/rpm.rb

@@ -1,7 +1,8 @@
 
-require 'rpm/ffi'
+require 'rpm/c'
 require 'rpm/package'
 require 'rpm/db'
+require 'rpm/problem'
 require 'rpm/transaction'
 require 'rpm/match_iterator'
 require 'rpm/version'
@@ -10,23 +11,15 @@ require 'rpm/utils'
 
 module RPM
 
-  module LibC
-    extend ::FFI::Library
-    ffi_lib ::FFI::Library::LIBC
+  TAG = RPM::C::Tag
+  LOG = RPM::C::Log
+  SENSE = RPM::C::Sense
+  FILE = RPM::C::FileAttrs
+  FILE_STATE = RPM::C::FileState
+  TRANS_FLAG = RPM::C::TransFlags
+  PROB_FILTER = RPM::C::ProbFilter
+  MIRE = RPM::C::RegexpMode
 
-    # call #attach_function to attach to malloc, free, memcpy, bcopy, etc.
-     attach_function :malloc, [:size_t], :pointer
-  end
-
-  TAG = RPM::FFI::Tag
-  LOG = RPM::FFI::Log
-  SENSE = RPM::FFI::Sense
-  FILE = RPM::FFI::FileAttrs
-  FILE_STATE = RPM::FFI::FileState
-  TRANS_FLAG = RPM::FFI::TransFlags
-  PROB_FILTER = RPM::FFI::ProbFilter
-  MIRE = RPM::FFI::RegexpMode
-  
   # Creates a new transaction and pass it
   # to the given block
   #
@@ -43,14 +36,13 @@ module RPM
     yield ts
   end
 
-
   # @param [String] name Name of the macro
   # @return [String] value of macro +name+
   def self.[](name)
     val = String.new
     buffer = ::FFI::MemoryPointer.new(:pointer, 1024)
     buffer.write_string("%{#{name}}")
-    ret = RPM::FFI.expandMacros(nil, nil, buffer, 1024)
+    ret = RPM::C.expandMacros(nil, nil, buffer, 1024)
     buffer.read_string
   end
 
@@ -59,16 +51,16 @@ module RPM
   # @param [String] value Value of the macro or +nil+ to delete it
   def self.[]=(name, value)
     if value.nil?
-      RPM::FFI.delMacro(nil, name.to_s)
+      RPM::C.delMacro(nil, name.to_s)
     else
-      RPM::FFI.addMacro(nil, name.to_s, nil, value.to_s, RPM::FFI::RMIL_DEFAULT)
+      RPM::C.addMacro(nil, name.to_s, "", value.to_s, RPM::C::RMIL_DEFAULT)
     end
   end
 
 end
- 
-RPM::FFI.rpmReadConfigFiles(nil, nil)
-RPM::FFI.rpmInitMacros(nil, RPM::FFI.MACROFILES)
+
+RPM::C.rpmReadConfigFiles(nil, nil)
+RPM::C.rpmInitMacros(nil, RPM::C.MACROFILES)
 
 # TODO
 # set verbosity

data/rpm.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
   s.add_runtime_dependency "ffi"
 end

data/test/data/simple.spec

@@ -26,10 +26,6 @@ echo "Hola" > %{buildroot}%{_datadir}/%{name}/README.es
 %clean
 %{?buildroot:%__rm -rf "%{buildroot}"}
 
-%post
-
-%postun
-
 %files
 %defattr(-,root,root)
 %{_datadir}/%{name}/README

data/test/data/simple_with_deps.spec

@@ -0,0 +1,41 @@
+Name:           simple_with_deps
+Version:        1.0
+Release:        0
+License:        GPL
+Summary:        Simple dummy package
+Url:            http://www.dummmy.com
+Group:          Development
+Requires:       a
+Requires:       b > 1.0
+Conflicts:      c d
+Obsoletes:      f
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+Dummy package
+
+%description -l es
+Paquete de muestra
+
+%prep
+
+%build
+mkdir -p %{buildroot}%{_datadir}/%{name}
+echo "Hello" > %{buildroot}%{_datadir}/%{name}/README
+echo "Hola" > %{buildroot}%{_datadir}/%{name}/README.es
+
+%install
+
+%clean
+%{?buildroot:%__rm -rf "%{buildroot}"}
+
+%files
+%defattr(-,root,root)
+%{_datadir}/%{name}/README
+%{_datadir}/%{name}/README.es
+
+%changelog
+* Wed Nov 06 2011 Duncan Mac-Vicar P. <dmacvicar@suse.de>
+- Fix something
+* Tue Nov 05 2011 Duncan Mac-Vicar P. <dmacvicar@suse.de>
+- Fix something else

data/test/helper.rb

@@ -3,5 +3,5 @@ require 'test/unit'
 require 'rpm'
 
 def fixture(name)
-  File.join(File.dirname(__FILE__), 'data', name)
+  File.expand_path(File.join(File.dirname(__FILE__), 'data', name))
 end

data/test/test_dependency.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require_relative('helper')
 require 'rpm/compat'
 
 class RPM_Dependency_Tests < Test::Unit::TestCase

data/test/test_lib.rb

@@ -3,34 +3,34 @@ require File.join(File.dirname(__FILE__), 'helper')
 class RPM_Lib_Tests < Test::Unit::TestCase
 
   def test_lib_lib
-    assert_kind_of String, RPM::FFI.RPMVERSION
+    assert_kind_of String, RPM::C.RPMVERSION
     # "x.y.z"
-    assert(RPM::FFI.RPMVERSION.size >= 5)
-    assert_kind_of Fixnum, RPM::FFI.rpm_version_code
+    assert(RPM::C.RPMVERSION.size >= 5)
+    assert_kind_of Fixnum, RPM::C.rpm_version_code
     # >= 4.0.0
-    assert(RPM::FFI.rpm_version_code >= ((4 << 16) + (0 << 8) + (0 << 0)))
+    assert(RPM::C.rpm_version_code >= ((4 << 16) + (0 << 8) + (0 << 0)))
   end
 
   def test_lib_header
-    ptr = RPM::FFI.headerNew
-    RPM::FFI.headerFree(ptr)
+    ptr = RPM::C.headerNew
+    RPM::C.headerFree(ptr)
   end
 
   def test_lib_ts
-    ts = RPM::FFI.rpmtsCreate
-    RPM::FFI.rpmtsSetRootDir(ts, "/")
-    it = RPM::FFI.rpmtsInitIterator(ts, 0, nil, 0)
+    ts = RPM::C.rpmtsCreate
+    RPM::C.rpmtsSetRootDir(ts, "/")
+    it = RPM::C.rpmtsInitIterator(ts, 0, nil, 0)
     hdrs = []
-    while (not (hdr = RPM::FFI.rpmdbNextIterator(it)).null?)
+    while (not (hdr = RPM::C.rpmdbNextIterator(it)).null?)
       hdrs << hdr
-      assert_kind_of String, RPM::FFI.headerGetAsString(hdr, :name)
+      assert_kind_of String, RPM::C.headerGetAsString(hdr, :name)
     end
-    RPM::FFI.rpmdbFreeIterator(it)
+    RPM::C.rpmdbFreeIterator(it)
 
   end
 
   def test_lib_macros
-    assert_kind_of String, RPM::FFI.MACROFILES
+    assert_kind_of String, RPM::C.MACROFILES
   end
 
 end

data/test/test_package.rb

@@ -18,7 +18,7 @@ class RPM_Header_Tests < Test::Unit::TestCase
 
     assert_equal "simple-1.0-0-i586", pkg.to_s
 
-    assert_equal '6895248ed5a081f73d035174329169c7', pkg.signature
+    assert_equal '3b5f9d468c877166532c662e29f43bc3', pkg.signature
 
     assert_kind_of RPM::Package, pkg
     assert_equal 'simple', pkg[:name]
@@ -45,11 +45,13 @@ class RPM_Header_Tests < Test::Unit::TestCase
     assert pkg.provides.map(&:name).include?("simple(x86-32)")
     assert pkg.provides.map(&:name).include?("simple")
 
-    assert pkg.requires.map(&:name).include?("/bin/sh")
-
     assert pkg.files.map(&:path).include?("/usr/share/simple/README")
     assert pkg.files.map(&:path).include?("/usr/share/simple/README.es")
 
+    assert pkg.conflicts.empty?
+    assert pkg.requires.map(&:name).include?('rpmlib(PayloadIsLzma)')
+    assert pkg.obsoletes.empty?
+
     file = pkg.files.select {|x| x.path == "/usr/share/simple/README" }.first
     assert_nil file.link_to
     assert !file.symlink?
@@ -57,4 +59,23 @@ class RPM_Header_Tests < Test::Unit::TestCase
     assert_equal ["- Fix something", "- Fix something else"], pkg.changelog.map(&:text)
   end
 
+  def test_dependencies
+    pkg = RPM::Package.open(fixture('simple_with_deps-1.0-0.i586.rpm'))
+    assert_equal 'simple_with_deps', pkg.name
+
+    assert pkg.provides.map(&:name).include?('simple_with_deps(x86-32)')
+    assert pkg.provides.map(&:name).include?('simple_with_deps')
+
+    assert pkg.requires.map(&:name).include?("a")
+    b = pkg.requires.find {|x| x.name == 'b'}
+    assert_not_nil b
+    assert_equal '1.0', b.version.to_s
+
+    assert pkg.conflicts.map(&:name).include?('c')
+    assert pkg.conflicts.map(&:name).include?('d')
+
+    assert pkg.obsoletes.map(&:name).include?('f')
+
+  end
+
 end

data/test/test_problem.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class RPM_Header_Tests < Test::Unit::TestCase
+
+  def test_create
+    problem = RPM::Problem.create(:requires, "foo-1.0-0", "foo.rpm", "bar-1.0-0", "Hello", 1)
+    assert_equal "foo.rpm", problem.key
+    assert_equal :requires, problem.type
+    assert_equal "Hello", problem.str
+    assert_equal "Hello is needed by (installed) bar-1.0-0", problem.to_s
+
+    # Create a RPM::Problem from an existing pointer
+    problem2 = RPM::Problem.new(problem.ptr)
+    assert_equal problem.key, problem2.key
+    assert_equal problem.type, problem2.type
+    assert_equal problem.str, problem2.str
+    assert_equal problem.to_s, problem2.to_s
+    
+  end
+end

data/test/test_transaction.rb

@@ -1,8 +1,11 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require_relative('helper')
 require 'tmpdir'
+require 'pathname'
 
 class RPM_Transaction_Tests < Test::Unit::TestCase
 
+  PACKAGE_FILENAME = 'simple-1.0-0.i586.rpm'
+
   def test_flags
     RPM.transaction do |t|
       assert_equal RPM::TRANS_FLAG_NONE, t.flags
@@ -21,7 +24,7 @@ class RPM_Transaction_Tests < Test::Unit::TestCase
     RPM.transaction do |t|
       it = t.init_iterator(nil, nil)
       it.regexp(:name, :glob, '*audio*')
-      it.each do |pkg| 
+      it.each do |pkg|
         assert pkg.name.include?("audio"), "'#{pkg.name}' contains 'audio'"
       end
     end
@@ -32,30 +35,128 @@ class RPM_Transaction_Tests < Test::Unit::TestCase
     RPM.transaction do |t|
       it = t.init_iterator(nil, nil)
       it.version(RPM::Version.new('2.1'))
-      it.each do |pkg| 
-        puts pkg
+      it.each do |sig|
+        # FIXME check that this worked
       end
     end
-  end 
-
-  def test_install
-    
-    filename = 'simple-1.0-0.i586.rpm'
-    pkg = RPM::Package.open(fixture(filename))
+  end
 
+  def test_basic_transaction_setters
     Dir.mktmpdir do |dir|
       RPM.transaction do |t|
         assert_equal "/", t.root_dir
         t.root_dir = dir
+        assert_equal  dir + '/', t.root_dir
+      end
+    end
+
+    Dir.mktmpdir do |dir|
+      RPM.transaction(dir) do |t|
         assert_equal dir + '/', t.root_dir
-        
+      end
+    end
+  end
+
+  def test_test_flag_install
+    filename = 'simple-1.0-0.i586.rpm'
+    pkg = RPM::Package.open(fixture(filename))
+
+    Dir.mktmpdir do |dir|
+      RPM.transaction(dir) do |t|
+
         t.flags = RPM::TRANS_FLAG_TEST
-        
-        t.install(pkg, filename)
-        #t.commit
+        t.install(pkg, fixture(filename))
+        t.commit
+
+        assert File.exist?(File.join(dir, '/var/lib/rpm/Packages')),
+          "rpm db exists"
+
+        assert !File.exist?('/usr/share/simple/README'),
+          "package #{pkg} was not installed"
+      end
+    end
+  end
+
+  def test_install_and_remove
+    pkg = RPM::Package.open(fixture(PACKAGE_FILENAME))
+
+    Dir.mktmpdir do |dir|
+      RPM.transaction(dir) do |t|
+        begin
+          t.install(pkg, fixture(PACKAGE_FILENAME))
+          t.commit
+
+          assert File.exist?(File.join(dir, '/var/lib/rpm/Packages')),
+            "rpm db exists"
+
+          assert File.exist?(File.join(dir, '/usr/share/simple/README')),
+            "package #{pkg} should be installed"
+        ensure
+          # Force close so that RPM does not try to do it
+          # when the tmpdir is deleted
+          t.db.close
+        end
       end
+
+      RPM.transaction(dir) do |t|
+        begin
+
+          assert_raise TypeError do
+            t.delete(Object.new)
+          end
+
+          t.delete(pkg)
+
+          t.order
+          t.clean
+
+          t.commit
+
+          assert !File.exist?(File.join(dir, '/usr/share/simple/README')),
+            "package #{pkg} should not be installed"
+
+        ensure
+          # Force close so that RPM does not try to do it
+          # when the tmpdir is deleted
+          t.db.close
+        end
+      end
+
     end
+  end
+
+  def test_install_with_custom_callback
+    pkg = RPM::Package.open(fixture(PACKAGE_FILENAME))
+
+    Dir.mktmpdir do |dir|
+      RPM.transaction(dir) do |t|
+        begin
+          t.install(pkg, fixture(PACKAGE_FILENAME))
 
+          t.check do |problem|
+            STDERR.puts "Problem: #{problem}"
+          end
+
+          t.order
+          t.clean
+
+          t.commit do |data|
+            next case data.type
+              when :inst_open_file then
+                @f = File.open(data.key, 'r')
+              when :inst_close_file then @f.close
+            end
+          end
+
+          assert File.exist?(File.join(dir, '/usr/share/simple/README')),
+            "package #{pkg} should be installed"
+        ensure
+          # Force close so that RPM does not try to do it
+          # when the tmpdir is deleted
+          t.db.close
+        end
+      end
+    end
   end
 
 end