[DRE-commits] [gem2deb] 01/03: gem2deb-test-runner: fix rubygems-integration path in build directories

[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 9433f2d4b012274fdbdb2ecdd79894ba7c18da62
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jul 24 08:51:35 2015 -0300

    gem2deb-test-runner: fix rubygems-integration path in build directories
---
 debian/changelog           | 8 ++++++++
 lib/gem2deb/test_runner.rb | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a7eeba8..86f2bdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gem2deb (0.21) UNRELEASED; urgency=medium
+
+  * gem2deb-test-runner:
+    - use the API version number to point to rubygems-integration directories
+      inside the build location
+
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 24 Jul 2015 08:50:24 -0300
+
 gem2deb (0.20) unstable; urgency=medium
 
   * gem2deb-test-runner:
diff --git a/lib/gem2deb/test_runner.rb b/lib/gem2deb/test_runner.rb
index 665d4a4..0996baf 100644
--- a/lib/gem2deb/test_runner.rb
+++ b/lib/gem2deb/test_runner.rb
@@ -58,7 +58,7 @@ module Gem2Deb
         { }
       else
         {
-          'GEM_PATH' => (Gem.path + Dir.glob("debian/*/usr/share/rubygems-integration/#{rubyver}")).join(':')
+          'GEM_PATH' => (Gem.path + Dir.glob("debian/*/usr/share/rubygems-integration/#{ruby_api_version}")).join(':')
         }
       end
     end
@@ -158,6 +158,9 @@ module Gem2Deb
     def rubyver
       @rubyver ||= RbConfig::CONFIG['ruby_install_name']
     end
+    def ruby_api_version
+      RbConfig::CONFIG['ruby_version']
+    end
     def ruby_binary
       @ruby_binary ||= File.join('/usr/bin', rubyver)
     end

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