di 0.1.4 → 0.1.5

data/HISTORY

@@ -1,5 +1,9 @@
 * Add --[no-]pager and turn it on by default.
 
+* Add --[no-]color and colorize diff output by default.
+
+* Read user's preferred default options from DI_OPTIONS.
+
 * Do not choke on file names starting with a hyphen.
 
 == 0.1.3 2010-03-10

data/README.rdoc

@@ -31,7 +31,7 @@ Run di --help for help.
 
 == REQUIREMENTS:
 
-- Ruby 1.8.6 or later
+- Ruby 1.8.7 or later
 
 - GNU diff(1)
 

data/Rakefile

@@ -13,6 +13,7 @@ EOS
     gem.email = "knu@idaemons.org"
     gem.homepage = "http://github.com/knu/di"
     gem.authors = ["Akinori MUSHA"]
+    gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.executables = ["di"]

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/di

@@ -73,8 +73,24 @@ def setup
   $diff.include = []
   $diff.flags = []
   $diff.format_flags = []
+  $diff.format = :normal
   $diff.custom_format_p = false
   $diff.use_pager = false
+  $diff.colorize = false
+  $diff.highlight_whitespace = true
+  $diff.colors = {
+    :comment	=> "\033[1m",
+    :file1	=> "\033[1m",
+    :file2	=> "\033[1m",
+    :header	=> "\033[36m",
+    :function	=> "\033[m",
+    :new	=> "\033[32m",
+    :old	=> "\033[31m",
+    :changed	=> "\033[33m",
+    :unchanged	=> "",
+    :whitespace	=> "\033[41m",
+    :off	=> "\033[m",
+  }
 end
 
 def parse_args!(args)
@@ -94,8 +110,12 @@ usage: #{MYNAME} [flags] [files]
     opts.accept(miniTrueClass, hash) {|arg, val| val == nil or val}
 
     opts.on('--[no-]pager',
-      'Pipe output into $PAGER (or more(1) if not defined) if stdout is a terminal. [!][*]') { |val|
-      $diff.use_pager = val
+      'Pipe output into pager if stdout is a terminal. [!][*]') { |val|
+      $diff.use_pager = val if $stdout.tty?
+    }
+    opts.on('--[no-]color',
+      'Colorize output if stdout is a terminal and the format is unified or context. [!][*]') { |val|
+      $diff.colorize = val if $stdout.tty?
     }
     opts.on('--[no-]rsync-exclude', '--[no-]cvs-exclude',
       'Exclude some kinds of files and directories a la rsync(1). [!][*]') { |val|
@@ -339,14 +359,26 @@ usage: #{MYNAME} [flags] [files]
 Options without the [*] sign will be passed through to diff(1).
 Options marked as [!] sign are turned on by default.  To turn them off,
 specify -?- for short options and --no-??? for long options, respectively.
+
+Environment variables:
+    DIFF        Path to diff(1)
+    DI_OPTIONS  User's preferred default options
+    PAGER       Path to pager (more(1) is used if not defined)
 EOS
       exit 0
     }
   }
 
   begin
-    opts.parse('--rsync-exclude', '--fignore-exclude', '--ignore-cvs-lines', '--pager',
+    opts.parse('--rsync-exclude', '--fignore-exclude', '--ignore-cvs-lines',
+               '--pager', '--color',
                '-U3', '-N', '-r', '-p', '-d')
+
+    if value = ENV['DI_OPTIONS']
+      require 'shellwords'
+      opts.parse(*value.shellsplit)
+    end
+
     opts.parse!(args)
 
     $diff.format_flags.each { |format_flag|
@@ -401,20 +433,28 @@ EOS
 end
 
 def invoke_pager
-  invoke_pager! if $diff.use_pager && $stdout.tty?
+  invoke_pager! if $diff.use_pager
 end
 
 def invoke_pager!
   $stdout.flush
   $stderr.flush
   pr, pw = IO.pipe
+  ppid = Process.pid
   pid = fork {
     $stdin.reopen(pr)
     pr.close
     pw.close
     IO.select([$stdin], nil, [$stdin])
-    exec(ENV['PAGER'] || 'more')
+    if system(ENV['PAGER'] || 'more')
+      Process.kill(:TERM, ppid)
+    else
+      $stderr.puts "Pager failed."
+      Process.kill(:INT, ppid)
+    end
   }
+  trap(:TERM) { exit(0) }
+  trap(:INT) { exit(130) }
   $stdout.reopen(pw)
   $stderr.reopen(pw) if $stderr.tty?
   pw.close
@@ -442,6 +482,24 @@ end
 def set_format_flag(flag, *val)
   $diff.format_flags.clear
   $diff.custom_format_p = false
+  case flag
+  when '-C'
+    $diff.format = :context
+  when '-U'
+    $diff.format = :unified
+  when '-e'
+    $diff.format = :ed
+  when '--normal'
+    $diff.format = :normal
+  when '-n'
+    $diff.format = :rcs
+  when '-y'
+    $diff.format = :side_by_side
+  when '-D'
+    $diff.format = :ifdef
+  else
+    $diff.format = :unknown
+  end
   $diff.format_flags.push([flag, *val])
 end
 
@@ -450,6 +508,7 @@ def set_custom_format_flag(flag, *val)
     $diff.format_flags.clear
     $diff.custom_format_p = true
   end
+  $diff.format = :custom
   $diff.format_flags.push([flag, *val])
 end
 
@@ -509,7 +568,21 @@ def diff_files(file1, file2)
 end
 
 def call_diff(*args)
-  system(*[DIFF_CMD, $diff.flags, args].flatten)
+  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
   status = $? >> 8
   $status = status if $status < status
   return status
@@ -594,4 +667,142 @@ def diff_exclude?(basename)
   return false
 end
 
+def colorize_unified_diff(io)
+  colors = $diff.colors
+
+  state = :comment
+  hunk_left = nil
+  io.each_line { |line|
+    case state
+    when :comment
+      case line
+      when /^\+{3} /
+        color = colors[:file1]
+      when /^-{3} /
+        color = colors[:file2]
+      when /^@@ -[0-9]+,([0-9]+)/
+        state = :hunk
+        hunk_left = $1.to_i
+        line.sub!(/^(@@ .*? @@)( )?/) {
+          $1 + ($2 ? colors[:off] + $2 + colors[:function] : '')
+        }
+        color = colors[:header]
+      else
+        color = colors[:comment]
+      end
+    when :hunk
+      check = false
+      case line
+      when /^\+/
+        color = colors[:new]
+        check = $diff.highlight_whitespace
+      when /^-/
+        color = colors[:old]
+        hunk_left -= 1
+        check = $diff.highlight_whitespace
+      when /^ /
+        color = colors[:unchanged]
+        hunk_left -= 1
+      else
+        # error
+        color = colors[:comment]
+      end
+      if check
+        line.sub!(/([ \t]+)$/) {
+          colors[:off] + colors[:whitespace] + $1
+        }
+      end
+      if hunk_left <= 0
+        state = :comment
+        hunk_left = nil
+      end
+    end
+
+    line.sub!(/^/, color)
+    line.sub!(/$/, colors[:off])
+
+    print line
+  }
+
+  io.close
+end
+
+def colorize_context_diff(io)
+  colors = $diff.colors
+
+  state = :comment
+  hunk_part = nil
+  io.each_line { |line|
+    case state
+    when :comment
+      case line
+      when /^\*{3} /
+        color = colors[:file1]
+      when /^-{3} /
+        color = colors[:file2]
+      when /^\*{15}/
+        state = :hunk
+        hunk_part = 0
+        line.sub!(/^(\*{15})( )?/) {
+          $1 + ($2 ? colors[:off] + $2 + colors[:function] : '')
+        }
+        color = colors[:header]
+      end
+    when :hunk
+      case hunk_part
+      when 0
+        case line
+        when /^\*{3} /
+          hunk_part = 1
+          color = colors[:header]
+        else
+          # error
+          color = colors[:comment]
+        end
+      when 1, 2
+        check = false
+        case line
+        when /^\-{3} /
+          if hunk_part == 1
+            hunk_part = 2
+            color = colors[:header]
+          else
+            #error
+            color = colors[:comment]
+          end
+        when /^\*{3} /, /^\*{15} /
+          state = :comment
+          redo
+        when /^\+ /
+          color = colors[:new]
+          check = $diff.highlight_whitespace
+        when /^- /
+          color = colors[:old]
+          check = $diff.highlight_whitespace
+        when /^! /
+          color = colors[:changed]
+          check = $diff.highlight_whitespace
+        when /^  /
+          color = colors[:unchanged]
+        else
+          # error
+          color = colors[:comment]
+        end
+        if check
+          line.sub!(/^(...*)([ \t]+)$/) {
+            $1 + colors[:off] + colors[:whitespace] + $2
+          }
+        end
+      end
+    end
+
+    line.sub!(/^/, color)
+    line.sub!(/$/, colors[:off])
+
+    print line
+  }
+
+  io.close
+end
+
 main(ARGV)

data/di.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{di}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
@@ -36,6 +36,7 @@ default settings and some original features.
   s.homepage = %q{http://github.com/knu/di}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A wrapper around GNU diff(1)}
   s.test_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -67,8 +67,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="