railties 3.0.0.beta3 → 3.0.0.beta4

data/lib/rails/engine.rb

@@ -1,6 +1,7 @@
 require 'rails/railtie'
 require 'active_support/core_ext/module/delegation'
 require 'pathname'
+require 'rbconfig'
 
 module Rails
   # Rails::Engine allows you to wrap a specific Rails application and share it accross
@@ -24,7 +25,7 @@ module Rails
   #   end
   #
   # Then ensure that this file is loaded at the top of your config/application.rb (or in
-  # your Gemfile) and it will automatically load models, controllers, helpers and metals
+  # your Gemfile) and it will automatically load models, controllers and helpers
   # inside app, load routes at "config/routes.rb", load locales at "config/locales/*",
   # load tasks at "lib/tasks/*".
   #
@@ -41,10 +42,10 @@ module Rails
   #     config.load_paths << File.expand_path("../lib/some/path", __FILE__)
   #
   #     initializer "my_engine.add_middleware" do |app|
-  #       app.middlewares.use MyEngine::Middleware
+  #       app.middleware.use MyEngine::Middleware
   #     end
   #   end
-  # 
+  #
   # == Paths
   #
   # Since Rails 3.0, both your Application and Engines do not have hardcoded paths.
@@ -72,7 +73,6 @@ module Rails
   #     paths.app.controllers     = "app/controllers"
   #     paths.app.helpers         = "app/helpers"
   #     paths.app.models          = "app/models"
-  #     paths.app.metals          = "app/metal"
   #     paths.app.views           = "app/views"
   #     paths.lib                 = "lib"
   #     paths.lib.tasks           = "lib/tasks"
@@ -119,20 +119,29 @@ module Rails
         root = File.exist?("#{root_path}/#{flag}") ? root_path : default
         raise "Could not find root path for #{self}" unless root
 
-        RUBY_PLATFORM =~ /(:?mswin|mingw)/ ?
+        Config::CONFIG['host_os'] =~ /mswin|mingw/ ?
           Pathname.new(root).expand_path : Pathname.new(root).realpath
       end
     end
 
-    delegate :middleware, :paths, :root, :to => :config
+    delegate :paths, :root, :to => :config
 
     def load_tasks
       super
       config.paths.lib.tasks.to_a.sort.each { |ext| load(ext) }
     end
 
+    def eager_load!
+      config.eager_load_paths.each do |load_path|
+        matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
+        Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
+          require_dependency file.sub(matcher, '\1')
+        end
+      end
+    end
+
     # Add configured load paths to ruby load paths and remove duplicates.
-    initializer :set_load_path, :before => :bootstrap_load_path do
+    initializer :set_load_path, :before => :bootstrap_hook do
       config.load_paths.reverse_each do |path|
         $LOAD_PATH.unshift(path) if File.directory?(path)
       end
@@ -141,7 +150,10 @@ module Rails
 
     # Set the paths from which Rails will automatically load source files,
     # and the load_once paths.
-    initializer :set_autoload_paths, :before => :bootstrap_load_path do |app|
+    #
+    # This needs to be an initializer, since it needs to run once
+    # per engine and get the engine as a block parameter
+    initializer :set_autoload_paths, :before => :bootstrap_hook do |app|
       ActiveSupport::Dependencies.load_paths.unshift(*config.load_paths)
 
       if reloadable?(app)
@@ -166,7 +178,7 @@ module Rails
       paths.app.controllers.to_a.each do |load_path|
         load_path = File.expand_path(load_path)
         Dir["#{load_path}/*/**/*_controller.rb"].collect do |path|
-          namespace = File.dirname(path).sub(/#{load_path}\/?/, '')
+          namespace = File.dirname(path).sub(/#{Regexp.escape(load_path)}\/?/, '')
           app.routes.controller_namespaces << namespace unless namespace.empty?
         end
       end
@@ -189,27 +201,15 @@ module Rails
       end
     end
 
-    initializer :add_metals do |app|
-      app.metal_loader.paths.unshift(*paths.app.metals.to_a)
-    end
-
     initializer :load_config_initializers do
       paths.config.initializers.to_a.sort.each do |initializer|
         load(initializer)
       end
     end
 
-    initializer :load_app_classes do |app|
-      next if $rails_rake_task
-
-      if app.config.cache_classes
-        config.eager_load_paths.each do |load_path|
-          matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
-          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
-            require_dependency file.sub(matcher, '\1')
-          end
-        end
-      end
+    initializer :engines_blank_point do
+      # We need this initializer so all extra initializers added in engines are
+      # consistently executed after all the initializers above across all engines.
     end
 
   protected

data/lib/rails/engine/configuration.rb

@@ -19,7 +19,6 @@ module Rails
           paths.app.helpers         "app/helpers",         :eager_load => true
           paths.app.models          "app/models",          :eager_load => true
           paths.app.mailers         "app/mailers",         :eager_load => true
-          paths.app.metals          "app/metal",           :eager_load => true
           paths.app.views           "app/views"
           paths.lib                 "lib",                 :load_path => true
           paths.lib.tasks           "lib/tasks",           :glob => "**/*.rake"

data/lib/rails/generators.rb

@@ -68,6 +68,7 @@ module Rails
       options.deep_merge! config.options
       fallbacks.merge! config.fallbacks
       templates_path.concat config.templates
+      templates_path.uniq!
     end
 
     def self.templates_path
@@ -166,6 +167,42 @@ module Rails
       end
     end
 
+    def self.hidden_namespaces
+      @hidden_namespaces ||= begin
+        orm      = options[:rails][:orm]
+        test     = options[:rails][:test_framework]
+        template = options[:rails][:template_engine]
+
+        [
+          "rails",
+          "#{orm}:migration",
+          "#{orm}:model",
+          "#{orm}:observer",
+          "#{orm}:session_migration",
+          "#{test}:controller",
+          "#{test}:helper",
+          "#{test}:integration",
+          "#{test}:mailer",
+          "#{test}:model",
+          "#{test}:observer",
+          "#{test}:scaffold",
+          "#{test}:view",
+          "#{test}:performance",
+          "#{test}:plugin",
+          "#{template}:controller",
+          "#{template}:scaffold",
+          "#{template}:mailer"
+        ]
+      end
+    end
+
+    class << self
+      def hide_namespaces(*namespaces)
+        hidden_namespaces.concat(namespaces)
+      end
+      alias hide_namespace hide_namespaces
+    end
+
     # Show help message with available generators.
     def self.help(command = 'generate')
       lookup!
@@ -197,9 +234,7 @@ module Rails
       rails.delete("app")
       print_list("rails", rails)
 
-      groups.delete("active_record") if options[:rails][:orm] == :active_record
-      groups.delete("test_unit")     if options[:rails][:test_framework] == :test_unit
-      groups.delete("erb")           if options[:rails][:template_engine] == :erb
+      hidden_namespaces.each {|n| groups.delete(n.to_s) }
 
       groups.sort.each { |b, n| print_list(b, n) }
     end
@@ -208,9 +243,17 @@ module Rails
 
       # Prints a list of generators.
       def self.print_list(base, namespaces) #:nodoc:
+        namespaces = namespaces.reject do |n|
+          hidden_namespaces.include?(n)
+        end
+
         return if namespaces.empty?
         puts "#{base.camelize}:"
-        namespaces.each { |namespace| puts("  #{namespace}") }
+
+        namespaces.each do |namespace|
+          puts("  #{namespace}")
+        end
+
         puts
       end
 
@@ -290,10 +333,5 @@ module Rails
         paths.uniq!
         paths
       end
-
   end
-end
-
-# If the application was already defined, configure generators,
-# otherwise you have to configure it by hand.
-Rails::Generators.configure! if Rails.respond_to?(:application) && Rails.application
+end

data/lib/rails/generators/actions.rb

@@ -1,5 +1,6 @@
 require 'open-uri'
 require 'active_support/deprecation'
+require 'rbconfig'
 
 module Rails
   module Generators
@@ -53,7 +54,8 @@ module Rails
         name, version = args
 
         # Deal with deprecated options
-        { :env => :only, :lib => :require_as }.each do |old, new|
+        { :env => :group, :only => :group,
+          :lib => :require, :require_as => :require }.each do |old, new|
           next unless options[old]
           options[new] = options.delete(old)
           ActiveSupport::Deprecation.warn "#{old.inspect} option in gem is deprecated, use #{new.inspect} instead"
@@ -240,7 +242,7 @@ module Rails
       def rake(command, options={})
         log :rake, command
         env  = options[:env] || 'development'
-        sudo = options[:sudo] && RUBY_PLATFORM !~ /mswin|mingw/ ? 'sudo ' : ''
+        sudo = options[:sudo] && Config::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
         in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
       end
 
@@ -307,7 +309,7 @@ module Rails
         # Add an extension to the given name based on the platform.
         #
         def extify(name)
-          if RUBY_PLATFORM =~ /mswin|mingw/
+          if Config::CONFIG['host_os'] =~ /mswin|mingw/
             "#{name}.bat"
           else
             name

data/lib/rails/generators/base.rb

@@ -20,24 +20,19 @@ module Rails
 
       add_runtime_options!
 
-      # Automatically sets the source root based on the class name.
-      #
-      def self.source_root
-        @_rails_source_root ||= begin
-          if base_name && generator_name
-            File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
-          end
-        end
+      # Returns the source root for this generator using default_source_root as default.
+      def self.source_root(path=nil)
+        @_source_root = path if path
+        @_source_root ||= default_source_root
       end
 
       # Tries to get the description from a USAGE file one folder above the source
       # root otherwise uses a default description.
-      #
       def self.desc(description=nil)
         return super if description
-        usage = File.expand_path(File.join(source_root, "..", "USAGE"))
+        usage = source_root && File.expand_path("../USAGE", source_root)
 
-        @desc ||= if File.exist?(usage)
+        @desc ||= if usage && File.exist?(usage)
           File.read(usage)
         else
           "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
@@ -47,7 +42,6 @@ module Rails
       # Convenience method to get the namespace from the class name. It's the
       # same as Thor default except that the Generator at the end of the class
       # is removed.
-      #
       def self.namespace(name=nil)
         return super if name
         @namespace ||= super.sub(/_generator$/, '').sub(/:generators:/, ':')
@@ -200,7 +194,6 @@ module Rails
       end
 
       # Make class option aware of Rails::Generators.options and Rails::Generators.aliases.
-      #
       def self.class_option(name, options={}) #:nodoc:
         options[:desc]    = "Indicates when to generate #{name.to_s.humanize.downcase}" unless options.key?(:desc)
         options[:aliases] = default_aliases_for_option(name, options)
@@ -208,14 +201,27 @@ module Rails
         super(name, options)
       end
 
+      # Returns the default source root for a given generator. This is used internally
+      # by rails to set its generators source root. If you want to customize your source
+      # root, you should use source_root.
+      def self.default_source_root
+        return unless base_name && generator_name
+        path = File.expand_path(File.join(base_name, generator_name, 'templates'), base_root)
+        path if File.exists?(path)
+      end
+
+      # Returns the base root for a common set of generators. This is used to dynamically
+      # guess the default source root.
+      def self.base_root
+        File.dirname(__FILE__)
+      end
+
       # Cache source root and add lib/generators/base/generator/templates to
       # source paths.
-      #
       def self.inherited(base) #:nodoc:
         super
 
-        # Cache source root, we need to do this, since __FILE__ is a relative value
-        # and can point to wrong directions when inside an specified directory.
+        # Invoke source_root so the default_source_root is set.
         base.source_root
 
         if base.name && base.name !~ /Base$/
@@ -282,7 +288,7 @@ module Rails
         end
 
         # Removes the namespaces and get the generator name. For example,
-        # Rails::Generators::MetalGenerator will return "metal" as generator name.
+        # Rails::Generators::ModelGenerator will return "model" as generator name.
         #
         def self.generator_name
           @generator_name ||= begin

data/lib/rails/generators/erb/scaffold/templates/_form.html.erb

@@ -1,13 +1,14 @@
 <%%= form_for(@<%= singular_name %>) do |f| %>
   <%% if @<%= singular_name %>.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
-    <ul>
-    <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
-      <li><%%= msg %></li>
-    <%% end %>
-    </ul>
-  </div>
+    <div id="error_explanation">
+      <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
+
+      <ul>
+      <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
+        <li><%%= msg %></li>
+      <%% end %>
+      </ul>
+    </div>
   <%% end %>
 
 <% for attribute in attributes -%>

data/lib/rails/generators/erb/scaffold/templates/show.html.erb

@@ -1,4 +1,4 @@
-<p class="notice"><%%= notice %></p>
+<p id="notice"><%%= notice %></p>
 
 <% for attribute in attributes -%>
 <p>

data/lib/rails/generators/generated_attribute.rb

@@ -9,12 +9,13 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer, :float, :decimal   then :text_field
-          when :datetime, :timestamp, :time then :datetime_select
-          when :date                        then :date_select
-          when :string                      then :text_field
-          when :text                        then :text_area
-          when :boolean                     then :check_box
+          when :integer, :float, :decimal then :text_field
+          when :time                      then :time_select
+          when :datetime, :timestamp      then :datetime_select
+          when :date                      then :date_select
+          when :string                    then :text_field
+          when :text                      then :text_area
+          when :boolean                   then :check_box
           else
             :text_field
         end

data/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.

data/lib/rails/generators/rails/app/app_generator.rb

@@ -1,87 +1,62 @@
 require 'digest/md5'
 require 'active_support/secure_random'
 require 'rails/version' unless defined?(Rails::VERSION)
+require 'rbconfig'
+require 'open-uri'
+require 'uri'
 
-module Rails::Generators
-  # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
-  # can change in Ruby 1.8.7 when we FileUtils.cd.
-  RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
+module Rails
+  module ActionMethods
+    attr_reader :options
 
-  RESERVED_NAMES = %w[generate console server dbconsole
-                      application destroy benchmarker profiler
-                      plugin runner test]
-
-  class AppGenerator < Base
-    DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
-
-    attr_accessor :rails_template
-    add_shebang_option!
-
-    argument :app_path, :type => :string
-
-    class_option :database, :type => :string, :aliases => "-d", :default => "sqlite3",
-                            :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
-
-    class_option :template, :type => :string, :aliases => "-m",
-                            :desc => "Path to an application template (can be a filesystem path or URL)."
-
-    class_option :dev, :type => :boolean, :default => false,
-                       :desc => "Setup the application with Gemfile pointing to your Rails checkout"
-
-    class_option :edge, :type => :boolean, :default => false,
-                        :desc => "Setup the application with Gemfile pointing to Rails repository"
-
-    class_option :skip_gemfile, :type => :boolean, :default => false,
-                                     :desc => "Don't create a Gemfile"
-
-    class_option :skip_activerecord, :type => :boolean, :aliases => "-O", :default => false,
-                                     :desc => "Skip ActiveRecord files"
-
-    class_option :skip_testunit, :type => :boolean, :aliases => "-T", :default => false,
-                                 :desc => "Skip TestUnit files"
-
-    class_option :skip_prototype, :type => :boolean, :aliases => "-J", :default => false,
-                                  :desc => "Skip Prototype files"
-
-    class_option :skip_git, :type => :boolean, :aliases => "-G", :default => false,
-                            :desc => "Skip Git ignores and keeps"
-
-    # Add bin/rails options
-    class_option :version, :type => :boolean, :aliases => "-v", :group => :rails,
-                           :desc => "Show Rails version number and quit"
+    def initialize(generator)
+      @generator = generator
+      @options   = generator.options
+    end
 
-    class_option :help, :type => :boolean, :aliases => "-h", :group => :rails,
-                        :desc => "Show this help message and quit"
+    private
+      %w(template copy_file directory empty_directory inside
+         empty_directory_with_gitkeep create_file chmod shebang).each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args, &block)
+            @generator.send(:#{method}, *args, &block)
+          end
+        RUBY
+      end
 
-    def initialize(*args)
-      super
-      if !options[:skip_activerecord] && !DATABASES.include?(options[:database])
-        raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
+      # TODO: Remove once this is fully in place
+      def method_missing(meth, *args, &block)
+        STDERR.puts "Calling #{meth} with #{args.inspect} with #{block}"
+        @generator.send(meth, *args, &block)
       end
+  end
+
+  class AppBuilder
+    def rakefile
+      template "Rakefile"
     end
 
-    def create_root
-      self.destination_root = File.expand_path(app_path, destination_root)
-      valid_app_const?
+    def readme
+      copy_file "README"
+    end
 
-      empty_directory '.'
-      set_default_accessors!
-      FileUtils.cd(destination_root)
+    def gemfile
+      template "Gemfile"
     end
 
-    def create_root_files
-      copy_file "README"
-      copy_file "gitignore", ".gitignore" unless options[:skip_git]
-      template "Rakefile"
+    def configru
       template "config.ru"
-      template "Gemfile" unless options[:skip_gemfile]
     end
 
-    def create_app_files
+    def gitignore
+      copy_file "gitignore", ".gitignore"
+    end
+
+    def app
       directory 'app'
     end
 
-    def create_config_files
+    def config
       empty_directory "config"
 
       inside "config" do
@@ -95,29 +70,24 @@ module Rails::Generators
       end
     end
 
-    def create_boot_file
-      template "config/boot.rb"
-    end
-
-    def create_activerecord_files
-      return if options[:skip_activerecord]
-      template "config/databases/#{options[:database]}.yml", "config/database.yml"
+    def database_yml
+      template "config/databases/#{@options[:database]}.yml", "config/database.yml"
     end
 
-    def create_db_files
+    def db
       directory "db"
     end
 
-    def create_doc_files
+    def doc
       directory "doc"
     end
 
-    def create_lib_files
+    def lib
       empty_directory "lib"
       empty_directory_with_gitkeep "lib/tasks"
     end
 
-    def create_log_files
+    def log
       empty_directory "log"
 
       inside "log" do
@@ -128,19 +98,19 @@ module Rails::Generators
       end
     end
 
-    def create_public_files
-      directory "public", "public", :recursive => false # Do small steps, so anyone can overwrite it.
+    def public_directory
+      directory "public", "public", :recursive => false
     end
 
-    def create_public_image_files
+    def images
       directory "public/images"
     end
 
-    def create_public_stylesheets_files
+    def stylesheets
       empty_directory_with_gitkeep "public/stylesheets"
     end
 
-    def create_prototype_files
+    def javascripts
       unless options[:skip_prototype]
         directory "public/javascripts"
       else
@@ -148,19 +118,18 @@ module Rails::Generators
       end
     end
 
-    def create_script_files
+    def script
       directory "script" do |content|
         "#{shebang}\n" + content
       end
       chmod "script", 0755, :verbose => false
     end
 
-    def create_test_files
-      return if options[:skip_testunit]
+    def test
       directory "test"
     end
 
-    def create_tmp_files
+    def tmp
       empty_directory "tmp"
 
       inside "tmp" do
@@ -170,25 +139,200 @@ module Rails::Generators
       end
     end
 
-    def create_vendor_files
+    def vendor_plugins
       empty_directory_with_gitkeep "vendor/plugins"
     end
+  end
 
-    def apply_rails_template
-      apply rails_template if rails_template
-    rescue Thor::Error, LoadError, Errno::ENOENT => e
-      raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
-    end
+  module Generators
+    # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
+    # can change in Ruby 1.8.7 when we FileUtils.cd.
+    RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
 
-    def bundle_if_dev_or_edge
-      bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
-      run "#{bundle_command} install" if dev_or_edge?
-    end
+    RESERVED_NAMES = %w[application destroy benchmarker profiler
+                        plugin runner test]
+
+    class AppGenerator < Base
+      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+
+      attr_accessor :rails_template
+      add_shebang_option!
+
+      argument :app_path,               :type => :string
+
+      class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
+                                        :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+
+      class_option :builder,            :type => :string, :aliases => "-b",
+                                        :desc => "Path to an application builder (can be a filesystem path or URL)"
+
+      class_option :template,           :type => :string, :aliases => "-m",
+                                        :desc => "Path to an application template (can be a filesystem path or URL)."
+
+      class_option :dev,                :type => :boolean, :default => false,
+                                        :desc => "Setup the application with Gemfile pointing to your Rails checkout"
+
+      class_option :edge,               :type => :boolean, :default => false,
+                                        :desc => "Setup the application with Gemfile pointing to Rails repository"
+
+      class_option :skip_gemfile,       :type => :boolean, :default => false,
+                                        :desc => "Don't create a Gemfile"
+
+      class_option :skip_activerecord,  :type => :boolean, :aliases => "-O", :default => false,
+                                        :desc => "Skip ActiveRecord files"
+
+      class_option :skip_testunit,      :type => :boolean, :aliases => "-T", :default => false,
+                                        :desc => "Skip TestUnit files"
+
+      class_option :skip_prototype,     :type => :boolean, :aliases => "-J", :default => false,
+                                        :desc => "Skip Prototype files"
+
+      class_option :skip_git,           :type => :boolean, :aliases => "-G", :default => false,
+                                        :desc => "Skip Git ignores and keeps"
+
+      # Add bin/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 initialize(*args)
+        raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
+
+        @original_wd = Dir.pwd
+
+        super
+
+        if !options[:skip_activerecord] && !DATABASES.include?(options[:database])
+          raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
+        end
+      end
+
+      def create_root
+        self.destination_root = File.expand_path(app_path, destination_root)
+        valid_app_const?
+
+        empty_directory '.'
+        set_default_accessors!
+        FileUtils.cd(destination_root)
+      end
+
+      def create_root_files
+        build(:readme)
+        build(:rakefile)
+        build(:configru)
+        build(:gitignore) unless options[:skip_git]
+        build(:gemfile)   unless options[:skip_gemfile]
+      end
+
+      def create_app_files
+        build(:app)
+      end
+
+      def create_config_files
+        build(:config)
+      end
+
+      def create_boot_file
+        template "config/boot.rb"
+      end
+
+      def create_activerecord_files
+        return if options[:skip_activerecord]
+        build(:database_yml)
+      end
+
+      def create_db_files
+        build(:db)
+      end
+
+      def create_doc_files
+        build(:doc)
+      end
+
+      def create_lib_files
+        build(:lib)
+      end
+
+      def create_log_files
+        build(:log)
+      end
+
+      def create_public_files
+        build(:public_directory)
+      end
+
+      def create_public_image_files
+        build(:images)
+      end
+
+      def create_public_stylesheets_files
+        build(:stylesheets)
+      end
+
+      def create_prototype_files
+        build(:javascripts)
+      end
+
+      def create_script_files
+        build(:script)
+      end
+
+      def create_test_files
+        build(:test) unless options[:skip_testunit]
+      end
+
+      def create_tmp_files
+        build(:tmp)
+      end
+
+      def create_vendor_files
+        build(:vendor_plugins)
+      end
+
+      def finish_template
+        build(:leftovers)
+      end
+
+      def apply_rails_template
+        apply rails_template if rails_template
+      rescue Thor::Error, LoadError, Errno::ENOENT => e
+        raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
+      end
+
+      def bundle_if_dev_or_edge
+        bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
+        run "#{bundle_command} install" if dev_or_edge?
+      end
 
     protected
 
       def self.banner
-        "rails #{self.arguments.map(&:usage).join(' ')} [options]"
+        "rails new #{self.arguments.map(&:usage).join(' ')} [options]"
+      end
+
+      def builder
+        @builder ||= begin
+          if path = options[:builder]
+            if URI(path).is_a?(URI::HTTP)
+              contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
+            else
+              contents = open(File.expand_path(path, @original_wd)) {|io| io.read }
+            end
+
+            prok = eval("proc { #{contents} }", TOPLEVEL_BINDING, path, 1)
+            instance_eval(&prok)
+          end
+
+          builder_class = defined?(::AppBuilder) ? ::AppBuilder : Rails::AppBuilder
+          builder_class.send(:include, ActionMethods)
+          builder_class.new(self)
+        end
+      end
+
+      def build(meth, *args)
+        builder.send(meth, *args) if builder.respond_to?(meth)
       end
 
       def set_default_accessors!
@@ -265,12 +409,13 @@ module Rails::Generators
           "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
           "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
           "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-        ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
+        ].find { |f| File.exist?(f) } unless Config::CONFIG['host_os'] =~ /mswin|mingw/
       end
 
       def empty_directory_with_gitkeep(destination, config = {})
         empty_directory(destination, config)
         create_file("#{destination}/.gitkeep") unless options[:skip_git]
       end
+    end
   end
 end