di 0.3.2 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 38a6ebb27f63c158a2281c8084a8b7e9f863c0694a27c65e046041dd417cb513
+  data.tar.gz: '05084a0031eb646d6250c9d479f23b8f438ac1ce6106f6c1b32d28fd4d02590b'
+SHA512:
+  metadata.gz: d410883c4714053d447fb99d320ebc5f451b3fab559f65b782e4d31d5885c6960b269e000377c0738c895063a93cadbecfb772aa7997acb4af300766ee14089c
+  data.tar.gz: e880ee0456c03170f1ca9276ee50864366b773bfa0b6182f1692251e5ae8438878fb3b06174ffc4ba22037fbfe9bae2ba04d37615133bc2976aa82089a8d6f5d

data/HISTORY

@@ -1,3 +1,31 @@
+== 0.4.4 2021-04-06
+
+* Fix a fatal conflict when -p is specified.
+  ("error: conflicting output format options.")
+
+== 0.4.3 2015-01-05
+
+* Do not use colors if the terminal does not support colors.
+
+* Do not invoke a pager when on a dumb terminal.
+
+== 0.4.2 2013-08-16
+
+* Do not close inherited file descriptors on invoking diff(1) so that
+  `di file <(command)` works.
+
+== 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/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
+Copyright (c) 2008-2021 Akinori MUSHA
 
 All rights reserved.
 

data/di.gemspec

@@ -14,6 +14,7 @@ default settings and some original features.
 EOS
   gem.summary       = %q{A wrapper around GNU diff(1)}
   gem.homepage      = "https://github.com/knu/di"
+  gem.license       = "2-clause BSDL"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -25,4 +26,5 @@ EOS
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  gem.add_runtime_dependency("diff-lcs", ["~> 1.2.2"])
 end

data/lib/di.rb

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
+# Copyright (c) 2008-2021 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -28,9 +28,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.3.2"
+MYVERSION = "0.4.4"
 MYNAME = File.basename($0)
-MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA"
+MYCOPYRIGHT = "Copyright (c) 2008-2021 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
@@ -59,6 +59,10 @@ FIGNORE_GLOBS = ENV.fetch('FIGNORE', '').split(':').map { |pat|
 
 IO::NULL = '/dev/null' unless defined? IO::NULL
 
+PLUS_SIGN  = '+'
+MINUS_SIGN = '-'
+EQUAL_SIGN = '='
+
 def main(args)
   setup
 
@@ -75,30 +79,47 @@ def warn(*lines)
   }
 end
 
+def xsystem(*args)
+  args << { :close_others => false } unless RUBY_VERSION < '1.9'
+  system(*args)
+end
+
 def setup
   require 'ostruct'
-  $diff = OpenStruct.new
-  $diff.exclude = []
-  $diff.include = []
-  $diff.flags = []
-  $diff.format_flags = []
-  $diff.format = :normal
-  $diff.colors = {
-    :comment	=> "\e[1m",
-    :file1	=> "\e[1m",
-    :file2	=> "\e[1m",
-    :header	=> "\e[36m",
-    :function	=> "\e[m",
-    :new	=> "\e[32m",
-    :old	=> "\e[31m",
-    :changed	=> "\e[33m",
-    :unchanged	=> "",
-    :whitespace	=> "\e[41m",
-    :off	=> "\e[m",
-    :open_inv	=> "\e[7m",
-    :close_inv	=> "\e[27m",
-  }
-  $diff.reversed = false
+  $diff = OpenStruct.new({
+      :exclude => [],
+      :include => [],
+      :flags => [],
+      :format_flags => [],
+      :format => :normal,
+      :colors => OpenStruct.new({
+          :comment	=> "\e[1m",
+          :file1	=> "\e[1m",
+          :file2	=> "\e[1m",
+          :header	=> "\e[36m",
+          :function	=> "\e[m",
+          :new		=> "\e[32m",
+          :old		=> "\e[31m",
+          :new_word	=> "\e[7;32m",
+          :old_word	=> "\e[7;31m",
+          :changed	=> "\e[33m",
+          :unchanged	=> "",
+          :whitespace	=> "\e[40m",
+          :off		=> "\e[m",
+          :open_inv	=> "\e[7m",
+          :close_inv	=> "\e[27m",
+        }),
+      :reversed => false,
+      :word_regex => /([@$%]*[[:alnum:]_]+|[^\n])/,
+    })
+end
+
+def tty_color?
+  $stdout.tty? && `tput colors`.to_i >= 8
+end
+
+def tty_dumb?
+  !$stdout.tty? || ENV['TERM'] == 'dumb'
 end
 
 def parse_args!(args)
@@ -120,14 +141,23 @@ usage: #{MYNAME} [flags] [files]
 
     opts.on('--[no-]pager',
       'Pipe output into pager if stdout is a terminal. [+][*]') { |val|
-      $diff.use_pager = val if $stdout.tty?
+      $diff.use_pager = val unless val && tty_dumb?
     }
-    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 = tty_color?
+      when false, 'never'
+        $diff.colorize = false
+      else
+        raise OptionParser::ParseError, "unknown value for --color: #{val}"
+      end
     }
     opts.on('--[no-]highlight-whitespace',
-      'Highlight suspicious whitespace differences in colorized output. [+][*]') { |val|
+      'Highlight whitespace differences in colorized output. [+][*]') { |val|
       $diff.highlight_whitespace = val
     }
     opts.on('--[no-]rsync-exclude', '--[no-]cvs-exclude',
@@ -358,7 +388,7 @@ usage: #{MYNAME} [flags] [files]
 
 ----
   EOF
-      system(DIFF_CMD, '--version')
+      xsystem(DIFF_CMD, '--version')
       exit
     }
     opts.on('--help',
@@ -384,9 +414,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)
@@ -394,8 +431,9 @@ EOS
 
     opts.parse!(args)
 
+    # -U3 must come before -p, otherwise you get "error: conflicting output format options."
     $diff.format_flags.each { |format_flag|
-      set_flag(*format_flag)
+      prepend_flag(*format_flag)
     }
 
     if $diff.ignore_cvs_lines
@@ -444,11 +482,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
@@ -458,11 +492,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)
@@ -477,6 +507,45 @@ 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 prepend_flag(flag, val)
+  case val
+  when true, false
+    $diff.flags.reject! { |f,| f == flag }
+    $diff.flags.unshift [flag] if val
+  else
+    $diff.flags.unshift [flag, val]
+  end
+end
+
 def set_flag(flag, val)
   case val
   when true, false
@@ -577,21 +646,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
+  xsystem *[DIFF_CMD, $diff.flags, args].flatten
   status = $? >> 8
   $status = status if $status < status
   return status
@@ -701,92 +757,228 @@ 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)
+  rescue LoadError
+    colorize_unified_diff_hunk = method(:colorize_hunk_in_unified_diff_normal)
+  end
+
   colors = $diff.colors
+  colors.to_function ||= colors.off + colors.function
 
   state = :comment
   hunk_left = nil
-  io.each_line { |line|
+  hunk = []
+  $stdin.each_line { |line|
+    line.chomp!
     replace_invalid_bytes!(line)
     case state
     when :comment
       case line
       when /^\+{3} /
-        color = colors[:file1]
+        color = colors.file1
       when /^-{3} /
-        color = colors[:file2]
+        color = colors.file2
       when /^@@ -[0-9]+(,([0-9]+))? \+[0-9]+(,([0-9]+))?/
         state = :hunk
         hunk_left = ($1 ? $2.to_i : 1) + ($3 ? $4.to_i : 1)
-        line.sub!(/^(@@ .*? @@)( )?/) {
-          $1 + ($2 ? colors[:off] + $2 + colors[:function] : '')
+        line.sub!(/^(@@ .*? @@ )/) {
+          $1 + colors.to_function
         }
-        color = colors[:header]
+        color = colors.header
       else
-        color = colors[:comment]
+        color = colors.comment
       end
     when :hunk
-      check = false
+      hunk << line
       case line
-      when /^\+/
-        color = colors[:new]
+      when /^[-+]/
         hunk_left -= 1
-        check = $diff.highlight_whitespace
-      when /^-/
-        color = colors[:old]
-        hunk_left -= 1
-        check = $diff.highlight_whitespace
       when /^ /
-        color = colors[:unchanged]
         hunk_left -= 2
-      else
-        # error
-        color = colors[:comment]
-      end
-      if check
-        line.sub!(/([ \t]+)$/) {
-          colors[:off] + colors[:whitespace] + $1
-        }
-        true while line.sub!(/^(.[ \t]*)( +)(\t)/) {
-          $1 + colors[:off] + colors[:whitespace] + $2 + colors[:off] + color + $3
-        }
       end
       if hunk_left <= 0
-        state = :comment
+        colorize_unified_diff_hunk.call(hunk)
         hunk_left = nil
+        hunk.clear
+        state = :comment
+      end
+      next
+    end
+
+    print color, line, colors.off, "\n"
+  }
+end
+
+def colorize_hunk_in_unified_diff_normal(hunk)
+  colors = $diff.colors
+
+  hunk.each { |line|
+    case line
+    when /^\+/
+      color = colors.new
+      ws = $diff.highlight_whitespace
+    when /^-/
+      color = colors.old
+      ws = $diff.highlight_whitespace
+    when /^ /
+      color = colors.unchanged
+      ws = false
+    end
+    if ws
+      highlight_whitespace_in_unified_diff!(line, color)
+    end
+    print color, line, colors.off, "\n"
+  }
+end
+
+def colorize_hunk_in_unified_diff_inline(hunk)
+  colors = $diff.colors
+
+  skip_next = false
+
+  Enumerator.new { |y|
+    y << nil
+    hunk.each { |line|
+      y << line
+    }
+    y << nil << nil
+  }.each_cons(4) { |line0, line1, line2, line3|
+    case
+    when skip_next
+      skip_next = false
+      next
+    when line1.nil?
+      break
+    when /^[-+]/ !~ line0 && /^-/ =~ line1 &&  /^\+/ =~ line2 &&  /^[-+]/ !~ line3
+      colorize_inline_diff(line1, line2)
+      skip_next = true
+      next
+    when /^\+/ =~ line1
+      color = colors.new
+      ws = $diff.highlight_whitespace
+    when /^-/ =~ line1
+      color = colors.old
+      ws = $diff.highlight_whitespace
+    when /^ / =~ line1
+      color = colors.unchanged
+      ws = false
+    end
+    if ws
+      line1 = line1.dup
+      highlight_whitespace_in_unified_diff!(line1, color)
+    end
+    print color, line1, colors.off, "\n"
+  }
+end
+
+def colorize_inline_diff(line1, line2)
+  words1, words2 = [line1, line2].map { |line|
+    line[1..-1].split($diff.word_regex)
+  }
+  xwords1, xwords2 = [words1, words2].map { |words|
+    words.each_with_index.map { |word, i| i.even? ? nil : word }
+  }
+  swords1, swords2, signs1, signs2 = [], [], [], []
+
+  Diff::LCS.sdiff(xwords1, xwords2).each { |tuple|
+    sign, (pos1, word1), (pos2, word2) = *tuple
+    case sign
+    when PLUS_SIGN
+      if signs2.last == sign
+        swords2.last << word2 if word2
+      else
+        swords2 << (word2 || '')
+        signs2 << sign
+      end
+    when MINUS_SIGN
+      if signs1.last == sign
+        swords1.last << word1 if word1
+      else
+        swords1 << (word1 || '')
+        signs1 << sign
+      end
+    else
+      if signs1.last == sign
+        swords1.last << words1[pos1]
+      else
+        swords1 << words1[pos1]
+        signs1 << sign
+      end
+      if signs2.last == sign
+        swords2.last << words2[pos2]
+      else
+        swords2 << words2[pos2]
+        signs2 << sign
       end
     end
+  }
 
-    line.sub!(/^/, color)
-    line.sub!(/$/, colors[:off])
+  colors = $diff.colors
 
-    print line
+  aline1 = ''.tap { |line|
+    signs1.zip(swords1) { |sign, word|
+      case sign
+      when EQUAL_SIGN
+        line << colors.off << colors.old << word
+      else
+        line << colors.off << colors.old_word << word
+      end
+    }
   }
+  aline2 = ''.tap { |line|
+    signs2.zip(swords2) { |sign, word|
+      case sign
+      when EQUAL_SIGN
+        line << colors.off << colors.new << word
+      else
+        line << colors.off << colors.new_word << word
+      end
+    }
+  }
+
+  print colors.old, '-', aline1, colors.off, "\n",
+        colors.new, '+', aline2, colors.off, "\n"
+end
+
+def highlight_whitespace_in_unified_diff!(line, color)
+  colors = $diff.colors
+  colors.to_whitespace ||= colors.off + colors.whitespace
 
-  io.close
+  line.gsub!(/([ \t]+)$|( +)(?=\t)/) {
+    if $1
+      colors.to_whitespace + $1
+    else
+      colors.to_whitespace + $2 << colors.off << color
+    end
+  }
 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
     when :comment
       case line
       when /^\*{3} /
-        color = colors[:file1]
+        color = colors.file1
       when /^-{3} /
-        color = colors[:file2]
+        color = colors.file2
       when /^\*{15}/
         state = :hunk
         hunk_part = 0
-        line.sub!(/^(\*{15})( )?/) {
-          $1 + ($2 ? colors[:off] + $2 + colors[:function] : '')
+        line.sub!(/^(\*{15} )/) {
+          $1 + colors.to_function
         }
-        color = colors[:header]
+        color = colors.header
       end
     when :hunk
       case hunk_part
@@ -794,10 +986,10 @@ def colorize_context_diff(io)
         case line
         when /^\*{3} /
           hunk_part = 1
-          color = colors[:header]
+          color = colors.header
         else
           # error
-          color = colors[:comment]
+          color = colors.comment
         end
       when 1, 2
         check = false
@@ -805,53 +997,58 @@ def colorize_context_diff(io)
         when /^\-{3} /
           if hunk_part == 1
             hunk_part = 2
-            color = colors[:header]
+            color = colors.header
           else
             #error
-            color = colors[:comment]
+            color = colors.comment
           end
         when /^\*{3} /, /^\*{15} /
           state = :comment
           redo
         when /^\+ /
-          color = colors[:new]
+          color = colors.new
           check = $diff.highlight_whitespace
         when /^- /
-          color = colors[:old]
+          color = colors.old
           check = $diff.highlight_whitespace
         when /^! /
-          color = colors[:changed]
+          color = colors.changed
           check = $diff.highlight_whitespace
         when /^  /
-          color = colors[:unchanged]
+          color = colors.unchanged
         else
           # error
-          color = colors[:comment]
+          color = colors.comment
         end
         if check
-          line.sub!(/^(. .*)([ \t]+)$/) {
-            $1 + colors[:off] + colors[:whitespace] + $2
-          }
-          true while line.sub!(/^(. [ \t]*)( +)(\t)/) {
-            $1 + colors[:off] + colors[:whitespace] + $2 + colors[:off] + color + $3
-          }
+          highlight_whitespace_in_context_diff!(line, color)
         end
       end
     end
 
-    line.sub!(/^/, color)
-    line.sub!(/$/, colors[:off])
-
-    print line
+    print color, line, colors.off, "\n"
   }
+end
+
+def highlight_whitespace_in_context_diff!(line, color)
+  colors = $diff.colors
+  colors.to_whitespace ||= colors.off + colors.whitespace
 
-  io.close
+  line.gsub!(/^(..)|([ \t]+)$|( +)(?=\t)/) {
+    if $1
+      $1
+    elsif $2
+      colors.to_whitespace + $2
+    else
+      colors.to_whitespace + $3 << colors.off << color
+    end
+  }
 end
 
 def replace_invalid_bytes!(text)
   colors = $diff.colors
   text.replace(text.replace_invalid_bytes { |byte|
-      '%s<%02X>%s' % [colors[:open_inv], byte, colors[:close_inv]]
+      '%s<%02X>%s' % [colors.open_inv, byte, colors.close_inv]
     })
 end
 

metadata

@@ -1,21 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: di
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - Akinori MUSHA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
-dependencies: []
-description: ! 'The di(1) command wraps around GNU diff(1) to provide reasonable
-
+date: 2021-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+description: |
+  The di(1) command wraps around GNU diff(1) to provide reasonable
   default settings and some original features.
-
-'
 email:
 - knu@idaemons.org
 executables:
@@ -25,8 +36,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - HISTORY
 - LICENSE
 - README.rdoc
@@ -37,28 +48,27 @@ files:
 - test/helper.rb
 - test/test_di.rb
 homepage: https://github.com/knu/di
-licenses: []
-post_install_message: 
+licenses:
+- 2-clause BSDL
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3
+signing_key:
+specification_version: 4
 summary: A wrapper around GNU diff(1)
 test_files:
 - test/helper.rb