see CHANGELOG, bump version to 2.2.4

Author: DanielKehoe

CHANGELOG.textile

@@ -1,5 +1,13 @@
 h1. CHANGELOG
 
+h2. 2.2.4 August 29, 2012
+
+* improve 'setup' recipe to save diagnostics before anything can fail
+* improve 'setup' recipe to not offer "Twitter Bootstrap (Less)" to Windows users
+* improve 'extras' recipe to only ask Linux users about adding 'therubyracer' gem
+* fix 'setup' recipe for error introduced in version 2.2.3
+* update gem 'puma' from 1.6.1 to 1.6.2
+
 h2. 2.2.3 August 27, 2012
 
 * fix 'setup', 'frontend', and 'controllers' recipes to allow CanCan authorization when OmniAuth authentication is selected

lib/rails_wizard/diagnostics.rb

@@ -39,7 +39,9 @@ module Diagnostics
     @@prefs << {:railsapps=>"rails3-mongoid-omniauth", :database=>'mongodb', :orm=>'mongoid', :templates=>'erb', :unit_test=>'rspec', :integration=>'cucumber', :fixtures=>'factory_girl', :frontend=>'none', :email=>'none', :authentication=>'omniauth', :omniauth_provider=>'twitter', :authorization=>'none', :starter_app=>'users_app', :form_builder=>'none'}
     @@prefs << {:railsapps=>"rails3-subdomains", :database=>'mongodb', :orm=>'mongoid', :templates=>'haml', :unit_test=>'rspec', :integration=>'cucumber', :fixtures=>'factory_girl', :frontend=>'none', :email=>'gmail', :authentication=>'devise', :devise_modules=>'default', :authorization=>'none', :starter_app=>'subdomains_app', :form_builder=>'none'}
     @@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"}
+    
     def self.recipes
       @@recipes
     end

autotest/discover.rb my/discover.rbautotest/discover.rb renamed to my/discover.rb

@@ -9,6 +9,7 @@
   end
   if prefer :authorization, 'cancan'
     inject_into_file 'app/controllers/application_controller.rb', :before => "\nend" do <<-RUBY
+\n
   rescue_from CanCan::AccessDenied do |exception|
     redirect_to root_path, :alert => exception.message
   end

recipes/controllers.rb

@@ -14,15 +14,16 @@
 end
 
 ## JSRUNTIME
-if config['jsruntime']
-  prefs[:jsruntime] = true
-end
-if prefs[:jsruntime]
-  say_wizard "recipe adding 'therubyracer' JavaScript runtime gem"
-  # maybe it was already added for bootstrap-less?
-  unless prefer :bootstrap, 'less'
-    gem 'therubyracer', '>= 0.10.2', :group => :assets, :platform => :ruby
-  end
+case RbConfig::CONFIG['host_os']
+  when /linux/i
+    prefs[:jsruntime] = yes_wizard? "Add 'therubyracer' JavaScript runtime (for Linux users without node.js)?" unless prefs.has_key? :jsruntime
+    if prefs[:jsruntime]
+      # was it already added for bootstrap-less?
+      unless prefer :bootstrap, 'less'
+        say_wizard "recipe adding 'therubyracer' JavaScript runtime gem"
+        gem 'therubyracer', '>= 0.10.2', :group => :assets, :platform => :ruby
+      end
+    end
 end
 
 ## RVMRC
@@ -112,9 +113,6 @@
   - ban_spiders:
       type: boolean
       prompt: Set a robots.txt file to ban spiders?
-  - jsruntime:
-      type: boolean
-      prompt: Add 'therubyracer' JavaScript runtime (for Linux users without node.js)?
   - rvmrc:
       type: boolean
       prompt: Create a project-specific rvm gemset and .rvmrc?

recipes/extras.rb

@@ -10,14 +10,14 @@
 if (prefs[:dev_webserver] == prefs[:prod_webserver])
   gem 'thin', '>= 1.4.1' if prefer :dev_webserver, 'thin'
   gem 'unicorn', '>= 4.3.1' if prefer :dev_webserver, 'unicorn'
-  gem 'puma', '>= 1.6.1' if prefer :dev_webserver, 'puma'
+  gem 'puma', '>= 1.6.2' if prefer :dev_webserver, 'puma'
 else
   gem 'thin', '>= 1.4.1', :group => [:development, :test] if prefer :dev_webserver, 'thin'
   gem 'unicorn', '>= 4.3.1', :group => [:development, :test] if prefer :dev_webserver, 'unicorn'
-  gem 'puma', '>= 1.6.1', :group => [:development, :test] if prefer :dev_webserver, 'puma'
+  gem 'puma', '>= 1.6.2', :group => [:development, :test] if prefer :dev_webserver, 'puma'
   gem 'thin', '>= 1.4.1', :group => :production if prefer :prod_webserver, 'thin'
   gem 'unicorn', '>= 4.3.1', :group => :production if prefer :prod_webserver, 'unicorn'
-  gem 'puma', '>= 1.6.1', :group => :production if prefer :prod_webserver, 'puma'
+  gem 'puma', '>= 1.6.2', :group => :production if prefer :prod_webserver, 'puma'
 end
 
 ## Database Adapter

recipes/gems.rb

@@ -2,6 +2,8 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/setup.rb
 
 ## Ruby on Rails
+HOST_OS = RbConfig::CONFIG['host_os']
+say_wizard "Your operating system is #{HOST_OS}."
 say_wizard "You are using Ruby version #{RUBY_VERSION}."
 say_wizard "You are using Rails version #{Rails::VERSION::STRING}."
 
@@ -62,8 +64,13 @@
   prefs[:frontend] = multiple_choice "Front-end framework?", [["None", "none"], ["Twitter Bootstrap", "bootstrap"], 
     ["Zurb Foundation", "foundation"], ["Skeleton", "skeleton"], ["Just normalize CSS for consistent styling", "normalize"]] unless prefs.has_key? :frontend
   if prefer :frontend, 'bootstrap'
-    prefs[:bootstrap] = multiple_choice "Twitter Bootstrap version?", [["Twitter Bootstrap (Less)", "less"],
-      ["Twitter Bootstrap (Sass)", "sass"]] unless prefs.has_key? :bootstrap
+    case HOST_OS
+      when /mswin|windows/i
+        prefs[:bootstrap] = multiple_choice "Twitter Bootstrap version?", [["Twitter Bootstrap (Sass)", "sass"]] unless prefs.has_key? :bootstrap
+      else
+        prefs[:bootstrap] = multiple_choice "Twitter Bootstrap version?", [["Twitter Bootstrap (Less)", "less"],
+          ["Twitter Bootstrap (Sass)", "sass"]] unless prefs.has_key? :bootstrap
+    end
   end
 end
 
@@ -117,6 +124,10 @@
   end
 end
 
+# save diagnostics before anything can fail
+create_file "README", "RECIPES\n#{recipes.sort.inspect}\n"
+append_file "README", "PREFERENCES\n#{prefs.inspect}"
+
 __END__
 
 name: setup

recipes/setup.rb

@@ -94,7 +94,7 @@
   end
   ## TURNIP
   if prefer :integration, 'turnip'
-    append_to_file '.rspec', '-r turnip/rspec'
+    append_file '.rspec', '-r turnip/rspec'
     inject_into_file 'spec/spec_helper.rb', "require 'turnip/capybara'\n", :after => "require 'rspec/rails'\n"
     create_file 'spec/acceptance/steps/.gitkeep'
   end

recipes/testing.rb

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