[DRE-commits] [gem2deb] 02/03: dh-make-ruby: avoid dependencies on exact versions

[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 be6afcea56a85301674c73b445ebd4d4791ac713
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jun 17 19:38:20 2015 -0300

    dh-make-ruby: avoid dependencies on exact versions
---
 debian/changelog               | 2 ++
 lib/gem2deb/dh_make_ruby.rb    | 2 +-
 test/unit/dh_make_ruby_test.rb | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8c720c..0b580d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gem2deb (0.18.2) UNRELEASED; urgency=medium
     converting gem names to source package names (not just the first one).
   * dh_ruby: install gemspecs to rubygems-integration directories using
     API_VERSION (e.g. 2.2.0) and not the short version (e.g. 2.2)
+  * dh-make-ruby: avoid converting gem dependencies on exact versions
+    (= 0.1.2) to Debian; that is never going to work.
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 12:13:45 -0300
 
diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index c6827ca..4f6dc7a 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -244,7 +244,7 @@ module Gem2Deb
           yield(dependency)
         else
           dep.requirements_list.each do |v|
-            spec = v.gsub('~>', '>=').gsub(/>(\s+)/, '>>\1').gsub(/<(\s+)/, '<<\1')
+            spec = v.gsub('~>', '>=').gsub(/>(\s+)/, '>>\1').gsub(/<(\s+)/, '<<\1').gsub(/^=(\s+)/, '>=\1')
             yield('%s (%s)' % [dependency, spec])
           end
         end
diff --git a/test/unit/dh_make_ruby_test.rb b/test/unit/dh_make_ruby_test.rb
index 9203c3d..05ed56b 100644
--- a/test/unit/dh_make_ruby_test.rb
+++ b/test/unit/dh_make_ruby_test.rb
@@ -141,13 +141,13 @@ class DhMakeRubyTest < Gem2DebTestCase
     setup do
       file = File.join(DEBIANIZED_SIMPLE_GEM, 'debian/control')
       deps = `grep-dctrl -sDepends -n '' #{file}`
-      @dependencies = deps.split(/\s*,\s*/)
+      @dependencies = deps.strip.split(/\s*,\s*/)
     end
     should 'get simple dependency' do
       assert_include @dependencies, 'ruby-dep'
     end
-    should 'get dependency with an exact version' do
-      assert_include @dependencies, 'ruby-depwithversion (= 1.0)'
+    should 'not use dependencies with exact versions' do
+      assert_include @dependencies, 'ruby-depwithversion (>= 1.0)'
     end
     should 'get version with spermy' do
       assert_include @dependencies, 'ruby-depwithspermy (>= 1.0)'

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