diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-31 16:21:07 -0300 |
| commit | 3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (patch) | |
| tree | def6d6a808ebe187be1f37f8a739fd786cc11f02 /railties/lib/commands/generate.rb | |
| parent | c1cbf02e3170f1004daf4a146cbc41176c2458d3 (diff) | |
| parent | 62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff) | |
| download | rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.gz rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.bz2 rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/lib/commands/generate.rb')
| -rwxr-xr-x | railties/lib/commands/generate.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/railties/lib/commands/generate.rb b/railties/lib/commands/generate.rb index 3d3db3d856..32cabcab10 100755 --- a/railties/lib/commands/generate.rb +++ b/railties/lib/commands/generate.rb @@ -1,6 +1,10 @@ +require File.expand_path(File.join(File.dirname(__FILE__), '..', 'generators')) require "#{RAILS_ROOT}/config/environment" -require 'rails_generator' -require 'rails_generator/scripts/generate' -ARGV.shift if ['--help', '-h'].include?(ARGV[0]) -Rails::Generator::Scripts::Generate.new.run(ARGV) +if ARGV.size == 0 + Rails::Generators.help + exit +end + +name = ARGV.shift +Rails::Generators.invoke name, ARGV, :behavior => :invoke |