fix tests to depend on a preset load path rather than an explicit require path in each

lib/capistrano/shell.rb

@@ -1,5 +1,5 @@
 require 'thread'
-require 'capistrano/command'
+require 'capistrano/processable'
 
 module Capistrano
   # The Capistrano::Shell class is the guts of the "shell" task. It implements
@@ -7,7 +7,7 @@ module Capistrano
   # commands. It makes for a GREAT way to monitor systems, and perform quick
   # maintenance on one or more machines.
   class Shell
-    include Command::Processable
+    include Processable
 
     # A Readline replacement for platforms where readline is either
     # unavailable, or has not been installed.

test/cli/execute_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/execute'
 
 class CLIExecuteTest < Test::Unit::TestCase

test/cli/help_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/help'
 
 class CLIHelpTest < Test::Unit::TestCase

test/cli/options_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/options'
 
 class CLIOptionsTest < Test::Unit::TestCase

test/cli/ui_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/ui'
 
 class CLIUITest < Test::Unit::TestCase

test/cli_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/cli'
 
 class CLI_Test < Test::Unit::TestCase

test/command_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/command'
 
 class CommandTest < Test::Unit::TestCase

test/configuration/actions/file_transfer_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/configuration/actions/file_transfer'
 
 class ConfigurationActionsFileTransferTest < Test::Unit::TestCase

test/configuration/actions/inspect_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/configuration/actions/inspect'
 
 class ConfigurationActionsInspectTest < Test::Unit::TestCase

test/configuration/actions/invocation_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/configuration/actions/invocation'
 
 class ConfigurationActionsInvocationTest < Test::Unit::TestCase

test/configuration/callbacks_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/callbacks'
 
 class ConfigurationCallbacksTest < Test::Unit::TestCase

test/configuration/connections_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/connections'
 
 class ConfigurationConnectionsTest < Test::Unit::TestCase

test/configuration/execution_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/execution'
 require 'capistrano/task_definition'
 

test/configuration/loading_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/loading'
 
 class ConfigurationLoadingTest < Test::Unit::TestCase

test/configuration/namespace_dsl_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/namespaces'
 
 class ConfigurationNamespacesDSLTest < Test::Unit::TestCase

test/configuration/roles_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/roles'
 require 'capistrano/server_definition'
 

test/configuration/servers_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/task_definition'
 require 'capistrano/configuration/servers'
 

test/configuration/variables_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/configuration/variables'
 
 class ConfigurationVariablesTest < Test::Unit::TestCase

test/configuration_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/configuration'
 
 # These tests are only for testing the integration of the various components

test/deploy/scm/accurev_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/accurev'
 
 class AccurevTest < Test::Unit::TestCase

test/deploy/scm/base_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/base'
 
 class DeploySCMBaseTest < Test::Unit::TestCase

test/deploy/scm/git_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/git'
 
 class DeploySCMGitTest < Test::Unit::TestCase

test/deploy/scm/mercurial_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/recipes/deploy/scm/mercurial'
 
 class DeploySCMMercurialTest < Test::Unit::TestCase

test/deploy/strategy/copy_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/logger'
 require 'capistrano/recipes/deploy/strategy/copy'
 require 'stringio'

test/extensions_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano'
 
 class ExtensionsTest < Test::Unit::TestCase

test/logger_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/logger'
 require 'stringio'
 

test/server_definition_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/server_definition'
 
 class ServerDefinitionTest < Test::Unit::TestCase

test/shell_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/configuration'
 require 'capistrano/shell'
 

test/ssh_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/ssh'
 
 class SSHTest < Test::Unit::TestCase

test/task_definition_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/task_definition'
 
 class TaskDefinitionTest < Test::Unit::TestCase

test/upload_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/upload'
 
 class UploadTest < Test::Unit::TestCase

test/utils.rb

@@ -1,42 +1,38 @@
-unless defined?(TestExtensions)
-  $:.unshift "#{File.dirname(__FILE__)}/../lib"
+begin
+  require 'rubygems'
+  gem     'mocha'
+rescue LoadError
+end
 
-  begin
-    require 'rubygems'
-    gem     'mocha'
-  rescue LoadError
+require 'test/unit'
+require 'mocha'
+require 'capistrano/server_definition'
+
+module TestExtensions
+  def server(host, options={})
+    Capistrano::ServerDefinition.new(host, options)
   end
 
-  require 'test/unit'
-  require 'mocha'
-  require 'capistrano/server_definition'
-
-  module TestExtensions
-    def server(host, options={})
-      Capistrano::ServerDefinition.new(host, options)
-    end
-
-    def namespace(fqn=nil)
-      space = stub(:roles => {}, :fully_qualified_name => fqn, :default_task => nil)
-      yield(space) if block_given?
-      space
-    end
-
-    def role(space, name, *args)
-      opts = args.last.is_a?(Hash) ? args.pop : {}
-      space.roles[name] ||= []
-      space.roles[name].concat(args.map { |h| Capistrano::ServerDefinition.new(h, opts) })
-    end
-
-    def new_task(name, namespace=@namespace, options={}, &block)
-      block ||= Proc.new {}
-      task = Capistrano::TaskDefinition.new(name, namespace, options, &block)
-      assert_equal block, task.body
-      return task
-    end
+  def namespace(fqn=nil)
+    space = stub(:roles => {}, :fully_qualified_name => fqn, :default_task => nil)
+    yield(space) if block_given?
+    space
   end
 
-  class Test::Unit::TestCase
-    include TestExtensions
+  def role(space, name, *args)
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    space.roles[name] ||= []
+    space.roles[name].concat(args.map { |h| Capistrano::ServerDefinition.new(h, opts) })
+  end
+
+  def new_task(name, namespace=@namespace, options={}, &block)
+    block ||= Proc.new {}
+    task = Capistrano::TaskDefinition.new(name, namespace, options, &block)
+    assert_equal block, task.body
+    return task
   end
 end
+
+class Test::Unit::TestCase
+  include TestExtensions
+end

test/version_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/version'
 
 class VersionTest < Test::Unit::TestCase