[rbx] Attempt to fix encoding issues.

listrophy · Jun 8, 2012 · 425a5c1 · 425a5c1
1 parent a340ea2
commit 425a5c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ spec/fixtures/mercurial-repo/.hg/*cache
 spec/fixtures/vcr
 .yardoc
 /doc
+.rbx/
diff --git a/lib/cocoapods/podfile.rb b/lib/cocoapods/podfile.rb
@@ -153,7 +153,10 @@ def empty?
 
     def self.from_file(path)
       podfile = Podfile.new do
-        eval(File.open(path, 'r:utf-8') { |f| f.read }, nil, path.to_s)
+        # TODO: work around for Rubinius incomplete encoding in 1.9 mode
+        string = File.open(path, 'r')  { |f| f.read }
+        string.encode!('UTF-8') if string.respond_to?(:encode!)
+        eval(string, nil, path.to_s)
       end
       podfile.defined_in_file = path
       podfile.validate!

diff --git a/lib/cocoapods/specification.rb b/lib/cocoapods/specification.rb
@@ -4,7 +4,10 @@ module Pod
   extend Config::Mixin
 
   def self._eval_podspec(path)
-    eval(File.open(path, 'r:utf-8') { |f| f.read }, nil, path.to_s)
+    # TODO: work around for Rubinius incomplete encoding in 1.9 mode
+    string = File.open(path, 'r')  { |f| f.read }
+    string.encode!('UTF-8') if string.respond_to?(:encode!)
+    eval(string, nil, path.to_s)
   end
 
   class Specification