[DRE-commits] [SCM] gem2deb.git branch, master, updated. 460e84be1f7bd8d430c5ddae46d62fd657ac5fa3

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 001b14566cb0ea69a2cc4a40d3d2e0dc7e3c5a75
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Mar 17 20:41:56 2011 -0300

    Being more strict with input package names

diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 507c6f0..f0e0834 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -33,7 +33,11 @@ module Gem2Deb
 
     attr_accessor :gemspec
 
-    attr_accessor :source_package_name
+    attr_reader :source_package_name
+
+    def source_package_name=(value)
+      @source_package_name = value.gsub('_', '-')
+    end
 
     attr_accessor :source_tarball_name
 
@@ -57,7 +61,7 @@ module Gem2Deb
       elsif source_tarball_name =~ /^(.*)-(.*).tar.gz$/
         self.gem_name = $1
         self.gem_version = $2
-        self.source_package_name ||= 'ruby-' + gem_name.gsub(/^ruby-|-ruby$/, '')
+        self.source_package_name ||= 'ruby-' + gem_name.gsub(/^ruby[-_]|[-_]ruby$/, '')
         self.orig_tarball_name = "#{source_package_name}_#{gem_version}.orig.tar.gz"
       else
         raise "Could not determine gem name and version from tarball #{source_tarball_name}"
diff --git a/test/unit/dh_make_ruby_test.rb b/test/unit/dh_make_ruby_test.rb
index 26ff536..f7cdd5a 100644
--- a/test/unit/dh_make_ruby_test.rb
+++ b/test/unit/dh_make_ruby_test.rb
@@ -21,6 +21,15 @@ class DhMakeRubyTest < Gem2DebTestCase
     assert_equal 'xyz', Gem2Deb::DhMakeRuby.new(SIMPLE_GEM_UPSTREAM_TARBALL, :source_package_name => 'xyz').source_package_name
   end
 
+  should 'replace underscores with dashes in source package name' do
+    assert_equal 'ruby-foo-bar', Gem2Deb::DhMakeRuby.new('foo_bar-0.0.1.tar.gz').source_package_name
+  end
+
+  should 'not duplicate "ruby" in the name of a package' do
+    assert_equal 'ruby-foo', Gem2Deb::DhMakeRuby.new('ruby_foo-1.2.3.tar.gz').source_package_name
+    assert_equal 'ruby-foo', Gem2Deb::DhMakeRuby.new('foo_ruby-1.2.3.tar.gz').source_package_name
+  end
+
   context 'simple gem' do
     %w[
       debian/control

-- 
gem2deb.git