di 0.2.2 → 0.2.3

data/HISTORY

@@ -1,3 +1,8 @@
+== 0.2.3 2012-03-29
+
+* Fix the case where comparing two directories fails when the latter
+  contains a directory that the former doesn't have.
+
 == 0.2.2 2012-01-18
 
 * Try to fix a bug where "di DIR FILE..." produces a reversed diff.

data/di.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "di"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
-  s.date = "2012-01-18"
+  s.date = "2012-03-29"
   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"]

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.2"
+MYVERSION = "0.2.3"
 MYNAME = File.basename($0)
 MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA"
 
@@ -615,22 +615,24 @@ def diff_dirs(dir1, dir2)
   missing1 = entries2 - entries1
   missing2 = entries1 - entries2
 
-  files = []
-  common.each { |file|
-    file1 = File.join(dir1, file)
-    file2 = File.join(dir2, file)
-    file1_is_dir = File.directory?(file1)
-    file2_is_dir = File.directory?(file2)
-    if file1_is_dir && file2_is_dir
-      diff_dirs(file1, file2) if $diff.recursive
-    elsif !file1_is_dir && !file2_is_dir
-      files << file1
-    else
-      missing1 << file
-      missing2 << file
-    end
-  }
-  diff_files(files, dir2)
+  unless common.empty?
+    files = []
+    common.each { |file|
+      file1 = File.join(dir1, file)
+      file2 = File.join(dir2, file)
+      file1_is_dir = File.directory?(file1)
+      file2_is_dir = File.directory?(file2)
+      if file1_is_dir && file2_is_dir
+        diff_dirs(file1, file2) if $diff.recursive
+      elsif !file1_is_dir && !file2_is_dir
+        files << file1
+      else
+        missing1 << file
+        missing2 << file
+      end
+    }
+    diff_files(files, dir2)
+  end
 
   if $diff.reversed
     [[dir1, missing2], [dir2, missing1]]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: di
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda