di 0.1.1 → 0.1.3

data/.document

@@ -0,0 +1,6 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+HISTORY
+LICENSE

data/.gitignore

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

data/HISTORY

@@ -0,0 +1,15 @@
+== 0.1.3 2010-03-10
+
+* Fix handling of the following options and make custom format options
+  work:
+    -D/--ifdef=NAME
+    --GTYPE-group-format=GFMT
+    --line-format=LFMT
+    --LTYPE-line-format=LFMT
+
+* Fix a problem where escape sequence ESC $ B .. : is regarded as CVS
+  keyword, which often appears in a text encoded in ISO-2022-JP.
+
+== 0.1.1 2008-10-06
+
+* Initial release

data/{README.txt → LICENSE}

@@ -1,47 +1,4 @@
-= di
-
-* http://www.idaemons.org/projects/di/
-
-== DESCRIPTION:
-
-di - a wrapper around GNU diff(1)
-
-== FEATURES:
-
-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.
-
-  - Ignore difference of lines containing RCS tags.
-
-  - Output in unified format.
-
-  - Perform recursive comparison.
-
-  - Turn on some other useful options: -N -p -d.
-
-  - Provide the way to negate any of the above options.
-
-== SYNOPSIS:
-
-Run di --help for help.
-
-== REQUIREMENTS:
-
-- Ruby 1.8.6 or later
-
-- GNU diff(1)
-
-== INSTALL:
-
-gem install di
-
-== LICENSE:
-
-Copyright (c) 2008 Akinori MUSHA
+Copyright (c) 2008, 2009, 2010 Akinori MUSHA
 
 All rights reserved.
 

data/README.rdoc

@@ -0,0 +1,46 @@
+= di
+
+* http://www.idaemons.org/projects/di/
+
+== DESCRIPTION:
+
+di - a wrapper around GNU diff(1)
+
+== FEATURES:
+
+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.
+
+  - Ignore difference of lines containing RCS tags.
+
+  - Output in unified format by default.
+
+  - Perform recursive comparison.
+
+  - Turn on some other useful options: -N -p -d.
+
+  - Provide the way to negate any of the above options.
+
+== SYNOPSIS:
+
+Run di --help for help.
+
+== REQUIREMENTS:
+
+- Ruby 1.8.6 or later
+
+- GNU diff(1)
+
+== INSTALL:
+
+gem install di
+
+== COPYRIGHT:
+
+Copyright (c) 2008, 2009, 2010 Akinori MUSHA
+
+See LICENSE for license terms.

data/Rakefile

@@ -0,0 +1,57 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "di"
+    gem.summary = %Q{A wrapper around GNU diff(1)}
+    gem.description = <<EOS
+The di(1) command wraps around GNU diff(1) to provide reasonable
+default settings and some original features.
+EOS
+    gem.email = "knu@idaemons.org"
+    gem.homepage = "http://github.com/knu/di"
+    gem.authors = ["Akinori MUSHA"]
+    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"]
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "di #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.3

data/bin/di

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008 Akinori MUSHA
+# Copyright (c) 2008, 2009, 2010 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -27,12 +27,8 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
-#
-# $Id: di 69 2008-10-06 03:58:09Z knu $
 
-MYVERSION = "0.1.1"
-MYREVISION = %w$Rev: 69 $[1]
-MYDATE = %w$Date: 2008-10-06 12:58:09 +0900 (Mon, 06 Oct 2008) $[1]
+MYVERSION = "0.1.3"
 MYNAME = File.basename($0)
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
@@ -76,6 +72,8 @@ def setup
   $diff.exclude = []
   $diff.include = []
   $diff.flags = []
+  $diff.format_flags = []
+  $diff.custom_format_p = false
 end
 
 def parse_args!(args)
@@ -83,7 +81,7 @@ def parse_args!(args)
 
   banner = <<-"EOF"
 #{MYNAME} - a wrapper around GNU diff(1)
-  version #{MYVERSION} [revision #{MYREVISION}] (#{MYDATE})
+  version #{MYVERSION}
 
 usage: #{MYNAME} [flags] [files]
   EOF
@@ -149,19 +147,19 @@ usage: #{MYNAME} [flags] [files]
     }
     opts.on('-c[NUM]', '--context[=NUM]', Integer,
       'Output NUM (default 3) lines of copied context.') { |val|
-      $diff.format = ['-C', val ? val.to_s : '3']
+      set_format_flag('-C', val ? val.to_s : '3')
     }
     opts.on('-C NUM', Integer,
       'Output NUM lines of copied context.') { |val|
-      $diff.format = ['-C', val.to_s]
+      set_format_flag('-C', val.to_s)
     }
     opts.on('-u[NUM]', '--unified[=NUM]', Integer,
       'Output NUM (default 3) lines of unified context. [!]') { |val|
-      $diff.format = ['-U', val ? val.to_s : '3']
+      set_format_flag('-U', val ? val.to_s : '3')
     }
     opts.on('-U NUM', Integer,
       'Output NUM lines of unified context.') { |val|
-      $diff.format = ['-U', val.to_s]
+      set_format_flag('-U', val.to_s)
     }
     opts.on('-L LABEL', '--label=LABEL',
       'Use LABEL instead of file name.') { |val|
@@ -182,25 +180,25 @@ usage: #{MYNAME} [flags] [files]
     opts.on('-e', '--ed[=-]', miniTrueClass,
       'Output an ed script.') { |val|
       if val
-        $diff.format = ['-e', val]
+        set_format_flag('-e', val)
       end
     }
     opts.on('--normal[=-]', miniTrueClass,
       'Output a normal diff.') { |val|
       if val
-        $diff.format = ['--normal', val]
+        set_format_flag('--normal', val)
       end
     }
     opts.on('-n', '--rcs[=-]', miniTrueClass,
       'Output an RCS format diff.') { |val|
       if val
-        $diff.format = ['-n', val]
+        set_format_flag('-n', val)
       end
     }
     opts.on('-y', '--side-by-side[=-]', miniTrueClass,
       'Output in two columns.') { |val|
       if val
-        $diff.format = ['-y', val]
+        set_format_flag('-y', val)
       end
     }
     opts.on('-W NUM', '--width=NUM', Integer,
@@ -217,35 +215,39 @@ usage: #{MYNAME} [flags] [files]
     }
     opts.on('-D NAME', '--ifdef=NAME',
       'Output merged file to show `#ifdef NAME\' diffs.') { |val|
-      set_flag('-D', val)
+      set_format_flag('-D', val)
     }
     opts.on('--old-group-format=GFMT',
       'Format old input groups with GFMT.') { |val|
-      set_flag('--old-group-format', val)
+      set_custom_format_flag('--old-group-format', val)
     }
     opts.on('--new-group-format=GFMT',
       'Format new input groups with GFMT.') { |val|
-      set_flag('--new-group-format', 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_flag('--unchanged-group-format', val)
+      set_custom_format_flag('--unchanged-group-format', val)
     }
     opts.on('--line-format=LFMT',
       'Format all input lines with LFMT.') { |val|
-      set_flag('--line-format', val)
+      set_custom_format_flag('--line-format', val)
     }
     opts.on('--old-line-format=LFMT',
       'Format old input lines with LFMT.') { |val|
-      set_flag('--old-line-format', val)
+      set_custom_format_flag('--old-line-format', val)
     }
     opts.on('--new-line-format=LFMT',
       'Format new input lines with LFMT.') { |val|
-      set_flag('--new-line-format', val)
+      set_custom_format_flag('--new-line-format', val)
     }
     opts.on('--unchanged-line-format=LFMT',
       'Format unchanged input lines with LFMT.') { |val|
-      set_flag('--unchanged-line-format', val)
+      set_custom_format_flag('--unchanged-line-format', val)
     }
     opts.on('-l', '--paginate[=-]', miniTrueClass,
       'Pass the output through `pr\' to paginate it.') { |val|
@@ -338,14 +340,15 @@ usage: #{MYNAME} [flags] [files]
 
   begin
     opts.parse('--rsync-exclude', '--fignore-exclude', '--ignore-cvs-lines',
-               '-N', '-r', '-p', '-d')
+               '-U3', '-N', '-r', '-p', '-d')
     opts.parse!(args)
 
-    $diff.format ||= ['-U', '3']
-    set_flag(*$diff.format)
+    $diff.format_flags.each { |format_flag|
+      set_flag(*format_flag)
+    }
 
     if $diff.ignore_cvs_lines
-      opts.parse('--ignore-matching-lines=\$[A-Z][A-Za-z0-9][A-Za-z0-9]*\(:.*\)\{0,1\}\$')
+      opts.parse('--ignore-matching-lines="^[^\x1b]*\$[A-Z][A-Za-z0-9][A-Za-z0-9]*\(:.*\)\{0,1\}\$')
     end
   rescue OptionParser::ParseError => e
     warn e, "Try `#{MYNAME} --help' for more information."
@@ -403,6 +406,20 @@ def set_flag(flag, val)
   end
 end
 
+def set_format_flag(flag, *val)
+  $diff.format_flags.clear
+  $diff.custom_format_p = false
+  $diff.format_flags.push([flag, *val])
+end
+
+def set_custom_format_flag(flag, *val)
+  if !$diff.custom_format_p
+    $diff.format_flags.clear
+    $diff.custom_format_p = true
+  end
+  $diff.format_flags.push([flag, *val])
+end
+
 def diff_main
   $status = 0
 

data/di.gemspec

@@ -0,0 +1,59 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{di}
+  s.version = "0.1.3"
+
+  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.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.
+}
+  s.email = %q{knu@idaemons.org}
+  s.executables = ["di"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "HISTORY",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/di",
+     "di.gemspec",
+     "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.rubygems_version = %q{1.3.6}
+  s.summary = %q{A wrapper around GNU diff(1)}
+  s.test_files = [
+    "test/helper.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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

data/test/helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'di'
+
+class Test::Unit::TestCase
+end

data/test/test_di.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestDi < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: di
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -9,47 +14,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +09:00
-default_executable: 
-dependencies: []
+date: 2010-03-10 00:00:00 +09:00
+default_executable: di
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+description: |
+  The di(1) command wraps around GNU diff(1) to provide reasonable
+  default settings and some original features.
 
-description: 
 email: knu@idaemons.org
 executables: 
 - di
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
 files: 
+- .document
+- .gitignore
+- HISTORY
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
 - bin/di
-- README.txt
-- History.txt
-has_rdoc: false
-homepage: http://www.idaemons.org/projects/di/
-post_install_message: 
-rdoc_options: []
+- di.gemspec
+- test/helper.rb
+- test/test_di.rb
+has_rdoc: true
+homepage: http://github.com/knu/di
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: unixutils
-rubygems_version: 1.0.1
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A wrapper around GNU diff(1)
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/test_di.rb

data/History.txt

@@ -1,3 +0,0 @@
-== 0.1.1 2008-10-06
-
-* Initial release