di 0.1.9 → 0.2.0

data/HISTORY

@@ -1,3 +1,19 @@
+== 0.2.0 2011-05-09
+
+* Update the default exclude pattern list:
+    - Sort out file patterns and directory patterns so that (for example)
+      a directory named "core" is not ignored.
+    - Remove RCSLOG and cvslog.* which I haven't seen for decades.
+    - Add files generated by gtags(1): GTAGS, GRTAGS, GSYMS and GPATH.
+    - Add core.<pid>.
+    - Add *.so.<version>.
+    - Add *.bundle and *.dylib for OS X.
+    - Add *.py[co].
+
+== 0.1.9 2010-05-06
+
+* Make changes regarding file layout and documentation.
+
 == 0.1.8 2010-03-11
 
 * Fix unified diff parser.

data/LICENSE

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

data/di.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{di}
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2011-05-09}
   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.
@@ -18,34 +18,31 @@ default settings and some original features.
   s.executables = ["di"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "HISTORY",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "bin/di",
-     "di.gemspec",
-     "lib/di.rb",
-     "test/helper.rb",
-     "test/test_di.rb"
+    "HISTORY",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "bin/di",
+    "di.gemspec",
+    "lib/di.rb",
+    "test/helper.rb",
+    "test/test_di.rb"
   ]
   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.7.pre.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A wrapper around GNU diff(1)}
   s.test_files = [
     "test/helper.rb",
-     "test/test_di.rb"
+    "test/test_di.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/di.rb

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008, 2009, 2010 Akinori MUSHA
+# Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -28,25 +28,31 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.1.9"
+MYVERSION = "0.2.0"
 MYNAME = File.basename($0)
-MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010 Akinori MUSHA"
+MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
 EMPTYFILE = '/dev/null'
 
-RSYNC_EXCLUDE_GLOBS = %w(
-  RCS SCCS CVS CVS.adm
-  RCSLOG cvslog.* tags TAGS
-  .make.state .nse_depinfo *~
-  \#* .\#* ,* _$*
-  *$ *.old *.bak *.BAK
-  *.orig *.rej *.del-* *.a
-  *.olb *.o *.obj *.so
-  *.exe *.Z *.elc *.ln
-  core .svn .git .bzr .hg
-)
+RSYNC_EXCLUDE_FILE_GLOBS = [
+  'tags', 'TAGS', 'GTAGS', 'GRTAGS', 'GSYMS', 'GPATH',
+  '.make.state', '.nse_depinfo',
+  '*~', '\#*', '.\#*', ',*', '_$*', '*$',
+  '*.old', '*.bak', '*.BAK',
+  '*.orig', '*.rej', '*.del-*',
+  '*.a', '*.olb', '*.o', '*.obj',
+  /\A[^.].*[^.]\.so(?:\.[0-9]+)*\z/,
+  '*.bundle', '*.dylib',
+  '*.exe', '*.Z', '*.elc', '*.py[co]', '*.ln',
+  /\Acore(?:\.[0-9]+)*\z/,
+]
+
+RSYNC_EXCLUDE_DIR_GLOBS = [
+  'RCS', 'SCCS', 'CVS', 'CVS.adm',
+  '.svn', '.git', '.bzr', '.hg',
+]
 
 FIGNORE_GLOBS = ENV.fetch('FIGNORE', '').split(':').map { |pat|
   '*' + pat
@@ -76,22 +82,18 @@ def setup
   $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",
+    :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	=> "\033[41m",
-    :off	=> "\033[m",
+    :whitespace	=> "\e[41m",
+    :off	=> "\e[m",
   }
 end
 
@@ -107,9 +109,10 @@ usage: #{MYNAME} [flags] [files]
 
   opts = OptionParser.new(banner) { |opts|
     miniTrueClass = Class.new
-    hash = OptionParser::CompletingHash.new
-    hash['-'] = false
-    opts.accept(miniTrueClass, hash) {|arg, val| val == nil or val}
+    miniTrueClassHash = OptionParser::CompletingHash['-', false]
+    opts.accept(miniTrueClass, miniTrueClassHash) { |arg, val|
+      val == nil or val
+    }
 
     opts.on('--[no-]pager',
       'Pipe output into pager if stdout is a terminal. [!][*]') { |val|
@@ -119,6 +122,10 @@ usage: #{MYNAME} [flags] [files]
       '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|
+      $diff.highlight_whitespace = val
+    }
     opts.on('--[no-]rsync-exclude', '--[no-]cvs-exclude',
       'Exclude some kinds of files and directories a la rsync(1). [!][*]') { |val|
       $diff.rsync_exclude = val
@@ -384,7 +391,7 @@ EOS
 
   begin
     opts.parse('--rsync-exclude', '--fignore-exclude', '--ignore-cvs-lines',
-               '--pager', '--color',
+               '--pager', '--color', '--highlight-whitespace',
                '-U3', '-N', '-r', '-p', '-d')
 
     if value = ENV[ENV_NAME]
@@ -411,13 +418,13 @@ EOS
 
   begin
     if $diff.from_files
-      $diff.to_files ||= args.dup
+      $diff.to_files ||= args
 
       if $diff.to_files.empty?
         raise "missing operand"
       end
     elsif $diff.to_files
-      $diff.from_files = args.dup
+      $diff.from_files = args
 
       if $diff.from_files.empty?
         raise "missing operand"
@@ -427,12 +434,10 @@ EOS
         raise "missing operand"
       end
 
-      if File.directory?(args[0])
-        $diff.to_files   = args.dup
-        $diff.from_files = [$diff.to_files.shift]
+      if File.directory?(args.first)
+        $diff.to_files, $diff.from_files = args[0..0], args[1..-1]
       else
-        $diff.from_files = args.dup
-        $diff.to_files   = [$diff.from_files.pop]
+        $diff.from_files, $diff.to_files = args[0..-2], args[-1..-1]
       end
     end
 
@@ -482,11 +487,9 @@ end
 
 def set_flag(flag, val)
   case val
-  when false
+  when true, false
     $diff.flags.reject! { |f,| f == flag }
-  when true
-    $diff.flags.reject! { |f,| f == flag }
-    $diff.flags << [flag]
+    $diff.flags << [flag] if val
   else
     $diff.flags << [flag, val]
   end
@@ -513,7 +516,7 @@ def set_format_flag(flag, *val)
   else
     $diff.format = :unknown
   end
-  $diff.format_flags.push([flag, *val])
+  $diff.format_flags << [flag, *val]
 end
 
 def set_custom_format_flag(flag, *val)
@@ -522,7 +525,7 @@ def set_custom_format_flag(flag, *val)
     $diff.custom_format_p = true
   end
   $diff.format = :custom
-  $diff.format_flags.push([flag, *val])
+  $diff.format_flags << [flag, *val]
 end
 
 def diff_main
@@ -657,13 +660,13 @@ end
 
 def diff_entries(dir)
   return [] if dir.nil?
-  return Dir.entries(dir).reject { |file| diff_exclude?(file) }
+  return Dir.entries(dir).reject { |file| diff_exclude?(dir, file) }
 rescue => e
   warn "#{dir}: #{e}"
   return []
 end
 
-def diff_exclude?(basename)
+def diff_exclude?(dir, basename)
   return true if basename == '.' || basename == '..'
   return false if $diff.include.any? { |pat|
     File.fnmatch(pat, basename, File::FNM_DOTMATCH)
@@ -671,12 +674,21 @@ def diff_exclude?(basename)
   return true if $diff.exclude.any? { |pat|
     File.fnmatch(pat, basename, File::FNM_DOTMATCH)
   }
-  return true if $diff.rsync_exclude && RSYNC_EXCLUDE_GLOBS.any? { |pat|
-    File.fnmatch(pat, basename, File::FNM_DOTMATCH)
-  }
   return true if $diff.fignore_exclude && FIGNORE_GLOBS.any? { |pat|
     File.fnmatch(pat, basename, File::FNM_DOTMATCH)
   }
+  return true if $diff.rsync_exclude &&
+    if File.directory?(File.join(dir, basename))
+      RSYNC_EXCLUDE_DIR_GLOBS
+    else
+      RSYNC_EXCLUDE_FILE_GLOBS
+    end.any? { |pat|
+      if Regexp === pat
+        pat.match(basename)
+      else
+        File.fnmatch(pat, basename, File::FNM_DOTMATCH)
+      end
+    }
   return false
 end
 
@@ -725,6 +737,9 @@ def colorize_unified_diff(io)
         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
@@ -803,9 +818,12 @@ def colorize_context_diff(io)
           color = colors[:comment]
         end
         if check
-          line.sub!(/^(...*)([ \t]+)$/) {
+          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
+          }
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: di
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +09:00
+date: 2011-05-09 00:00:00 +09:00
 default_executable: di
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - HISTORY
 - LICENSE
 - README.rdoc
@@ -61,8 +60,8 @@ homepage: http://github.com/knu/di
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -88,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7.pre.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A wrapper around GNU diff(1)

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC