rails_apps_composer 1.0.26 → 1.1.0

data/README.textile

@@ -10,12 +10,10 @@ The Rails Apps Composer gem is a fork of "Michael Bleigh's RailsWizard gem":http
 
 Any issues? Please create a "GitHub issue":http://github.com/RailsApps/rails_apps_composer/issues.
 
-h2. !http://twitter-badges.s3.amazonaws.com/t_logo-a.png(Follow on Twitter)!:http://www.twitter.com/rails_apps Follow on Twitter !http://railsapps.github.com/images/mailing-list-icon.jpg(Join the Mailing List)!:http://eepurl.com/dQx3o Join the Mailing List
+h2. !http://twitter-badges.s3.amazonaws.com/t_logo-a.png(Follow on Twitter)!:http://www.twitter.com/rails_apps Follow on Twitter
 
 Follow the project on Twitter: "@rails_apps":http://twitter.com/rails_apps. Tweet some praise if you like what you've found.
 
-<a href="http://eepurl.com/dQx3o">Join the email list</a> (low volume, announcements only) for project updates and my tips about Rails resources.
-
 h2. Suggested Use
 
 Any developer can quickly generate a Rails web application using the @rails new@ command. In practice, experienced Rails developers typically add an assortment of useful additional packages (gems) before beginning development of any web application. A developer often uses the same set of packages to get started and may create a "starter app" that can be copied and reused for any new project.
@@ -31,11 +29,9 @@ h2. Dependencies
 Before generating a new Rails app, you will need:
 
 * The Ruby language (version 1.9.3)
-* Rails 3.1
-
-Recipes will detect which version of Rails is in use. Some of the recipes behave differently depending on the version of Rails.
+* Rails 3.1 or newer
 
-See "Managing Rails Versions and Gems":http://railsapps.github.com/managing-rails-versions-gems.html for detailed instructions and advice.
+See "Installing Rails 3.2":http://railsapps.github.com/installing-rails.html for detailed instructions and advice.
 
 h2. Installation
 
@@ -67,16 +63,16 @@ h2. Make Your Own Starter App for One-Time Use
 
 h4. Select Recipes
 
-You can mix and match recipes to create your own customized starter app. See an annotated list of available "recipes for the Rails Apps Composer gem":http://railsapps.github.com/rails-apps-recipes.html. For an up-to-date list, browse the repository "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes to see what is available. Then provide your list of recipes to the Rails Apps Composer gem using the @-r@ option and generate an app as needed. Here's an example that creates a simple app using jquery and haml:
+You can mix and match recipes to create your own customized starter app. See an annotated list of available "recipes for the Rails Apps Composer gem":http://railsapps.github.com/rails-apps-recipes.html. For an up-to-date list, browse the repository "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes to see what is available. Then provide your list of recipes to the Rails Apps Composer gem using the @-r@ option and generate an app as needed. Here's an example that creates a simple app using haml:
 
 <pre>
-$ rails_apps_composer new myapp -r jquery haml
+$ rails_apps_composer new myapp -r haml
 </pre>
 
 For example, to build the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rails_apps_composer new myapp -r jquery haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout html5 navigation cleanup ban_spiders extras git
+$ rails_apps_composer new myapp -r haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout html5 navigation cleanup ban_spiders extras git
 </pre>
 
 Replace @myapp@ with the name you want for your application.
@@ -115,7 +111,7 @@ The Rails Apps Composer gem creates an application template that can be used by
 $ rails new myapp -m ~/Desktop/template.txt
 </pre>
 
-You can specify the @-T -O@ flags as needed to skip Test::Unit files and Active Record files. For Rails 3.0, you can also specify the @-J@ flag to skip Prototype files (not needed for Rails 3.1).
+You can specify the @-T -O@ flags as needed to skip Test::Unit files and Active Record files.
 
 That's all it takes. You'll have a ready-to-customize Rails web application in minutes.
 
@@ -124,7 +120,7 @@ h4. Template for Rails 3 + Devise + RSpec + Cucumber
 To build a reusable application template for the "rails3-devise-rspec-cucumber":http://github.com/RailsApps/rails3-devise-rspec-cucumber/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T@ flag.
@@ -138,7 +134,7 @@ h4. Template for Rails 3 + Mongoid + Devise
 To build a reusable application template for the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -152,7 +148,7 @@ h4. Template for Rails 3 + Mongoid + OmniAuth
 To build a reusable application template for the "rails3-mongoid-omniauth":http://github.com/RailsApps/rails3-mongoid-omniauth/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,css_setup,application_layout,html5,navigation,users_page,omniauth_email,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,css_setup,application_layout,html5,navigation,users_page,omniauth_email,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -166,7 +162,7 @@ h4. Template for Rails 3 + Subdomains
 To build a reusable application template for the "rails3-subdomains":https://github.com/RailsApps/rails3-subdomains example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,subdomains,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,subdomains,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -209,10 +205,10 @@ h4. Rails Apps Composer Differences
 The Rails Apps Composer gem is very similar to the rails_wizard gem, with one significant difference. The rails_wizard gem allows specification of execution order for recipes with @run_after@ and @run_after@ configuration flags. The Rails Apps Composer gem does not support @run_after@ or @run_after@; instead, the order which you provide the recipes sets the execution order. This makes it easier to chain a series of recipes in the order you prefer. For example,
 
 <pre>
-$ rails_apps_composer new myapp -r git jquery haml
+$ rails_apps_composer new myapp -r git haml
 </pre>
 
-installs jquery before haml.
+installs git before haml.
 
 h4. Recipe Differences
 

data/recipes/activerecord.rb

@@ -3,11 +3,6 @@ if config['database']
   old_gem = gem_for_database
   @options = @options.dup.merge(:database => config['database'])
   gsub_file 'Gemfile', "gem '#{old_gem}'", "gem '#{gem_for_database}'"
-  if config['database'] == 'mysql'
-    if recipes.include? 'rails 3.0'
-      gsub_file 'Gemfile', "gem 'mysql2'", "gem 'mysql2', '<= 0.3.0'"
-    end
-  end
   template "config/databases/#{@options[:database]}.yml", "config/database.yml.new"
   run 'mv config/database.yml.new config/database.yml'
 end

data/recipes/application_layout.rb

@@ -20,21 +20,16 @@ after_bundler do
     = csrf_meta_tags
   %body
     - flash.each do |name, msg|
-      = content_tag :div, msg, :id => "flash_\#{name}" if msg.is_a?(String)
+      = content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String)
     = yield
 HAML
     end
-    if recipes.include? 'rails 3.0'
-      gsub_file 'app/views/layouts/application.html.haml', /stylesheet_link_tag :application/, 'stylesheet_link_tag :all'
-      gsub_file 'app/views/layouts/application.html.haml', /javascript_include_tag :application/, 'javascript_include_tag :defaults'
-      gsub_file 'app/views/layouts/application.html.haml', /csrf_meta_tags/, 'csrf_meta_tag'
-    end
   else
     unless recipes.include? 'html5'
       inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
     <<-ERB
   <%- flash.each do |name, msg| -%>
-    <%= content_tag :div, msg, :id => "flash_\#{name}" if msg.is_a?(String) %>
+    <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
   <%- end -%>
 ERB
       end

data/recipes/backbone.rb

@@ -1,15 +1,7 @@
 if config['backbone']
-  # rails-backbone is preferred, but only support rails 3.1
-  if recipes.include? 'rails 3.1'
-    gem 'rails-backbone', :version => '~> 0.5.3'
-    after_bundler do
-      generate 'backbone:install'
-    end
-  else
-    gem 'backbone-rails', :version => '~> 0.5.2'
-    after_bundler do
-      generate 'backbone:install'
-    end
+  gem 'rails-backbone', :version => '~> 0.6.1'
+  after_bundler do
+    generate 'backbone:install'
   end
 else
   recipes.delete('backbone')

data/recipes/cleanup.rb

@@ -10,18 +10,9 @@ after_bundler do
     README
     doc/README_FOR_APP
     public/index.html
+    app/assets/images/rails.png
   }.each { |file| remove_file file }
-  
-  if recipes.include? 'rails 3.0'
-    %w{
-      public/images/rails.png
-    }.each { |file| remove_file file }
-  else
-    %w{
-      app/assets/images/rails.png
-    }.each { |file| remove_file file }
-  end
-  
+
   # add placeholder READMEs
   get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/sample_readme.txt", "README"
   get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/sample_readme.textile", "README.textile"

data/recipes/compass.rb

@@ -1,27 +1,18 @@
 if config['compass']
-  if recipes.include? 'rails 3.1'
-    gem 'compass', :version => '~> 0.12.alpha.0'
-
-    after_bundler do
-      remove_file 'app/assets/stylesheets/application.css'
-      create_file 'app/assets/stylesheets/application.css.sass' do <<-SASS
+  gem 'compass', :version => '~> 0.12.alpha.4'
+  after_bundler do
+    remove_file 'app/assets/stylesheets/application.css'
+    create_file 'app/assets/stylesheets/application.css.sass' do <<-SASS
 //= require_self
-//= require_tree . 
+//= require_tree .
 
 @import compass
 @import _blueprint
 SASS
-      end
-    end
-  else
-    gem 'compass', :version => '~> 0.11'
-
-    after_bundler do
-      run 'compass init rails'
     end
   end
 else
-  receipes.delete('compass')
+  recipes.delete('compass')
 end
 
 __END__

data/recipes/css_setup.rb

@@ -57,16 +57,15 @@ header nav ul li {
 
 CSS
 
-  if recipes.include? 'rails 3.0'
-    create_file 'public/stylesheets/application.css', css
+  # rename the application stylesheet to use SCSS
+  copy_file 'app/assets/stylesheets/application.css', 'app/assets/stylesheets/application.css.scss'
+  remove_file 'app/assets/stylesheets/application.css'
+  if recipes.include? 'html5'
+    append_file 'app/assets/stylesheets/application.css.scss', css_html5
   else
-    if recipes.include? 'html5'
-      append_file 'app/assets/stylesheets/application.css', css_html5
-    else
-      append_file 'app/assets/stylesheets/application.css', css
-    end
+    append_file 'app/assets/stylesheets/application.css.scss', css
   end
-
+  
 end
 
 __END__

data/recipes/cucumber.rb

@@ -2,19 +2,10 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/cucumber.rb
 
 if config['cucumber']
-  if recipes.include? 'rails 3.0'
-    # for Rails 3.0, use only gem versions we know that work
-    gem 'cucumber-rails', '0.5.1', :group => :test
-    gem 'capybara', '1.0.0', :group => :test
-    gem 'database_cleaner', '0.6.7', :group => :test
-    gem 'launchy', '0.4.0', :group => :test
-  else
-    # for Rails 3.1+, use optimistic versioning for gems
-    gem 'cucumber-rails', '>= 1.2.0', :group => :test
-    gem 'capybara', '>= 1.1.2', :group => :test
-    gem 'database_cleaner', '>= 0.7.0', :group => :test
-    gem 'launchy', '>= 2.0.5', :group => :test
-  end
+  gem 'cucumber-rails', '>= 1.2.1', :group => :test
+  gem 'capybara', '>= 1.1.2', :group => :test
+  gem 'database_cleaner', '>= 0.7.1', :group => :test
+  gem 'launchy', '>= 2.0.5', :group => :test
 else
   recipes.delete('cucumber')
 end

data/recipes/devise.rb

@@ -2,18 +2,11 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/devise.rb
 
 if config['devise']
-  if recipes.include? 'rails 3.0'
-    # for Rails 3.0, use only gem versions we know that work
-    gem 'devise', '1.3.4'
-  else
-    # for Rails 3.1+, use optimistic versioning for gems
-    gem 'devise', '>= 1.5.0'
-  end
+  gem 'devise', '>= 2.0.0'
 else
   recipes.delete('devise')
 end
 
-
 if config['devise']
   after_bundler do
     

data/recipes/guard.rb

@@ -1,7 +1,15 @@
 if config['guard']
   gem 'guard', '>= 0.6.2', :group => :development
-  
+
+  prepend_file 'Gemfile' do <<-RUBY
+require 'rbconfig'
+HOST_OS = RbConfig::CONFIG['host_os']
+
+RUBY
+  end
+
   append_file 'Gemfile' do <<-RUBY
+  # need newline here!
 case HOST_OS
   when /darwin/i
     gem 'rb-fsevent', :group => :development
@@ -24,29 +32,29 @@ end
   def guard(name, version = nil)
     args = []
     if version
-      args << version 
+      args << version
     end
     args << { :group => :development }
     gem "guard-#{name}", *args
     guards << name
   end
 
-  guard 'bundler', '>= 0.1.3' 
+  guard 'bundler', '>= 0.1.3'
 
-  unless recipes.include? 'pow' 
-    guard 'rails', '>= 0.0.3' 
+  unless recipes.include? 'pow'
+    guard 'rails', '>= 0.0.3'
   end
 
   if config['livereload']
     guard 'livereload', '>= 0.3.0'
   end
 
-  if recipes.include? 'rspec' 
-    guard 'rspec', '>= 0.4.3' 
+  if recipes.include? 'rspec'
+    guard 'rspec', '>= 0.4.3'
   end
 
-  if recipes.include? 'cucumber' 
-    guard 'cucumber', '>= 0.6.1' 
+  if recipes.include? 'cucumber'
+    guard 'cucumber', '>= 0.6.1'
   end
 
   after_bundler do
@@ -57,7 +65,7 @@ end
   end
 
 else
-  recipes.delete 'guard' 
+  recipes.delete 'guard'
 end
 
 __END__

data/recipes/haml.rb

@@ -2,15 +2,8 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/haml.rb
 
 if config['haml']
-  if recipes.include? 'rails 3.0'
-    # for Rails 3.0, use only gem versions we know that work
-    gem 'haml', '3.1.1'
-    gem 'haml-rails', '0.3.4', :group => :development
-  else
-    # for Rails 3.1+, use optimistic versioning for gems
-    gem 'haml', '>= 3.1.2'
-    gem 'haml-rails', '>= 0.3.4', :group => :development
-  end
+  gem 'haml', '>= 3.1.4'
+  gem 'haml-rails', '>= 0.3.4', :group => :development
 else
   recipes.delete('haml')
 end

data/recipes/heroku.rb

@@ -1,8 +1,12 @@
 heroku_name = app_name.gsub('_','')
 
+gem 'heroku', group: :development
+
 after_everything do
   if config['create']
-    say_wizard "Creating Heroku app '#{heroku_name}.heroku.com'"  
+    say_wizard "Creating Heroku app '#{heroku_name}.heroku.com'"
+    # system "heroku apps:destroy --app #{heroku_name} --confirm #{heroku_name}"
+
     while !system("heroku create #{heroku_name}")
       heroku_name = ask_wizard("What do you want to call your app? ")
     end
@@ -54,5 +58,5 @@ config:
       if: create
   - deploy:
       prompt: "Deploy immediately?"
-      type: boolean 
+      type: boolean
       if: create

data/recipes/html5.rb

@@ -1,68 +1,62 @@
 # Application template recipe for the rails_apps_composer. Check for a newer version here:
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/html5.rb
 
-if recipes.include? 'rails 3.1'
+case config['css_option']
+  when 'foundation'
+    # https://github.com/zurb/foundation-rails
+    gem 'zurb-foundation'
+  when 'bootstrap'
+    # https://github.com/thomas-mcdonald/bootstrap-sass
+    # http://rubysource.com/twitter-bootstrap-less-and-sass-understanding-your-options-for-rails-3-1/
+    gem 'bootstrap-sass'
+end
+after_bundler do
+  say_wizard "HTML5 recipe running 'after bundler'"
+  # add a humans.txt file
+  get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/humans.txt", "public/humans.txt"
+  # install a front-end framework for HTML5 and CSS3
   case config['css_option']
+    when 'nothing'
+      say_wizard "no HTML5 front-end framework selected"
     when 'foundation'
-      # https://github.com/zurb/foundation-rails
-      gem 'zurb-foundation'
+      say_wizard "installing Zurb Foundation HTML5 framework"
+      insert_into_file "app/assets/javascripts/application.js", "//= require foundation\n", :after => "jquery_ujs\n"
+      insert_into_file "app/assets/stylesheets/application.css.scss", " *= require foundation\n", :after => "require_self\n"
     when 'bootstrap'
-      # https://github.com/seyhunak/twitter-bootstrap-rails
-      gem 'twitter-bootstrap-rails'
+      say_wizard "installing Twitter Bootstrap HTML5 framework"
+      insert_into_file "app/assets/javascripts/application.js", "//= require bootstrap\n", :after => "jquery_ujs\n"
+      insert_into_file "app/assets/stylesheets/application.css.scss", " *= require bootstrap\n", :after => "require_self\n"
+    when 'skeleton'
+      say_wizard "installing Skeleton HTML5 framework"
+      get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
+      get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css", "app/assets/stylesheets/base.css.scss"
+      get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css", "app/assets/stylesheets/layout.css.scss"
+      get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css", "app/assets/stylesheets/skeleton.css.scss"
+      get "https://raw.github.com/dhgamache/Skeleton/master/javascripts/tabs.js", "app/assets/javascripts/tabs.js"
+    when 'normalize'
+      say_wizard "normalizing CSS for consistent styling"
+      get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
   end
-  after_bundler do
-    say_wizard "HTML5 recipe running 'after bundler'"
-    # add a humans.txt file
-    get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/humans.txt", "public/humans.txt"
-    # install a front-end framework for HTML5 and CSS3
-    case config['css_option']
-      when 'nothing'
-        say_wizard "no HTML5 front-end framework selected"
-      when 'foundation'
-        say_wizard "installing Zurb Foundation HTML5 framework"
-        insert_into_file "app/assets/javascripts/application.js", "//= require foundation\n", :after => "jquery_ujs\n"
-        insert_into_file "app/assets/stylesheets/application.css", " *= require foundation\n", :after => "require_self\n"
-      when 'bootstrap'
-        say_wizard "installing Twitter Bootstrap HTML5 framework"
-        insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
-        insert_into_file "app/assets/stylesheets/application.css", " *= require twitter/bootstrap\n", :after => "require_self\n"
-      when 'skeleton'
-        say_wizard "installing Skeleton HTML5 framework"
-        get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
-        get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css", "app/assets/stylesheets/base.css.scss"
-        get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css", "app/assets/stylesheets/layout.css.scss"
-        get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css", "app/assets/stylesheets/skeleton.css.scss"
-        get "https://raw.github.com/dhgamache/Skeleton/master/javascripts/tabs.js", "app/assets/javascripts/tabs.js"
-      when 'normalize'
-        say_wizard "normalizing CSS for consistent styling"
-        get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
-    end
-    # Set up the default application layout
-    if recipes.include? 'haml'
-      # Haml version of default application layout
-      remove_file 'app/views/layouts/application.html.erb'
-      remove_file 'app/views/layouts/application.html.haml'
-      get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/views/layouts/application.html.haml", "app/views/layouts/application.html.haml"
-      gsub_file "app/views/layouts/application.html.haml", /App_Name/, "#{app_name.humanize.titleize}"
-    else
-      # ERB version of default application layout
-      remove_file 'app/views/layouts/application.html.erb'
-      remove_file 'app/views/layouts/application.html.haml'
-      get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/views/layouts/application.html.erb", "app/views/layouts/application.html.erb"
-      gsub_file "app/views/layouts/application.html.erb", /App_Name/, "#{app_name.humanize.titleize}"
-    end
+  # Set up the default application layout
+  if recipes.include? 'haml'
+    # Haml version of default application layout
+    remove_file 'app/views/layouts/application.html.erb'
+    remove_file 'app/views/layouts/application.html.haml'
+    get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/views/layouts/application.html.haml", "app/views/layouts/application.html.haml"
+    gsub_file "app/views/layouts/application.html.haml", /App_Name/, "#{app_name.humanize.titleize}"
+  else
+    # ERB version of default application layout
+    remove_file 'app/views/layouts/application.html.erb'
+    remove_file 'app/views/layouts/application.html.haml'
+    get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/views/layouts/application.html.erb", "app/views/layouts/application.html.erb"
+    gsub_file "app/views/layouts/application.html.erb", /App_Name/, "#{app_name.humanize.titleize}"
   end
-elsif recipes.include? 'rails 3.0'
-  say_wizard "Not supported for Rails version #{Rails::VERSION::STRING}. HTML5 recipe skipped."
-else
-  say_wizard "Don't know what to do for Rails version #{Rails::VERSION::STRING}. HTML5 recipe skipped."
 end
 
-
 __END__
 
 name: html5
-description: "Install a front-end framework for HTML5 and CSS3."
+description: "Install a front-end framework for HTML5 and CSS."
 author: RailsApps
 
 category: other
@@ -71,6 +65,6 @@ tags: [utilities, configuration]
 config:
   - css_option:
       type: multiple_choice
-      prompt: "Which front-end framework would you like for HTML5 and CSS3?"
+      prompt: "Which front-end framework would you like for HTML5 and CSS?"
       choices: [["None", nothing], ["Zurb Foundation", foundation], ["Twitter Bootstrap", bootstrap], ["Skeleton", skeleton], ["Just normalize CSS for consistent styling", normalize]]