Add bundler to list of binstubs; specify Gemfile

Author: mattbrictson

Rakefile

@@ -65,7 +65,7 @@ namespace :generate do
       in_example_app do
         sh "./travis_retry_bundle_install.sh 2>&1"
         # Rails 4 cannot use a `rails` binstub generated by Bundler
-        sh "bundle binstubs rspec-core rake --force"
+        sh "bundle binstubs bundler rspec-core rake --force"
         sh "bundle binstubs railties" unless File.exist?("bin/rails")
 
         application_file = File.read("config/application.rb")
@@ -94,6 +94,7 @@ def in_example_app(*command_opts)
   end
   Dir.chdir(app_dir) do
     Bundler.with_original_env do
+      ENV["BUNDLE_GEMFILE"] = "Gemfile"
       sh *command_opts unless command_opts.empty?
       yield if block_given?
     end
@@ -182,12 +183,12 @@ namespace :no_active_record do
 
         # Rails 4 cannot use a `rails` binstub generated by Bundler
         sh "rm -f #{bindir}/rails"
-        sh "bundle exec rails new #{example_app_dir} --skip-active-record --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
+        sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
 
         in_example_app(:app_dir => example_app_dir) do
           sh "./travis_retry_bundle_install.sh 2>&1"
           # Rails 4 cannot use a `rails` binstub generated by Bundler
-          sh "bundle binstubs rspec-core rake --force"
+          sh "bundle binstubs bundler rspec-core rake --force"
           sh "bundle binstubs railties" unless File.exist?("bin/rails")
 
           application_file = File.read("config/application.rb")