Merge pull request #541 from nodo/fix-file-clash

Fix "file clash" bug

Author: rafaelfranca

lib/thor/actions/empty_directory.rb

@@ -114,11 +114,17 @@ def invoke_with_conflict_check(&block)
         if exists?
           on_conflict_behavior(&block)
         else
-          say_status :create, :green
           yield unless pretend?
+          say_status :create, :green
         end
 
         destination
+      rescue Errno::EISDIR, Errno::EEXIST
+        on_file_clash_behavior
+      end
+
+      def on_file_clash_behavior
+        say_status :file_clash, :red
       end
 
       # What to do when the destination file already exists.

spec/actions/create_file_spec.rb

@@ -131,6 +131,30 @@ def silence!
         end
       end
     end
+
+    context "when file exists and it causes a file clash" do
+      before do
+        create_file("doc/config")
+        invoke!
+      end
+
+      it "generates a file clash" do
+        create_file("doc/config/config.rb")
+        expect(invoke!).to eq("  file_clash  doc/config/config.rb\n")
+      end
+    end
+
+    context "when directory exists and it causes a file clash" do
+      before do
+        create_file("doc/config/hello")
+        invoke!
+      end
+
+      it "generates a file clash" do
+        create_file("doc/config")
+        expect(invoke!) .to eq("  file_clash  doc/config\n")
+      end
+    end
   end
 
   describe "#revoke!" do