0
@@ -12,7 +12,7 @@ require "rubygems"
0
   end
0
 end
0
 
0
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
0
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib])))
0
 
0
 require "piston"
0
 require "piston/commands"

0
@@ -1 +1 @@
0
-Dir[File.dirname(__FILE__) + "/commands/**/*.rb"].each {|f| require f}
0
+Dir["#{File.dirname(__FILE__)}/commands/**/*.rb"].each {|f| require f}

0
@@ -4,7 +4,7 @@ require "pathname"
0
 require "logger"
0
 
0
 @root = Pathname.new(File.dirname(__FILE__)).parent
0
-$:.unshift @root + "lib"
0
+$:.unshift("#{@root}lib"
0
 
0
 require "piston"
0
 require "piston/svn"

0
@@ -1,7 +1,7 @@
0
 #!/usr/bin/env ruby
0
 #
0
 # Import an SVN repository into an SVN working copy.
0
-require File.dirname(__FILE__) + "/common"
0
+require "#{File.dirname(__FILE__)}/common"
0
 
0
 @root = @root + "tmp/git_git"
0
 @root.rmtree rescue nil

0
@@ -1,7 +1,7 @@
0
 #!/usr/bin/env ruby
0
 #
0
 # Import a Git project into a Subversion working copy.
0
-require File.dirname(__FILE__) + "/common"
0
+require "#{File.dirname(__FILE__)}/common"
0
 
0
 @root = @root + "tmp/git_svn"
0
 @root.rmtree rescue nil

0
@@ -1,7 +1,7 @@
0
 #!/usr/bin/env ruby
0
 #
0
 # Import an SVN repository into a Git working copy.
0
-require File.dirname(__FILE__) + "/common"
0
+require "#{File.dirname(__FILE__)}/common"
0
 
0
 @root = @root + "tmp/svn_git"
0
 @root.rmtree rescue nil

0
@@ -1,7 +1,7 @@
0
 #!/usr/bin/env ruby
0
 #
0
 # Import an SVN repository into an SVN working copy.
0
-require File.dirname(__FILE__) + "/common"
0
+require "#{File.dirname(__FILE__)}/common"
0
 
0
 @root = @root + "tmp/svn_svn"
0
 @root.rmtree rescue nil

0
@@ -1,17 +1,14 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
0
-require File.dirname(__FILE__) + "/../integration_helpers"
0
 
0
-class TestImportGitGit < Test::Unit::TestCase
0
+class TestImportGitGit < PistonTestCase
0
   attr_reader :root_path, :repos_path, :wc_path
0
 
0
   def setup
0
-    @root_path = Pathname.new("/tmp/import_git_git")
0
+    super
0
+    @root_path = mkpath("/tmp/import_git_git")
0
     @wc_path = @root_path + "wc"
0
+    mkpath(@wc_path)
0
 
0
-    root_path.rmtree rescue nil
0
-    root_path.mkpath
0
-
0
-    wc_path.mkpath
0
     Dir.chdir(wc_path) do
0
       git(:init)
0
       File.open(wc_path + "README", "wb") {|f| f.write "Hello World!"}
0
@@ -22,10 +19,6 @@ class TestImportGitGit < Test::Unit::TestCase
0
     end
0
   end
0
 
0
-  def teardown
0
-    root_path.rmtree rescue nil
0
-  end
0
-
0
   def test_import
0
     piston(:import, "git://github.com/technoweenie/attachment_fu.git", wc_path + "vendor/attachment_fu")
0
 

0
@@ -1,27 +1,20 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
0
-require File.dirname(__FILE__) + "/../integration_helpers"
0
 
0
-class TestImportGitSvn < Test::Unit::TestCase
0
+class TestImportGitSvn < PistonTestCase
0
   attr_reader :root_path, :repos_path, :wc_path
0
 
0
   def setup
0
-    @root_path = Pathname.new("/tmp/import_git_svn")
0
+    super
0
+    @root_path = mkpath("/tmp/import_git_svn")
0
     @repos_path = @root_path + "repos"
0
     @wc_path = @root_path + "wc"
0
 
0
-    root_path.rmtree rescue nil
0
-    root_path.mkpath
0
-
0
     svnadmin :create, repos_path
0
     svn :checkout, "file://#{repos_path}", wc_path
0
     svn :mkdir, wc_path + "trunk", wc_path + "tags", wc_path + "branches", wc_path + "trunk/vendor"
0
     svn :commit, wc_path, "--message", "'first commit'"
0
   end
0
 
0
-  def teardown
0
-    root_path.rmtree rescue nil
0
-  end
0
-
0
   def test_import
0
     piston(:import, "git://github.com/technoweenie/attachment_fu.git", wc_path + "trunk/vendor/attachment_fu")
0
 

0
@@ -1,18 +1,15 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
0
-require File.dirname(__FILE__) + "/../integration_helpers"
0
 
0
-class TestImportSvnGit < Test::Unit::TestCase
0
+class TestImportSvnGit < PistonTestCase
0
   attr_reader :root_path, :repos_path, :wc_path
0
 
0
   def setup
0
-    @root_path = Pathname.new("/tmp/import_svn_git")
0
+    super
0
+    @root_path = mkpath("/tmp/import_svn_git")
0
     @repos_path = @root_path + "repos"
0
     @wc_path = @root_path + "wc"
0
+    mkpath(wc_path)
0
 
0
-    root_path.rmtree rescue nil
0
-    root_path.mkpath
0
-
0
-    wc_path.mkpath
0
     Dir.chdir(wc_path) do
0
       git(:init)
0
       File.open(wc_path + "README", "wb") {|f| f.write "Hello World!"}
0
@@ -23,10 +20,6 @@ class TestImportSvnGit < Test::Unit::TestCase
0
     end
0
   end
0
 
0
-  def teardown
0
-    root_path.rmtree rescue nil
0
-  end
0
-
0
   def test_import
0
     piston :import, "http://dev.rubyonrails.org/svn/rails/plugins/ssl_requirement/", wc_path + "vendor/ssl_requirement"
0
 

0
@@ -1,27 +1,20 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
0
-require File.dirname(__FILE__) + "/../integration_helpers"
0
 
0
-class TestImportSvnSvn < Test::Unit::TestCase
0
+class TestImportSvnSvn < PistonTestCase
0
   attr_reader :root_path, :repos_path, :wc_path
0
 
0
   def setup
0
-    @root_path = Pathname.new("/tmp/import_svn_svn")
0
+    super
0
+    @root_path = mkpath("/tmp/import_svn_svn")
0
     @repos_path = @root_path + "repos"
0
     @wc_path = @root_path + "wc"
0
 
0
-    root_path.rmtree rescue nil
0
-    root_path.mkpath
0
-
0
     svnadmin :create, repos_path
0
     svn :checkout, "file://#{repos_path}", wc_path
0
     svn :mkdir, wc_path + "trunk", wc_path + "tags", wc_path + "branches", wc_path + "trunk/vendor"
0
     svn :commit, wc_path, "--message", "'first commit'"
0
   end
0
 
0
-  def teardown
0
-    root_path.rmtree rescue nil
0
-  end
0
-
0
   def test_import
0
     piston :import, "http://dev.rubyonrails.org/svn/rails/plugins/ssl_requirement/", wc_path + "trunk/vendor/ssl_requirement"
0
 

0
@@ -10,7 +10,9 @@ rescue LoadError
0
   # NOP: ignore, this is not a real dependency
0
 end
0
 
0
-require File.dirname(__FILE__) + "/../config/requirements"
0
+require File.expand_path("#{File.dirname(__FILE__)}/../config/requirements")
0
+require File.expand_path("#{File.dirname(__FILE__)}/integration_helpers")
0
+require "find"
0
 
0
 module Test
0
   module Unit
0
@@ -37,7 +39,38 @@ module Test
0
   end
0
 end
0
 
0
-LOG_DIR = Pathname.new(File.dirname(__FILE__) + "/../log") unless Object::const_defined?(:LOG_DIR)
0
+class PistonTestCase < Test::Unit::TestCase
0
+  attr_reader :pathnames
0
+  def setup
0
+    super
0
+    @pathnames = []
0
+  end
0
+
0
+  def teardown
0
+    pathnames.each do |pathname|
0
+      pathname.rmtree if File.exists?(pathname)
0
+    end
0
+    super
0
+  end
0
+
0
+  def run(*args)
0
+    return if method_name.to_sym == :default_test
0
+    super
0
+  end
0
+
0
+  def mkpath(path_or_pathname)
0
+    if path_or_pathname.is_a?(Pathname)
0
+      path = path_or_pathname
0
+    else
0
+      path = Pathname.new(path_or_pathname)
0
+    end
0
+    path.mkpath
0
+    pathnames.push(path)
0
+    path
0
+  end
0
+end
0
+
0
+LOG_DIR = Pathname.new(File.expand_path("#{File.dirname(__FILE__)}/../log")) unless Object::const_defined?(:LOG_DIR)
0
 LOG_DIR.mkdir rescue nil
0
 
0
 Log4r::Logger.root.level = Log4r::DEBUG

0
@@ -1,7 +1,8 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitCommitCheckout < Test::Unit::TestCase
0
+class Piston::Git::TestGitCommitCheckout < PistonTestCase
0
   def setup
0
+    super
0
     @repos = mock("repos")
0
     @repos.stubs(:url).returns("git://a.repos.com/project.git")
0
     @reposdir = Pathname.new("tmp/.repos.tmp.git")

0
@@ -1,23 +1,17 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
-require "find"
0
 
0
-class TestGitCommitEach < Test::Unit::TestCase
0
+class Piston::Git::TestGitCommitEach < PistonTestCase
0
   def setup
0
+    super
0
     @repos = mock("repository")
0
     @repos.stubs(:url).returns("git://github.com/francois/arepos.git")
0
-
0
-    @tmpdir = Pathname.new("tmp/.arepos.tmp.git")
0
-    @tmpdir.rmtree rescue nil
0
-    @tmpdir.mkdir
0
+    @tmpdir = mkpath("tmp/.arepos.tmp.git")
0
+    
0
     @commit = Piston::Git::Commit.new(@repos, "ab"*20)
0
     @commit.stubs(:git).returns("commit " + "ab" * 20)
0
     @commit.checkout_to(@tmpdir)
0
   end
0
 
0
-  def teardown
0
-    @tmpdir.rmtree
0
-  end
0
-
0
   def test_prunes_search_tree_on_dot_git_directory
0
     @tmpdir.expects(:find).yields(@tmpdir + ".git")
0
     assert_throws :prune do

0
@@ -1,7 +1,8 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitCommitRememberance < Test::Unit::TestCase
0
+class Piston::Git::TestGitCommitRememberance < PistonTestCase
0
   def setup
0
+    super
0
     @repos = mock("repository")
0
     @repos.stubs(:url).returns("git://github.com/francois/arepos.git")
0
 

0
@@ -1,7 +1,8 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitCommitValidation < Test::Unit::TestCase
0
+class Piston::Git::TestGitCommitValidation < PistonTestCase
0
   def setup
0
+    super
0
     @repository = mock("repository")
0
     @repository.stubs(:url).returns("git://my-git-repos/my-project.git")
0
   end

0
@@ -1,7 +1,8 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitRepositoryAt < Test::Unit::TestCase
0
+class Piston::Git::TestGitRepositoryAt < PistonTestCase
0
   def setup
0
+    super
0
     @repos = Piston::Git::Repository.new("git://a.repos.com/project.git")
0
   end
0
 

0
@@ -1,6 +1,6 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitRepositoryBasename < Test::Unit::TestCase
0
+class Piston::Git::TestGitRepositoryBasename < PistonTestCase
0
   def test_basename_is_urls_last_component_minus_dot_git
0
     assert_equal "piston", basename("git://github.com/francois/piston.git")
0
   end

0
@@ -1,6 +1,6 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitRepositoryBranchname < Test::Unit::TestCase
0
+class Piston::Git::TestGitRepositoryBranchname < PistonTestCase
0
   def test_branchname_is_nil_when_no_branch_in_url
0
     assert_nil Piston::Git::Repository.new("git://github.com/francois/piston.git").branchname
0
   end

0
@@ -1,6 +1,6 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitRepositoryGuessing < Test::Unit::TestCase
0
+class Piston::Git::TestGitRepositoryGuessing < PistonTestCase
0
   def test_understands_git_protocol
0
     assert Piston::Git::Repository.understands_url?("git://github.com/francois/piston.git")
0
   end

0
@@ -1,16 +1,13 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitWorkingCopyCopying < Test::Unit::TestCase
0
+class Piston::Git::TestGitWorkingCopyCopying < PistonTestCase
0
   def setup
0
-    @wcdir = Pathname.new("tmp/wc")
0
+    super
0
+    @wcdir = mkpath("tmp/wc")
0
     @wc = Piston::Git::WorkingCopy.new(@wcdir)
0
     @wc.stubs(:git)
0
   end
0
 
0
-  def teardown
0
-    @wcdir.rmtree rescue nil
0
-  end
0
-
0
   def test_copies_file
0
     files = ["file.rb"]
0
     files.expects(:copy_to).with("file.rb", @wcdir + files.first)

0
@@ -1,17 +1,13 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitWorkingCopyCreation < Test::Unit::TestCase
0
+class Piston::Git::TestGitWorkingCopyCreation < PistonTestCase
0
   def setup
0
-    @wcdir = Pathname.new("tmp/wc")
0
-    @wcdir.rmtree rescue nil
0
+    super
0
+    @wcdir = mkpath("tmp/wc")
0
     @wc = Piston::Git::WorkingCopy.new(@wcdir)
0
     @wc.stubs(:git)
0
   end
0
 
0
-  def teardown
0
-    @wcdir.rmtree rescue nil
0
-  end
0
-
0
   def test_create_does_a_simple_mkpath
0
     @wcdir.expects(:mkpath)
0
     @wc.create

0
@@ -1,14 +1,12 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitWorkingCopyExistence < Test::Unit::TestCase
0
+class Piston::Git::TestGitWorkingCopyExistence < PistonTestCase
0
   def setup
0
+    super
0
     @wcdir = Pathname.new("tmp/wc")
0
     @wc = Piston::Git::WorkingCopy.new(@wcdir)
0
   end
0
 
0
-  def teardown
0
-    @wcdir.rmtree rescue nil
0
-  end
0
 
0
   def test_exist_false_when_no_dir
0
     deny @wc.exist?

0
@@ -1,15 +1,12 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitWorkingCopyFinalization < Test::Unit::TestCase
0
+class Piston::Git::TestGitWorkingCopyFinalization < PistonTestCase
0
   def setup
0
-    @wcdir = Pathname.new("tmp/wc")
0
+    super
0
+    @wcdir = mkpath("tmp/wc")
0
     @wc = Piston::Git::WorkingCopy.new(@wcdir)
0
   end
0
 
0
-  def teardown
0
-    @wcdir.rmtree rescue nil
0
-  end
0
-
0
   def test_finalize_adds_path_to_git
0
     Dir.expects(:chdir).with(@wcdir).yields
0
     @wc.expects(:git).with(:add, ".")

0
@@ -1,8 +1,9 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitWorkingCopyGuessing < Test::Unit::TestCase
0
+class Piston::Git::TestGitWorkingCopyGuessing < PistonTestCase
0
   def setup
0
-    @dir = Pathname.new("tmp/wc")
0
+    super
0
+    @dir = mkpath("tmp/wc")
0
   end
0
 
0
   def test_does_git_status_on_directory

0
@@ -1,9 +1,9 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestMerging < Test::Unit::TestCase
0
+class Piston::Git::TestMerging < PistonTestCase
0
   def setup
0
-    @wcdir = Pathname.new("tmp/wc")
0
-    @wcdir.mkdir rescue nil
0
+    super
0
+    @wcdir = mkpath("tmp/wc")
0
     @repos = mock("repository")
0
     @repos.stubs(:url).returns("git://github.com/technoweenie/attachment_fu.git")
0
     @wc = Piston::Git::WorkingCopy.new(@wcdir)

0
@@ -1,16 +1,12 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestGitWorkingCopyRememberance < Test::Unit::TestCase
0
+class Piston::Git::TestGitWorkingCopyRememberance < PistonTestCase
0
   def setup
0
-    @wcdir = Pathname.new("tmp/wc")
0
-    @wcdir.mkdir rescue nil
0
+    super
0
+    @wcdir = mkpath("tmp/wc")
0
     @wc = Piston::Git::WorkingCopy.new(@wcdir)
0
   end
0
 
0
-  def teardown
0
-    @wcdir.rmtree
0
-  end
0
-
0
   def test_creates_dot_piston_dot_yml_file
0
     @wc.remember({}, "a" => "b")
0
     assert((@wcdir + ".piston.yml").exist?)

0
@@ -1,7 +1,8 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestSvnRepositoryAt < Test::Unit::TestCase
0
+class Piston::Svn::TestSvnRepositoryAt < PistonTestCase
0
   def setup
0
+    super
0
     @repos = Piston::Svn::Repository.new("http://bla.com/svn/repos/trunk")
0
   end
0
 

0
@@ -1,6 +1,6 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestSvnRepositoryBasename < Test::Unit::TestCase
0
+class Piston::Svn::TestSvnRepositoryBasename < PistonTestCase
0
   def test_basename_is_urls_path_last_component
0
     assert_equal "piston", basename("http://svn.rubyforge.org/var/svn/piston")
0
   end

0
@@ -1,6 +1,6 @@
0
 require File.expand_path("#{File.dirname(__FILE__)}/../../../test_helper")
0
 
0
-class TestSvnRepositoryGuessing < Test::Unit::TestCase
0
+class Piston::Svn::TestSvnRepositoryGuessing < PistonTestCase
0
   def test_guesses_with_svn_protocol
0
     assert Piston::Svn::Repository.understands_url?("svn://a.host.com/")
0
   end