[DRE-commits] [SCM] gem2deb.git branch, master, updated. debian/0.2.3-8-ge6437f2

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit e6437f2f063534580101625af23ce4789f565ece
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Tue May 31 18:28:26 2011 -0700

    Shut up on commented 'require "rubygems"' lines (Closes: #628704)

diff --git a/lib/gem2deb/dh_ruby.rb b/lib/gem2deb/dh_ruby.rb
index 298ed4f..d3320a6 100644
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@ -173,23 +173,27 @@ module Gem2Deb
       end
       packages.each do |pkg|
         pkg.chomp!
-        Dir["debian/#{pkg}/usr/lib/ruby/vendor_ruby/**/*.rb"].each do |f|
+        ruby_source_files_in_package(pkg).each do |f|
           lines = IO::readlines(f)
-          rglines = lines.select { |l| l =~ /require.*rubygems/ }
+          rglines = lines.select { |l| l =~ /require.*rubygems/  && l !~ /^\s*#/ }
           rglines.each do |l|
             if not overrides.include?(f)
-              puts "#{f}: #{l}"
+              puts "#{f}: #{l}" if @verbose
               found = true
             end
           end
         end
       end
       if found
-        puts "Found some 'require rubygems' without overrides (see above)."
+        puts "Found some 'require rubygems' without overrides (see above)." if @verbose
         handle_test_failure('require-rubygems')
       end
     end
 
+    def ruby_source_files_in_package(pkg)
+      Dir["debian/#{pkg}/usr/lib/ruby/vendor_ruby/**/*.rb"]
+    end
+
     def handle_test_failure(test)
       if ENV['DH_RUBY_IGNORE_TESTS']
         if ENV['DH_RUBY_IGNORE_TESTS'].split.include?('all')
diff --git a/test/sample/check_rubygems/bad.rb b/test/sample/check_rubygems/bad.rb
new file mode 100644
index 0000000..e81bf0c
--- /dev/null
+++ b/test/sample/check_rubygems/bad.rb
@@ -0,0 +1 @@
+require "rubygems"
diff --git a/test/sample/check_rubygems/good.rb b/test/sample/check_rubygems/good.rb
new file mode 100644
index 0000000..980e29b
--- /dev/null
+++ b/test/sample/check_rubygems/good.rb
@@ -0,0 +1 @@
+# require "rubygems"
diff --git a/test/unit/dh_ruby_test.rb b/test/unit/dh_ruby_test.rb
index d48e1d5..e13531b 100644
--- a/test/unit/dh_ruby_test.rb
+++ b/test/unit/dh_ruby_test.rb
@@ -116,6 +116,23 @@ class DhRubyTest < Gem2DebTestCase
     end
   end
 
+  context 'checking for require "rubygems"' do
+    setup do
+      @dh_ruby = Gem2Deb::DhRuby.new
+      @dh_ruby.verbose = false
+    end
+    should 'detect require "rubygems"' do
+      @dh_ruby.stubs(:ruby_source_files_in_package).returns(['test/sample/check_rubygems/bad.rb'])
+      @dh_ruby.expects(:handle_test_failure).once
+      @dh_ruby.send(:check_rubygems)
+    end
+    should 'not complain about commented require "rubygems"' do
+      @dh_ruby.stubs(:ruby_source_files_in_package).returns(['test/sample/check_rubygems/good.rb'])
+      @dh_ruby.expects(:handle_test_failure).never
+      @dh_ruby.send(:check_rubygems)
+    end
+  end
+
   protected
 
   def assert_installed(gem_dirname, package, path)

-- 
gem2deb.git