spring 1.0.0 → 1.1.0.beta1

data/lib/spring/client/help.rb

@@ -20,6 +20,8 @@ module Spring
         @spring_commands      = spring_commands      || Spring::Client::COMMANDS.dup
         @application_commands = application_commands || Spring.commands.dup
 
+        @spring_commands.delete_if { |k, v| k.start_with?("-") }
+
         @application_commands["rails"] = @spring_commands.delete("rails")
       end
 
@@ -46,19 +48,9 @@ module Spring
         spring_commands.merge application_commands
       end
 
-      def description_for_command(command)
-        if command.respond_to?(:description)
-          command.description
-        elsif command.respond_to?(:exec_name)
-          "Runs the #{command.exec_name} command"
-        else
-          "No description given."
-        end
-      end
-
       def display(name, command)
-        if description = description_for_command(command)
-          "  #{name.ljust(max_name_width)}  #{description}"
+        if command.description
+          "  #{name.ljust(max_name_width)}  #{command.description}"
         end
       end
 

data/lib/spring/client/rails.rb

@@ -24,9 +24,7 @@ module Spring
         else
           require "spring/configuration"
           ARGV.shift
-          Object.const_set(:APP_PATH, Spring.application_root_path.join("config/application").to_s)
-          require Spring.application_root_path.join("config/boot")
-          require "rails/commands"
+          load Dir.glob(Spring.application_root_path.join("{bin,script}/rails")).first
         end
       end
     end

data/lib/spring/client/version.rb

@@ -0,0 +1,11 @@
+require "spring/version"
+
+module Spring
+  module Client
+    class Version < Command
+      def call
+        puts "Spring version #{Spring::VERSION}"
+      end
+    end
+  end
+end

data/lib/spring/command_wrapper.rb

@@ -0,0 +1,83 @@
+require "spring/configuration"
+
+module Spring
+  class CommandWrapper
+    attr_reader :name, :command
+
+    def initialize(name, command = nil)
+      @name    = name
+      @command = command
+      @setup   = false
+    end
+
+    def description
+      if command.respond_to?(:description)
+        command.description
+      else
+        "Runs the #{name} command"
+      end
+    end
+
+    def setup?
+      @setup
+    end
+
+    def setup
+      if !setup? && command.respond_to?(:setup)
+        command.setup
+        @setup = true
+        return true
+      else
+        @setup = true
+        return false
+      end
+    end
+
+    def call
+      if command.respond_to?(:call)
+        command.call
+      else
+        $0 = exec
+        load exec
+      end
+    end
+
+    def gem_name
+      if command.respond_to?(:gem_name)
+        command.gem_name
+      else
+        exec_name
+      end
+    end
+
+    def exec_name
+      if command.respond_to?(:exec_name)
+        command.exec_name
+      else
+        name
+      end
+    end
+
+    def binstub
+      Spring.application_root_path.join(binstub_name)
+    end
+
+    def binstub_name
+      "bin/#{name}"
+    end
+
+    def exec
+      if binstub.exist?
+        binstub.to_s
+      else
+        Gem.bin_path(gem_name, exec_name)
+      end
+    end
+
+    def env(args)
+      if command.respond_to?(:env)
+        command.env(args)
+      end
+    end
+  end
+end

data/lib/spring/commands.rb

@@ -1,4 +1,5 @@
 require "spring/watcher"
+require "spring/command_wrapper"
 
 module Spring
   @commands = {}
@@ -7,8 +8,8 @@ module Spring
     attr_reader :commands
   end
 
-  def self.register_command(name, klass)
-    commands[name] = klass
+  def self.register_command(name, command = nil)
+    commands[name] = CommandWrapper.new(name, command)
   end
 
   def self.command?(name)

data/lib/spring/commands/rails.rb

@@ -3,8 +3,7 @@ module Spring
     class Rails
       def call
         ARGV.unshift command_name
-        Object.const_set(:APP_PATH, ::Rails.root.join('config/application'))
-        require "rails/commands"
+        load Dir.glob(::Rails.root.join("{bin,script}/rails")).first
       end
 
       def description

data/lib/spring/commands/rake.rb

@@ -23,10 +23,6 @@ module Spring
 
         nil
       end
-
-      def exec_name
-        "rake"
-      end
     end
 
     Spring.register_command "rake", Rake.new

data/lib/spring/server.rb

@@ -82,13 +82,7 @@ module Spring
     end
 
     def rails_env_for(args, default_rails_env)
-      command = Spring.command(args.first)
-
-      if command.respond_to?(:env)
-        env = command.env(args.drop(1))
-      end
-
-      env || default_rails_env
+      Spring.command(args.first).env(args.drop(1)) || default_rails_env
     end
 
     # Boot the server into the process group of the current session.

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.0.0"
+  VERSION = "1.1.0.beta1"
 end

data/test/acceptance/app_test.rb

@@ -1,146 +1,30 @@
 # encoding: utf-8
-require 'helper'
-require 'io/wait'
+require "helper"
+require "acceptance/helper"
+require "io/wait"
 require "timeout"
 require "spring/sid"
-require "spring/env"
+require "spring/client"
 
 class AppTest < ActiveSupport::TestCase
   DEFAULT_SPEEDUP = 0.8
-  DEFAULT_TIMEOUT = ENV['CI'] ? 30 : 10
 
   def rails_version
     ENV['RAILS_VERSION'] || '~> 4.0.0'
   end
 
-  def rails_3?
-    rails_version.split(" ").last =~ /^3/
+  def generator
+    @@generator ||= Spring::Test::ApplicationGenerator.new(rails_version)
   end
 
-  def app_root
-    Pathname.new("#{TEST_ROOT}/apps/rails-#{rails_version.scan(/\d/)[0..1].join("-")}")
-  end
-
-  def gem_home
-    app_root.join "vendor/gems/#{RUBY_VERSION}"
-  end
-
-  def user_home
-    app_root.join "user_home"
-  end
-
-  def spring
-    gem_home.join "bin/spring"
-  end
-
-  def spring_env
-    @spring_env ||= Spring::Env.new(app_root)
-  end
-
-  def stdout
-    @stdout ||= IO.pipe
-  end
-
-  def stderr
-    @stderr ||= IO.pipe
-  end
-
-  def log_file
-    @log_file ||= File.open("/tmp/spring.log", "w+")
-  end
-
-  def env
-    @env ||= {
-      "GEM_HOME"   => gem_home.to_s,
-      "GEM_PATH"   => "",
-      "HOME"       => user_home.to_s,
-      "RAILS_ENV"  => nil,
-      "RACK_ENV"   => nil,
-      "SPRING_LOG" => log_file.path
-    }
-  end
-
-  def app_run(command, opts = {})
-    start_time = Time.now
-
-    Bundler.with_clean_env do
-      Process.spawn(
-        env,
-        command.to_s,
-        out:   stdout.last,
-        err:   stderr.last,
-        in:    :close,
-        chdir: app_root.to_s,
-      )
-    end
-
-    _, status = Timeout.timeout(opts.fetch(:timeout, DEFAULT_TIMEOUT)) { Process.wait2 }
-
-    if pid = spring_env.pid
-      @server_pid = pid
-      lines = `ps -A -o ppid= -o pid= | egrep '^\\s*#{@server_pid}'`.lines
-      @application_pids = lines.map { |l| l.split.last.to_i }
-    end
-
-    output = read_streams
-    puts dump_streams(command, output) if ENV["SPRING_DEBUG"]
-
-    @times << (Time.now - start_time) if @times
-
-    output.merge(status: status, command: command)
-  rescue Timeout::Error => e
-    raise e, "Output:\n\n#{dump_streams(command, read_streams)}"
-  end
-
-  def read_streams
-    {
-      stdout: read_stream(stdout.first),
-      stderr: read_stream(stderr.first),
-      log:    read_stream(log_file)
-    }
-  end
-
-  def read_stream(stream)
-    output = ""
-    while IO.select([stream], [], [], 0.5) && !stream.eof?
-      output << stream.readpartial(10240)
-    end
-    output
-  end
-
-  def dump_streams(command, streams)
-    output = "$ #{command}\n"
-
-    streams.each do |name, stream|
-      unless stream.chomp.empty?
-        output << "--- #{name} ---\n"
-        output << "#{stream.chomp}\n"
-      end
-    end
-
-    output << "\n"
-    output
-  end
-
-  def alive?(pid)
-    Process.kill 0, pid
-    true
-  rescue Errno::ESRCH
-    false
-  end
-
-  def await_reload
-    raise "no pid" if @application_pids.nil? || @application_pids.empty?
-
-    Timeout.timeout(DEFAULT_TIMEOUT) do
-      sleep 0.1 while @application_pids.any? { |p| alive?(p) }
-    end
+  def app
+    @app ||= Spring::Test::Application.new("#{TEST_ROOT}/apps/tmp")
   end
 
   def debug(artifacts)
     artifacts = artifacts.dup
     artifacts.delete :status
-    dump_streams(artifacts.delete(:command), artifacts)
+    app.dump_streams(artifacts.delete(:command), artifacts)
   end
 
   def assert_output(artifacts, expected)
@@ -151,13 +35,13 @@ class AppTest < ActiveSupport::TestCase
   end
 
   def assert_success(command, expected_output = nil)
-    artifacts = app_run(*Array(command))
+    artifacts = app.run(*Array(command))
     assert artifacts[:status].success?, "expected successful exit status\n\n#{debug(artifacts)}"
     assert_output artifacts, expected_output if expected_output
   end
 
   def assert_failure(command, expected_output = nil)
-    artifacts = app_run(*Array(command))
+    artifacts = app.run(*Array(command))
     assert !artifacts[:status].success?, "expected unsuccessful exit status\n\n#{debug(artifacts)}"
     assert_output artifacts, expected_output if expected_output
   end
@@ -166,286 +50,236 @@ class AppTest < ActiveSupport::TestCase
     if ENV['CI']
       yield
     else
-      @times = []
-      yield
-      assert (@times.last / @times.first) < ratio, "#{@times.last} was not less than #{ratio} of #{@times.first}"
-      @times = nil
-    end
-  end
-
-  def spring_test_command
-    "#{spring} #{rails_3? ? 'testunit' : 'rake test'} #{@test}"
-  end
-
-  def generate_app
-    Bundler.with_clean_env do
-      # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
-
-      assert system("(gem list rails --installed --version '#{rails_version}' || " \
-                      "gem install rails --clear-sources --source http://rubygems.org --version '#{rails_version}') > /dev/null")
-
-      # Have to shell out otherwise bundler prevents us finding the gem
-      version = `ruby -e 'puts Gem::Specification.find_by_name("rails", "#{rails_version}").version'`.chomp
-
-      assert system("rails _#{version}_ new #{app_root} --skip-bundle --skip-javascript --skip-sprockets > /dev/null")
-
-      FileUtils.mkdir_p(gem_home)
-      FileUtils.mkdir_p(user_home)
-      FileUtils.rm_rf("#{app_root}/test/performance/")
-
-      if rails_3?
-        File.write(
-          "#{app_root}/Gemfile",
-          File.read("#{app_root}/Gemfile") + "gem 'spring-commands-testunit'\n"
-        )
+      app.with_timing do
+        yield
+        assert app.timing_ratio < ratio, "#{app.last_time} was not less than #{ratio} of #{app.first_time}"
       end
-
-      File.write(
-        "#{app_root}/Gemfile",
-        File.read("#{app_root}/Gemfile").sub("https://rubygems.org", "http://rubygems.org")
-      )
     end
   end
 
-  def install
-    generate_app unless app_root.exist?
-
-    assert system("gem build spring.gemspec 2>/dev/null 1>/dev/null")
-
-    assert_success ["gem install ../../../spring-#{Spring::VERSION}.gem", timeout: nil]
-    assert_success ["(gem list bundler | grep bundler) || gem install bundler", timeout: nil]
-    assert_success ["bundle check || bundle update", timeout: nil]
+  def assert_app_reloaded
+    assert_success app.spring_test_command
 
-    unless File.exist?(@controller)
-      assert_success "bundle exec rails g scaffold post title:string"
-    end
+    File.write(app.application_config, app.application_config.read + <<-CODE)
+      class Foo
+        def self.omg
+          raise "omg"
+        end
+      end
+    CODE
+    File.write(app.test, app.test.read.sub("get :index", "Foo.omg"))
 
-    assert_success "bundle exec rake db:migrate db:test:clone"
-    @@installed = true
+    app.await_reload
+    assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
   end
 
-  @@installed = false
-
   setup do
-    @test       = "#{app_root}/test/#{rails_3? ? 'functional' : 'controllers'}/posts_controller_test.rb"
-    @controller = "#{app_root}/app/controllers/posts_controller.rb"
-
-    install unless @@installed
-
-    @test_contents       = File.read(@test)
-    @controller_contents = File.read(@controller)
+    generator.generate_if_missing
+    generator.install_spring
+    generator.copy_to(app.root)
   end
 
   teardown do
-    app_run "#{spring} stop"
-    File.write(@test, @test_contents)
-    File.write(@controller, @controller_contents)
-    FileUtils.rm_f("#{app_root}/config/spring.rb")
+    app.stop_spring
   end
 
   test "basic" do
     assert_speedup do
-      2.times { app_run spring_test_command }
+      2.times { app.run app.spring_test_command }
     end
   end
 
   test "help message when called without arguments" do
-    assert_success spring, stdout: 'Usage: spring COMMAND [ARGS]'
+    assert_success "bin/spring", stdout: 'Usage: spring COMMAND [ARGS]'
   end
 
   test "test changes are picked up" do
     assert_speedup do
-      assert_success spring_test_command, stdout: "0 failures"
+      assert_success app.spring_test_command, stdout: "0 failures"
 
-      File.write(@test, @test_contents.sub("get :index", "raise 'omg'"))
-      assert_failure spring_test_command, stdout: "RuntimeError: omg"
+      File.write(app.test, app.test.read.sub("get :index", "raise 'omg'"))
+      assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
     end
   end
 
   test "code changes are picked up" do
     assert_speedup do
-      assert_success spring_test_command, stdout: "0 failures"
+      assert_success app.spring_test_command, stdout: "0 failures"
 
-      File.write(@controller, @controller_contents.sub("@posts = Post.all", "raise 'omg'"))
-      assert_failure spring_test_command, stdout: "RuntimeError: omg"
+      File.write(app.controller, app.controller.read.sub("@posts = Post.all", "raise 'omg'"))
+      assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
     end
   end
 
   test "code changes in pre-referenced app files are picked up" do
-    begin
-      initializer = "#{app_root}/config/initializers/load_posts_controller.rb"
-      File.write(initializer, "PostsController\n")
+    File.write(app.path("config/initializers/load_posts_controller.rb"), "PostsController\n")
 
-      assert_speedup do
-        assert_success spring_test_command, stdout: "0 failures"
+    assert_speedup do
+      assert_success app.spring_test_command, stdout: "0 failures"
 
-        File.write(@controller, @controller_contents.sub("@posts = Post.all", "raise 'omg'"))
-        assert_failure spring_test_command, stdout: "RuntimeError: omg"
-      end
-    ensure
-      FileUtils.rm_f(initializer)
+      File.write(app.controller, app.controller.read.sub("@posts = Post.all", "raise 'omg'"))
+      assert_failure app.spring_test_command, stdout: "RuntimeError: omg"
     end
   end
 
-  def assert_app_reloaded
-    application = "#{app_root}/config/application.rb"
-    application_contents = File.read(application)
-
-    assert_success spring_test_command
-
-    File.write(application, application_contents + <<-CODE)
-      class Foo
-        def self.omg
-          raise "omg"
-        end
-      end
-    CODE
-    File.write(@test, @test_contents.sub("get :index", "Foo.omg"))
-
-    await_reload
-    assert_failure spring_test_command, stdout: "RuntimeError: omg"
-  ensure
-    File.write(application, application_contents)
-  end
-
   test "app gets reloaded when preloaded files change (polling watcher)" do
-    env["RAILS_ENV"] = "test"
-    assert_success "#{spring} rails runner 'puts Spring.watcher.class'", stdout: "Polling"
+    app.env["RAILS_ENV"] = "test"
+    assert_success "bin/rails runner 'puts Spring.watcher.class'", stdout: "Polling"
     assert_app_reloaded
   end
 
   test "app gets reloaded when preloaded files change (listen watcher)" do
-    begin
-      gemfile = app_root.join("Gemfile")
-      gemfile_contents = gemfile.read
-      File.write(gemfile, gemfile_contents + "\ngem 'listen', '~> 1.0'")
-
-      File.write("#{app_root}/config/spring.rb", "Spring.watch_method = :listen")
-
-      assert_success ["bundle install", timeout: nil]
+    File.write(app.gemfile, "#{app.gemfile.read}gem 'listen', '~> 1.0'")
+    File.write(app.spring_config, "Spring.watch_method = :listen")
+    app.bundle
 
-      env["RAILS_ENV"] = "test"
-      assert_success "#{spring} rails runner 'puts Spring.watcher.class'", stdout: "Listen"
-
-      assert_app_reloaded
-    ensure
-      File.write(gemfile, gemfile_contents)
-      assert_success "bundle check"
-    end
+    app.env["RAILS_ENV"] = "test"
+    assert_success "bin/rails runner 'puts Spring.watcher.class'", stdout: "Listen"
+    assert_app_reloaded
   end
 
   test "app recovers when a boot-level error is introduced" do
-    begin
-      application = "#{app_root}/config/application.rb"
-      application_contents = File.read(application)
+    config = app.application_config.read
 
-      assert_success spring_test_command
+    assert_success app.spring_test_command
 
-      File.write(application, application_contents + "\nomg")
-      await_reload
+    File.write(app.application_config, "#{config}\nomg")
+    app.await_reload
 
-      assert_failure spring_test_command
+    assert_failure app.spring_test_command
 
-      File.write(application, application_contents)
-      assert_success spring_test_command
-    ensure
-      File.write(application, application_contents)
-    end
+    File.write(app.application_config, config)
+    assert_success app.spring_test_command
   end
 
   test "stop command kills server" do
-    app_run spring_test_command
-    assert spring_env.server_running?, "The server should be running but it isn't"
+    app.run app.spring_test_command
+    assert app.spring_env.server_running?, "The server should be running but it isn't"
 
-    assert_success "#{spring} stop"
-    assert !spring_env.server_running?, "The server should not be running but it is"
+    assert_success "bin/spring stop"
+    assert !app.spring_env.server_running?, "The server should not be running but it is"
   end
 
   test "custom commands" do
-    File.write("#{app_root}/config/spring.rb", <<-CODE)
+    File.write(app.spring_config, <<-CODE)
       class CustomCommand
         def call
           puts "omg"
         end
+
+        def exec_name
+          "rake"
+        end
       end
 
       Spring.register_command "custom", CustomCommand.new
     CODE
 
-    assert_success "#{spring} custom", stdout: "omg"
+    assert_success "bin/spring custom", stdout: "omg"
+
+    assert_success "bin/spring binstub custom"
+    assert_success "bin/custom", stdout: "omg"
+
+    app.env["DISABLE_SPRING"] = "1"
+    assert_success %{bin/custom -e 'puts "foo"'}, stdout: "foo"
   end
 
-  test "binstubs" do
-    begin
-      FileUtils.mv "#{app_root}/bin", "#{app_root}/bin~" if File.exist?("#{app_root}/bin")
+  test "binstub" do
+    assert_success "bin/rails server --help", stdout: "Usage: rails server" # rails command fallback
 
-      app_run "#{spring} binstub rake"
-      assert_success "bin/rake -T", stdout: "rake db:migrate"
+    assert_success "#{app.spring} binstub rake", stdout: "bin/rake: spring already present"
 
-      app_run "#{spring} binstub rake rails"
-      assert_success "bin/rails runner 'puts %(omg)'", stdout: "omg"
-      assert_success "bin/rails server --help", stdout: "Usage: rails server"
+    assert_success "#{app.spring} binstub --remove rake", stdout: "bin/rake: spring removed"
+    assert !app.path("bin/rake").read.include?(Spring::Client::Binstub::LOADER)
+    assert_success "bin/rake -T", stdout: "rake db:migrate"
+  end
 
-      FileUtils.rm ["#{app_root}/bin/rails", "#{app_root}/bin/rake"]
+  test "binstub when spring is uninstalled" do
+    app.run! "gem uninstall --ignore-dependencies spring"
+    File.write(app.gemfile, app.gemfile.read.sub("gem 'spring-commands-testunit'\n", ""))
+    assert_success "bin/rake -T", stdout: "rake db:migrate"
+  end
 
-      app_run "#{spring} binstub --all"
-      assert_success "bin/rake -T", stdout: "rake db:migrate"
-      assert_success "bin/rails runner 'puts %(omg)'", stdout: "omg"
-    ensure
-      if File.exist?("#{app_root}/bin~")
-        FileUtils.rm_rf "#{app_root}/bin"
-        FileUtils.mv "#{app_root}/bin~", "#{app_root}/bin"
-      end
-    end
+  test "binstub upgrade" do
+    File.write(app.path("bin/rake"), <<CODE)
+#!/usr/bin/env ruby
+
+if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
+  exec "bundle", "exec", "rake", *ARGV
+else
+  ARGV.unshift "rake"
+  load Gem.bin_path("spring", "spring")
+end
+CODE
+
+    File.write(app.path("bin/rails"), <<CODE)
+#!/usr/bin/env ruby
+
+if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
+  APP_PATH = File.expand_path('../../config/application',  __FILE__)
+  require_relative '../config/boot'
+  require 'rails/commands'
+else
+  ARGV.unshift "rails"
+  load Gem.bin_path("spring", "spring")
+end
+CODE
+
+    assert_success "bin/spring binstub --all", stdout: "upgraded"
+
+    assert_equal app.path("bin/rake").read, <<CODE
+#!/usr/bin/env ruby
+#{Spring::Client::Binstub::LOADER.strip}
+require 'bundler/setup'
+load Gem.bin_path('rake', 'rake')
+CODE
+
+    assert_equal app.path("bin/rails").read, <<CODE
+#!/usr/bin/env ruby
+#{Spring::Client::Binstub::LOADER.strip}
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
+CODE
   end
 
   test "after fork callback" do
-    File.write("#{app_root}/config/spring.rb", "Spring.after_fork { puts '!callback!' }")
-    assert_success "#{spring} rails runner 'puts 2'", stdout: "!callback!\n2"
+    File.write(app.spring_config, "Spring.after_fork { puts '!callback!' }")
+    assert_success "bin/rails runner 'puts 2'", stdout: "!callback!\n2"
   end
 
   test "global config file evaluated" do
-    begin
-      File.write("#{user_home}/.spring.rb", "Spring.after_fork { puts '!callback!' }")
-      assert_success "#{spring} rails runner 'puts 2'", stdout: "!callback!\n2"
-    ensure
-      FileUtils.rm_r("#{user_home}/.spring.rb")
-    end
+    File.write("#{app.user_home}/.spring.rb", "Spring.after_fork { puts '!callback!' }")
+    assert_success "bin/rails runner 'puts 2'", stdout: "!callback!\n2"
   end
 
   test "missing config/application.rb" do
-    begin
-      FileUtils.mv app_root.join("config/application.rb"), app_root.join("config/application.rb.bak")
-
-      assert_failure "#{spring} rake -T", stderr: "unable to find your config/application.rb"
-    ensure
-      FileUtils.mv app_root.join("config/application.rb.bak"), app_root.join("config/application.rb")
-    end
+    app.application_config.delete
+    assert_failure "bin/rake -T", stderr: "unable to find your config/application.rb"
   end
 
   test "piping" do
-    assert_success "#{spring} rake -T | grep db", stdout: "rake db:migrate"
+    assert_success "bin/rake -T | grep db", stdout: "rake db:migrate"
   end
 
   test "status" do
-    assert_success "#{spring} status", stdout: "Spring is not running"
-    app_run "#{spring} rails runner ''"
-    assert_success "#{spring} status", stdout: "Spring is running"
+    assert_success "bin/spring status", stdout: "Spring is not running"
+    assert_success "bin/rails runner ''"
+    assert_success "bin/spring status", stdout: "Spring is running"
   end
 
   test "runner command sets Rails environment from command-line options" do
-    assert_success "#{spring} rails runner -e production 'puts Rails.env'", stdout: "production"
-    assert_success "#{spring} rails runner --environment=production 'puts Rails.env'", stdout: "production"
+    assert_success "bin/rails runner -e production 'puts Rails.env'", stdout: "production"
+    assert_success "bin/rails runner --environment=production 'puts Rails.env'", stdout: "production"
   end
 
   test "forcing rails env via environment variable" do
-    env['RAILS_ENV'] = 'production'
-    assert_success "#{spring} rake -p 'Rails.env'", stdout: "production"
+    app.env['RAILS_ENV'] = 'production'
+    assert_success "bin/rake -p 'Rails.env'", stdout: "production"
   end
 
   test "setting env vars with rake" do
-    begin
-      File.write("#{app_root}/lib/tasks/env.rake", <<-'CODE')
+    File.write(app.path("lib/tasks/env.rake"), <<-'CODE')
       task :print_rails_env => :environment do
         puts Rails.env
       end
@@ -455,57 +289,39 @@ class AppTest < ActiveSupport::TestCase
       end
 
       task(:default).clear.enhance [:print_rails_env]
-      CODE
+    CODE
 
-      assert_success "#{spring} rake RAILS_ENV=test print_rails_env", stdout: "test"
-      assert_success "#{spring} rake FOO=bar print_env", stdout: "FOO=bar"
-      assert_success "#{spring} rake", stdout: "test"
-    ensure
-      FileUtils.rm_f("#{app_root}/lib/tasks/env.rake")
-    end
+    assert_success "bin/rake RAILS_ENV=test print_rails_env", stdout: "test"
+    assert_success "bin/rake FOO=bar print_env", stdout: "FOO=bar"
+    assert_success "bin/rake", stdout: "test"
   end
 
   test "changing the Gemfile restarts the server" do
-    begin
-      gemfile = app_root.join("Gemfile")
-      gemfile_contents = gemfile.read
-
-      assert_success %(#{spring} rails runner 'require "sqlite3"')
+    assert_success %(bin/rails runner 'require "sqlite3"')
 
-      File.write(gemfile, gemfile_contents.sub(%{gem 'sqlite3'}, %{# gem 'sqlite3'}))
-      app_run "bundle check"
+    File.write(app.gemfile, app.gemfile.read.sub(%{gem 'sqlite3'}, %{# gem 'sqlite3'}))
+    app.bundle
 
-      await_reload
-      assert_failure %(#{spring} rails runner 'require "sqlite3"'), stderr: "sqlite3"
-    ensure
-      File.write(gemfile, gemfile_contents)
-      assert_success "bundle check"
-    end
+    app.await_reload
+    assert_failure %(bin/rails runner 'require "sqlite3"'), stderr: "sqlite3"
   end
 
   test "changing the environment between runs" do
-    begin
-      application = "#{app_root}/config/application.rb"
-      application_contents = File.read(application)
-
-      File.write(application, "#{application_contents}\nENV['BAR'] = 'bar'")
+    File.write(app.application_config, "#{app.application_config.read}\nENV['BAR'] = 'bar'")
 
-      env["OMG"] = "1"
-      env["FOO"] = "1"
-      env["RUBYOPT"] = "-rubygems"
+    app.env["OMG"] = "1"
+    app.env["FOO"] = "1"
+    app.env["RUBYOPT"] = "-rubygems"
 
-      assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "1"
-      assert_success %(#{spring} rails runner 'p ENV["BAR"]'), stdout: "bar"
-      assert_success %(#{spring} rails runner 'p ENV.key?("BUNDLE_GEMFILE")'), stdout: "true"
-      assert_success %(#{spring} rails runner 'p ENV["RUBYOPT"]'), stdout: "bundler"
+    assert_success %(bin/rails runner 'p ENV["OMG"]'), stdout: "1"
+    assert_success %(bin/rails runner 'p ENV["BAR"]'), stdout: "bar"
+    assert_success %(bin/rails runner 'p ENV.key?("BUNDLE_GEMFILE")'), stdout: "true"
+    assert_success %(bin/rails runner 'p ENV["RUBYOPT"]'), stdout: "bundler"
 
-      env["OMG"] = "2"
-      env.delete "FOO"
+    app.env["OMG"] = "2"
+    app.env.delete "FOO"
 
-      assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "2"
-      assert_success %(#{spring} rails runner 'p ENV.key?("FOO")'), stdout: "false"
-    ensure
-      File.write(application, application_contents)
-    end
+    assert_success %(bin/rails runner 'p ENV["OMG"]'), stdout: "2"
+    assert_success %(bin/rails runner 'p ENV.key?("FOO")'), stdout: "false"
   end
 end