From bfbdc5b5314076574a797106a7551278bf86ebe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Thu, 4 Feb 2010 10:19:45 +0100
Subject: [PATCH] use Bundler to bootstrap testing dependencies

---
 Gemfile                                     | 19 +++++++++++++++++++
 spec/finders/active_record_spec.rb          |  3 +--
 spec/finders/activerecord_test_connector.rb |  4 ++--
 spec/finders/data_mapper_spec.rb            |  2 +-
 spec/finders/sequel_spec.rb                 |  2 +-
 spec/spec_helper.rb                         |  2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 Gemfile

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..3503c1988
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,19 @@
+rails_dir = '/Users/mislav/.coral/rails-rails'
+if File.directory? rails_dir
+  path rails_dir
+else
+  git 'git://github.com/rails/rails.git'
+end
+source :gemcutter
+
+gem 'activerecord', '~> 3.0.pre'
+gem 'activeresource', '~> 3.0.pre'
+gem 'actionpack', '~> 3.0.pre'
+gem 'sequel', '~> 3.8.0'
+gem 'rspec', '~> 1.3.0'
+gem 'mocha', '~> 0.9.8'
+gem 'sqlite3-ruby', '~> 1.2.5'
+gem 'dm-core', '~> 0.10.2'
+gem 'do_sqlite3', '~> 0.10.1.1'
+gem 'mysql', '~> 2.8.1'
+gem 'pg', '~> 0.8.0'
diff --git a/spec/finders/active_record_spec.rb b/spec/finders/active_record_spec.rb
index 4b61b81c9..1b18976c2 100644
--- a/spec/finders/active_record_spec.rb
+++ b/spec/finders/active_record_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 require 'will_paginate/finders/active_record'
-require File.dirname(__FILE__) + '/activerecord_test_connector'
 
 require 'will_paginate'
 WillPaginate::enable_named_scope
+require File.expand_path('../activerecord_test_connector', __FILE__)
 
 class ArProject < ActiveRecord::Base
   def self.column_names
@@ -13,7 +13,6 @@ def self.column_names
   named_scope :distinct, :select => "DISTINCT #{table_name}.*"
 end
 
-gem 'sqlite3-ruby'
 ActiverecordTestConnector.setup
 
 describe WillPaginate::Finders::ActiveRecord do
diff --git a/spec/finders/activerecord_test_connector.rb b/spec/finders/activerecord_test_connector.rb
index 540935699..8d07415a4 100644
--- a/spec/finders/activerecord_test_connector.rb
+++ b/spec/finders/activerecord_test_connector.rb
@@ -7,7 +7,7 @@ class ActiverecordTestConnector
   cattr_accessor :able_to_connect
   cattr_accessor :connected
 
-  FIXTURES_PATH = File.join(File.dirname(__FILE__), '..', 'fixtures')
+  FIXTURES_PATH = File.expand_path('../../fixtures', __FILE__)
 
   # Set our defaults
   self.connected = false
@@ -35,7 +35,7 @@ def self.add_load_path(path)
   def self.setup_connection
     db = ENV['DB'].blank?? 'sqlite3' : ENV['DB']
     
-    configurations = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'database.yml'))
+    configurations = YAML.load_file(File.expand_path('../../database.yml', __FILE__))
     raise "no configuration for '#{db}'" unless configurations.key? db
     configuration = configurations[db]
     
diff --git a/spec/finders/data_mapper_spec.rb b/spec/finders/data_mapper_spec.rb
index 4f0c0b35b..e2c6ba30f 100644
--- a/spec/finders/data_mapper_spec.rb
+++ b/spec/finders/data_mapper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'will_paginate/finders/data_mapper'
-require File.dirname(__FILE__) + '/data_mapper_test_connector'
+require File.expand_path('../data_mapper_test_connector', __FILE__)
 
 require 'will_paginate'
 
diff --git a/spec/finders/sequel_spec.rb b/spec/finders/sequel_spec.rb
index 81f3c17f9..fc924e3cf 100644
--- a/spec/finders/sequel_spec.rb
+++ b/spec/finders/sequel_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'will_paginate/finders/sequel'
-require File.dirname(__FILE__) + '/sequel_test_connector'
+require File.expand_path('../sequel_test_connector', __FILE__)
 
 describe Sequel::Dataset::Pagination, 'extension' do
   
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 84ac7eabf..cee1ec3f6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/autorun'
 
 module MyExtras
   protected