aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrailties/bin/rails2
-rw-r--r--railties/lib/generator/generators/app.thor7
2 files changed, 8 insertions, 1 deletions
diff --git a/railties/bin/rails b/railties/bin/rails
index 6a0c675206..5e4fb38dba 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -17,4 +17,4 @@ require 'rails_generator/scripts/generate'
Rails::Generator::Base.use_application_sources!
Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
-Dir.chdir(app_path) { `rake rails:freeze:gems`; puts "froze" } if freeze \ No newline at end of file
+Dir.chdir(app_path) { `rake rails:freeze:gems`; puts "froze" } if freeze
diff --git a/railties/lib/generator/generators/app.thor b/railties/lib/generator/generators/app.thor
index c433ca21c0..84f0504519 100644
--- a/railties/lib/generator/generators/app.thor
+++ b/railties/lib/generator/generators/app.thor
@@ -37,6 +37,13 @@ module Rails::Generators
class_option :no_prototype, :type => :boolean, :aliases => "-P", :default => false,
:desc => "Do not generate Prototype files"
+ # Add Rails options
+ class_option :version, :type => :boolean, :aliases => "-v", :group => :rails,
+ :desc => "Show Rails version number and quit"
+
+ class_option :help, :type => :boolean, :aliases => "-h", :group => :rails,
+ :desc => "Show this help message and quit"
+
def create_root
self.root = File.expand_path(app_path, root)
empty_directory '.'