Add support for APP_ENV environment variable

README.md

@@ -270,7 +270,7 @@ You can also provide a configuration file with the `-C` (or `--config`) flag:
 $ puma -C /path/to/config
 ```
 
-If no configuration file is specified, Puma will look for a configuration file at `config/puma.rb`. If an environment is specified, either via the `-e` and `--environment` flags, or through the `RACK_ENV` or the `RAILS_ENV` environment variables, Puma first looks for configuration at `config/puma/<environment_name>.rb`, and then falls back to `config/puma.rb`.
+If no configuration file is specified, Puma will look for a configuration file at `config/puma.rb`. If an environment is specified (via the `--environment` flag or through the `APP_ENV`, `RACK_ENV`, or `RAILS_ENV` environment variables) Puma looks for a configuration file at `config/puma/<environment_name>.rb` and then falls back to `config/puma.rb`.
 
 If you want to prevent Puma from looking for a configuration file in those locations, include the `--no-config` flag:
 

lib/puma/configuration.rb

@@ -200,7 +200,7 @@ def puma_default_options
         :worker_shutdown_timeout => DefaultWorkerShutdownTimeout,
         :remote_address => :socket,
         :tag => method(:infer_tag),
-        :environment => -> { ENV['RACK_ENV'] || ENV['RAILS_ENV'] || "development" },
+        :environment => -> { ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development' },
         :rackup => DefaultRackup,
         :logger => STDOUT,
         :persistent_timeout => Const::PERSISTENT_TIMEOUT,

lib/puma/control_cli.rb

@@ -47,7 +47,7 @@ def initialize(argv, stdout=STDOUT, stderr=STDERR)
       @control_auth_token = nil
       @config_file = nil
       @command = nil
-      @environment = ENV['RACK_ENV'] || ENV['RAILS_ENV']
+      @environment = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']
 
       @argv = argv.dup
       @stdout = stdout

test/test_cli.rb

@@ -426,6 +426,19 @@ def test_extra_runtime_dependencies
     assert_equal %w[a b], extra_dependencies
   end
 
+  def test_environment_app_env
+    ENV['RACK_ENV'] = @environment
+    ENV['RAILS_ENV'] = @environment
+    ENV['APP_ENV'] = 'test'
+
+    cli = Puma::CLI.new []
+
+    assert_equal 'test', cli.environment
+
+    ENV.delete 'APP_ENV'
+    ENV.delete 'RAILS_ENV'
+  end
+
   def test_environment_rack_env
     ENV.delete 'RACK_ENV'
 

test/test_config.rb

@@ -466,6 +466,15 @@ def setup
     File.write("config/puma/fake-env.rb", "")
   end
 
+  def test_config_files_with_app_env
+    with_env('APP_ENV' => 'fake-env') do
+      conf = Puma::Configuration.new do
+      end
+
+      assert_equal ['config/puma/fake-env.rb'], conf.config_files
+    end
+  end
+
   def test_config_files_with_rack_env
     with_env('RACK_ENV' => 'fake-env') do
       conf = Puma::Configuration.new do

test/test_pumactl.rb

@@ -46,13 +46,50 @@ def test_config_file
     assert_equal "t3-pid", control_cli.instance_variable_get("@pidfile")
   end
 
+  def test_app_env_without_environment
+    with_env('APP_ENV' => 'test') do
+      control_cli = Puma::ControlCLI.new ['halt']
+      assert_equal 'test', control_cli.instance_variable_get('@environment')
+    end
+  end
+
   def test_rack_env_without_environment
     with_env("RACK_ENV" => "test") do
       control_cli = Puma::ControlCLI.new ["halt"]
       assert_equal "test", control_cli.instance_variable_get("@environment")
     end
   end
 
+  def test_app_env_precedence
+    with_env('APP_ENV' => nil, 'RACK_ENV' => nil, 'RAILS_ENV' => 'production') do
+      control_cli = Puma::ControlCLI.new ['halt']
+      assert_equal 'production', control_cli.instance_variable_get('@environment')
+    end
+
+    with_env('APP_ENV' => nil, 'RACK_ENV' => 'test', 'RAILS_ENV' => 'production') do
+      control_cli = Puma::ControlCLI.new ['halt']
+      assert_equal 'test', control_cli.instance_variable_get('@environment')
+    end
+
+    with_env('APP_ENV' => 'development', 'RACK_ENV' => 'test', 'RAILS_ENV' => 'production') do
+      control_cli = Puma::ControlCLI.new ['halt']
+      assert_equal 'development', control_cli.instance_variable_get('@environment')
+
+      control_cli = Puma::ControlCLI.new ['-e', 'test', 'halt']
+      assert_equal 'test', control_cli.instance_variable_get('@environment')
+    end
+  end
+
+  def test_environment_without_app_env
+    with_env('APP_ENV' => nil, 'RACK_ENV' => nil, 'RAILS_ENV' => nil) do
+      control_cli = Puma::ControlCLI.new ['halt']
+      assert_nil control_cli.instance_variable_get('@environment')
+
+      control_cli = Puma::ControlCLI.new ['-e', 'test', 'halt']
+      assert_equal 'test', control_cli.instance_variable_get('@environment')
+    end
+  end
+
   def test_environment_without_rack_env
     with_env("RACK_ENV" => nil, 'RAILS_ENV' => nil) do
       control_cli = Puma::ControlCLI.new ["halt"]