di 0.1.5 → 0.1.6

data/HISTORY

@@ -1,9 +1,19 @@
-* Add --[no-]pager and turn it on by default.
+== 0.1.6 2010-03-11
+
+* Fix colorization of the last hunk.
+
+* Reimplement --version.
+
+== 0.1.5 2010-03-10
 
 * Add --[no-]color and colorize diff output by default.
 
 * Read user's preferred default options from DI_OPTIONS.
 
+== 0.1.4 2010-03-10
+
+* Add --[no-]pager and turn it on by default.
+
 * Do not choke on file names starting with a hyphen.
 
 == 0.1.3 2010-03-10

data/README.rdoc

@@ -11,19 +11,25 @@ di - a wrapper around GNU diff(1)
 The di(1) command wraps around GNU diff(1) to provide reasonable
 default settings and some original features:
 
-  - Ignore non-significant files, such as backup files, object files,
-    VCS administration files, etc. a la rsync(1)'s --cvs-ignore
-    option.
+  - Useful options turned on by default: -U3 -N -p -d.
 
-  - Ignore difference of lines containing RCS tags.
+  - Diff output is colorized, and paginated by user's favorite pager.
+
+  - Non-significant files are ignored by default, such as backup
+    files, object files, VCS administration files, etc. a la
+    rsync(1)'s --cvs-ignore option.
 
-  - Output in unified format by default.
+  - Ignore difference of lines containing RCS tags.
 
   - Perform recursive comparison.
 
-  - Turn on some other useful options: -N -p -d.
+  - Support combinations of command line options that GNU diff(1) is
+    expected to but does not support.
+
+  - Default set of options are configurable via environment variable.
 
-  - Provide the way to negate any of the above options.
+  - Any option can be negated from a command line. (Specify -N- to
+    negate the default -N, etc.)
 
 == SYNOPSIS:
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/di

@@ -30,6 +30,7 @@
 
 MYVERSION = "0.1.3"
 MYNAME = File.basename($0)
+MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 EMPTYFILE = '/dev/null'
@@ -350,7 +351,14 @@ usage: #{MYNAME} [flags] [files]
     }
     opts.on('-v', '--version',
       'Output version info.') { |val|
-      set_flag('-v', val)
+      print <<-"EOF"
+#{MYNAME} version #{MYVERSION}
+#{MYCOPYRIGHT}
+
+----
+  EOF
+      system(DIFF_CMD, '--version')
+      exit
     }
     opts.on('--help',
       'Output this help.') { |val|
@@ -680,9 +688,9 @@ def colorize_unified_diff(io)
         color = colors[:file1]
       when /^-{3} /
         color = colors[:file2]
-      when /^@@ -[0-9]+,([0-9]+)/
+      when /^@@ -[0-9]+,([0-9]+) \+[0-9]+,([0-9]+)/
         state = :hunk
-        hunk_left = $1.to_i
+        hunk_left = $1.to_i + $2.to_i
         line.sub!(/^(@@ .*? @@)( )?/) {
           $1 + ($2 ? colors[:off] + $2 + colors[:function] : '')
         }
@@ -695,6 +703,7 @@ def colorize_unified_diff(io)
       case line
       when /^\+/
         color = colors[:new]
+        hunk_left -= 1
         check = $diff.highlight_whitespace
       when /^-/
         color = colors[:old]
@@ -702,7 +711,7 @@ def colorize_unified_diff(io)
         check = $diff.highlight_whitespace
       when /^ /
         color = colors[:unchanged]
-        hunk_left -= 1
+        hunk_left -= 2
       else
         # error
         color = colors[:comment]

data/di.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{di}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
-  s.date = %q{2010-03-10}
+  s.date = %q{2010-03-11}
   s.default_executable = %q{di}
   s.description = %q{The di(1) command wraps around GNU diff(1) to provide reasonable
 default settings and some original features.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +09:00
+date: 2010-03-11 00:00:00 +09:00
 default_executable: di
 dependencies: 
 - !ruby/object:Gem::Dependency