Fix smoke task

.travis.yml

@@ -3,7 +3,7 @@ before_script:
   - rm -f bin/rails
   - bundle exec rails --version
 script: "script/run_build 2>&1"
-bundler_args: "--binstubs"
+bundler_args: "--binstubs --path ../bundle"
 before_install:
   # Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
   - gem install bundler -v=1.5.3

Gemfile

@@ -2,15 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
-%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
-  library_path = File.expand_path("../../#{lib}", __FILE__)
-  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
-    gem lib, :path => library_path
-  else
-    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => branch
-  end
-end
+rspec_dependencies_gemfile = File.expand_path("../Gemfile-rspec-dependencies", __FILE__)
+eval_gemfile rspec_dependencies_gemfile
 
 ### deps for rdoc.info
 group :documentation do
@@ -41,27 +34,7 @@ if RUBY_VERSION <= '1.8.7'
 end
 
 custom_gemfile = File.expand_path("../Gemfile-custom", __FILE__)
-eval File.read(custom_gemfile) if File.exist?(custom_gemfile)
+eval_gemfile custom_gemfile if File.exist?(custom_gemfile)
 
-version_file = File.expand_path("../.rails-version", __FILE__)
-case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp)
-when /master/
-  gem "rails", :git => "git://github.com/rails/rails.git"
-  gem "arel", :git => "git://github.com/rails/arel.git"
-  gem "journey", :git => "git://github.com/rails/journey.git"
-  gem "activerecord-deprecated_finders", :git => "git://github.com/rails/activerecord-deprecated_finders.git"
-  gem "rails-observers", :git => "git://github.com/rails/rails-observers"
-  gem 'sass-rails', :git => "git://github.com/rails/sass-rails.git"
-  gem 'coffee-rails', :git => "git://github.com/rails/coffee-rails.git"
-when /stable$/
-  gem "rails", :git => "git://github.com/rails/rails.git", :branch => version
-when nil, false, ""
-  if RUBY_VERSION < '1.9.3'
-    # Rails 4+ requires 1.9.3+, so on earlier versions default to the last 3.x release.
-    gem "rails", "~> 3.2.17"
-  else
-    gem "rails", "~> 4.0.4"
-  end
-else
-  gem "rails", version
-end
+rails_dependencies_gemfile = File.expand_path("../Gemfile-rails-dependencies", __FILE__)
+eval_gemfile rails_dependencies_gemfile

Gemfile-rails-dependencies

@@ -0,0 +1,22 @@
+version_file = File.expand_path("../.rails-version", __FILE__)
+case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp)
+when /master/
+  gem "rails", :git => "git://github.com/rails/rails.git"
+  gem "arel", :git => "git://github.com/rails/arel.git"
+  gem "journey", :git => "git://github.com/rails/journey.git"
+  gem "activerecord-deprecated_finders", :git => "git://github.com/rails/activerecord-deprecated_finders.git"
+  gem "rails-observers", :git => "git://github.com/rails/rails-observers"
+  gem 'sass-rails', :git => "git://github.com/rails/sass-rails.git"
+  gem 'coffee-rails', :git => "git://github.com/rails/coffee-rails.git"
+when /stable$/
+  gem "rails", :git => "git://github.com/rails/rails.git", :branch => version
+when nil, false, ""
+  if RUBY_VERSION < '1.9.3'
+    # Rails 4+ requires 1.9.3+, so on earlier versions default to the last 3.x release.
+    gem "rails", "~> 3.2.17"
+  else
+    gem "rails", "~> 4.0.4"
+  end
+else
+  gem "rails", version
+end

Gemfile-rspec-dependencies

@@ -0,0 +1,9 @@
+branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
+%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
+  library_path = File.expand_path("../../#{lib}", __FILE__)
+  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
+    gem lib, :path => library_path, :require => false
+  else
+    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => branch, :require => false
+  end
+end

Rakefile

@@ -52,14 +52,14 @@ namespace :generate do
 
       # Rails 4 cannot use a `rails` binstub generated by Bundler
       sh "rm -f #{bindir}/rails"
-      sh "bundle exec rails new ./tmp/example_app --skip-javascript --skip-sprockets --skip-gemfile --skip-git --skip-test-unit"
+      sh "bundle exec rails new ./tmp/example_app --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=templates/generate_app.rb"
 
       if test ?d, bindir
-        Dir.chdir("./tmp/example_app") do
-          Dir.mkdir("bin") unless File.directory?("bin")
-          sh "ln -sf #{bindir}/rake bin/rake"
-          sh "ln -sf #{bindir}/rspec bin/rspec"
-          sh "ln -sf #{bindir}/cucumber bin/cucumber"
+        in_example_app do
+          sh "bundle install --gemfile ./Gemfile --path ../../../bundle"
+          # Rails 4 cannot use a `rails` binstub generated by Bundler
+          sh "bundle binstubs rspec-core rake --force"
+          sh "bundle binstubs rails" unless File.exist?("bin/rails")
 
           application_file = File.read("config/application.rb")
           sh "rm config/application.rb"
@@ -77,10 +77,11 @@ namespace :generate do
   end
 end
 
-def in_example_app(command)
+def in_example_app(command = nil, &block)
   Dir.chdir("./tmp/example_app/") do
     Bundler.with_clean_env do
-      sh command
+      sh command if command
+      block.call if block
     end
   end
 end

spec/generators/rspec/install/install_generator_spec.rb

@@ -11,6 +11,13 @@
     expect(file('.rspec')).to exist
   end
 
+  it "generates spec/spec_helper.rb" do
+    run_generator
+    expect(File.read( file('spec/spec_helper.rb') )).to match(
+      / This file was generated by the `rails generate rspec:install` command./m
+    )
+  end
+
   it "generates spec/rails_helper.rb" do
     run_generator
     expect(File.read( file('spec/rails_helper.rb') )).to match(/^require 'rspec\/rails'$/m)

spec/sanity_check_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+RSpec.describe "Verify required rspec dependencies" do
+
+  tmp_root = RSpec::Core::RubyProject.root.join("tmp")
+
+  before{ FileUtils.mkdir_p tmp_root }
+
+  it "fails when libraries are not required" do
+    script = tmp_root.join("fail_sanity_check")
+    File.open(script, "w") do |f|
+      f.write <<-EOF.gsub(/^\s+\|/, '')
+        |#!/usr/bin/env ruby
+        |RSpec::Support.require_rspec_core "project_initializer"
+      EOF
+    end
+    FileUtils.chmod 0777, script
+
+    Bundler.with_clean_env do
+      expect(`bundle exec #{script} 2>&1`).
+        to match(/uninitialized constant RSpec::Support \(NameError\)/).
+        or match(/undefined method `require_rspec_core' for RSpec::Support:Module/)
+
+      expect($?.exitstatus).to eq(1)
+    end
+  end
+
+  it "passes when libraries are required" do
+    script = tmp_root.join("pass_sanity_check")
+    File.open(script, "w") do |f|
+      f.write <<-EOF.gsub(/^\s+\|/, '')
+        |#!/usr/bin/env ruby
+        |require 'rspec/core'
+        |require 'rspec/support'
+        |RSpec::Support.require_rspec_core "project_initializer"
+      EOF
+    end
+    FileUtils.chmod 0777, script
+
+    Bundler.with_clean_env do
+      expect(`bundle exec #{script} 2>&1`).to be_empty
+      expect($?.exitstatus).to eq(0)
+    end
+  end
+
+end

templates/generate_app.rb

@@ -0,0 +1,17 @@
+rspec_rails_repo_path = File.expand_path("../../", __FILE__)
+rspec_dependencies_gemfile = File.join(rspec_rails_repo_path, 'Gemfile-rspec-dependencies')
+rails_dependencies_gemfile = File.join(rspec_rails_repo_path, 'Gemfile-rails-dependencies')
+in_root do
+  # Remove the existing rails version so we can properly use master or other
+  # edge branches
+  gsub_file 'Gemfile', /^.*\bgem 'rails.*$/, ''
+
+  # Use our version of RSpec and Rails
+  append_to_file 'Gemfile', <<-EOT.gsub(/^ +\|/, '')
+    |gem 'rspec-rails',
+    |    :path => '#{rspec_rails_repo_path}',
+    |    :groups => [:development, :test]
+    |eval_gemfile '#{rspec_dependencies_gemfile}'
+    |eval_gemfile '#{rails_dependencies_gemfile}'
+  EOT
+end