[DRE-commits] [gem2deb] 01/01: Removes mkmf.log installed at the binary extension directory by Rubygems on Ruby 2.1 (Closes: #743671)

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository gem2deb.

commit 79beb22215ad4da3147a64e0cc76534c12d081ca
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Apr 5 09:00:06 2014 -0300

    Removes mkmf.log installed at the binary extension directory by Rubygems on Ruby 2.1 (Closes: #743671)
---
 debian/changelog                                           |  7 +++++++
 lib/gem2deb/extension_builder.rb                           | 10 ++++++++++
 lib/gem2deb/version.rb                                     |  2 +-
 test/sample/simpleextension_with_name_clash/ext/extconf.rb |  1 +
 test/unit/extension_builder_test.rb                        |  6 ++++++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c759a1e..71510d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gem2deb (0.7.5) unstable; urgency=medium
+
+  * Removes mkmf.log installed at the binary extension directory by Rubygems
+    on Ruby 2.1 (Closes: #743671)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 05 Apr 2014 08:59:00 -0300
+
 gem2deb (0.7.4) unstable; urgency=medium
 
   * dh_ruby: abort builds for unsupported Ruby versions.
diff --git a/lib/gem2deb/extension_builder.rb b/lib/gem2deb/extension_builder.rb
index 648acb5..b85bfd7 100644
--- a/lib/gem2deb/extension_builder.rb
+++ b/lib/gem2deb/extension_builder.rb
@@ -67,6 +67,16 @@ module Gem2Deb
           rubygems_builder.build(extension, '.', target, results)
           puts results
         end
+
+        # handle mkmf.log being installed at the extension directory by
+        # Rubygems on Ruby 2.1+
+        mkmf_log = File.join(target, 'mkmf.log')
+        if File.exists?(mkmf_log)
+          puts "cat #{mkmf_log}"
+          system("cat", mkmf_log)
+          FileUtils::Verbose.rm_f mkmf_log
+        end
+
       rescue Exception => e
         puts results
         raise e
diff --git a/lib/gem2deb/version.rb b/lib/gem2deb/version.rb
index 8155c2a..f8a8147 100644
--- a/lib/gem2deb/version.rb
+++ b/lib/gem2deb/version.rb
@@ -1,3 +1,3 @@
 module Gem2Deb
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end
diff --git a/test/sample/simpleextension_with_name_clash/ext/extconf.rb b/test/sample/simpleextension_with_name_clash/ext/extconf.rb
index a60f380..f02e074 100644
--- a/test/sample/simpleextension_with_name_clash/ext/extconf.rb
+++ b/test/sample/simpleextension_with_name_clash/ext/extconf.rb
@@ -1,2 +1,3 @@
 require 'mkmf'
 create_makefile('simpleextension_with_name_clash')
+xsystem 'date'
diff --git a/test/unit/extension_builder_test.rb b/test/unit/extension_builder_test.rb
index 78f1211..de32e5b 100644
--- a/test/unit/extension_builder_test.rb
+++ b/test/unit/extension_builder_test.rb
@@ -23,6 +23,12 @@ class ExtensionBuilderTest < Gem2DebTestCase
         assert_file_exists File.join('debian', package, RbConfig::CONFIG['vendorarchdir'] + '/simpleextension_with_name_clash.so')
       end
     end
+
+    should 'not install mkmf.log' do
+      Dir.chdir(target_dir) do
+        assert Dir.glob(File.join('debian', package, RbConfig::CONFIG['vendorarchdir'], 'mkmf.log')).empty?, 'mkmf.log installed to extension dir!'
+      end
+    end
   end
 
 end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git