Development env now works correctly with bundler.

Gemfile

@@ -1,8 +1,12 @@
 source "http://rubygems.org"
 
-gem 'arel', :path => "./vendor/arel"
+gem 'arel',  :path => "./vendor/arel"
 gem 'rails', :path => "./vendor/rails"
-gem 'rspec', '>= 2.0.0.beta.10'
+gem 'rspec-core', :path => "../rspec-core"
+gem 'rspec-expectations', :path => "../rspec-expectations"
+gem 'rspec-mocks', :path => "../rspec-mocks"
+gem 'rspec', :path => "../rspec"
+gem 'thor'
 gem 'cucumber'
 gem 'aruba'
 gem 'jeweler'

Rakefile

@@ -1,3 +1,6 @@
+require "bundler"
+Bundler.setup
+
 require 'rake'
 require 'yaml'
 
@@ -92,8 +95,8 @@ namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app => ["rails:clone"] do |t|
     unless File.directory?('./tmp/example_app')
-      ruby "./vendor/rails/bin/rails new ./tmp/example_app"
-      system "cp ./templates/Gemfile ./tmp/example_app/" 
+      sh "bundle exec ./vendor/rails/bin/rails new ./tmp/example_app"
+      sh "cp ./templates/Gemfile ./tmp/example_app/" 
     end
   end
 

features/support/env.rb

@@ -1,5 +1,22 @@
-require "aruba"
-require "rspec/expectations"
+require 'bundler'
+Bundler.setup
+
+require 'aruba'
+require 'rspec/expectations'
+
+module ArubaOverrides
+  def detect_ruby_script(cmd)
+    if cmd =~ /^rspec /
+      "bundle exec ../../../rspec-core/bin/#{cmd}"
+    elsif cmd =~ /^ruby /
+      "bundle exec #{cmd}"
+    else
+      super(cmd)
+    end
+  end
+end
+
+World(ArubaOverrides)
 
 unless File.directory?('./tmp/example_app')
   system "rake generate:app generate:stuff"

templates/Gemfile

@@ -5,6 +5,8 @@ gem "rails", :path => "../../vendor/rails"
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
-group :test do
-  gem "rspec-rails", :path => "../../../rspec-rails"
-end
+gem "rspec", :path => "../../../rspec"
+gem "rspec-core", :path => "../../../rspec-core"
+gem "rspec-expectations", :path => "../../../rspec-expectations"
+gem "rspec-mocks", :path => "../../../rspec-mocks"
+gem "rspec-rails", :path => "../../../rspec-rails"

templates/run_specs.rb

@@ -1,4 +1,4 @@
-run('rspec spec -cfdoc')
+run('bundle exec ../../../rspec-core/bin/rspec spec -cfdoc')
 run('rake spec')
 run('rake spec:requests')
 run('rake spec:models')