railties 3.0.0.beta → 3.0.0.beta2

data/lib/rails/generators/actions.rb

@@ -32,7 +32,7 @@ module Rails
           options[:git] = "-b #{options[:branch]} #{options[:git]}"   if options[:branch]
           options[:svn] = "-r #{options[:revision]} #{options[:svn]}" if options[:revision]
           in_root do
-            run_ruby_script "script/plugin install #{options[:svn] || options[:git]}", :verbose => false
+            run_ruby_script "script/rails plugin install #{options[:svn] || options[:git]}", :verbose => false
           end
         else
           log "! no git or svn provided for #{name}. Skipping..."
@@ -69,7 +69,7 @@ module Rails
         # otherwise use name (version).
         parts, message = [ name.inspect ], name
         if version ||= options.delete(:version)
-          parts   << version
+          parts   << version.inspect
           message << " (#{version})"
         end
         message = options[:git] if options[:git]
@@ -81,7 +81,7 @@ module Rails
         end
 
         in_root do
-          append_file "Gemfile", "gem #{parts.join(", ")}", :verbose => false
+          append_file "Gemfile", "gem #{parts.join(", ")}\n", :verbose => false
         end
       end
 
@@ -89,12 +89,12 @@ module Rails
       #
       # ==== Example
       #
-      #   source "http://gems.github.com/"
+      #   add_source "http://gems.github.com/"
       def add_source(source, options={})
         log :source, source
 
         in_root do
-          prepend_file "Gemfile", "source #{source.inspect}", :verbose => false
+          prepend_file "Gemfile", "source #{source.inspect}\n", :verbose => false
         end
       end
 
@@ -226,7 +226,7 @@ module Rails
         log :generate, what
         argument = args.map {|arg| arg.to_s }.flatten.join(" ")
 
-        in_root { run_ruby_script("script/generate #{what} #{argument}", :verbose => false) }
+        in_root { run_ruby_script("script/rails generate #{what} #{argument}", :verbose => false) }
       end
 
       # Runs the supplied rake task
@@ -280,6 +280,16 @@ module Rails
         end
       end
 
+      # Reads the given file at the source root and prints it in the console.
+      #
+      # === Example
+      #
+      #   readme "README"
+      #
+      def readme(path)
+        say File.read(find_in_source_paths(path))
+      end
+
       protected
 
         # Define log for backwards compatibility. If just one argument is sent,

data/lib/rails/generators/base.rb

@@ -1,4 +1,12 @@
-require 'thor/group'
+begin
+  require 'thor/group'
+rescue LoadError
+  puts "Thor is not available.\nIf you ran this command from a git checkout " \
+       "of Rails, please make sure thor is installed,\nand run this command " \
+       "as `ruby /path/to/rails myapp --dev`"
+  exit
+end
+
 require 'rails/generators/actions'
 
 module Rails
@@ -17,7 +25,7 @@ module Rails
       def self.source_root
         @_rails_source_root ||= begin
           if base_name && generator_name
-            File.expand_path(File.join("../../generators", base_name, generator_name, 'templates'), File.dirname(__FILE__))
+            File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
           end
         end
       end
@@ -62,7 +70,7 @@ module Rails
       #
       # For example, if the user invoke the controller generator as:
       #
-      #   ruby script/generate controller Account --test-framework=test_unit
+      #   rails generate controller Account --test-framework=test_unit
       #
       # The controller generator will then try to invoke the following generators:
       #
@@ -117,11 +125,11 @@ module Rails
       # All hooks come with switches for user interface. If the user don't want
       # to use any test framework, he can do:
       #
-      #   ruby script/generate controller Account --skip-test-framework
+      #   rails generate controller Account --skip-test-framework
       #
       # Or similarly:
       #
-      #   ruby script/generate controller Account --no-test-framework
+      #   rails generate controller Account --no-test-framework
       #
       # ==== Boolean hooks
       #
@@ -133,7 +141,7 @@ module Rails
       #
       # Then, if you want, webrat to be invoked, just supply:
       #
-      #   ruby script/generate controller Account --webrat
+      #   rails generate controller Account --webrat
       #
       # The hooks lookup is similar as above:
       #
@@ -213,8 +221,7 @@ module Rails
         if base.name && base.name !~ /Base$/
           Rails::Generators.subclasses << base
 
-          if defined?(Rails.root) && Rails.root
-            path = File.expand_path(File.join(Rails.root, 'lib', 'templates'))
+          Rails::Generators.templates_path.each do |path|
             if base.name.include?('::')
               base.source_paths << File.join(path, base.base_name, base.generator_name)
             else

data/lib/rails/generators/erb.rb

@@ -0,0 +1,21 @@
+require 'rails/generators/named_base'
+
+module Erb
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+      protected
+
+      def format
+        :html
+      end
+
+      def handler
+        :erb
+      end
+
+      def filename_with_extensions(name)
+        [name, format, handler].compact.join(".")
+      end
+    end
+  end
+end

data/lib/{generators → rails/generators}/erb/controller/controller_generator.rb

@@ -1,19 +1,18 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators
     class ControllerGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "action action"
 
-      def create_view_files
+      def copy_view_files
         base_path = File.join("app/views", class_path, file_name)
         empty_directory base_path
 
         actions.each do |action|
           @action = action
-          @path   = File.join(base_path, "#{action}.html.erb")
-
-          template 'view.html.erb', @path
+          @path = File.join(base_path, filename_with_extensions(action))
+          template filename_with_extensions(:view), @path
         end
       end
     end

data/lib/rails/generators/erb/mailer/mailer_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators/erb/controller/controller_generator'
+
+module Erb
+  module Generators
+    class MailerGenerator < ControllerGenerator
+      protected
+
+      def format
+        :text
+      end
+    end
+  end
+end

data/lib/{generators → rails/generators}/erb/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 require 'rails/generators/resource_helpers'
 
 module Erb
@@ -15,39 +15,27 @@ module Erb
         empty_directory File.join("app/views", controller_file_path)
       end
 
-      def copy_index_file
-        return if options[:singleton]
-        copy_view :index
-      end
-
-      def copy_edit_file
-        copy_view :edit
-      end
+      def copy_view_files
+        views = available_views
+        views.delete("index") if options[:singleton]
 
-      def copy_show_file
-        copy_view :show
-      end
-
-      def copy_new_file
-        copy_view :new
-      end
-
-      def copy_form_file
-        copy_view :_form
+        views.each do |view|
+          filename = filename_with_extensions(view)
+          template filename, File.join("app/views", controller_file_path, filename)
+        end
       end
 
       def copy_layout_file
         return unless options[:layout]
-        template "layout.html.erb",
-                 File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.erb")
+        template filename_with_extensions(:layout),
+          File.join("app/views/layouts", controller_class_path, filename_with_extensions(controller_file_name))
       end
 
-      protected
-
-        def copy_view(view)
-          template "#{view}.html.erb", File.join("app/views", controller_file_path, "#{view}.html.erb")
-        end
+    protected
 
+      def available_views
+        %w(index edit show new _form)
+      end
     end
   end
 end

data/lib/{generators → rails/generators}/erb/scaffold/templates/_form.html.erb

@@ -1,4 +1,4 @@
-<%% form_for(@<%= singular_name %>) do |f| %>
+<%%= form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>
 
 <% for attribute in attributes -%>

data/lib/{generators → rails/generators}/erb/scaffold/templates/index.html.erb

@@ -24,4 +24,4 @@
 
 <br />
 
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
+<%%= link_to 'New <%= human_name %>', new_<%= singular_name %>_path %>

data/lib/{generators → rails/generators}/erb/scaffold/templates/layout.html.erb

@@ -9,6 +9,7 @@
 <body>
 
 <p class="notice"><%%= notice %></p>
+<p class="alert"><%%= alert %></p>
 
 <%%= yield %>
 

data/lib/rails/generators/named_base.rb

@@ -27,6 +27,10 @@ module Rails
           @class_name ||= (class_path + [file_name]).map!{ |m| m.camelize }.join('::')
         end
 
+        def human_name
+          @human_name ||= singular_name.humanize
+        end
+
         def plural_name
           @plural_name ||= singular_name.pluralize
         end

data/lib/{generators → rails/generators}/rails/app/app_generator.rb

@@ -5,7 +5,11 @@ require 'rails/version' unless defined?(Rails::VERSION)
 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__))
+  RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
+
+  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 )
@@ -27,6 +31,9 @@ module Rails::Generators
     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"
 
@@ -67,7 +74,7 @@ module Rails::Generators
       copy_file "gitignore", ".gitignore" unless options[:skip_git]
       template "Rakefile"
       template "config.ru"
-      template "Gemfile"
+      template "Gemfile" unless options[:skip_gemfile]
     end
 
     def create_app_files
@@ -134,8 +141,11 @@ module Rails::Generators
     end
 
     def create_prototype_files
-      return if options[:skip_prototype]
-      directory "public/javascripts"
+      unless options[:skip_prototype]
+        directory "public/javascripts"
+      else
+        empty_directory_with_gitkeep "public/javascripts"
+      end
     end
 
     def create_script_files
@@ -171,7 +181,8 @@ module Rails::Generators
     end
 
     def bundle_if_dev_or_edge
-      run "bundle install" 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
@@ -209,9 +220,12 @@ module Rails::Generators
       end
 
       def valid_app_const?
-        case app_const
-        when /^\d/
+        if app_const =~ /^\d/
           raise Error, "Invalid application name #{app_name}. Please give a name which does not start with numbers."
+        elsif RESERVED_NAMES.include?(app_name)
+          raise Error, "Invalid application name #{app_name}. Please give a name which does not match one of the reserved rails words."
+        elsif Object.const_defined?(app_const_base)
+          raise Error, "Invalid application name #{app_name}, constant #{app_const_base} is already in use. Please choose another application name."
         end
       end
 

data/lib/rails/generators/rails/app/templates/Gemfile

@@ -0,0 +1,34 @@
+source 'http://rubygems.org'
+
+<%- if options.dev? -%>
+gem 'rails', :path => '<%= Rails::Generators::RAILS_DEV_PATH %>'
+<%- elsif options.edge? -%>
+gem 'rails', :git => 'git://github.com/rails/rails.git'
+<%- else -%>
+gem 'rails', '<%= Rails::VERSION::STRING %>'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+<%- end -%>
+
+<% unless options[:skip_activerecord] -%>
+gem '<%= gem_for_database %>'<% if require_for_database %>, :require => '<%= require_for_database %>'<% end %>
+<% end -%>
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri', '1.4.1'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for certain environments:
+# gem 'rspec', :group => :test
+# group :test do
+#   gem 'webrat'
+# end

data/lib/{generators → rails/generators}/rails/app/templates/README

@@ -29,14 +29,15 @@ link:files/vendor/rails/actionpack/README.html.
 
 1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
    and your application name. Ex: rails myapp
-2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
+2. Change directory into myapp and start the web server: <tt>rails server</tt> (run with --help for options)
 3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!"
 4. Follow the guidelines to start developing your application
 
 
 == Web Servers
 
-By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
+By default, Rails will try to use Mongrel if it's installed when started with <tt>rails server</tt>, otherwise
+Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
 with a variety of other web servers.
 
 Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
@@ -164,20 +165,20 @@ Finally, when you're ready to resume execution, you enter "cont"
 
 == Console
 
-You can interact with the domain model by starting the console through <tt>script/console</tt>.
+You can interact with the domain model by starting the console through <tt>rails console</tt>.
 Here you'll have all parts of the application configured, just like it is when the
 application is running. You can inspect domain models, change values, and save to the
 database. Starting the script without arguments will launch it in the development environment.
-Passing an argument will specify a different environment, like <tt>script/console production</tt>.
+Passing an argument will specify a different environment, like <tt>rails console production</tt>.
 
 To reload your controllers and models after launching the console run <tt>reload!</tt>
 
 == dbconsole
 
-You can go to the command line of your database directly through <tt>script/dbconsole</tt>.
+You can go to the command line of your database directly through <tt>rails dbconsole</tt>.
 You would be connected to the database with the credentials defined in database.yml.
 Starting the script without arguments will connect you to the development database. Passing an
-argument will connect you to a different database, like <tt>script/dbconsole production</tt>.
+argument will connect you to a different database, like <tt>rails dbconsole production</tt>.
 Currently works for mysql, postgresql and sqlite.
 
 == Description of Contents
@@ -207,7 +208,7 @@ app/views/layouts
 
 app/helpers
   Holds view helpers that should be named like weblogs_helper.rb. These are generated
-  for you automatically when using script/generate for controllers. Helpers can be used to
+  for you automatically when using rails generate for controllers. Helpers can be used to
   wrap functionality for your views into methods.
 
 config
@@ -234,7 +235,7 @@ script
   Helper scripts for automation and generation.
 
 test
-  Unit and functional tests along with fixtures. When using the script/generate scripts, template
+  Unit and functional tests along with fixtures. When using the rails generate command, template
   test files will be generated for you and placed in this directory.
 
 vendor