From 06860dcf29d73c0c4fbe5a42fde4db0ce9753937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 4 Feb 2010 14:14:11 +0100 Subject: Remove duplicated version check. --- railties/lib/rails/commands.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'railties/lib/rails/commands.rb') diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 4240038673..55744db275 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -60,8 +60,6 @@ when 'runner' require ENV_PATH -when '--version', '-v' - puts "Rails #{Rails::VERSION::STRING}" when '--help', '-h' puts HELP_TEXT when '--version', '-v' -- cgit v1.2.3 From 293fd9daf82c99d1dd57528ad0b770fad4cb8ce2 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 10:50:14 -0800 Subject: server command loads the application --- railties/lib/rails/commands.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/commands.rb') diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 55744db275..500dcf7f9e 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -33,6 +33,7 @@ when 'c', 'console' require APP_PATH Rails::Console.start(Rails::Application) when 's', 'server' + require APP_PATH require 'rails/commands/server' Dir.chdir(ROOT_PATH) Rails::Server.start @@ -68,4 +69,4 @@ when '--version', '-v' else puts "Error: Command not recognized" puts HELP_TEXT -end \ No newline at end of file +end -- cgit v1.2.3 From 7f7dfd2babf0de37f64a1caf5c0f9e65a91112d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 8 Feb 2010 16:05:22 +0100 Subject: Take into account gem versions (so script/rails server can work outside the application) and use Rails::Application.root instead of ROOT_PATH. --- railties/lib/rails/commands.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands.rb') diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 500dcf7f9e..5b73577e36 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -35,7 +35,7 @@ when 'c', 'console' when 's', 'server' require APP_PATH require 'rails/commands/server' - Dir.chdir(ROOT_PATH) + Dir.chdir(Rails::Application.root) Rails::Server.start when 'db', 'dbconsole' require 'rails/commands/dbconsole' -- cgit v1.2.3 From 39ebd6eb2b6c90756514798450eb15bdfec67be6 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 9 Feb 2010 08:40:06 -0800 Subject: rails runner loads environment after parsing command-line options --- railties/lib/rails/commands.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'railties/lib/rails/commands.rb') diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 5b73577e36..991d2a0205 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -58,8 +58,6 @@ when 'plugin' require 'rails/commands/plugin' when 'runner' require 'rails/commands/runner' - require ENV_PATH - when '--help', '-h' puts HELP_TEXT -- cgit v1.2.3 From cafe882d12d767f510d6b8ad283f49a1c02e82ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20Niemel=C3=A4?= Date: Tue, 9 Feb 2010 23:21:11 +0200 Subject: Fix server environment [#3877 status:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- railties/lib/rails/commands.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/commands.rb') diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 991d2a0205..6972e25b29 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -33,10 +33,13 @@ when 'c', 'console' require APP_PATH Rails::Console.start(Rails::Application) when 's', 'server' - require APP_PATH require 'rails/commands/server' + # Initialize the server first, so environment options are set + server = Rails::Server.new + require APP_PATH + Dir.chdir(Rails::Application.root) - Rails::Server.start + server.start when 'db', 'dbconsole' require 'rails/commands/dbconsole' require APP_PATH -- cgit v1.2.3