see CHANGELOG, bump version to 2.2.5

Author: DanielKehoe

CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h2. 2.2.5 August 29, 2012
+
+* fix 'frontend' recipe to remove application.css after twitter-bootstrap-rails creates it
+
 h2. 2.2.4 August 29, 2012
 
 * improve 'setup' recipe to save diagnostics before anything can fail

lib/rails_wizard/diagnostics.rb

@@ -41,6 +41,7 @@ module Diagnostics
     @@prefs << {:railsapps=>"none", :database=>"sqlite", :unit_test=>"rspec", :integration=>"capybara", :fixtures=>"factory_girl", :frontend=>"bootstrap", :bootstrap=>"sass", :email=>"none", :authentication=>"omniauth", :omniauth_provider=>"twitter", :authorization=>"cancan", :form_builder=>"none", :starter_app=>"admin_app"}
     @@prefs << {:railsapps=>"none", :database=>"sqlite", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"none", :frontend=>"bootstrap", :bootstrap=>"sass", :email=>"gmail", :authentication=>"devise", :devise_modules=>"invitable", :authorization=>"cancan", :form_builder=>"simple_form", :starter_app=>"admin_app"}
     @@prefs << {:railsapps=>"none", :database=>"sqlite", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"factory_girl", :frontend=>"bootstrap", :bootstrap=>"sass", :email=>"gmail", :authentication=>"devise", :devise_modules=>"default", :authorization=>"cancan", :form_builder=>"none", :starter_app=>"admin_app"}
+    @@prefs << {:railsapps=>"none", :database=>"sqlite", :unit_test=>"test_unit", :integration=>"none", :fixtures=>"none", :frontend=>"bootstrap", :bootstrap=>"less", :email=>"sendgrid", :authentication=>"devise", :devise_modules=>"confirmable", :authorization=>"cancan", :form_builder=>"none", :starter_app=>"admin_app"}
 
     def self.recipes
       @@recipes

recipes/frontend.rb

@@ -27,7 +27,6 @@
   gsub_file application_layout_file, /App_Name/, "#{app_name.humanize.titleize}"
   gsub_file navigation_partial_file, /App_Name/, "#{app_name.humanize.titleize}"
   ### CSS ###
-  remove_file 'app/assets/stylesheets/application.css'
   copy_from_repo 'app/assets/stylesheets/application.css.scss'
   copy_from_repo 'app/assets/stylesheets/application-bootstrap.css.scss', :prefs => 'bootstrap'
   if prefer :bootstrap, 'less'
@@ -50,6 +49,7 @@
   elsif prefer :frontend, 'normalize'
     copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
   end
+  remove_file 'app/assets/stylesheets/application.css'
   ### GIT ###
   git :add => '.' if prefer :git, true
   git :commit => "-aqm 'rails_apps_composer: front-end framework'" if prefer :git, true

version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end