Assign envs before preload

Author: eval

lib/spring/application.rb

@@ -133,17 +133,27 @@ def run
       end
     end
 
+    def set_env_vars(env)
+      # Delete all env vars which are unchanged from before spring started
+      original_env.each { |k, v| ENV.delete k if ENV[k] == v }
+
+      # Load in the current env vars, except those which *were* changed when spring started
+      env.each { |k, v| ENV[k] ||= v }
+    end
+
     def serve(client)
       log "got client"
       manager.puts
 
       stdout, stderr, stdin = streams = 3.times.map { client.recv_io }
       [STDOUT, STDERR, STDIN].zip(streams).each { |a, b| a.reopen(b) }
 
-      preload unless preloaded?
+      client_args, client_env = JSON.load(client.read(client.gets.to_i)).values_at("args", "env")
 
-      args, env = JSON.load(client.read(client.gets.to_i)).values_at("args", "env")
-      command   = Spring.command(args.shift)
+      set_env_vars(client_env)
+
+      preload unless preloaded?
+      command = Spring.command(client_args.shift)
 
       connect_database
       setup command
@@ -157,15 +167,9 @@ def serve(client)
         IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
         trap("TERM", "DEFAULT")
 
-        ARGV.replace(args)
+        ARGV.replace(client_args)
         $0 = command.process_title
 
-        # Delete all env vars which are unchanged from before spring started
-        original_env.each { |k, v| ENV.delete k if ENV[k] == v }
-
-        # Load in the current env vars, except those which *were* changed when spring started
-        env.each { |k, v| ENV[k] ||= v }
-
         # 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.

test/acceptance/app_test.rb

@@ -291,6 +291,16 @@ def binstub_prelude
     assert_success "bin/rake -p 'Rails.env'", stdout: "test"
   end
 
+  test "config via environment variable" do
+    app.env['FORCE_SSL'] = '1'
+    app.env['RAILS_ENV'] = 'test'
+    assert_success "bin/rails runner 'p Rails.application.config.force_ssl'", stdout: "true"
+
+    app.env['FORCE_SSL'] = '0'
+    app.env['RAILS_ENV'] = 'development'
+    assert_success "bin/rails runner 'p Rails.application.config.force_ssl'", stdout: "false"
+  end
+
   test "setting env vars with rake" do
     File.write(app.path("lib/tasks/env.rake"), <<-'CODE')
       task :print_rails_env => :environment do

test/acceptance/helper.rb

@@ -121,6 +121,10 @@ def application_config
         path "config/application.rb"
       end
 
+      def some_initializer
+        path "config/initializers/foo.rb"
+      end
+
       def spring_config
         path "config/spring.rb"
       end
@@ -295,6 +299,7 @@ def generate
           FileUtils.rm_rf(application.path("test/performance"))
 
           File.write(application.gemfile, "#{application.gemfile.read}gem 'spring', '#{Spring::VERSION}'\n")
+          File.write(application.some_initializer, "Rails.application.config.force_ssl = ('1' == ENV['FORCE_SSL'])\n")
 
           if version.needs_testunit?
             File.write(application.gemfile, "#{application.gemfile.read}gem 'spring-commands-testunit'\n")