di 0.2.1 → 0.2.2

data/HISTORY

@@ -1,3 +1,7 @@
+== 0.2.2 2012-01-18
+
+* Try to fix a bug where "di DIR FILE..." produces a reversed diff.
+
 == 0.2.1 2011-08-04
 
 * Make the regexp pattern used for --ignore-cvs-lines more specific so

data/LICENSE

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

data/README.rdoc

@@ -1,6 +1,6 @@
 = di
 
-* http://www.idaemons.org/projects/di/
+* https://github.com/knu/di
 
 == DESCRIPTION:
 
@@ -72,6 +72,6 @@ Or just install lib/di.rb as "di" to a directory in your PATH.
 
 == COPYRIGHT:
 
-Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA
+Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA
 
 See LICENSE for license terms.

data/Rakefile

@@ -13,7 +13,7 @@ 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.homepage = "https://github.com/knu/di"
     gem.authors = ["Akinori MUSHA"]
     gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"

data/di.gemspec

@@ -4,17 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{di}
-  s.version = "0.2.1"
+  s.name = "di"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  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 = [%q{di}]
+  s.authors = ["Akinori MUSHA"]
+  s.date = "2012-01-18"
+  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"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -31,11 +29,11 @@ default settings and some original features.
     "test/helper.rb",
     "test/test_di.rb"
   ]
-  s.homepage = %q{http://github.com/knu/di}
-  s.require_paths = [%q{lib}]
+  s.homepage = "https://github.com/knu/di"
+  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{A wrapper around GNU diff(1)}
+  s.rubygems_version = "1.8.15"
+  s.summary = "A wrapper around GNU diff(1)"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/di.rb

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA
+# Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -28,9 +28,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.2.1"
+MYVERSION = "0.2.2"
 MYNAME = File.basename($0)
-MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011 Akinori MUSHA"
+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"
@@ -95,6 +95,7 @@ def setup
     :whitespace	=> "\e[41m",
     :off	=> "\e[m",
   }
+  $diff.reversed = false
 end
 
 def parse_args!(args)
@@ -436,6 +437,7 @@ EOS
 
       if File.directory?(args.first)
         $diff.to_files, $diff.from_files = args[0..0], args[1..-1]
+        $diff.reversed = true
       else
         $diff.from_files, $diff.to_files = args[0..-2], args[-1..-1]
       end
@@ -569,6 +571,7 @@ def diff_main
 end
 
 def diff_files(file1, file2)
+  file1, file2 = file2, file1 if $diff.reversed
   if file1.is_a?(Array)
     file2.is_a?(Array) and raise "cannot compare two sets of multiple files"
     file1.empty? and return 0
@@ -629,7 +632,11 @@ def diff_dirs(dir1, dir2)
   }
   diff_files(files, dir2)
 
-  [[dir1, missing2], [dir2, missing1]].each { |dir, missing|
+  if $diff.reversed
+    [[dir1, missing2], [dir2, missing1]]
+  else
+    [[dir2, missing1], [dir1, missing2]]
+  end.each { |dir, missing|
     new_files = []
     missing.each { |entry|
       file = File.join(dir, entry)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: di
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -54,7 +54,7 @@ files:
 - lib/di.rb
 - test/helper.rb
 - test/test_di.rb
-homepage: http://github.com/knu/di
+homepage: https://github.com/knu/di
 licenses: []
 
 post_install_message: 
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A wrapper around GNU diff(1)