From 5ff80e743345e87209303a477a5caaca75c6cece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 17 Jun 2009 13:00:59 +0200
Subject: bin/rails uses the new generator.

---
 railties/bin/rails | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'railties/bin')

diff --git a/railties/bin/rails b/railties/bin/rails
index 5e4fb38dba..cd173e51b6 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -7,14 +7,5 @@ if %w(--version -v).include? ARGV.first
   exit(0)
 end
 
-freeze   = ARGV.any? { |option| %w(--freeze -f).include?(option) }
-
-app_path = ARGV.first
-
-require File.dirname(__FILE__) + '/../lib/rails_generator'
-
-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
+require File.dirname(__FILE__) + '/../lib/generator/generators/app'
+Rails::Generators::App.start
-- 
cgit v1.2.3