lib/daddy/cucumber/diff.rb in daddy-0.0.22 vs lib/daddy/cucumber/diff.rb in daddy-0.1.0

@@ -3,10 +3,12 @@
 module Daddy
   module Cucumber
     module Diff
       
       def git_diff(file, options = {})
+        options[:as] ||= 'edit'
+        
         git = Daddy::Git.new
         a = File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         b = git.show_previous(file, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         diff = format_diff(Differ.diff(a, b))
 
@@ -17,16 +19,16 @@
       def git_diff_name(*includes)
         git = Daddy::Git.new
         puts '<pre>' + git.git_diff_name(*includes) + '</pre>'
       end
       
-      def diff(file_a, file_b)
+      def diff(file_a, file_b, options = {})
         a = File.read(file_a)
         b = File.read(file_b)
         diff = format_diff(Differ.diff(a, b))
 
-        puts file_a
+        show_filename(file_a, options)
         puts "<pre>#{diff}</pre>"
       end
 
       def show(file, options = {})
         show_filename(file, options)
@@ -36,9 +38,13 @@
       private
       
       def show_filename(filename, options = {})
         if options[:as] == 'new'
           puts "<span class=\"new\">[新規作成] #{filename}</span>"
+        elsif options[:as] == 'auto'
+          puts "<span class=\"auto\">[自動生成] #{filename}</span>"
+        elsif options[:as] == 'edit'
+          puts "<span class=\"edit\">[編集] #{filename}</span>"
         else
           puts filename
         end
       end