use rpmExpandMacros on 4.14+

Author: dmacvicar

lib/rpm.rb

@@ -41,11 +41,22 @@ def self.transaction(root = '/')
   # @param [String] name Name of the macro
   # @return [String] value of macro +name+
   def self.[](name)
-    val = ''
-    buffer = ::FFI::MemoryPointer.new(:pointer, 1024)
-    buffer.write_string("%{#{name}}")
-    ret = RPM::C.expandMacros(nil, nil, buffer, 1024)
-    buffer.read_string
+    if C::rpm_version_code >= ((4 << 16) + (14 << 8) + (0 << 0))
+      obuf = ::FFI::MemoryPointer.new(:pointer, 1)
+      sbuf = FFI::MemoryPointer.from_string("%{#{name}}")
+      ret = RPM::C.rpmExpandMacros(nil, sbuf, obuf, 0)
+      raise if ret < 0
+
+      val = obuf.read_pointer
+      val.nil? ? nil : val.read_string
+    else
+      buffer = ::FFI::MemoryPointer.new(:pointer, 1024)
+      buffer.write_string("%{#{name}}")
+      ret = RPM::C.expandMacros(nil, nil, buffer, 1024)
+      raise if ret < 0
+
+      buffer.read_string
+    end
   end
 
   # Setup a macro

lib/rpm/c/rpmmacro.rb

@@ -19,6 +19,7 @@ module C
     if rpm_version_code >= ((4 << 16) + (14 << 8) + (0 << 0))
       attach_function 'rpmPushMacro', [:pointer, :string, :string, :string, :int], :void
       attach_function 'rpmPopMacro', [:pointer, :string], :void
+      attach_function 'rpmExpandMacros', [:pointer, :pointer, :pointer, :int], :int
     else
       attach_function 'addMacro', [:pointer, :string, :string, :string, :int], :void
       attach_function 'delMacro', [:pointer, :string], :void

test/test_rpm.rb

@@ -25,12 +25,10 @@ def test_iterator
   end
 
   def test_macro_read
-    skip("NoMethodError: undefined method `expandMacros' for module RPM::C")
     assert_equal '/usr', RPM['_usr']
   end
 
   def test_macro_write
-    skip("NoMethodError: undefined method `expandMacros' for module RPM::C")
     RPM['hoge'] = 'hoge'
     assert_equal(RPM['hoge'], 'hoge')
   end

test/test_transaction.rb

@@ -57,64 +57,60 @@ def test_basic_transaction_setters
   end
 
   def test_test_flag_install
-    skip("NoMethodError: undefined method `expandMacros' for RPM::C:Module")
-
-    filename = 'simple-1.0-0.i586.rpm'
-    pkg = RPM::Package.open(fixture(filename))
+    pkg = RPM::Package.open(fixture(PACKAGE_FILENAME))
 
     Dir.mktmpdir do |dir|
       RPM.transaction(dir) do |t|
         t.flags = RPM::TRANS_FLAG_TEST
-        t.install(pkg, fixture(filename))
+        t.install(pkg, fixture(PACKAGE_FILENAME))
         t.commit
 
-        assert File.exist?(File.join(dir, RPM['_dbpath'], 'Packages')),
-               'rpm db exists'
+        rpmdb_file = RPM::C.rpmvercmp(RPM::C.RPMVERSION, '4.16.0') >= 0 ? 'rpmdb.sqlite' : 'Packages'
 
-        assert !File.exist?('/usr/share/simple/README'),
-               "package #{pkg} was not installed"
+        assert File.exist?(File.join(dir, RPM['_dbpath'], rpmdb_file)), 'rpm db exists'
+        assert !File.exist?('/usr/share/simple/README'), "package #{pkg} was not installed"
+      ensure
+        # Force close so that RPM does not try to do it
+        # when the tmpdir is deleted
+        t.db.close
       end
     end
   end
 
   def test_install_and_remove
     pkg = RPM::Package.open(fixture(PACKAGE_FILENAME))
 
-    skip("NoMethodError: undefined method `expandMacros' for RPM::C:Module")
-
     Dir.mktmpdir do |dir|
       RPM.transaction(dir) do |t|
         begin
           t.install(pkg, fixture(PACKAGE_FILENAME))
           t.commit
 
-          assert File.exist?(File.join(dir, RPM['_dbpath'], 'Packages')),
-                 'rpm db exists'
+          rpmdb_file = RPM::C.rpmvercmp(RPM::C.RPMVERSION, '4.16.0') >= 0 ? 'rpmdb.sqlite' : 'Packages'
 
-          assert File.exist?(File.join(dir, '/usr/share/simple/README')),
-                 "package #{pkg} should be installed"
+          assert File.exist?(File.join(dir, RPM['_dbpath'], rpmdb_file)), '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
 
+      skip("Commit hangs on package delete")
+
       RPM.transaction(dir) do |t|
         begin
           assert_raises 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"
+          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