di 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e6d0dda9d8ab2f37c5781743238023291f5d3a
-  data.tar.gz: d08a5f0ea260bdd94ff720f73670490acdebf649
+  metadata.gz: 89485791b2612b6df2c0cce66f24856571c85dde
+  data.tar.gz: 8ac703cf8b70c4ccb5a680c91f64c12f8d7c21cf
 SHA512:
-  metadata.gz: 672d1f491243ad2ede807e4176ced0c0fa216965a223e2ea8e8bf44b853cb93ea8d792fb6fa5031708c31b84603d65f2b4a8a79ce03de371bda958983ede1e17
-  data.tar.gz: b5fd0a90f9bace17a97e72b3df21259d96f768b14042b0e1bd5623175b547f16ab2c44d9835905de9402f4c4c03bdf469c9741c221631a7c3943dbadd9c7dbde
+  metadata.gz: 6693cdfccee6b3787ed382feb31cd51818f548ba2e5643121920bfb81d7932632ed2ca01bb263e56d1a9c60d6a39f4077a21e988338274bb4c4baf97274d774e
+  data.tar.gz: 032c8c70a6851bc94f2901401b454011873419dc9cc80a6ec0e2f2de2272abe555d1682529217cb6298a7f700d3ac922bd81b8a6c7d1a0524d490b0fa90df48f

data/HISTORY

@@ -1,3 +1,15 @@
+== 0.4.1 2013-04-11
+
+* Set better labels and disable pager if invoked by git difftool.
+
+* Enhance the --color option like Git.
+
+== 0.4.0 2013-04-04
+
+* Add inline word-diff highlighting.
+
+* Improve suspicious whitespace highlighting.
+
 == 0.3.2 2013-01-09
 
 * Do not choke on encoding errors when colorizing on Ruby 1.9+.

data/lib/di.rb

@@ -28,7 +28,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.4.0"
+MYVERSION = "0.4.1"
 MYNAME = File.basename($0)
 MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA"
 
@@ -130,9 +130,18 @@ usage: #{MYNAME} [flags] [files]
       'Pipe output into pager if stdout is a terminal. [+][*]') { |val|
       $diff.use_pager = val if $stdout.tty?
     }
-    opts.on('--[no-]color',
+    opts.on('--[no-]color[=WHEN]',
       'Colorize output if stdout is a terminal and the format is unified or context. [+][*]') { |val|
-      $diff.colorize = val if $stdout.tty?
+      case val
+      when true, 'always'
+        $diff.colorize = true
+      when 'auto'
+        $diff.colorize = $stdout.tty?
+      when false, 'never'
+        $diff.colorize = false
+      else
+        raise OptionParser::ParseError, "unknown value for --color: #{val}"
+      end
     }
     opts.on('--[no-]highlight-whitespace',
       'Highlight whitespace differences in colorized output. [+][*]') { |val|
@@ -392,9 +401,16 @@ EOS
 
   begin
     opts.parse('--rsync-exclude', '--fignore-exclude', '--ignore-cvs-lines',
-               '--pager', '--color', '--highlight-whitespace',
+               '--pager', '--color=auto', '--highlight-whitespace',
                '-U3', '-N', '-r', '-p', '-d')
 
+    if ENV['GIT_DIFFTOOL_EXTCMD']
+      if base = ENV['BASE']
+        opts.parse('--label', File.join('a', base), '--label', File.join('b', base))
+      end
+      opts.parse('--no-pager')
+    end
+
     if value = ENV[ENV_NAME]
       require 'shellwords'
       opts.parse(*value.shellsplit)
@@ -452,11 +468,7 @@ EOS
   end
 end
 
-def invoke_pager
-  invoke_pager! if $diff.use_pager
-end
-
-def invoke_pager!
+def invoke_filter
   $stdout.flush
   $stderr.flush
   pr, pw = IO.pipe
@@ -466,11 +478,7 @@ def invoke_pager!
     pr.close
     pw.close
     IO.select([$stdin], nil, [$stdin])
-    begin
-      exec(ENV['PAGER'] || 'more')
-    rescue
-      $stderr.puts "Pager failed."
-    end
+    yield
   }
 
   $stdout.reopen(pw)
@@ -485,6 +493,35 @@ def invoke_pager!
   }
 end
 
+def invoke_pager
+  invoke_pager! if $diff.use_pager
+end
+
+def invoke_pager!
+  invoke_filter {
+    begin
+      exec(ENV['PAGER'] || 'more')
+    rescue
+      $stderr.puts "Pager failed."
+    end
+  }
+end
+
+def invoke_colorizer
+  invoke_colorizer! if $diff.colorize
+end
+
+def invoke_colorizer!
+  invoke_filter {
+    case $diff.format
+    when :unified
+      colorize_unified_diff
+    when :context
+      colorize_context_diff
+    end
+  }
+end
+
 def set_flag(flag, val)
   case val
   when true, false
@@ -585,21 +622,8 @@ def diff_files(file1, file2)
 end
 
 def call_diff(*args)
-  command_args = [DIFF_CMD, $diff.flags, args].flatten
-  if $diff.colorize
-    case $diff.format
-    when :unified
-      filter = method(:colorize_unified_diff)
-    when :context
-      filter = method(:colorize_context_diff)
-    end
-  end
-  if filter
-    require 'shellwords'
-    filter.call(IO.popen(command_args.shelljoin, 'r'))
-  else
-    system(*command_args)
-  end
+  invoke_colorizer
+  system *[DIFF_CMD, $diff.flags, args].flatten
   status = $? >> 8
   $status = status if $status < status
   return status
@@ -709,7 +733,7 @@ def diff_exclude?(dir, basename)
   return false
 end
 
-def colorize_unified_diff(io)
+def colorize_unified_diff
   begin
     require 'diff/lcs'
     colorize_unified_diff_hunk = method(:colorize_hunk_in_unified_diff_inline)
@@ -723,7 +747,7 @@ def colorize_unified_diff(io)
   state = :comment
   hunk_left = nil
   hunk = []
-  io.each_line { |line|
+  $stdin.each_line { |line|
     line.chomp!
     replace_invalid_bytes!(line)
     case state
@@ -762,8 +786,6 @@ def colorize_unified_diff(io)
 
     print color, line, colors.off, "\n"
   }
-
-  io.close
 end
 
 def colorize_hunk_in_unified_diff_normal(hunk)
@@ -893,8 +915,8 @@ def colorize_inline_diff(line1, line2)
     }
   }
 
-  print colors.old, '-', aline1, "\n",
-        colors.new, '+', aline2, "\n"
+  print colors.old, '-', aline1, colors.off, "\n",
+        colors.new, '+', aline2, colors.off, "\n"
 end
 
 def highlight_whitespace_in_unified_diff!(line, color)
@@ -910,13 +932,13 @@ def highlight_whitespace_in_unified_diff!(line, color)
   }
 end
 
-def colorize_context_diff(io)
+def colorize_context_diff
   colors = $diff.colors
   colors.to_function ||= colors.off + colors.function
 
   state = :comment
   hunk_part = nil
-  io.each_line { |line|
+  $stdin.each_line { |line|
     line.chomp!
     replace_invalid_bytes!(line)
     case state
@@ -982,8 +1004,6 @@ def colorize_context_diff(io)
 
     print color, line, colors.off, "\n"
   }
-
-  io.close
 end
 
 def highlight_whitespace_in_context_diff!(line, color)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: di
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A wrapper around GNU diff(1)