Merge commit 'mainstream/master'

Conflicts:
	railties/guides/source/active_support_overview.textile

11 files changed, 4 insertions, 40 deletions

diff --git a/railties/bin/about b/railties/bin/about
deleted file mode 100755
index 1eeb6eb915..0000000000
--- a/railties/bin/about
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
diff --git a/railties/bin/console b/railties/bin/console
deleted file mode 100755
index 235a1f2780..0000000000
--- a/railties/bin/console
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/console'
diff --git a/railties/bin/dbconsole b/railties/bin/dbconsole
deleted file mode 100755
index 83c8436a9d..0000000000
--- a/railties/bin/dbconsole
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/dbconsole'
diff --git a/railties/bin/destroy b/railties/bin/destroy
deleted file mode 100755
index 88d295f7aa..0000000000
--- a/railties/bin/destroy
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/destroy'
diff --git a/railties/bin/generate b/railties/bin/generate
deleted file mode 100755
index 62a8a4c0c5..0000000000
--- a/railties/bin/generate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/generate'
diff --git a/railties/bin/performance/benchmarker b/railties/bin/performance/benchmarker
deleted file mode 100755
index 3bff809fb3..0000000000
--- a/railties/bin/performance/benchmarker
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../../config/boot',  __FILE__)
-require 'commands/performance/benchmarker'
diff --git a/railties/bin/performance/profiler b/railties/bin/performance/profiler
deleted file mode 100755
index 07640575cd..0000000000
--- a/railties/bin/performance/profiler
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../../config/boot',  __FILE__)
-require 'commands/performance/profiler'
diff --git a/railties/bin/plugin b/railties/bin/plugin
deleted file mode 100755
index b82201fa83..0000000000
--- a/railties/bin/plugin
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/plugin'
diff --git a/railties/bin/rails b/railties/bin/rails
index 6a0c675206..538d0cbc84 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -7,14 +7,9 @@ if %w(--version -v).include? ARGV.first
   exit(0)
 end
 
-freeze   = ARGV.any? { |option| %w(--freeze -f).include?(option) }
+ARGV << "--help" if ARGV.empty?
 
-app_path = ARGV.first
+require File.dirname(__FILE__) + '/../lib/generators'
+require 'generators/rails/app/app_generator'
 
-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
\ No newline at end of file
+Rails::Generators::AppGenerator.start
diff --git a/railties/bin/runner b/railties/bin/runner
deleted file mode 100755
index be4c5d4572..0000000000
--- a/railties/bin/runner
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/runner'
diff --git a/railties/bin/server b/railties/bin/server
deleted file mode 100755
index b9fcb71793..0000000000
--- a/railties/bin/server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/server'