rails_apps_composer 2.2.32 → 2.2.33

data/README.textile

@@ -188,7 +188,7 @@ $ rails_apps_composer new myapp -r core
 
 Would you like to skip Test::Unit? (yes for RSpec) (y/n)
 Would you like to skip Active Record? (yes for MongoDB) (y/n)
-What gem would you like to add? (blank to finish) 
+What gem would you like to add? (blank to finish)
 
 Generating basic application, using:
 "rails new myapp -m <temp_file>"
@@ -231,7 +231,7 @@ mvc: controllers, models, routes, views
 other: extras
 testing: testing
 
-Which recipe would you like to add? (blank to finish) 
+Which recipe would you like to add? (blank to finish)
 What gem would you like to add? (blank to finish)
 Generating and saving application template...
 Done.
@@ -343,7 +343,7 @@ If you get an error like this:
 Your bundle is complete! Use `bundle show [gemname]` to see where a bundled gem is installed.
     composer  Running 'after bundler' callbacks.
 The template [...] could not be loaded.
-Error: You have already activated ..., but your Gemfile requires .... 
+Error: You have already activated ..., but your Gemfile requires ....
 Using bundle exec may solve this.
 </pre>
 

data/lib/rails_wizard/config.rb

@@ -7,7 +7,7 @@ module RailsWizard
     def initialize(schema, defaults=nil)
       @questions = ActiveSupport::OrderedHash.new
       @defaults = defaults
-      schema.each do |hash| 
+      schema.each do |hash|
         key = hash.keys.first
         details = hash.values.first
 
@@ -68,7 +68,7 @@ module RailsWizard
     end
 
     class TrueFalse < Prompt
-      def question 
+      def question
         "yes_wizard?(#{prompt.inspect})"
       end
     end
@@ -76,7 +76,7 @@ module RailsWizard
     class MultipleChoice < Prompt
       def question
         "multiple_choice(#{prompt.inspect}, #{@details['choices'].inspect})"
-      end 
+      end
     end
 
     QUESTION_TYPES = {

data/lib/rails_wizard/template.rb

@@ -55,7 +55,7 @@ module RailsWizard
         RailsWizard::Diagnostics.prefs.inspect
       end
     end
-    
+
     # Sort the recipes list taking 'run_after' directives into account.
     def resolve_recipes
       @resolve_recipes ||= begin
@@ -81,7 +81,7 @@ module RailsWizard
 
     def recipes_with_dependencies
       @recipes_with_dependencies ||= recipe_classes
-      
+
       added_more = false
       for recipe in recipe_classes
         recipe.requires.each do |requirement|

data/recipes/controllers.rb

@@ -16,7 +16,7 @@ after_bundler do
   end
 RUBY
     end
-  end  
+  end
   ### HOME_CONTROLLER ###
   if ['home_app','users_app','admin_app','subdomains_app'].include? prefs[:starter_app]
     generate(:controller, "home index")

data/recipes/core.rb

@@ -11,4 +11,4 @@ description: "Select all core recipes."
 author: RailsApps
 
 requires: [git, railsapps, setup, readme, gems, testing, email, models, controllers, views, routes, frontend, init, prelaunch, saas, extras]
-category: collections
+category: collections

data/recipes/email.rb

@@ -17,9 +17,9 @@ config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 RUBY
     end
     ### TEST
-    inject_into_file 'config/environments/test.rb', :before => "\nend" do 
+    inject_into_file 'config/environments/test.rb', :before => "\nend" do
   <<-RUBY
-\n  
+\n
   # ActionMailer Config
   config.action_mailer.default_url_options = { :host => 'example.com' }
 RUBY

data/recipes/example.rb

@@ -58,7 +58,7 @@ config:
       type: boolean
       prompt: Do you also want to test your application on Mars?
       if: space_test
-      if_recipe: mars_lander      
+      if_recipe: mars_lander
   - test_count:
       type: string
       prompt: How many times would you like to repeat the test?
@@ -67,4 +67,4 @@ config:
       type: multiple_choice
       prompt: "What orbit do you want?"
       choices: [ [Low Earth orbit, leo], [Sun-synchronous, spy], [Geostationary, gps] ]
-      if: space_test
+      if: space_test

data/recipes/frontend.rb

@@ -20,7 +20,7 @@ after_bundler do
     copy_from_repo 'app/views/layouts/_navigation-devise.html.erb', :prefs => 'devise'
     copy_from_repo 'app/views/layouts/_navigation-omniauth.html.erb', :prefs => 'omniauth'
   end
-  copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'  
+  copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'
   ## APPLICATION NAME
   application_layout_file = Dir['app/views/layouts/application.html.*'].first
   navigation_partial_file = Dir['app/views/layouts/_navigation.html.*'].first

data/recipes/git.rb

@@ -17,4 +17,4 @@ name: git
 description: "Initialize git for your application."
 author: RailsApps
 
-category: configuration
+category: configuration

data/recipes/init.rb

@@ -17,30 +17,34 @@ after_everything do
     when 'mandrill'
       credentials = "MANDRILL_USERNAME: Your_Username\nMANDRILL_API_KEY: Your_API_Key\n"
   end
-  append_file 'config/application.yml', credentials
-  ## DEFAULT USER
-  append_file 'config/application.yml' do <<-FILE
+  append_file 'config/application.yml', credentials if prefs[:local_env_file]
+  if prefs[:local_env_file]
+    ## DEFAULT USER
+    append_file 'config/application.yml' do <<-FILE
 ADMIN_NAME: First User
 ADMIN_EMAIL: user@example.com
 ADMIN_PASSWORD: changeme
 FILE
-  end
-  ## AUTHENTICATION
-  if prefer :authentication, 'omniauth'
-    append_file 'config/application.yml' do <<-FILE
+    end
+    ## AUTHENTICATION
+    if prefer :authentication, 'omniauth'
+      append_file 'config/application.yml' do <<-FILE
 OMNIAUTH_PROVIDER_KEY: Your_OmniAuth_Provider_Key
 OMNIAUTH_PROVIDER_SECRET: Your_OmniAuth_Provider_Secret
 FILE
+      end
+    end
+    ## AUTHORIZATION
+    if (prefer :authorization, 'cancan')
+      append_file 'config/application.yml', "ROLES: [admin, user, VIP]\n"
     end
-  end
-  ## AUTHORIZATION
-  if (prefer :authorization, 'cancan')
-    append_file 'config/application.yml', "ROLES: [admin, user, VIP]\n"
   end
   ### SUBDOMAINS ###
   copy_from_repo 'config/application.yml', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains_app'
   ### APPLICATION.EXAMPLE.YML ###
-  copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
+  if prefs[:local_env_file]
+    copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
+  end
   ### DATABASE SEED ###
   append_file 'db/seeds.rb' do <<-FILE
 # Environment variables (ENV['...']) are set in the file config/application.yml.

data/recipes/prelaunch.rb

@@ -2,7 +2,7 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/prelaunch.rb
 
 if prefer :railsapps, 'rails-prelaunch-signup'
-  
+
   after_everything do
     say_wizard "recipe running after 'bundle install'"
     repo = 'https://raw.github.com/RailsApps/rails-prelaunch-signup/master/'
@@ -56,7 +56,7 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     copy_from_repo 'db/seeds.rb', :repo => repo
     run 'bundle exec rake db:seed'
     run 'bundle exec rake db:test:prepare'
-    
+
     # >-------------------------------[ Controllers ]--------------------------------<
 
     copy_from_repo 'app/controllers/confirmations_controller.rb', :repo => repo
@@ -65,7 +65,7 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     copy_from_repo 'app/controllers/users_controller.rb', :repo => repo
 
     # >-------------------------------[ Mailers ]--------------------------------<
-    
+
     generate 'mailer UserMailer'
     copy_from_repo 'spec/mailers/user_mailer_spec.rb', :repo => repo
     copy_from_repo 'app/mailers/user_mailer.rb', :repo => repo
@@ -89,7 +89,7 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     copy_from_repo 'config/routes.rb', :repo => repo
     ### CORRECT APPLICATION NAME ###
     gsub_file 'config/routes.rb', /^.*.routes.draw do/, "#{app_const}.routes.draw do"
-    
+
     # >-------------------------------[ Assets ]--------------------------------<
 
     copy_from_repo 'app/assets/javascripts/application.js', :repo => repo
@@ -98,14 +98,14 @@ if prefer :railsapps, 'rails-prelaunch-signup'
 
     # >-------------------------------[ Cucumber ]--------------------------------<
     say_wizard "copying Cucumber scenarios from the rails-prelaunch-signup examples"
-    copy_from_repo 'features/admin/send_invitations.feature', :repo => repo    
+    copy_from_repo 'features/admin/send_invitations.feature', :repo => repo
     copy_from_repo 'features/admin/view_progress.feature', :repo => repo
     copy_from_repo 'features/visitors/request_invitation.feature', :repo => repo
     copy_from_repo 'features/users/sign_in.feature', :repo => repo
     copy_from_repo 'features/users/sign_up.feature', :repo => repo
     copy_from_repo 'features/users/user_show.feature', :repo => repo
     copy_from_repo 'features/step_definitions/admin_steps.rb', :repo => repo
-    copy_from_repo 'features/step_definitions/user_steps.rb', :repo => repo    
+    copy_from_repo 'features/step_definitions/user_steps.rb', :repo => repo
     copy_from_repo 'features/step_definitions/visitor_steps.rb', :repo => repo
     copy_from_repo 'config/locales/devise.en.yml', :repo => repo
 

data/recipes/readme.rb

@@ -3,7 +3,7 @@
 
 after_everything do
   say_wizard "recipe running after everything"
-  
+
   # remove default READMEs
   %w{
     README
@@ -25,11 +25,11 @@ after_everything do
   gsub_file "README.textile", /PREFERENCES/, prefs.inspect
   gsub_file "README", /RECIPES/, recipes.sort.inspect
   gsub_file "README", /PREFERENCES/, prefs.inspect
-  
+
   # Ruby on Rails
   gsub_file "README.textile", /\* Ruby/, "* Ruby version #{RUBY_VERSION}"
   gsub_file "README.textile", /\* Rails/, "* Rails version #{Rails::VERSION::STRING}"
-    
+
   # Database
   gsub_file "README.textile", /SQLite/, "PostgreSQL" if prefer :database, 'postgresql'
   gsub_file "README.textile", /SQLite/, "MySQL" if prefer :database, 'mysql'
@@ -73,7 +73,7 @@ after_everything do
 
   git :add => '-A' if prefer :git, true
   git :commit => '-qm "rails_apps_composer: add README files"' if prefer :git, true
-  
+
 end # after_everything
 
 __END__

data/recipes/routes.rb

@@ -33,4 +33,4 @@ author: RailsApps
 
 requires: [setup, gems, models, controllers, views]
 run_after: [setup, gems, models, controllers, views]
-category: mvc
+category: mvc

data/recipes/setup.rb

@@ -12,9 +12,9 @@ gemfile = File.read(destination_root() + '/Gemfile')
 sqlite_detected = gemfile.include? 'sqlite3'
 
 ## Web Server
-prefs[:dev_webserver] = multiple_choice "Web server for development?", [["WEBrick (default)", "webrick"], 
+prefs[:dev_webserver] = multiple_choice "Web server for development?", [["WEBrick (default)", "webrick"],
   ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"]] unless prefs.has_key? :dev_webserver
-webserver = multiple_choice "Web server for production?", [["Same as development", "same"], 
+webserver = multiple_choice "Web server for production?", [["Same as development", "same"],
   ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"]] unless prefs.has_key? :prod_webserver
 if webserver == 'same'
   case prefs[:dev_webserver]
@@ -30,7 +30,7 @@ else
 end
 
 ## Database Adapter
-prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"], 
+prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
   ["MySQL", "mysql"], ["MongoDB", "mongodb"]] unless prefs.has_key? :database
 case prefs[:database]
   when 'mongodb'
@@ -54,14 +54,14 @@ 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"], ["MiniTest", "minitest"]] unless prefs.has_key? :unit_test
-  prefs[:integration] = multiple_choice "Integration testing?", [["None", "none"], ["RSpec with Capybara", "rspec-capybara"], 
+  prefs[:integration] = multiple_choice "Integration testing?", [["None", "none"], ["RSpec with Capybara", "rspec-capybara"],
     ["Cucumber with Capybara", "cucumber"], ["Turnip with Capybara", "turnip"], ["MiniTest with Capybara", "minitest-capybara"]] unless prefs.has_key? :integration
   prefs[:fixtures] = multiple_choice "Fixture replacement?", [["None","none"], ["Factory Girl","factory_girl"], ["Machinist","machinist"], ["Fabrication","fabrication"]] unless prefs.has_key? :fixtures
 end
 
 ## Front-end Framework
 if recipes.include? 'frontend'
-  prefs[:frontend] = multiple_choice "Front-end framework?", [["None", "none"], ["Twitter Bootstrap", "bootstrap"], 
+  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'
     case HOST_OS
@@ -76,7 +76,7 @@ end
 
 ## Email
 if recipes.include? 'email'
-  prefs[:email] = multiple_choice "Add support for sending email?", [["None", "none"], ["Gmail","gmail"], ["SMTP","smtp"], 
+  prefs[:email] = multiple_choice "Add support for sending email?", [["None", "none"], ["Gmail","gmail"], ["SMTP","smtp"],
     ["SendGrid","sendgrid"], ["Mandrill","mandrill"]] unless prefs.has_key? :email
 else
   prefs[:email] = 'none'
@@ -90,11 +90,11 @@ if recipes.include? 'models'
       if prefer :orm, 'mongoid'
         prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"]] unless prefs.has_key? :devise_modules
       else
-        prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"], ["Devise with Confirmable module","confirmable"], 
+        prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"], ["Devise with Confirmable module","confirmable"],
           ["Devise with Confirmable and Invitable modules","invitable"]] unless prefs.has_key? :devise_modules
       end
     when 'omniauth'
-      prefs[:omniauth_provider] = multiple_choice "OmniAuth provider?", [["Facebook", "facebook"], ["Twitter", "twitter"], ["GitHub", "github"], 
+      prefs[:omniauth_provider] = multiple_choice "OmniAuth provider?", [["Facebook", "facebook"], ["Twitter", "twitter"], ["GitHub", "github"],
         ["LinkedIn", "linkedin"], ["Google-Oauth-2", "google_oauth2"], ["Tumblr", "tumblr"]] unless prefs.has_key? :omniauth_provider
   end
   prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["CanCan with Rolify", "cancan"]] unless prefs.has_key? :authorization
@@ -106,18 +106,18 @@ prefs[:form_builder] = multiple_choice "Use a form builder gem?", [["None", "non
 ## MVC
 if (recipes.include? 'models') && (recipes.include? 'controllers') && (recipes.include? 'views') && (recipes.include? 'routes')
   if prefer :authorization, 'cancan'
-    prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"], 
+    prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"],
       ["Home Page, User Accounts", "users_app"], ["Home Page, User Accounts, Admin Dashboard", "admin_app"]] unless prefs.has_key? :starter_app
   elsif prefer :authentication, 'devise'
     if prefer :orm, 'mongoid'
-      prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"], 
+      prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"],
         ["Home Page, User Accounts", "users_app"], ["Home Page, User Accounts, Subdomains", "subdomains_app"]] unless prefs.has_key? :starter_app
     else
-      prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"], 
+      prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"],
         ["Home Page, User Accounts", "users_app"]] unless prefs.has_key? :starter_app
     end
   elsif prefer :authentication, 'omniauth'
-    prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"], 
+    prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"],
       ["Home Page, User Accounts", "users_app"]] unless prefs.has_key? :starter_app
   else
     prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"]] unless prefs.has_key? :starter_app

data/recipes/views.rb

@@ -54,4 +54,4 @@ author: RailsApps
 
 requires: [setup, gems, models, controllers]
 run_after: [setup, gems, models, controllers]
-category: mvc
+category: mvc

data/templates/helpers.erb

@@ -11,7 +11,7 @@ def say_recipe(name); say "\033[1m\033[36m" + "recipe".rjust(10) + "\033[0m" + "
 def say_wizard(text); say_custom(@current_recipe || 'composer', text) end
 
 def ask_wizard(question)
-  ask "\033[1m\033[30m\033[46m" + (@current_recipe || "prompt").rjust(10) + "\033[1m\033[36m" + "  #{question}\033[0m"
+  ask "\033[1m\033[36m" + (@current_recipe || "prompt").rjust(10) + "\033[1m\033[36m" + "  #{question}\033[0m"
 end
 
 def yes_wizard?(question)

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.32"
+  VERSION = "2.2.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.32
+  version: 2.2.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-16 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: 2607671084260746200
+      hash: -2885590873741171090
 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: 2607671084260746200
+      hash: -2885590873741171090
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.25