rails_apps_composer 2.6.13 → 3.0.0

data/recipes/setup.rb

@@ -34,51 +34,21 @@ if prefs[:prod_webserver] == 'same'
 end
 
 ## Database Adapter
-if rails_4_1?
-  prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
-    ["MySQL", "mysql"]] unless prefs.has_key? :database
-else
-  prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
-    ["MySQL", "mysql"], ["MongoDB", "mongodb"]] unless prefs.has_key? :database
-end
-case prefs[:database]
-  when 'mongodb'
-    unless sqlite_detected
-      prefs[:orm] = multiple_choice "How will you connect to MongoDB?", [["Mongoid","mongoid"]] unless prefs.has_key? :orm
-    else
-      say_wizard "WARNING! SQLite gem detected in the Gemfile"
-      say_wizard "If you wish to use MongoDB you must skip Active Record."
-      say_wizard "If using rails_apps_composer, choose 'skip Active Record'."
-      say_wizard "If using Rails Composer or an application template, use the '-O' flag as in 'rails new foo -O'."
-      prefs[:fail] = multiple_choice "Abort or continue?", [["abort", "abort"], ["continue", "continue"]]
-      if prefer :fail, 'abort'
-        raise StandardError.new "SQLite detected in the Gemfile. Use '-O' or '--skip-activerecord' as in 'rails new foo -O' if you don't want ActiveRecord and SQLite"
-      end
-    end
-end
+prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
+  ["MySQL", "mysql"]] unless prefs.has_key? :database
 
 ## Template Engine
 prefs[:templates] = multiple_choice "Template engine?", [["ERB", "erb"], ["Haml", "haml"], ["Slim", "slim"]] unless prefs.has_key? :templates
 
 ## Testing Framework
-if rails_4_1?
-  if recipes.include? 'tests4'
-    prefs[:tests] = multiple_choice "Test framework?", [["None", "none"],
-      ["RSpec with Capybara", "rspec"]] unless prefs.has_key? :tests
-    case prefs[:tests]
-      when 'rspec'
-        say_wizard "Adding DatabaseCleaner, FactoryGirl, Faker, Launchy, Selenium"
-        prefs[:continuous_testing] = multiple_choice "Continuous testing?", [["None", "none"], ["Guard", "guard"]] unless prefs.has_key? :continuous_testing
-      end
-  end
-else
-  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"],
-      ["Cucumber with Capybara", "cucumber"], ["Turnip with Capybara", "turnip"], ["MiniTest with Capybara", "minitest-capybara"]] unless prefs.has_key? :integration
-    prefs[:continuous_testing] = multiple_choice "Continuous testing?", [["None", "none"], ["Guard", "guard"]] unless prefs.has_key? :continuous_testing
-    prefs[:fixtures] = multiple_choice "Fixture replacement?", [["None","none"], ["Factory Girl","factory_girl"], ["Machinist","machinist"], ["Fabrication","fabrication"]] unless prefs.has_key? :fixtures
-  end
+if recipes.include? 'tests'
+  prefs[:tests] = multiple_choice "Test framework?", [["None", "none"],
+    ["RSpec with Capybara", "rspec"]] unless prefs.has_key? :tests
+  case prefs[:tests]
+    when 'rspec'
+      say_wizard "Adding DatabaseCleaner, FactoryGirl, Faker, Launchy, Selenium"
+      prefs[:continuous_testing] = multiple_choice "Continuous testing?", [["None", "none"], ["Guard", "guard"]] unless prefs.has_key? :continuous_testing
+    end
 end
 
 ## Front-end Framework
@@ -101,51 +71,28 @@ else
 end
 
 ## Authentication and Authorization
-if recipes.include? 'models'
+if (recipes.include? 'devise') || (recipes.include? 'omniauth')
   prefs[:authentication] = multiple_choice "Authentication?", [["None", "none"], ["Devise", "devise"], ["OmniAuth", "omniauth"]] unless prefs.has_key? :authentication
   case prefs[:authentication]
     when 'devise'
-      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"]] unless prefs.has_key? :devise_modules
-      end
+      prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"],
+      ["Devise with Confirmable module","confirmable"]] unless prefs.has_key? :devise_modules
     when 'omniauth'
       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
-  unless prefs.has_key? :authorization
-    if rails_4_1?
-      prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["Pundit", "pundit"]]
-    else
-      prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["CanCan with Rolify", "cancan"]]
-    end
-  end
+  prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["Pundit", "pundit"]] unless prefs.has_key? :authorization
 end
 
 ## Form Builder
 prefs[:form_builder] = multiple_choice "Use a form builder gem?", [["None", "none"], ["SimpleForm", "simple_form"]] unless prefs.has_key? :form_builder
 
-## MVC
-if (recipes.include? 'models') && (recipes.include? 'controllers') && (recipes.include? 'views') && (recipes.include? 'routes')
-  if (prefer :authorization, 'cancan') or (prefer :authorization, 'pundit')
-    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"],
-        ["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"],
-        ["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"],
-      ["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
-  end
+## Pages
+if recipes.include? 'pages'
+  prefs[:pages] = multiple_choice "Add pages?", [["None", "none"],
+    ["Home", "home"], ["Home and About", "about"],
+    ["Home and Users", "users"],
+    ["Home, About, and Users", "about+users"]] unless prefs.has_key? :pages
 end
 
 # save diagnostics before anything can fail

data/recipes/{tests4.rb → tests.rb}

@@ -1,8 +1,8 @@
 # Application template recipe for the rails_apps_composer. Change the recipe here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/tests4.rb
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/tests.rb
 
-after_bundler do
-  say_wizard "recipe running after 'bundle install'"
+stage_two do
+  say_wizard "recipe stage two"
   if prefer :tests, 'rspec'
     say_wizard "recipe installing RSpec"
     generate 'testing:configure rspec -f'
@@ -15,8 +15,8 @@ after_bundler do
   git :commit => '-qm "rails_apps_composer: testing framework"' if prefer :git, true
 end
 
-after_everything do
-  say_wizard "recipe running after everything"
+stage_three do
+  say_wizard "recipe stage three"
   if (prefer :authentication, 'devise') && (prefer :tests, 'rspec')
     generate 'testing:configure devise -f'
   end
@@ -30,7 +30,7 @@ end
 
 __END__
 
-name: tests4
+name: tests
 description: "Add testing framework."
 author: RailsApps
 

data/templates/helpers.erb

@@ -10,14 +10,6 @@ def say_custom(tag, text); say "\033[1m\033[36m" + tag.to_s.rjust(10) + "\033[0m
 def say_recipe(name); say "\033[1m\033[36m" + "recipe".rjust(10) + "\033[0m" + "  Running #{name} recipe..." end
 def say_wizard(text); say_custom(@current_recipe || 'composer', text) end
 
-def rails_4?
-  Rails::VERSION::MAJOR.to_s == "4"
-end
-
-def rails_4_1?
-  Rails::VERSION::MAJOR.to_s == "4" && Rails::VERSION::MINOR.to_s == "1"
-end
-
 def ask_wizard(question)
   ask "\033[1m\033[36m" + (@current_recipe || "prompt").rjust(10) + "\033[1m\033[36m" + "  #{question}\033[0m"
 end
@@ -51,9 +43,9 @@ end
 @configs = {}
 
 @after_blocks = []
-def after_bundler(&block); @after_blocks << [@current_recipe, block]; end
-@after_everything_blocks = []
-def after_everything(&block); @after_everything_blocks << [@current_recipe, block]; end
+def stage_two(&block); @after_blocks << [@current_recipe, block]; end
+@stage_three_blocks = []
+def stage_three(&block); @stage_three_blocks << [@current_recipe, block]; end
 @before_configs = {}
 def before_config(&block); @before_configs[@current_recipe] = block; end
 

data/templates/layout.erb

@@ -116,7 +116,7 @@ say_wizard("\033[1m\033[36m" + "                             \| \|   \| \|" + "\
 say_wizard("\033[1m\033[36m" + "                             \| \|   \| \|" + "\033[0m")
 say_wizard("\033[1m\033[36m" + '' + "\033[0m")
 say_wizard("\033[1m\033[36m" + "Rails Composer, open source, supported by subscribers." + "\033[0m")
-say_wizard("\033[1m\033[36m" + "Please join RailsApps and support development of Rails Composer." + "\033[0m")
+say_wizard("\033[1m\033[36m" + "Please join RailsApps to support development of Rails Composer." + "\033[0m")
 say_wizard("Need help? Ask on Stack Overflow with the tag \'railsapps.\'")
 say_wizard("Your new application will contain diagnostics in its README file.")
 
@@ -199,9 +199,9 @@ say_wizard "Installing gems. This will take a while."
 run 'bundle install --without production'
 say_wizard "Updating gem paths."
 Gem.clear_paths
-# >-----------------------------[ Run 'After Bundler' Callbacks ]-------------------------------<
+# >-----------------------------[ Run 'stage_two' Callbacks ]-------------------------------<
 
-say_wizard "Running 'after bundler' callbacks."
+say_wizard "Stage Two (running recipe 'stage_two' callbacks)."
 if prefer :templates, 'haml'
   say_wizard "importing html2haml conversion tool"
   require 'html2haml'
@@ -213,11 +213,11 @@ say_wizard "importing html2haml and haml2slim conversion tools"
 end
 @after_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; puts @current_recipe; b[1].call}
 
-# >-----------------------------[ Run 'After Everything' Callbacks ]-------------------------------<
+# >-----------------------------[ Run 'stage_three' Callbacks ]-------------------------------<
 
 @current_recipe = nil
-say_wizard "Running 'after everything' callbacks."
-@after_everything_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; puts @current_recipe; b[1].call}
+say_wizard "Stage Three (running recipe 'stage_three' callbacks)."
+@stage_three_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; puts @current_recipe; b[1].call}
 
 @current_recipe = nil
 say_wizard("Your new application will contain diagnostics in its README file.")

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.6.13"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.6.13
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -119,9 +119,9 @@ files:
 - lib/rails_wizard/recipes.rb
 - lib/rails_wizard/template.rb
 - recipes/admin.rb
-- recipes/controllers.rb
 - recipes/core.rb
 - recipes/deployment.rb
+- recipes/devise.rb
 - recipes/email.rb
 - recipes/email_dev.rb
 - recipes/example.rb
@@ -131,8 +131,8 @@ files:
 - recipes/git.rb
 - recipes/init.rb
 - recipes/learn_rails.rb
-- recipes/models.rb
-- recipes/prelaunch.rb
+- recipes/omniauth.rb
+- recipes/pages.rb
 - recipes/rails_bootstrap.rb
 - recipes/rails_devise.rb
 - recipes/rails_devise_pundit.rb
@@ -141,12 +141,9 @@ files:
 - recipes/rails_signup_download.rb
 - recipes/railsapps.rb
 - recipes/readme.rb
-- recipes/routes.rb
-- recipes/saas.rb
+- recipes/roles.rb
 - recipes/setup.rb
-- recipes/testing.rb
-- recipes/tests4.rb
-- recipes/views.rb
+- recipes/tests.rb
 - spec/rails_wizard/config_spec.rb
 - spec/rails_wizard/recipe_spec.rb
 - spec/rails_wizard/recipes/sanity_spec.rb

data/recipes/controllers.rb

@@ -1,86 +0,0 @@
-# Application template recipe for the rails_apps_composer. Change the recipe here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/controllers.rb
-
-after_bundler do
-  say_wizard "recipe running after 'bundle install'"
-  ### APPLICATION_CONTROLLER ###
-  if prefer :authentication, 'omniauth'
-    copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
-  end
-  if prefer :authorization, 'pundit'
-    copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
-  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
-RUBY
-    end
-  end
-  ### HOME_CONTROLLER ###
-  if ['home_app','users_app','admin_app','subdomains_app'].include? prefs[:starter_app]
-    generate 'controller home --skip-assets --skip-helper'
-  end
-  ### USERS_CONTROLLER ###
-  case prefs[:starter_app]
-    when 'users_app'
-      if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise')
-        copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/'
-      elsif prefer :authentication, 'omniauth'
-        if rails_4?
-          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
-        else
-          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
-        end
-      end
-    when 'admin_app'
-      if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise')
-        copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
-      elsif prefer :authentication, 'omniauth'
-        if rails_4?
-          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
-        else
-          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
-        end
-      end
-      if prefer :authorization, 'pundit'
-        copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
-        copy_from_repo 'app/policies/user_policy.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
-      end
-    when 'subdomains_app'
-      copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/'
-  end
-  ### REGISTRATIONS_CONTROLLER ###
-  if rails_4?
-    if ['users_app','admin_app','subdomains_app'].include? prefs[:starter_app]
-      ## accommodate strong parameters in Rails 4
-      copy_from_repo 'app/controllers/registrations_controller-devise.rb', :prefs => 'devise'
-    end
-  end
-  ### SESSIONS_CONTROLLER ###
-  if prefer :authentication, 'omniauth'
-    filename = 'app/controllers/sessions_controller.rb'
-    copy_from_repo filename, :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
-    gsub_file filename, /twitter/, prefs[:omniauth_provider] unless prefer :omniauth_provider, 'twitter'
-    if prefer :authorization, 'cancan'
-      inject_into_file filename, "    user.add_role :admin if User.count == 1 # make the first user an admin\n", :after => "session[:user_id] = user.id\n"
-    end
-  end
-  ### PROFILES_CONTROLLER ###
-  copy_from_repo 'app/controllers/profiles_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains_app'
-  ### GIT ###
-  git :add => '-A' if prefer :git, true
-  git :commit => '-qm "rails_apps_composer: controllers"' if prefer :git, true
-end # after_bundler
-
-__END__
-
-name: controllers
-description: "Add controllers needed for starter apps."
-author: RailsApps
-
-requires: [setup, gems, models]
-run_after: [setup, gems, models]
-category: mvc

data/recipes/models.rb

@@ -1,112 +0,0 @@
-# Application template recipe for the rails_apps_composer. Change the recipe here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/models.rb
-
-after_bundler do
-  say_wizard "recipe running after 'bundle install'"
-  ### DEVISE ###
-  if prefer :authentication, 'devise'
-    if rails_4_1?
-      # prevent logging of password_confirmation
-      gsub_file 'config/initializers/filter_parameter_logging.rb', /:password/, ':password, :password_confirmation'
-    end
-    generate 'devise:install'
-    generate 'devise_invitable:install' if prefer :devise_modules, 'invitable'
-    generate 'devise user' # create the User model
-    if prefer :orm, 'mongoid'
-      ## DEVISE AND MONGOID
-      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-devise/master/' unless rails_4?
-      if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
-        gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
-        gsub_file 'app/models/user.rb', /# field :confirmation_token/, "field :confirmation_token"
-        gsub_file 'app/models/user.rb', /# field :confirmed_at/, "field :confirmed_at"
-        gsub_file 'app/models/user.rb', /# field :confirmation_sent_at/, "field :confirmation_sent_at"
-        gsub_file 'app/models/user.rb', /# field :unconfirmed_email/, "field :unconfirmed_email"
-      end
-      if (prefer :devise_modules, 'invitable')
-        gsub_file 'app/models/user.rb', /\bend\s*\Z/ do
-  <<-RUBY
-  #invitable
-  field :invitation_token, :type => String
-  field :invitation_sent_at, :type => Time
-  field :invitation_accepted_at, :type => Time
-  field :invitation_limit, :type => Integer
-  field :invited_by_id, :type => String
-  field :invited_by_type, :type => String
-end
-RUBY
-        end
-      end
-    else
-      ## DEVISE AND ACTIVE RECORD
-      unless prefer :railsapps, 'rails-recurly-subscription-saas'
-        generate 'migration AddNameToUsers name:string'
-      end
-      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/' unless rails_4?
-      if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
-        gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
-        generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
-      end
-      run 'bundle exec rake db:migrate'
-    end
-    ## DEVISE AND CUCUMBER
-    if prefer :integration, 'cucumber'
-      # Cucumber wants to test GET requests not DELETE requests for destroy_user_session_path
-      # (see https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3)
-      gsub_file 'config/initializers/devise.rb', 'config.sign_out_via = :delete', 'config.sign_out_via = Rails.env.test? ? :get : :delete'
-    end
-  end
-  ### OMNIAUTH ###
-  if prefer :authentication, 'omniauth'
-    if rails_4_1?
-      copy_from_repo 'config/initializers/omniauth.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
-    else
-      copy_from_repo 'config/initializers/omniauth.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
-    end
-    gsub_file 'config/initializers/omniauth.rb', /twitter/, prefs[:omniauth_provider] unless prefer :omniauth_provider, 'twitter'
-    if prefer :orm, 'mongoid'
-      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
-    else
-      generate 'model User name:string email:string provider:string uid:string'
-      run 'bundle exec rake db:migrate'
-      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
-    end
-  end
-  ### SUBDOMAINS ###
-  copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains_app'
-  ### AUTHORIZATION ###
-  if prefer :authorization, 'pundit'
-    generate 'migration AddRoleToUsers role:integer'
-    copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
-    if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
-      gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
-      generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
-    end
-  end
-  if prefer :authorization, 'cancan'
-    generate 'cancan:ability'
-    if prefer :starter_app, 'admin_app'
-      # Limit access to the users#index page
-      copy_from_repo 'app/models/ability.rb', :repo => 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
-      # allow an admin to update roles
-      insert_into_file 'app/models/user.rb', "  attr_accessible :role_ids, :as => :admin\n", :before => "  attr_accessible"
-    end
-    unless prefer :orm, 'mongoid'
-      generate 'rolify Role User'
-    else
-      generate 'rolify Role User --orm=mongoid'
-    end
-  end
-  ### GIT ###
-  git :add => '-A' if prefer :git, true
-  git :commit => '-qm "rails_apps_composer: models"' if prefer :git, true
-end # after_bundler
-
-__END__
-
-name: models
-description: "Add models needed for starter apps."
-author: RailsApps
-
-requires: [setup, gems]
-run_after: [setup, gems]
-category: mvc