Merge pull request #414 from grosser/grosser/speed

speed up tests by not copying bundled directory every time

Author: jonleighton

.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
   - 1.9.3
   - 2.0.0

lib/spring/test/acceptance_test.rb

@@ -194,9 +194,13 @@ def exec_name
       end
 
       test "binstub when spring is uninstalled" do
-        app.run! "gem uninstall --ignore-dependencies spring"
-        File.write(app.gemfile, app.gemfile.read.gsub(/gem 'spring.*/, ""))
-        assert_success "bin/rake -T", stdout: "rake db:migrate"
+        begin
+          app.run! "gem uninstall --ignore-dependencies spring"
+          File.write(app.gemfile, app.gemfile.read.gsub(/gem 'spring.*/, ""))
+          assert_success "bin/rake -T", stdout: "rake db:migrate"
+        ensure
+          generator.build_and_install_gems
+        end
       end
 
       test "binstub upgrade" do

lib/spring/test/application.rb

@@ -48,7 +48,7 @@ def gemfile
       end
 
       def gem_home
-        path "vendor/gems/#{RUBY_VERSION}"
+        path "../gems/#{RUBY_VERSION}"
       end
 
       def user_home

lib/spring/test/application_generator.rb

@@ -52,19 +52,32 @@ def generate_files
         FileUtils.mkdir_p(application.user_home)
         FileUtils.rm_rf(application.path("test/performance"))
 
-        File.write(application.gemfile, "#{application.gemfile.read}gem 'spring', '#{Spring::VERSION}'\n")
+        append_to_file(application.gemfile, "gem 'spring', '#{Spring::VERSION}'")
 
         if version.needs_testunit?
-          File.write(application.gemfile, "#{application.gemfile.read}gem 'spring-commands-testunit'\n")
+          append_to_file(application.gemfile, "gem 'spring-commands-testunit'")
+        end
+
+        rewrite_file(application.gemfile) do |c|
+          c.sub!("https://rubygems.org", "http://rubygems.org")
+          c.gsub!(/(gem '(byebug|web-console|sdoc|jbuilder)')/, "# \\1")
+          c
         end
 
-        File.write(application.gemfile, application.gemfile.read.sub("https://rubygems.org", "http://rubygems.org"))
 
         if application.path("bin").exist?
           FileUtils.cp_r(application.path("bin"), application.path("bin_original"))
         end
       end
 
+      def rewrite_file(file)
+        File.write(file, yield(file.read))
+      end
+
+      def append_to_file(file, add)
+        rewrite_file(file) { |c| c << "#{add}\n" }
+      end
+
       def generate_if_missing
         generate unless application.exists?
       end