aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails/app/templates
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-02-02 15:50:56 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-02-02 15:50:56 -0800
commitd236827881d119fb9ad25c81ce8e7756f1966823 (patch)
treedffcd371f7060298ecbce80b95e0596a564c6404 /railties/lib/generators/rails/app/templates
parent144f41ed9bf9d32f902531da0d3cf2a12d3a6b2b (diff)
downloadrails-d236827881d119fb9ad25c81ce8e7756f1966823.tar.gz
rails-d236827881d119fb9ad25c81ce8e7756f1966823.tar.bz2
rails-d236827881d119fb9ad25c81ce8e7756f1966823.zip
Removed all the default commands in script/* and replaced them with script/rails and a rails command that'll act the same when run from within the app [DHH]
Diffstat (limited to 'railties/lib/generators/rails/app/templates')
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/about3
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/console.tt5
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/dbconsole.tt5
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/destroy2
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/generate2
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/performance/benchmarker2
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/performance/profiler2
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/plugin2
-rw-r--r--railties/lib/generators/rails/app/templates/script/rails6
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/runner3
-rwxr-xr-xrailties/lib/generators/rails/app/templates/script/server.tt5
11 files changed, 6 insertions, 31 deletions
diff --git a/railties/lib/generators/rails/app/templates/script/about b/railties/lib/generators/rails/app/templates/script/about
deleted file mode 100755
index 93fd007649..0000000000
--- a/railties/lib/generators/rails/app/templates/script/about
+++ /dev/null
@@ -1,3 +0,0 @@
-require File.expand_path('../../config/environment', __FILE__)
-$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'rails/commands/about'
diff --git a/railties/lib/generators/rails/app/templates/script/console.tt b/railties/lib/generators/rails/app/templates/script/console.tt
deleted file mode 100755
index 47aa254f9f..0000000000
--- a/railties/lib/generators/rails/app/templates/script/console.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-require File.expand_path('../../config/boot', __FILE__)
-require 'rails/commands/console'
-require File.expand_path('../../config/application', __FILE__)
-
-Rails::Console.start(Rails::Application)
diff --git a/railties/lib/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/generators/rails/app/templates/script/dbconsole.tt
deleted file mode 100755
index 1e53c1d761..0000000000
--- a/railties/lib/generators/rails/app/templates/script/dbconsole.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-require File.expand_path('../../config/boot', __FILE__)
-require 'rails/commands/dbconsole'
-require File.expand_path('../../config/application', __FILE__)
-
-Rails::DBConsole.start(Rails::Application)
diff --git a/railties/lib/generators/rails/app/templates/script/destroy b/railties/lib/generators/rails/app/templates/script/destroy
deleted file mode 100755
index adfa8e8426..0000000000
--- a/railties/lib/generators/rails/app/templates/script/destroy
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/commands/destroy'
diff --git a/railties/lib/generators/rails/app/templates/script/generate b/railties/lib/generators/rails/app/templates/script/generate
deleted file mode 100755
index 6fb8ad0395..0000000000
--- a/railties/lib/generators/rails/app/templates/script/generate
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/commands/generate'
diff --git a/railties/lib/generators/rails/app/templates/script/performance/benchmarker b/railties/lib/generators/rails/app/templates/script/performance/benchmarker
deleted file mode 100755
index 9647d8f10a..0000000000
--- a/railties/lib/generators/rails/app/templates/script/performance/benchmarker
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.expand_path('../../../config/environment', __FILE__)
-require 'rails/commands/performance/benchmarker'
diff --git a/railties/lib/generators/rails/app/templates/script/performance/profiler b/railties/lib/generators/rails/app/templates/script/performance/profiler
deleted file mode 100755
index a5822042d2..0000000000
--- a/railties/lib/generators/rails/app/templates/script/performance/profiler
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.expand_path('../../../config/environment', __FILE__)
-require 'rails/commands/performance/profiler'
diff --git a/railties/lib/generators/rails/app/templates/script/plugin b/railties/lib/generators/rails/app/templates/script/plugin
deleted file mode 100755
index 1f1af6c880..0000000000
--- a/railties/lib/generators/rails/app/templates/script/plugin
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.expand_path('../../config/application', __FILE__)
-require 'rails/commands/plugin'
diff --git a/railties/lib/generators/rails/app/templates/script/rails b/railties/lib/generators/rails/app/templates/script/rails
new file mode 100644
index 0000000000..038547598e
--- /dev/null
+++ b/railties/lib/generators/rails/app/templates/script/rails
@@ -0,0 +1,6 @@
+ENV_PATH = File.expand_path('../../config/environment', __FILE__)
+BOOT_PATH = File.expand_path('../../config/boot', __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+
+require BOOT_PATH
+require 'rails/commands/rails'
diff --git a/railties/lib/generators/rails/app/templates/script/runner b/railties/lib/generators/rails/app/templates/script/runner
deleted file mode 100755
index 3354ed4a28..0000000000
--- a/railties/lib/generators/rails/app/templates/script/runner
+++ /dev/null
@@ -1,3 +0,0 @@
-require File.expand_path('../../config/boot', __FILE__)
-require 'rails/commands/runner'
-require File.expand_path('../../config/environment', __FILE__)
diff --git a/railties/lib/generators/rails/app/templates/script/server.tt b/railties/lib/generators/rails/app/templates/script/server.tt
deleted file mode 100755
index 4fd0cc7832..0000000000
--- a/railties/lib/generators/rails/app/templates/script/server.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-require File.expand_path('../../config/boot', __FILE__)
-require 'rails/commands/server'
-
-Dir.chdir(File.expand_path('../..', __FILE__))
-Rails::Server.start