Merge pull request #786 from tomclose/fix-create-file-identical-utf-8-bug

CreateFile#identical? fixed for files containing multi-byte UTF-8 codepoints

Author: rafaelfranca

lib/thor/actions/create_file.rb

@@ -43,7 +43,8 @@ def initialize(base, destination, data, config = {})
       # Boolean:: true if it is identical, false otherwise.
       #
       def identical?
-        exists? && File.binread(destination) == render
+        # binread uses ASCII-8BIT, so to avoid false negatives, the string must use the same
+        exists? && File.binread(destination) == String.new(render).force_encoding("ASCII-8BIT")
       end
 
       # Holds the content to be added to the file.

spec/actions/create_file_spec.rb

@@ -7,11 +7,11 @@
     ::FileUtils.rm_rf(destination_root)
   end
 
-  def create_file(destination = nil, config = {}, options = {})
+  def create_file(destination = nil, config = {}, options = {}, contents = "CONFIGURATION")
     @base = MyCounter.new([1, 2], options, :destination_root => destination_root)
     allow(@base).to receive(:file_name).and_return("rdoc")
 
-    @action = Thor::Actions::CreateFile.new(@base, destination, "CONFIGURATION", {:verbose => !@silence}.merge(config))
+    @action = Thor::Actions::CreateFile.new(@base, destination, contents, {:verbose => !@silence}.merge(config))
   end
 
   def invoke!
@@ -204,5 +204,12 @@ def silence!
       invoke!
       expect(@action.identical?).to be true
     end
+
+    it "returns true if the destination file exists and is identical and contains multi-byte UTF-8 codepoints" do
+      create_file("doc/config.rb", {}, {}, "€")
+      expect(@action.identical?).to be false
+      invoke!
+      expect(@action.identical?).to be true
+    end
   end
 end