aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-06-03 23:47:44 +1000
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-06-04 12:30:03 -0500
commit4774680405adcbf0d3f64abbc236c7653d137fa3 (patch)
treeeb9594758b5842d7a922782b2c0e45f2138bb2ee /railties/lib/rails/generators
parent517f709b51d1d2766d1a783d9f02fa7a6a41abc4 (diff)
downloadrails-4774680405adcbf0d3f64abbc236c7653d137fa3.tar.gz
rails-4774680405adcbf0d3f64abbc236c7653d137fa3.tar.bz2
rails-4774680405adcbf0d3f64abbc236c7653d137fa3.zip
Changing command line API from 'rails blog' to 'rails new blog'.
Also removed the limitation of not being able to call your new server any of the rails commands (generate, server, dbconsole, console etc) as there is no longer any ambiguity here. http://rails.lighthouseapp.com/projects/8994/tickets/4665 Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/USAGE4
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb3
2 files changed, 3 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/USAGE b/railties/lib/rails/generators/rails/app/USAGE
index 36d6061a59..9e7a78d132 100644
--- a/railties/lib/rails/generators/rails/app/USAGE
+++ b/railties/lib/rails/generators/rails/app/USAGE
@@ -1,9 +1,9 @@
Description:
- The 'rails' command creates a new Rails application with a default
+ The 'rails new' command creates a new Rails application with a default
directory structure and configuration at the path you specify.
Example:
- rails ~/Code/Ruby/weblog
+ rails new ~/Code/Ruby/weblog
This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
See the README in the newly created application to get going.
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index cd4a3dce4e..fc971907df 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -149,8 +149,7 @@ module Rails
# can change in Ruby 1.8.7 when we FileUtils.cd.
RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
- RESERVED_NAMES = %w[generate g console c server s dbconsole db
- application destroy benchmarker profiler
+ RESERVED_NAMES = %w[application destroy benchmarker profiler
plugin runner test]
class AppGenerator < Base