di 0.2.0 → 0.2.1

data/HISTORY

@@ -1,3 +1,10 @@
+== 0.2.1 2011-08-04
+
+* Make the regexp pattern used for --ignore-cvs-lines more specific so
+  it does not misfire on Perl scripts.
+
+* Disable --pager on Ruby 1.9, which currently stalls.
+
 == 0.2.0 2011-05-09
 
 * Update the default exclude pattern list:

data/README.rdoc

@@ -72,6 +72,6 @@ Or just install lib/di.rb as "di" to a directory in your PATH.
 
 == COPYRIGHT:
 
-Copyright (c) 2008, 2009, 2010 Akinori MUSHA
+Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA
 
 See LICENSE for license terms.

data/di.gemspec

@@ -5,17 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{di}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Akinori MUSHA"]
-  s.date = %q{2011-05-09}
-  s.default_executable = %q{di}
+  s.authors = [%q{Akinori MUSHA}]
+  s.date = %q{2011-08-04}
   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.executables = [%q{di}]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -33,14 +32,10 @@ default settings and some original features.
     "test/test_di.rb"
   ]
   s.homepage = %q{http://github.com/knu/di}
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.8.5}
   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
     s.specification_version = 3

data/lib/di.rb

@@ -28,7 +28,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.2.0"
+MYVERSION = "0.2.1"
 MYNAME = File.basename($0)
 MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA"
 
@@ -116,7 +116,7 @@ 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?
+      $diff.use_pager = val if $stdout.tty? && RUBY_VERSION < "1.9"
     }
     opts.on('--[no-]color',
       'Colorize output if stdout is a terminal and the format is unified or context. [!][*]') { |val|
@@ -131,7 +131,7 @@ usage: #{MYNAME} [flags] [files]
       $diff.rsync_exclude = val
     }
     opts.on('--[no-]ignore-cvs-lines',
-      'Ignore CVS keyword lines. [!][*]') { |val|
+      'Ignore CVS/RCS keyword lines. [!][*]') { |val|
       $diff.ignore_cvs_lines = val
     }
     opts.on('--[no-]fignore-exclude',
@@ -406,7 +406,7 @@ EOS
     }
 
     if $diff.ignore_cvs_lines
-      opts.parse('--ignore-matching-lines="^[^\x1b]*\$[A-Z][A-Za-z0-9][A-Za-z0-9]*\(:.*\)\{0,1\}\$')
+      opts.parse('-I', '\$\(LastChanged\(Date\|Revision\|By\)\|Date\|Revision\|Rev\|Author\|HeadURL\|URL\|Id\|Header\|\(Free\|Net\|Open\)BSD\|Name\|Locker\|Log\|RCSfile\|Source\|State\)\(\|: .* \|:: .*[ #]\)\$')
     end
   rescue OptionParser::ParseError => e
     warn e, "Try `#{MYNAME} --help' for more information."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: di
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +09:00
-default_executable: di
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -55,7 +54,6 @@ files:
 - lib/di.rb
 - test/helper.rb
 - test/test_di.rb
-has_rdoc: true
 homepage: http://github.com/knu/di
 licenses: []
 
@@ -87,10 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A wrapper around GNU diff(1)
-test_files: 
-- test/helper.rb
-- test/test_di.rb
+test_files: []
+