Skip to content

Commit

Permalink
Changing command line API from 'rails blog' to 'rails new blog'.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mikel committed Jun 3, 2010
1 parent ab34b7b commit 06892c3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
6 changes: 6 additions & 0 deletions railties/lib/rails/commands.rb
Expand Up @@ -38,6 +38,10 @@
when 'application', 'runner'
require "rails/commands/#{command}"

when 'new'
puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n"
puts "Type 'rails' for help."

when '--version', '-v'
ARGV.unshift '--version'
require 'rails/commands/application'
Expand All @@ -53,6 +57,8 @@
server Start the Rails server (short-cut alias: "s")
dbconsole Start a console for the database specified in config/database.yml
(short-cut alias: "db")
new Create a new Rails application. "rails new my_app" creates a
new application called MyApp in "./my_app"
In addition to those, there are:
application Generate the Rails application code
Expand Down
7 changes: 6 additions & 1 deletion railties/lib/rails/commands/application.rb
Expand Up @@ -4,7 +4,12 @@
exit(0)
end

ARGV << "--help" if ARGV.empty?
if ARGV.first != "new" || ARGV.empty?
ARGV[0] = "--help"
else
ARGV.shift
end

require 'rubygems' if ARGV.include?("--dev")

require 'rails/generators'
Expand Down
4 changes: 2 additions & 2 deletions 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.
3 changes: 1 addition & 2 deletions railties/lib/rails/generators/rails/app/app_generator.rb
Expand Up @@ -149,8 +149,7 @@ module Generators
# 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
Expand Down

0 comments on commit 06892c3

Please sign in to comment.