rails_apps_composer 2.1.6 → 2.1.7

data/README.textile

@@ -59,7 +59,7 @@ h2. Who This Is For
 
 This gem is for experienced Rails developers who need a tool to create and maintain a Rails starter app or Rails application template. If you're regularly building Rails applications that use certain popular gems or rely on common functionality such as authentication, you can benefit from the rails_apps_composer gem.
 
-If you are new to Rails, try the "Rails Composer":http://railsapps.github.com/rails-composer/ tool instead. It provides an application template that is generated from the rails_apps_composer gem's core recipes. It is easier to use.
+If you are new to Rails, try the "Rails Composer":http://railsapps.github.com/rails-composer/ tool instead. It provides an application template that is generated from the rails_apps_composer gem's core recipes. The Rails Composer tool is easier to use; use the rails_apps_composer gem if you want a custom application template, a custom combination of recipes, or the convenience of setting a defaults file.
 
 h2. Alternatives
 
@@ -118,9 +118,9 @@ testing        # Add testing framework.
 views          # Add views needed for starter apps.
 </pre>
 
-The above list is current for rails_apps_composer 2.0; later releases will contain more recipes.
+The above list is current for rails_apps_composer 2.1; later releases will contain more recipes.
 
-You can learn more about the available recipes by examing the source code in the repository "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes.
+See the Guide for more "detailed descriptions of recipes":http://railsapps.github.com/tutorial-rails-apps-composer.html#Recipes. You can find all available recipes in the repository "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes. Examining the recipe source code is the very best way to learn what a recipe will do.
 
 h3. Recipe Order and Interdependency
 

data/lib/rails_wizard/command.rb

@@ -36,7 +36,8 @@ module RailsWizard
       else
         recipes = RailsWizard::Recipes.list_classes
       end
-
+      puts "#{bold}#{cyan}To learn more about recipes, see#{clear}:"
+      puts "#{bold}#{cyan}http://railsapps.github.com/tutorial-rails-apps-composer.html#Recipes#{clear}\n"
       recipes.each do |recipe|
         puts recipe.key.ljust(15) + "# #{recipe.description}"
       end

data/recipes/frontend.rb

@@ -32,6 +32,8 @@ after_bundler do
 body { padding-top: 60px; }
 @import "bootstrap-responsive";
 RUBY
+  elsif prefer :frontend, 'foundation'
+    insert_into_file 'app/assets/stylesheets/application.css.scss', " *= require foundation_and_overrides\n", :after => "require_self\n"
   elsif prefer :frontend, 'skeleton'
     copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
     copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css', 'app/assets/stylesheets/base.css'

data/recipes/gems.rb

@@ -7,29 +7,24 @@
 insert_into_file 'Gemfile', "ruby '1.9.3'\n", :before => "gem 'rails', '3.2.6'" if prefer :deploy, 'heroku'
 
 ## Web Server
-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.5.0', :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'
+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'
+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 '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'
+end
 
 ## Database Adapter
 gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
 gem 'mongoid', '>= 3.0.3' if prefer :orm, 'mongoid'
 gem 'pg', '>= 0.14.0' if prefer :database, 'postgresql'
 gem 'mysql2', '>= 0.3.11' if prefer :database, 'mysql'
-copy_from_repo 'config/database-postgresql.yml', :prefs => 'postgresql'
-copy_from_repo 'config/database-mysql.yml', :prefs => 'mysql'
-gsub_file "config/database.yml", /username: .*/, "username: #{app_name}" unless prefer :orm, 'mongoid'
-gsub_file "config/database.yml", /password: .*/, "password: #{app_name}" unless prefer :orm, 'mongoid'
-begin
-  run "createuser #{app_name}" if prefer :database, 'postgresql'
-  run 'bundle exec rake db:drop' if prefer :database, 'postgresql'
-  run 'bundle exec rake db:create:all' if prefer :database, 'postgresql'
-rescue StandardError
-  raise "unable to create a user and database for PostgreSQL"
-end
 
 ## Template Engine
 if prefer :templates, 'haml'
@@ -72,7 +67,8 @@ gem 'machinist', '>= 2.0', :group => :test if prefer :fixtures, 'machinist'
 
 ## Front-end Framework
 gem 'bootstrap-sass', '>= 2.0.4.0' if prefer :bootstrap, 'sass'
-gem 'zurb-foundation', '>= 3.0.8', :group => :assets if prefer :frontend, 'foundation'
+gem 'compass-rails', '>= 1.0.3', :group => :assets if prefer :frontend, 'foundation'
+gem 'zurb-foundation', '>= 3.0.9', :group => :assets if prefer :frontend, 'foundation'
 if prefer :bootstrap, 'less'
   gem 'twitter-bootstrap-rails', '>= 2.1.1', :group => :assets
   # install gem 'therubyracer' to use Less
@@ -117,11 +113,39 @@ end
 git :add => '.' if prefer :git, true
 git :commit => "-aqm 'rails_apps_composer: Gemfile'" if prefer :git, true
 
-### GENERATORS ###
+### CREATE DATABASE ###
 after_bundler do
-  ## Database
+  copy_from_repo 'config/database-postgresql.yml', :prefs => 'postgresql'
+  copy_from_repo 'config/database-mysql.yml', :prefs => 'mysql'
   generate 'mongoid:config' if prefer :orm, 'mongoid'
   remove_file 'config/database.yml' if prefer :orm, 'mongoid'
+  if prefer :database, 'postgresql'
+    begin
+      say_wizard "Creating a user named '#{app_name}' for PostgreSQL"
+      run "createuser #{app_name}" if prefer :database, 'postgresql'
+      gsub_file "config/database.yml", /username: .*/, "username: #{app_name}"
+    rescue StandardError
+      raise "unable to create a user for PostgreSQL"
+    end
+  end
+  unless prefer :database, 'sqlite'
+    affirm = multiple_choice "Drop any existing databases named #{app_name}?", 
+      [["Yes (continue)",true], ["No (abort)",false]]
+    if affirm
+      run 'bundle exec rake db:drop'
+    else
+      raise "aborted at user's request"
+    end
+  end
+  run 'bundle exec rake db:create:all' unless prefer :orm, 'mongoid'
+  run 'bundle exec rake db:create' if prefer :orm, 'mongoid'
+  ## Git
+  git :add => '.' if prefer :git, true
+  git :commit => "-aqm 'rails_apps_composer: create database'" if prefer :git, true
+end # after_bundler
+
+### GENERATORS ###
+after_bundler do
   ## Front-end Framework
   generate 'foundation:install' if prefer :frontend, 'foundation'
   ## Git

data/recipes/railsapps.rb

@@ -2,7 +2,7 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/railsapps.rb
 
 prefs[:railsapps] = multiple_choice "Install an example application?", 
-  [["No, let me build my own application", "none"], 
+  [["let me build my own application", "none"], 
   ["rails3-bootstrap-devise-cancan", "rails3-bootstrap-devise-cancan"], 
   ["rails3-devise-rspec-cucumber", "rails3-devise-rspec-cucumber"], 
   ["rails3-mongoid-devise", "rails3-mongoid-devise"],

data/recipes/setup.rb

@@ -52,7 +52,7 @@ prefs[:templates] = multiple_choice "Template engine?", [["ERB", "erb"], ["Haml"
 ## Testing Framework
 if recipes.include? 'testing'
   prefs[:unit_test] = multiple_choice "Unit testing?", [["Test::Unit", "test_unit"], ["RSpec", "rspec"]] unless prefs.has_key? :unit_test
-  prefs[:integration] = multiple_choice "Integration testing?", [["RSpec with Capybara", "capybara"], 
+  prefs[:integration] = multiple_choice "Integration testing?", [["None", "none"], ["RSpec with Capybara", "capybara"], 
     ["Cucumber with Capybara", "cucumber"], ["Turnip with Capybara", "turnip"]] unless prefs.has_key? :integration
   prefs[:fixtures] = multiple_choice "Fixture replacement?", [["None","none"], ["Factory Girl","factory_girl"], ["Machinist","machinist"]] unless prefs.has_key? :fixtures
 end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.1.6"
+  VERSION = "2.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1555427350048369200
+      hash: 6717265878412409
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1555427350048369200
+      hash: 6717265878412409
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24