lib/guard/rails/runner.rb in guard-rails-0.3.3 vs lib/guard/rails/runner.rb in guard-rails-0.3.4

@@ -35,12 +35,10 @@
     end
 
     def build_rails_command
       return %{#{options[:CLI]} --pid #{pid_file}} if options[:CLI]
 
-      @env['RAILS_ENV'] = options[:environment] if options[:environment]
-
       rails_options = [
         options[:daemon] ? '-d' : nil,
         options[:debugger] ? '-u' : nil,
         '-e', options[:environment],
         '--pid', pid_file,
@@ -51,9 +49,10 @@
       zeus_options = [
         options[:zeus_plan] || 'server',
       ]
 
       # omit env when use zeus
+      @env['RAILS_ENV'] = options[:environment] if options[:environment] && options[:zeus].nil?
       rails_runner = options[:zeus] ? "zeus #{zeus_options.join(' ')}" : "rails server"
 
       %{#{rails_runner} #{rails_options.join(' ')}}
     end