[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.14-3-g653cd89

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 4b716699ed4ab0d139ea5300fe3ccce7317c9769
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Mon Jun 4 23:15:51 2012 +0200

    Check for encoding support, and use File.readlines accordingly

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

-- 
gem2deb.git