lib/daddy/cucumber/diff.rb in daddy-0.0.18 vs lib/daddy/cucumber/diff.rb in daddy-0.0.19

@@ -2,35 +2,62 @@
 
 module Daddy
   module Cucumber
     module Diff
       
-      def git_diff(local_file, git_path)
+      def git_diff(local_file, git_path = nil)
         git = Daddy::Git.new
+        git_path ||= local_file 
+
         a = File.read(local_file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         b = git.show_previous(git_path, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        diff = Differ.diff(a, b)
+        diff = format_diff(Differ.diff(a, b))
 
-        diff_lines = diff.to_s.split("\n")
+        puts local_file
+        puts "<pre>#{diff}</pre>"
+      end
+      
+      def git_diff_name(*includes)
+        git = Daddy::Git.new
+        puts '<pre>' + git.git_diff_name(*includes) + '</pre>'
+      end
+      
+      def diff(file_a, file_b)
+        a = File.read(file_a)
+        b = File.read(file_b)
+        diff = format_diff(Differ.diff(a, b))
+
+        puts file_a
+        puts "<pre>#{diff}</pre>"
+      end
+
+      def show(file)
+        puts file
+        puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')}</pre>"
+      end
+      
+      private
+      
+      def format_diff(diff)
         lines = []
-        puts diff_lines.size
+
+        diff_lines = diff.to_s.split("\n")
         diff_lines.each_with_index do |line, i|
-          if line.index('<ins ') and line.index('<del ')
-            split = line.split('<ins ')
+          if line.index('</del><ins class="differ">') 
+            split = line.split('</del><ins class="differ">')
             lines << split[0]
-            lines << '<ins ' + split[1]
+            if split[1].start_with?('"')
+              lines << '</del><ins class="differ">"'
+              lines << split[1][1..-1]
+            else
+              lines << '</del><ins class="differ">' + split[1]
+            end
           else
             lines << line
           end
         end
-
-        puts local_file
-        puts "<pre>#{lines.join("\n")}</pre>"
-      end
-
-      def show(file)
-        puts file
-        puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')}</pre>"
+        
+        lines.join("\n")
       end
 
     end
   end
 end