cmer-diff_dirs 0.1.1 → 0.1.2

data/README.rdoc

@@ -3,7 +3,8 @@
 Helper to diff two directories
 
 = Example
-
+  require 'rubygems'
+  require 'diff_dirs'
   diff_dirs "~/dir1", "~/dir2"
 
 == Dependencies (for tests only)

data/Rakefile

@@ -19,7 +19,34 @@ begin
     gemspec.description = "Ruby helper to diff two directories"
     gemspec.authors = ["Carl Mercier"]
     gemspec.files =  FileList["[A-Z]*", "{bin,generators,lib,test}/**/*"]
+    gemspec.rubyforge_project = 'diffdirs'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
+
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/cmercier/diff_dirs/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/diff_dirs.rb

@@ -20,10 +20,10 @@ class DiffDirs
       # New/Deleted files
       match = line.match(/^Only in ([^:]*): ([^$]*)$/)
       if match
-        if match[1] == dir1
-          return [:deleted, match[2]] # deleted from second dir
-        elsif match[1] == dir2
-          return [:new, match[2]] # new in second dir
+        if match[1].starts_with?(dir1)
+          return [:deleted, remove_dir_from_path("#{match[1]}/#{match[2]}", dir1)] # deleted from second dir
+        elsif match[1].starts_with?(dir2)
+          return [:new, remove_dir_from_path("#{match[1]}/#{match[2]}", dir2)] # new in second dir
         else
           raise "#{dir1} or #{dir2} didn't match #{match[1]}"
         end
@@ -43,7 +43,7 @@ class DiffDirs
     end
     
     def self.remove_dir_from_path(path, dir)
-      dir += "/" unless dir[-1..-1] == "/"
+      dir = add_slash(dir)
       path.sub(Regexp.new("^#{dir}"), "")
     end
     
@@ -54,6 +54,18 @@ class DiffDirs
         dir
       end
     end
+    
+    def self.add_slash(path)
+      path += "/" unless path[-1..-1] == "/"
+      path
+    end
+end
+
+class String
+  def starts_with?(prefix)
+    prefix = prefix.to_s
+    self[0, prefix.length] == prefix
+  end
 end
 
 public 

data/test/diff_dirs_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
-require File.dirname(__FILE__) + '/../diff_dirs'
+require File.dirname(__FILE__) + '/../lib/diff_dirs'
 
 class DiffDirsTest < Test::Unit::TestCase
   context "diff executable" do
@@ -67,4 +67,43 @@ class DiffDirsTest < Test::Unit::TestCase
       assert_not_equal "~/", DiffDirs.send(:expand_path, "~/")
     end
   end
+  
+  context "complex real life directory structure" do
+    setup do
+      @path = "/tmp/diff-dirs-test-#{rand(10000)}"
+      exec "mkdir -p #{@path}/1/dir1/dir2"
+      exec "touch    #{@path}/1/dir1/file1"
+      exec "touch    #{@path}/1/dir1/dir2/file2"
+      exec "mkdir -p #{@path}/1/foo/bar"
+      exec "touch    #{@path}/1/foo/file_in_foo"
+      exec "touch    #{@path}/1/file_in_root"
+      exec "touch    #{@path}/1/another_file_in_root"
+      exec "echo hello > #{@path}/1/foo/file_with_content"
+      
+      exec "mkdir -p #{@path}/2/foo/bar"
+      exec "touch    #{@path}/2/foo/file_in_foo"
+      exec "touch    #{@path}/2/foo/bar/file_in_bar"
+      exec "touch    #{@path}/2/file_in_root"
+      exec "touch    #{@path}/2/yet_another_file_in_root"
+      exec "echo world > #{@path}/2/foo/file_with_content"
+    end
+    
+    teardown do
+      `rm -fr #{@path}`
+    end
+    
+    should "run the full stack properly and return the correct diff result" do
+
+      assert_equal [[:deleted, "another_file_in_root"],
+                    [:deleted, "dir1"],
+                    [:new, "foo/bar/file_in_bar"],
+                    [:modified, "foo/file_with_content"],
+                    [:new, "yet_another_file_in_root"]], DiffDirs.diff_dirs("#{@path}/1", "#{@path}/2")
+    end
+  end
+  
+  def exec(cmd)
+    # puts cmd
+    `#{cmd}`
+  end
 end

data/test/github-test.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'yaml'
+ 
+if ARGV.size < 1
+  puts "Usage: github-test.rb my-project.gemspec"
+  exit
+end
+ 
+require 'rubygems/specification'
+data = File.read(ARGV[0])
+spec = nil
+ 
+if data !~ %r{!ruby/object:Gem::Specification}
+  Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
+else
+  spec = YAML.load(data)
+end
+ 
+spec.validate
+ 
+puts spec
+puts "OK"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cmer-diff_dirs
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Carl Mercier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - VERSION
 - lib/diff_dirs.rb
 - test/diff_dirs_test.rb
+- test/github-test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/cmer/diff_dirs
@@ -51,11 +52,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: diffdirs
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Ruby helper to diff two directories
 test_files: 
 - test/diff_dirs_test.rb
+- test/github-test.rb
 - test/test_helper.rb