rails_apps_composer 1.0.4 → 1.0.5

data/README.textile

@@ -1,16 +1,18 @@
 h1. Rails Apps Composer Gem
 
-A gem with recipes to create Rails application templates you can use to generate Rails starter apps. Creates ready-to-run Rails web applications. Makes it easy to create and maintain a starter app using your own preferred options.
+A gem with recipes to create Rails application templates you can use to generate Rails starter apps. Creates ready-to-run Rails web applications. Makes it easy to create and maintain a starter app.
+
+I use the Rails Apps Composer gem to create the "Rails Example Apps":http://railsapps.github.com/ for the "RailsApps project":https://github.com/RailsApps.
 
 h4. Based on Michael Bleigh's RailsWizard Gem
 
-The rails_apps_composer gem is a fork of "Michael Bleigh's RailsWizard gem":https://github.com/intridea/rails_wizard (see credits below). The purpose of this fork is to provide recipes for ready-to-run Rails starter apps. Several recipes provided by the rails_apps_composer gem are different from those provided by the rails_wizard gem. Applications generated with the rails_apps_composer gem are more complete; for example, they may include a home page with sign-in, sign-out navigation links.
+The Rails Apps Composer gem is a fork of "Michael Bleigh's RailsWizard gem":https://github.com/intridea/rails_wizard (see credits below). The purpose of the fork is to provide recipes for ready-to-run Rails starter apps. Several recipes provided by the Rails Apps Composer gem are different from those provided by the rails_wizard gem. Applications generated with the Rails Apps Composer gem are more complete; for example, they may include a home page with sign-in, sign-out navigation links.
 
 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
 
-Follow the project on Twitter: "http://twitter.com/rails_apps":http://twitter.com/rails_apps. Tweet some praise if you like what you've found.
+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.
 
@@ -28,17 +30,12 @@ h2. Dependencies
 
 Before generating a new Rails app, you will need:
 
-* The Ruby language (version 1.8.7 or 1.9.2)
-* Rails (version 3.0.4 or newer)
-
-I recommend installing rvm, the "Ruby Version Manager":http://rvm.beginrescueend.com/, to manage multiple versions of Rails.
+* The Ruby language (version 1.9.2)
+* Rails
 
-If you are using rvm, you can see a list of the Ruby versions currently installed:
-@$ rvm list@
+Recipes can be written to detect which version of Rails is in use. Some of the recipes behave differently  depending on the version of Rails.
 
-Check that appropriate versions of Ruby and Rails are installed in your development environment:
-@$ ruby -v@
-@$ rails -v@
+See "Managing Rails Versions and Gems":http://railsapps.github.com/managing-rails-versions-gems.html for detailed instructions and advice.
 
 h2. Installation
 
@@ -58,11 +55,11 @@ You'll find more details about the available recipes by browsing the repository
 
 h4. Generate a Starter App
 
-There are two ways to use the rails_apps_composer gem to generate a starter app.
+There are two ways to use the Rails Apps Composer gem to generate a starter app.
 
 If you want to build a starter app for one-time use, you can build an application by providing a list of recipes with the @-r@ option. This will automatically generate an application using the specified recipes.
 
-If you want to create and save an application template that you can reuse as needed to "clone" identical starter apps, you can download the rails_apps_composer project, customize recipes as needed, and use a @rake@ task to save a reusable application template file.
+If you want to create and save an application template that you can reuse as needed to "clone" identical starter apps, you can download the Rails Apps Composer project, customize recipes as needed, and use a @rake@ task to save a reusable application template file.
 
 Each of these approaches is described below.
 
@@ -70,13 +67,13 @@ 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. 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. 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:
 
 <pre>
 $ rails_apps_composer new APP_NAME -r jquery haml
 </pre>
 
-To build the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
+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 APP_NAME -r jquery haml rspec cucumber mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout devise_navigation cleanup ban_spiders git
@@ -86,13 +83,13 @@ h2. Make Your Own Starter App with a Reusable Application Template
 
 You can modify the recipes and save an application template that creates your own customized starter app.
 
-First, you'll need to make your own copy of the rails_apps_composer gem.
+First, you'll need to make your own copy of the Rails Apps Composer gem.
 
 @$ git clone git://github.com/RailsApps/rails_apps_composer.git@
 
 @$ cd rails_apps_composer@
 
-The "mg":https://github.com/sr/mg "minimal gem" is required for development of the rails_apps_composer gem. Several other gems are needed as well:
+The "mg":https://github.com/sr/mg "minimal gem" is required for development of the Rails Apps Composer gem. Several other gems are needed as well:
 
 @$ gem install i18n activesupport thor rspec mg@
 
@@ -102,7 +99,7 @@ Modify or write new recipes as you wish (see below for details about writing rec
 
 h4. Save the Application Template
 
-The rails_apps_composer gem creates an application template as an intermediate step before generating an application. You can generate and save the application template. Here's an example of generating an application template and saving the template to a file:
+The Rails Apps Composer gem creates an application template as an intermediate step before generating an application. You can generate and save the application template. Here's an example of generating an application template and saving the template to a file:
 
 <pre>
 $ rake print --silent RECIPES=recipe1,recipe2 > ~/Desktop/template.txt
@@ -110,13 +107,13 @@ $ rake print --silent RECIPES=recipe1,recipe2 > ~/Desktop/template.txt
 
 If you don't include the @--silent@ option, the rake task will generate the application template with an extraneous first line. Open the template file and remove the first line if you encounter this problem.
 
-The rails_apps_composer gem creates an application template that can be used by the @rails new@ command with the @-m@ option. For example:
+The Rails Apps Composer gem creates an application template that can be used by the @rails new@ command with the @-m@ option. For example:
 
 <pre>
 $ rails new testapp -m ~/Desktop/template.txt
 </pre>
 
-You can specify the @-T -O -J@ 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.
+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).
 
 That's all it takes. You'll have a ready-to-customize Rails web application in minutes.
 
@@ -168,11 +165,11 @@ For your reference, here’s an annotated list of available "recipes for the Rai
 
 h2. Writing New Recipes
 
-You can find the rails_apps_composer recipe collection in the GitHub repository's "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes. If you find errors or improve a recipe you can contribute to the project by submitting a pull request or creating a "Github issue":http://github.com/RailsApps/rails_apps_composer/issues.
+You can find the Rails Apps Composer recipe collection in the GitHub repository's "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes. If you find errors or improve a recipe you can contribute to the project by submitting a pull request or creating a "Github issue":http://github.com/RailsApps/rails_apps_composer/issues.
 
 h4. Rails Wizard Basics
 
-For more information on all available options for authoring recipes that can be read by the rails_wizard or rails_apps_composer gems, please see the "wiki for Michael Bleigh's  RailsWizard gem":https://github.com/intridea/rails_wizard/wiki.
+For more information on all available options for authoring recipes that can be read by the rails_wizard or Rails Apps Composer gems, please see the "wiki for Michael Bleigh's  RailsWizard gem":https://github.com/intridea/rails_wizard/wiki.
 
 Recipes are made of up *template code* and *YAML back-matter* stored in a ruby file. The @__END__@ parsing convention is used so that each recipe is actually a valid, parseable Ruby file. The structure of a recipe looks something like this:
 
@@ -193,7 +190,7 @@ author: mbleigh
 
 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,
+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 APP_NAME -r git jquery haml
@@ -203,7 +200,7 @@ installs jquery before haml.
 
 h4. Recipe Differences
 
-Several recipes provided by the rails_apps_composer gem are different from those provided by the rails_wizard gem.
+Several recipes provided by the Rails Apps Composer gem are different from those provided by the rails_wizard gem.
 
 h4. Rails Wizard RSpec Tests
 
@@ -244,11 +241,11 @@ RSpec, Cucumber, and Yard recipes were contributed by "Ramon Brooker":http://cog
 Additional recipes by Daniel Kehoe, "http://danielkehoe.com/":http://danielkehoe.com/.
 
 Is the gem useful to you? Follow the project on Twitter:
-"http://twitter.com/rails_apps":http://twitter.com/rails_apps
+"rails_apps":http://twitter.com/rails_apps
 and tweet some praise. I'd love to know you were helped out by the gem.
 
 h2. License
 
 h4. MIT License
 
-The rails_apps_composer gem and its recipes are distributed under the MIT License.
+The Rails Apps Composer gem and its recipes are distributed under the MIT License.

data/recipes/application_layout.rb

@@ -10,7 +10,7 @@ after_bundler do
     remove_file 'app/views/layouts/application.html.erb'
     # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
     create_file 'app/views/layouts/application.html.haml' do <<-HAML
-!!!
+!!! 5
 %html
   %head
     %title #{app_name}
@@ -23,6 +23,10 @@ after_bundler do
     = yield
 HAML
     end
+    if recipes.include? 'rails 3.1'
+      gsub_file 'app/views/layouts/application.html.haml', /stylesheet_link_tag :all/, 'stylesheet_link_tag :application'
+      gsub_file 'app/views/layouts/application.html.haml', /javascript_include_tag :defaults/, 'javascript_include_tag :application'
+    end
   else
     inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
   <<-ERB

data/recipes/capybara.rb

@@ -1,4 +1,4 @@
-gem 'capybara', :group => [:development, :test]
+gem 'capybara', :group => [:development, :test] unless config['cucumber']
 
 after_bundler do
   create_file "spec/support/capybara.rb", <<-RUBY

data/recipes/css_setup.rb

@@ -6,14 +6,15 @@ after_bundler do
   say_wizard "CssSetup recipe running 'after bundler'"
 
   # Add a stylesheet with styles for a horizontal menu and flash messages
-  create_file 'public/stylesheets/application.css' do <<-CSS
+  css = <<-CSS
+
 ul.hmenu {
-  list-style: none;	
+  list-style: none;
   margin: 0 0 2em;
   padding: 0;
 }
 ul.hmenu li {
-  display: inline;  
+  display: inline;
 }
 #flash_notice, #flash_alert {
   padding: 5px 8px;
@@ -27,7 +28,12 @@ ul.hmenu li {
   background-color: #FCC;
   border: solid 1px #C66;
 }
+
 CSS
+  if recipes.include? 'rails 3.0'
+    create_file 'public/stylesheets/application.css', css
+  else
+    append_file 'app/assets/stylesheets/application.css', css
   end
 
 end

data/recipes/cucumber.rb

@@ -4,13 +4,13 @@
 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.4.1', :group => :test
-    gem 'capybara', '0.4.1.2', :group => :test
+    gem 'cucumber-rails', '0.5.1', :group => :test
+    gem 'capybara', '1.0.0.beta1', :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', '>= 0.5.0', :group => :test
+    gem 'cucumber-rails', '>= 0.5.1', :group => :test
     gem 'capybara', '>= 1.0.0.beta1', :group => :test
     gem 'database_cleaner', '>= 0.6.7', :group => :test
     gem 'launchy', '>= 0.4.0', :group => :test
@@ -35,17 +35,17 @@ end
 if config['cucumber']
   if recipes.include? 'devise'
     after_bundler do
-      say_wizard "Copying Cucumber scenarios from the rails3-mongoid-devise examples"
+      say_wizard "Copying Cucumber scenarios from the rails3-devise-rspec-cucumber examples"
       begin
-        # copy all the Cucumber scenario files from the rails3-mongoid-devise example app
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/users/sign_in.feature', 'features/users/sign_in.feature'
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/users/sign_out.feature', 'features/users/sign_out.feature'
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/users/sign_up.feature', 'features/users/sign_up.feature'
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/users/user_edit.feature', 'features/users/user_edit.feature'
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/users/user_show.feature', 'features/users/user_show.feature'
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/step_definitions/user_steps.rb', 'features/step_definitions/user_steps.rb'
+        # copy all the Cucumber scenario files from the rails3-devise-rspec-cucumber example app
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/users/sign_in.feature', 'features/users/sign_in.feature'
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/users/sign_out.feature', 'features/users/sign_out.feature'
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/users/sign_up.feature', 'features/users/sign_up.feature'
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/users/user_edit.feature', 'features/users/user_edit.feature'
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/users/user_show.feature', 'features/users/user_show.feature'
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/step_definitions/user_steps.rb', 'features/step_definitions/user_steps.rb'
         remove_file 'features/support/paths.rb'
-        get 'https://github.com/RailsApps/rails3-mongoid-devise/raw/master/features/support/paths.rb', 'features/support/paths.rb'
+        get 'https://github.com/RailsApps/rails3-devise-rspec-cucumber/raw/master/features/support/paths.rb', 'features/support/paths.rb'
       rescue OpenURI::HTTPError
         say_wizard "Unable to obtain Cucumber example files from the repo"
       end

data/recipes/devise_navigation.rb

@@ -64,9 +64,9 @@ ERB
     if recipes.include? 'haml'
       # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
       inject_into_file 'app/views/layouts/application.html.haml', :after => "%body\n" do <<-HAML
-  %ul.hmenu
-    = render 'devise/menu/registration_items'
-    = render 'devise/menu/login_items'
+    %ul.hmenu
+      = render 'devise/menu/registration_items'
+      = render 'devise/menu/login_items'
 HAML
       end
     else

data/recipes/rspec.rb

@@ -6,7 +6,7 @@ if config['rspec']
     # for Rails 3.0, use only gem versions we know that work
     say_wizard "REMINDER: When creating a Rails app using RSpec..."
     say_wizard "you should add the '-T' flag to 'rails new'"
-    gem 'rspec-rails', '2.5.0', :group => [:development, :test]
+    gem 'rspec-rails', '2.6.1', :group => [:development, :test]
     if recipes.include? 'mongoid'
       # use the database_cleaner gem to reset the test database
       gem 'database_cleaner', '0.6.7', :group => :test
@@ -19,7 +19,7 @@ if config['rspec']
     end
   else
     # for Rails 3.1+, use optimistic versioning for gems
-    gem 'rspec-rails', '>= 2.6.0', :group => [:development, :test]
+    gem 'rspec-rails', '>= 2.6.1', :group => [:development, :test]
     if recipes.include? 'mongoid'
       # use the database_cleaner gem to reset the test database
       gem 'database_cleaner', '>= 0.6.7', :group => :test

data/templates/layout.erb

@@ -57,6 +57,7 @@ say_wizard "Checking configuration. Please confirm your preferences."
 say_wizard "Running 'bundle install'. This will take a while."
 run 'bundle install'
 say_wizard "Running 'after bundler' callbacks."
+require 'bundler/setup'
 @after_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; b[1].call}
 
 @current_recipe = nil

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: rails_apps_composer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Daniel Kehoe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 Z
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -137,7 +137,6 @@ files:
 - recipes/pow.rb
 - recipes/prototype.rb
 - recipes/rails_admin.rb
-- recipes/rake_fix.rb
 - recipes/redis.rb
 - recipes/redistogo.rb
 - recipes/rightjs.rb
@@ -176,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 822178014315943346
+      hash: -1974234557299836899
       segments: 
       - 0
       version: "0"
@@ -185,14 +184,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 822178014315943346
+      hash: -1974234557299836899
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails_apps_composer
-rubygems_version: 1.7.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.

data/recipes/rake_fix.rb

@@ -1,25 +0,0 @@
-# Application template recipe for the rails_apps_composer. Check for a newer version here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/rake_fix.rb
-
-if config['rakefix']
-  if recipes.include? 'rails 3.0'
-    # for Rails 3.0, bind rake gem at version 0.8.7
-    gem 'rake', '0.8.7'
-  end
-else
-  recipes.delete('rakefix')
-end
-
-__END__
-
-name: RakeFix
-description: "For Rails 3.0, bind rake gem at version 0.8.7."
-author: RailsApps
-
-category: other
-tags: [utilities, configuration]
-
-config:
-  - rakefix:
-      type: boolean
-      prompt: Would you like to use Rake gem version 0.8.7 (recommended)?