di 0.2.3 → 0.3.0

data/HISTORY

@@ -1,3 +1,17 @@
+== 0.3.0 2012-05-14
+
+* Fix pagerizing with Ruby 1.9+ and turn it on by default.
+
+* Complement a missing implementation of --unidirectional-new-file.
+
+* Complement a missing implementation of -S/--starting-file=FILE.
+
+* Add support for --suppress-blank-empty.
+
+* Fix handling of -T/--initial-tab.
+
+* Remove -L which use has long been deprecated.
+
 == 0.2.3 2012-03-29
 
 * Fix the case where comparing two directories fails when the latter

data/di.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "di"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
-  s.date = "2012-03-29"
+  s.date = "2012-05-14"
   s.description = "The di(1) command wraps around GNU diff(1) to provide reasonable\ndefault settings and some original features.\n"
   s.email = "knu@idaemons.org"
   s.executables = ["di"]
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/knu/di"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "A wrapper around GNU diff(1)"
 
   if s.respond_to? :specification_version then

data/lib/di.rb

@@ -28,13 +28,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.2.3"
+MYVERSION = "0.3.0"
 MYNAME = File.basename($0)
 MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
-EMPTYFILE = '/dev/null'
 
 RSYNC_EXCLUDE_FILE_GLOBS = [
   'tags', 'TAGS', 'GTAGS', 'GRTAGS', 'GSYMS', 'GPATH',
@@ -58,6 +57,8 @@ FIGNORE_GLOBS = ENV.fetch('FIGNORE', '').split(':').map { |pat|
   '*' + pat
 }
 
+IO::NULL = '/dev/null' unless defined? IO::NULL
+
 def main(args)
   setup
 
@@ -116,31 +117,31 @@ 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? && RUBY_VERSION < "1.9"
+      '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|
+      'Colorize output if stdout is a terminal and the format is unified or context. [+][*]') { |val|
       $diff.colorize = val if $stdout.tty?
     }
     opts.on('--[no-]highlight-whitespace',
-      'Highlight suspicious whitespace differences in colorized output. [!][*]') { |val|
+      'Highlight suspicious whitespace differences in colorized output. [+][*]') { |val|
       $diff.highlight_whitespace = val
     }
     opts.on('--[no-]rsync-exclude', '--[no-]cvs-exclude',
-      'Exclude some kinds of files and directories a la rsync(1). [!][*]') { |val|
+      'Exclude some kinds of files and directories a la rsync(1). [+][*]') { |val|
       $diff.rsync_exclude = val
     }
     opts.on('--[no-]ignore-cvs-lines',
-      'Ignore CVS/RCS keyword lines. [!][*]') { |val|
+      'Ignore CVS/RCS keyword lines. [+][*]') { |val|
       $diff.ignore_cvs_lines = val
     }
     opts.on('--[no-]fignore-exclude',
-      'Ignore files having suffixes specified in FIGNORE. [!][*]') { |val|
+      'Ignore files having suffixes specified in FIGNORE. [+][*]') { |val|
       $diff.fignore_exclude = val
     }
     opts.on('-R', '--relative[=-]', miniTrueClass,
-      'Use relative path names. [*]') { |val|
+      'Use relative path names.') { |val|
       $diff.relative = val
     }
     opts.on('-i', '--ignore-case[=-]', miniTrueClass,
@@ -189,19 +190,19 @@ usage: #{MYNAME} [flags] [files]
       set_format_flag('-C', val.to_s)
     }
     opts.on('-u[NUM]', '--unified[=NUM]', Integer,
-      'Output NUM (default 3) lines of unified context. [!]') { |val|
+      'Output NUM (default 3) lines of unified context. [+]') { |val|
       set_format_flag('-U', val ? val.to_s : '3')
     }
     opts.on('-U NUM', Integer,
       'Output NUM lines of unified context.') { |val|
       set_format_flag('-U', val.to_s)
     }
-    opts.on('-L LABEL', '--label=LABEL',
+    opts.on('--label=LABEL',
       'Use LABEL instead of file name.') { |val|
-      set_flag('-L', val)
+      set_flag('--label', val)
     }
     opts.on('-p', '--show-c-function[=-]', miniTrueClass,
-      'Show which C function each change is in. [!]') { |val|
+      'Show which C function each change is in. [+]') { |val|
       set_flag('-p', val)
     }
     opts.on('-F RE', '--show-function-line=RE',
@@ -252,37 +253,21 @@ usage: #{MYNAME} [flags] [files]
       'Output merged file to show `#ifdef NAME\' diffs.') { |val|
       set_format_flag('-D', val)
     }
-    opts.on('--old-group-format=GFMT',
-      'Format old input groups with GFMT.') { |val|
-      set_custom_format_flag('--old-group-format', val)
-    }
-    opts.on('--new-group-format=GFMT',
-      'Format new input groups with GFMT.') { |val|
-      set_custom_format_flag('--new-group-format', val)
-    }
-    opts.on('--changed-group-format=GFMT',
-      'Format changed input groups with GFMT.') { |val|
-      set_custom_format_flag('--changed-group-format', val)
-    }
-    opts.on('--unchanged-group-format=GFMT',
-      'Format unchanged input groups with GFMT.') { |val|
-      set_custom_format_flag('--unchanged-group-format', val)
+    %w[old new changed unchanged].each { |gtype|
+      opts.on("--#{gtype}-group-format=GFMT",
+        "Format #{gtype} input groups with GFMT.") { |val|
+        set_custom_format_flag("--#{gtype}-group-format", val)
+      }
     }
     opts.on('--line-format=LFMT',
       'Format all input lines with LFMT.') { |val|
       set_custom_format_flag('--line-format', val)
     }
-    opts.on('--old-line-format=LFMT',
-      'Format old input lines with LFMT.') { |val|
-      set_custom_format_flag('--old-line-format', val)
-    }
-    opts.on('--new-line-format=LFMT',
-      'Format new input lines with LFMT.') { |val|
-      set_custom_format_flag('--new-line-format', val)
-    }
-    opts.on('--unchanged-line-format=LFMT',
-      'Format unchanged input lines with LFMT.') { |val|
-      set_custom_format_flag('--unchanged-line-format', val)
+    %w[old new changed unchanged].each { |ltype|
+      opts.on("--#{ltype}-line-format=LFMT",
+        "Format #{ltype} input lines with LFMT.") { |val|
+        set_custom_format_flag("--#{ltype}-line-format", val)
+      }
     }
     opts.on('-l', '--paginate[=-]', miniTrueClass,
       'Pass the output through `pr\' to paginate it.') { |val|
@@ -294,25 +279,30 @@ usage: #{MYNAME} [flags] [files]
     }
     opts.on('-T', '--initial-tab[=-]', miniTrueClass,
       'Make tabs line up by prepending a tab.') { |val|
-      set_flag('-T', '--initial-tab', val)
+      set_flag('-T', val)
     }
     opts.on('--tabsize=NUM', Integer,
       'Tab stops are every NUM (default 8) print columns.') { |val|
       set_flag('--tabsize', val.to_s)
     }
+    opts.on('--suppress-blank-empty[=-]', miniTrueClass,
+      'Suppress space or tab before empty output lines.') { |val|
+      set_flag('--suppress-blank-empty', val)
+    }
     opts.on('-r', '--recursive[=-]', miniTrueClass,
-      'Recursively compare any subdirectories found. [!]') { |val|
+      'Recursively compare any subdirectories found. [+]') { |val|
       set_flag('-r', val)
       $diff.recursive = val
     }
     opts.on('-N', '--[no-]new-file[=-]', miniTrueClass,
-      'Treat absent files as empty. [!]') { |val|
+      'Treat absent files as empty. [+]') { |val|
       set_flag('-N', val)
-      $diff.new_file = val
+      $diff.new_file = val ? :bidirectional : val
     }
     opts.on('--unidirectional-new-file[=-]', miniTrueClass,
       'Treat absent first files as empty.') { |val|
       set_flag('--unidirectional-new-file', val)
+      $diff.new_file = val ? :unidirectional : val
     }
     opts.on('-s', '--report-identical-files[=-]', miniTrueClass,
       'Report when two files are the same.') { |val|
@@ -336,7 +326,7 @@ usage: #{MYNAME} [flags] [files]
     }
     opts.on('-S FILE', '--starting-file=FILE',
       'Start with FILE when comparing directories.') { |val|
-      set_flag('-S', val)
+      $diff.starting_file = val
     }
     opts.on('--from-file=FILE1',
       'Compare FILE1 to all operands.  FILE1 can be a directory.') { |val|
@@ -351,7 +341,7 @@ usage: #{MYNAME} [flags] [files]
       set_flag('--horizon-lines', val.to_s)
     }
     opts.on('-d', '--minimal[=-]', miniTrueClass,
-      'Try hard to find a smaller set of changes. [!]') { |val|
+      'Try hard to find a smaller set of changes. [+]') { |val|
       set_flag('-d', val)
     }
     opts.on('--speed-large-files[=-]', miniTrueClass,
@@ -373,8 +363,8 @@ usage: #{MYNAME} [flags] [files]
       'Output this help.') { |val|
       invoke_pager
       print opts, <<EOS
-Options without the [*] sign will be passed through to diff(1).
-Options marked as [!] sign are turned on by default.  To turn them off,
+Options marked with [*] are this wrapper's original features.
+Options marked with [+] are turned on by default.  To turn them off,
 specify -?- for short options and --no-??? for long options, respectively.
 
 Environment variables:
@@ -466,23 +456,21 @@ def invoke_pager!
     pr.close
     pw.close
     IO.select([$stdin], nil, [$stdin])
-    if system(ENV['PAGER'] || 'more')
-      Process.kill(:TERM, ppid)
-    else
+    begin
+      exec(ENV['PAGER'] || 'more')
+    rescue
       $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
   at_exit {
     $stdout.flush
     $stderr.flush
-    $stdout.close
-    $stderr.close
+    $stdout.reopen(IO::NULL)
+    $stderr.reopen(IO::NULL)
     Process.waitpid(pid)
   }
 end
@@ -543,7 +531,7 @@ def diff_main
             to_file = File.expand_path(from_file, to_file)
           end
 
-          diff_dirs(from_file, to_file)
+          diff_dirs(from_file, to_file, true)
         else
           if $diff.relative
             from_file = File.expand_path(to_file, from_file)
@@ -607,9 +595,9 @@ def call_diff(*args)
   return status
 end
 
-def diff_dirs(dir1, dir2)
-  entries1 = diff_entries(dir1)
-  entries2 = diff_entries(dir2)
+def diff_dirs(dir1, dir2, toplevel_p = false)
+  entries1 = diff_entries(dir1, toplevel_p)
+  entries2 = diff_entries(dir2, toplevel_p)
 
   common = entries1 & entries2
   missing1 = entries2 - entries1
@@ -635,15 +623,20 @@ def diff_dirs(dir1, dir2)
   end
 
   if $diff.reversed
-    [[dir1, missing2], [dir2, missing1]]
+    [[dir1, missing2, true], [dir2, missing1, false]]
   else
-    [[dir2, missing1], [dir1, missing2]]
-  end.each { |dir, missing|
+    [[dir2, missing1, true], [dir1, missing2, false]]
+  end.each { |dir, missing, direction|
     new_files = []
+    case $diff.new_file
+    when :bidirectional
+      new_file = true
+    when :unidirectional
+      new_file = direction
+    end
     missing.each { |entry|
       file = File.join(dir, entry)
-
-      if $diff.new_file
+      if new_file
         if File.directory?(file)
           if dir.equal?(dir1)
             diff_dirs(file, nil)
@@ -660,16 +653,21 @@ def diff_dirs(dir1, dir2)
       end
     }
     if dir.equal?(dir1)
-      diff_files(new_files, EMPTYFILE)
+      diff_files(new_files, IO::NULL)
     else
-      diff_files(EMPTYFILE, new_files)
+      diff_files(IO::NULL, new_files)
     end
   }
 end
 
-def diff_entries(dir)
+def diff_entries(dir, toplevel_p)
   return [] if dir.nil?
-  return Dir.entries(dir).reject { |file| diff_exclude?(dir, file) }
+  Dir.entries(dir).tap { |entries|
+    entries.reject! { |file| diff_exclude?(dir, file) }
+    if toplevel_p && (starting_file = $diff.starting_file)
+      entries.reject! { |file| file < starting_file }
+    end
+  }
 rescue => e
   warn "#{dir}: #{e}"
   return []

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: di
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A wrapper around GNU diff(1)