From 0bcd3efcd0e2f0af6e49c0ca5b583436417c97fa Mon Sep 17 00:00:00 2001
From: Ben Mabey <ben@benmabey.com>
Date: Sun, 30 May 2010 22:37:23 -0600
Subject: [PATCH] updates bundler and adds needed symlinks to make features run
 w/bundler

---
 Gemfile                            |   3 +
 Gemfile.lock                       | 126 ++++++++++++++++-------------
 examples/Gemfile                   |   1 +
 examples/Gemfile.lock              |   1 +
 examples/features/support/env.rb   |   2 +-
 features/support/feature_runner.rb |   2 +-
 6 files changed, 79 insertions(+), 56 deletions(-)
 create mode 120000 examples/Gemfile
 create mode 120000 examples/Gemfile.lock

diff --git a/Gemfile b/Gemfile
index 0737e2b..44c8667 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 group :development do
   gem "mysql"
+  gem 'sqlite3-ruby'
   gem "rspec", "1.3.0"
   gem "cucumber"
   gem "jeweler"
@@ -9,6 +10,8 @@ group :development do
   gem "bson_ext"
   gem "mongo_mapper"
   gem "datamapper"
+  gem "data_objects"
+  gem "do_sqlite3"
   gem "couch_potato"
   gem "activerecord"
   gem "rake"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8116ccd..ea0374f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,69 @@
 --- 
+dependencies: 
+  ruby-debug: 
+    group: 
+    - :development
+    version: ">= 0"
+  datamapper: 
+    group: 
+    - :development
+    version: ">= 0"
+  bson_ext: 
+    group: 
+    - :development
+    version: ">= 0"
+  mongo: 
+    group: 
+    - :development
+    version: ">= 0"
+  activerecord: 
+    group: 
+    - :development
+    version: ">= 0"
+  mongo_mapper: 
+    group: 
+    - :development
+    version: ">= 0"
+  sqlite3-ruby: 
+    group: 
+    - :development
+    version: ">= 0"
+  mysql: 
+    group: 
+    - :development
+    version: ">= 0"
+  mongo_ext: 
+    group: 
+    - :development
+    version: ">= 0"
+  data_objects: 
+    group: 
+    - :development
+    version: ">= 0"
+  rake: 
+    group: 
+    - :development
+    version: ">= 0"
+  rspec: 
+    group: 
+    - :development
+    version: = 1.3.0
+  couch_potato: 
+    group: 
+    - :development
+    version: ">= 0"
+  jeweler: 
+    group: 
+    - :development
+    version: ">= 0"
+  cucumber: 
+    group: 
+    - :development
+    version: ">= 0"
+  do_sqlite3: 
+    group: 
+    - :development
+    version: ">= 0"
 specs: 
 - rake: 
     version: 0.8.7
@@ -38,6 +103,8 @@ specs:
     version: 1.0.5
 - cucumber: 
     version: 0.7.3
+- data_objects: 
+    version: 0.10.2
 - extlib: 
     version: 0.9.15
 - dm-core: 
@@ -58,6 +125,8 @@ specs:
     version: 0.10.1
 - datamapper: 
     version: 0.10.1
+- do_sqlite3: 
+    version: 0.10.2
 - gemcutter: 
     version: 0.5.0
 - git: 
@@ -86,60 +155,9 @@ specs:
     version: 0.10.3
 - ruby-debug: 
     version: 0.10.3
-hash: f2c77e94ff3c3ceb3ffc6a4c42f63e9eff224246
+- sqlite3-ruby: 
+    version: 1.2.5
+hash: c37ee43fed255276a87c138cb08b2024ac62ae38
 sources: 
 - Rubygems: 
     uri: http://rubygems.org
-dependencies: 
-  ruby-debug: 
-    version: ">= 0"
-    group: 
-    - :development
-  datamapper: 
-    version: ">= 0"
-    group: 
-    - :development
-  bson_ext: 
-    version: ">= 0"
-    group: 
-    - :development
-  mongo_ext: 
-    version: ">= 0"
-    group: 
-    - :development
-  activerecord: 
-    version: ">= 0"
-    group: 
-    - :development
-  mongo_mapper: 
-    version: ">= 0"
-    group: 
-    - :development
-  mysql: 
-    version: ">= 0"
-    group: 
-    - :development
-  rspec: 
-    version: = 1.3.0
-    group: 
-    - :development
-  couch_potato: 
-    version: ">= 0"
-    group: 
-    - :development
-  rake: 
-    version: ">= 0"
-    group: 
-    - :development
-  mongo: 
-    version: ">= 0"
-    group: 
-    - :development
-  jeweler: 
-    version: ">= 0"
-    group: 
-    - :development
-  cucumber: 
-    version: ">= 0"
-    group: 
-    - :development
diff --git a/examples/Gemfile b/examples/Gemfile
new file mode 120000
index 0000000..26cb2ad
--- /dev/null
+++ b/examples/Gemfile
@@ -0,0 +1 @@
+../Gemfile
\ No newline at end of file
diff --git a/examples/Gemfile.lock b/examples/Gemfile.lock
new file mode 120000
index 0000000..412e45f
--- /dev/null
+++ b/examples/Gemfile.lock
@@ -0,0 +1 @@
+../Gemfile.lock
\ No newline at end of file
diff --git a/examples/features/support/env.rb b/examples/features/support/env.rb
index de488b3..4f766d8 100644
--- a/examples/features/support/env.rb
+++ b/examples/features/support/env.rb
@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler'
 Bundler.setup
 require 'spec/expectations'
 require 'ruby-debug'
@@ -11,7 +12,6 @@ strategy    = ENV['STRATEGY']
 multiple_db = ENV['MULTIPLE_DBS']
 
 
-
 if orm && strategy
   $:.unshift(File.dirname(__FILE__) + '/../../../lib')
   require 'database_cleaner'
diff --git a/features/support/feature_runner.rb b/features/support/feature_runner.rb
index 0a62cea..f85c414 100644
--- a/features/support/feature_runner.rb
+++ b/features/support/feature_runner.rb
@@ -10,7 +10,7 @@ class FeatureRunner
     @strategy || 'truncation'
   end
 
-  def go feature
+  def go(feature)
     full_dir ||= File.expand_path(File.dirname(__FILE__) + "/../../examples/")
     Dir.chdir(full_dir) do