Merge pull request rails#528 from lingceng/master

Fix injecting into file which contains chinese

.gitignore

@@ -28,7 +28,7 @@ Session.vim
 _yardoc
 auto-save-list
 coverage
-doc/
+/doc/
 lib/bundler/man
 pkg
 pkg/*

lib/thor/actions/inject_into_file.rb

@@ -92,7 +92,7 @@ def say_status(behavior)
       #
       def replace!(regexp, string, force)
         return if base.options[:pretend]
-        content = File.binread(destination)
+        content = File.read(destination)
         if force || !content.include?(replacement)
           content.gsub!(regexp, string)
           File.open(destination, "wb") { |file| file.write(content) }

spec/actions/inject_into_file_spec.rb

@@ -83,6 +83,11 @@ def file
 
       expect(File.read(file)).to eq("__start__\nREADME\nmore content\nmore content\n__end__\n")
     end
+
+    it "can insert chinese" do
+      invoke! "doc/README.zh", "\n中文", :after => "__start__"
+      expect(File.read(File.join(destination_root, "doc/README.zh"))).to eq("__start__\n中文\n说明\n__end__\n")
+    end
   end
 
   describe "#revoke!" do

spec/fixtures/doc/README.zh

@@ -0,0 +1,3 @@
+__start__
+说明
+__end__