spring 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8e020e7dc1eb3f27faa79634ad8c9ff4e9c1ddb
-  data.tar.gz: 5bd55b0c1e659701f4cd61afaba2b854070bc482
+  metadata.gz: d4095a71b95759b8a4ed6a71b5ddcb5048aad506
+  data.tar.gz: 360837121b6655c0abc8fb88f28ce6b62f46a88e
 SHA512:
-  metadata.gz: ebecedcb2e4a616615dc33a752e54a380f685e9d43227f67a5c3a0f29ae8c500df20ab75705778e13f2efa5c52d51f4ed682472eda7b12006e3720a762232dd9
-  data.tar.gz: 349a6b90ba96409a80e90a14e5bc39d7057970d3a6a81eb8fe7e6c6b7cd48aebc7465d687ffd08b704a3977cc0c3405a72cc93521b022fd54ef7a13a154ba3e8
+  metadata.gz: 255ec2bc4edd38b0c1d609e16b8cc6d7d9f8bccdddff14e482f98202260e1dae3f7d766a56b47cb846973c443e45b67bac0ae1c8c3c830c9c9c0ed64486c6025
+  data.tar.gz: 3181e4b656a12b4094742647f6b7fe260d6f3f5acb0642bc39bfbfb83389a174a7434fa6ab355723a169cb2a2441793f02f46aa618a9ec87d7f9eccb9611ee71

data/.travis.yml

@@ -6,4 +6,6 @@ rvm:
 env:
   - RAILS_VERSION="~> 3.2.0"
   - RAILS_VERSION="~> 4.0.0"
-  - RAILS_VERSION="~> 4.1.0.beta1"
+  - RAILS_VERSION="~> 4.1.0.rc1"
+before_script:
+  - travis_retry gem install rails --version "$RAILS_VERSION"

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.1.2
+
+* Detect old binstubs generated with Spring 1.0 and exit with an error.
+  This prevents a situation where you can get stuck in an infinite loop
+  of spring invocations.
+* Avoid `warning: already initialized constant APP_PATH` when running
+  rails commands that do not use spring (e.g. `bin/rails server` would
+  emit this when you ^C to exit)
+* Fix `reload!` in rails console
+* Don't connect/disconnect the database if there are no connections
+  configured. Issue #256.
+
 ## 1.1.1
 
 * Fix `$0` so that it is no longer prefixed with "spring ", as doing

data/README.md

@@ -209,6 +209,7 @@ to pick up the changes):
 
 * [spring-commands-rspec](https://github.com/jonleighton/spring-commands-rspec)
 * [spring-commands-cucumber](https://github.com/jonleighton/spring-commands-cucumber)
+* [spring-commands-spinach](https://github.com/jvanbaarsen/spring-commands-spinach)
 * [spring-commands-testunit](https://github.com/jonleighton/spring-commands-testunit) - useful for
   running `Test::Unit` tests on Rails 3, since only Rails 4 allows you
   to use `rake test path/to/test` to run a particular test/directory.

data/bin/spring

@@ -1,5 +1,21 @@
 #!/usr/bin/env ruby
 
+if defined?(Spring)
+  $stderr.puts "You've tried to invoke Spring when it's already loaded (i.e. the Spring " \
+               "constant is defined)."
+  $stderr.puts
+  $stderr.puts "This is probably because you generated binstubs with " \
+               "Spring 1.0, and you now have a Spring version > 1.0 on your system. To solve " \
+               "this, upgrade your bundle to the latest Spring version and then run " \
+               "`bundle exec spring binstub --all` to regenerate your binstubs. This is a one-time " \
+               "step necessary to upgrade from 1.0 to 1.1."
+  $stderr.puts
+  $stderr.puts "Here's the backtrace:"
+  $stderr.puts
+  $stderr.puts caller
+  exit 1
+end
+
 if defined?(Gem)
   if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.1.0")
     warn "Warning: You're using Rubygems #{Gem::VERSION} with Spring. " \

data/lib/spring/application.rb

@@ -91,7 +91,9 @@ module Spring
 
       require Spring.application_root_path.join("config", "environment")
 
+      @original_cache_classes = Rails.application.config.cache_classes
       Rails.application.config.cache_classes = false
+
       disconnect_database
 
       @preloaded = :success
@@ -161,9 +163,13 @@ module Spring
         # Load in the current env vars, except those which *were* changed when spring started
         env.each { |k, v| ENV[k] ||= v }
 
-        # requiring is faster, and we don't need constant reloading in this process
-        ActiveSupport::Dependencies.mechanism = :require
-        Rails.application.config.cache_classes = true
+        # requiring is faster, so if config.cache_classes was true in
+        # the environment's config file, then we can respect that from
+        # here on as we no longer need constant reloading.
+        if @original_cache_classes
+          ActiveSupport::Dependencies.mechanism = :require
+          Rails.application.config.cache_classes = true
+        end
 
         connect_database
         srand
@@ -246,11 +252,11 @@ module Spring
     end
 
     def disconnect_database
-      ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.remove_connection if active_record_configured?
     end
 
     def connect_database
-      ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.establish_connection if active_record_configured?
     end
 
     # This feels very naughty
@@ -289,5 +295,11 @@ module Spring
       [STDOUT, STDERR].each { |stream| stream.reopen(spring_env.log_file) }
       STDIN.reopen("/dev/null")
     end
+
+    private
+
+    def active_record_configured?
+      defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.any?
+    end
   end
 end

data/lib/spring/application_manager.rb

@@ -82,6 +82,8 @@ module Spring
         Process.kill('TERM', pid)
         Process.wait(pid)
       end
+    rescue Errno::ESRCH, Errno::ECHILD
+      # Don't care
     end
 
     private

data/lib/spring/client/rails.rb

@@ -25,6 +25,7 @@ module Spring
           require "spring/configuration"
           ARGV.shift
           load Dir.glob(Spring.application_root_path.join("{bin,script}/rails")).first
+          exit
         end
       end
     end

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/acceptance/app_test.rb

@@ -263,13 +263,13 @@ CODE
   end
 
   test "runner command sets Rails environment from command-line options" do
-    assert_success "bin/rails runner -e production 'puts Rails.env'", stdout: "production"
-    assert_success "bin/rails runner --environment=production 'puts Rails.env'", stdout: "production"
+    assert_success "bin/rails runner -e test 'puts Rails.env'", stdout: "test"
+    assert_success "bin/rails runner --environment=test 'puts Rails.env'", stdout: "test"
   end
 
   test "forcing rails env via environment variable" do
-    app.env['RAILS_ENV'] = 'production'
-    assert_success "bin/rake -p 'Rails.env'", stdout: "production"
+    app.env['RAILS_ENV'] = 'test'
+    assert_success "bin/rake -p 'Rails.env'", stdout: "test"
   end
 
   test "setting env vars with rake" do

data/test/acceptance/helper.rb

@@ -23,7 +23,7 @@ module Spring
       end
 
       def bundles_spring?
-        version >= Gem::Version.new("4.1.0.beta1")
+        version.segments.take(2) == [4, 1] || version > Gem::Version.new("4.1")
       end
 
       def major
@@ -33,6 +33,10 @@ module Spring
       def minor
         version.segments[1]
       end
+
+      def to_s
+        version.to_s
+      end
     end
 
     class Application
@@ -216,17 +220,25 @@ module Spring
         end
       end
 
-      def run!(*args)
-        artifacts = run(*args)
-        unless artifacts[:status].success?
+      def run!(command, options = {})
+        attempts  = (options.delete(:retry) || 0) + 1
+        artifacts = nil
+
+        until attempts == 0 || artifacts && artifacts[:status].success?
+          artifacts = run(command, options)
+          attempts -= 1
+        end
+
+        if artifacts[:status].success?
+          artifacts
+        else
           raise "command failed\n\n#{debug(artifacts)}"
         end
-        artifacts
       end
 
       def bundle
-        run! "(gem list bundler | grep bundler) || gem install bundler", timeout: nil
-        run! "bundle update", timeout: nil
+        run! "(gem list bundler | grep bundler) || gem install bundler", timeout: nil, retry: 2
+        run! "bundle update --retry=2", timeout: nil
       end
 
       private
@@ -270,10 +282,13 @@ module Spring
           system("gem list rails --installed --version '#{version_constraint}' || " \
                    "gem install rails --clear-sources --source http://rubygems.org --version '#{version_constraint}'")
 
+          @version = RailsVersion.new(`ruby -e 'puts Gem::Specification.find_by_name("rails", "#{version_constraint}").version'`.chomp)
+
           skips = %w(--skip-bundle --skip-javascript --skip-sprockets)
           skips << "--skip-spring" if version.bundles_spring?
 
-          system("rails '_#{version_constraint}_' new #{application.root} #{skips.join(' ')}")
+          system("rails _#{version}_ new #{application.root} #{skips.join(' ')}")
+          raise "application generation failed" unless application.exists?
 
           FileUtils.mkdir_p(application.gem_home)
           FileUtils.mkdir_p(application.user_home)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport