Development env now works correctly with bundler.

Gemfile

@@ -1,3 +1,4 @@
+gem "bundler"
 gem "rake"
 gem "jeweler"
 gem "cucumber"
@@ -7,5 +8,6 @@ gem "rcov"
 gem "mocha"
 gem "rr"
 gem "flexmock"
+gem "rspec-core", :path => "."
 gem "rspec-expectations", :path => "../rspec-expectations"
-gem "rspec-mocks",        :path => "../rspec-mocks"
+gem "rspec-mocks", :path => "../rspec-mocks"

Rakefile

@@ -1,29 +1,32 @@
+require "bundler"
+Bundler.setup
+
 gem "jeweler", ">= 1.4.0"
-require 'rake'
-require 'yaml'
+require "rake"
+require "yaml"
 
-$:.unshift File.expand_path('../lib', __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 
-require 'rake/rdoctask'
-require 'rspec/core/rake_task'
-require 'rspec/core/version'
-require 'cucumber/rake/task'
+require "rake/rdoctask"
+require "rspec/core/rake_task"
+require "rspec/core/version"
+require "cucumber/rake/task"
 
 begin
-  require 'jeweler'
+  require "jeweler"
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-core"
     gem.version = RSpec::Core::Version::STRING
     gem.summary = "rspec-core-#{RSpec::Core::Version::STRING}"
-    gem.description = 'RSpec runner and example group classes'
+    gem.description = "RSpec runner and example groups"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
-    gem.homepage = "http://github.com/rspec/core"
+    gem.homepage = "http://github.com/rspec/rspec-core"
     gem.authors = ["Chad Humphries", "David Chelimsky"]
     gem.rubyforge_project = "rspec"
     gem.add_development_dependency "rspec-expectations", ">= #{RSpec::Core::Version::STRING}"
     gem.add_development_dependency "rspec-mocks", ">= #{RSpec::Core::Version::STRING}"
-    gem.add_development_dependency('cucumber', '>= 0.5.3')
-    gem.add_development_dependency('autotest', '>= 4.2.9')
+    gem.add_development_dependency "cucumber", ">= 0.5.3"
+    gem.add_development_dependency "autotest", ">= 4.2.9"
     gem.post_install_message = <<-EOM
 #{"*"*50}
 

features/support/env.rb

@@ -1,11 +1,13 @@
-$LOAD_PATH.unshift File.expand_path("../../../../rspec-expectations/lib", __FILE__)
-require 'rspec/expectations'
+require "bundler"
+Bundler.setup
+
 require 'aruba'
+require 'rspec/expectations'
 
 module ArubaOverrides
   def detect_ruby_script(cmd)
     if cmd =~ /^rspec /
-      "ruby  -I../../lib -S ../../bin/#{cmd}"
+      "bundle exec ruby -I../../lib -S ../../bin/#{cmd}"
     else
       super(cmd)
     end

rspec-core.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-06-15}
-  s.description = %q{RSpec runner and example group classes}
+  s.date = %q{2010-06-21}
+  s.description = %q{RSpec runner and example groups}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      ".gitignore",
      ".rspec",
      ".treasure_map.rb",
+     "Gemfile",
      "License.txt",
      "README.markdown",
      "Rakefile",
@@ -31,6 +32,7 @@ Gem::Specification.new do |s|
      "bin/spec",
      "cucumber.yml",
      "features/command_line/example_name_option.feature",
+     "features/command_line/exit_status.feature",
      "features/command_line/line_number_appended_to_path.feature",
      "features/command_line/line_number_option.feature",
      "features/configuration/custom_settings.feature",
@@ -95,6 +97,7 @@ Gem::Specification.new do |s|
      "script/console",
      "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
+     "spec/rspec/core/command_line_spec.rb",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/deprecations_spec.rb",
@@ -128,7 +131,7 @@ Gem::Specification.new do |s|
      "spec/support/matchers.rb",
      "specs.watchr"
   ]
-  s.homepage = %q{http://github.com/rspec/core}
+  s.homepage = %q{http://github.com/rspec/rspec-core}
   s.post_install_message = %q{**************************************************
 
   Thank you for installing rspec-core-2.0.0.beta.12