[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.14-8-g334b903

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 10bcc0d6a9e26dc58eeb77c73548b14ba8a705ec
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jun 5 14:12:01 2012 -0300

    Revert "Check for encoding support, and use File.readlines accordingly"
    
    This reverts commit 4b716699ed4ab0d139ea5300fe3ccce7317c9769.

diff --git a/lib/gem2deb/dh_ruby.rb b/lib/gem2deb/dh_ruby.rb
index 40c66f8..8e3fcfd 100644
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@ -378,11 +378,7 @@ module Gem2Deb
       @ruby_versions ||=
         begin
           # find ruby versions to build the package for.
-          if String.instance_methods.include?(:encoding)
-            lines = File.readlines('debian/control', {:encoding => 'UTF-8'}).grep(/^XS-Ruby-Versions: /)
-          else
-            lines = File.readlines('debian/control').grep(/^XS-Ruby-Versions: /)
-          end
+          lines = File.readlines('debian/control').grep(/^XS-Ruby-Versions: /)
           if lines.empty?
             puts "No XS-Ruby-Versions: field found in source!" if @verbose
             exit(1)
diff --git a/test/unit/dh_ruby_test.rb b/test/unit/dh_ruby_test.rb
index 20ce37e..5ceb8de 100644
--- a/test/unit/dh_ruby_test.rb
+++ b/test/unit/dh_ruby_test.rb
@@ -98,20 +98,12 @@ class DhRubyTest < Gem2DebTestCase
       @dh_ruby.verbose = false
     end
     should 'bail out if XS-Ruby-Versions is not found' do
-      if String.instance_methods.include?(:encoding)
-        File.expects(:readlines).with('debian/control', {:encoding => 'UTF-8'}).returns([])
-      else
-        File.expects(:readlines).with('debian/control').returns([])
-      end
+      File.expects(:readlines).with('debian/control').returns([])
       @dh_ruby.expects(:exit).with(1)
       @dh_ruby.send(:ruby_versions)
     end
     should 'read supported versions from debian/control' do
-      if String.instance_methods.include?(:encoding)
-        File.expects(:readlines).with('debian/control', {:encoding => 'UTF-8'}).returns(["XS-Ruby-Versions: all\n"])
-      else
-        File.expects(:readlines).with('debian/control').returns(["XS-Ruby-Versions: all\n"])
-      end
+      File.expects(:readlines).with('debian/control').returns(["XS-Ruby-Versions: all\n"])
       assert_equal ['all'], @dh_ruby.send(:ruby_versions)
     end
     should 'known when all versions are supported' do

-- 
gem2deb.git