rails_apps_composer 2.1.9 → 2.1.10

data/lib/rails_wizard/command.rb

@@ -13,7 +13,7 @@ module RailsWizard
       recipes, defaults = load_defaults
       args = ask_for_args(defaults)
       recipes = ask_for_recipes(recipes)
-      gems = ask_for_gems
+      gems = ask_for_gems(defaults)
       run_template(name, recipes, gems, args, defaults, nil)
     end
 
@@ -99,8 +99,8 @@ module RailsWizard
         recipes
       end
 
-      def ask_for_gems
-        gems = []
+      def ask_for_gems(defaults)
+        gems = defaults["gems"] || []
         while getgem = ask("#{bold}What gem would you like to add? #{clear}#{yellow}(blank to finish)#{clear}")
           if getgem == ''
             break

data/recipes/auth.rb

@@ -19,7 +19,6 @@ after_bundler do
     ## DEVISE MODULES
     if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
       gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
-      gsub_file 'app/models/user.rb', /:remember_me/, ':remember_me, :confirmed_at'
       if prefer :orm, 'mongoid'
         gsub_file 'app/models/user.rb', /# field :confirmation_token/, "field :confirmation_token"
         gsub_file 'app/models/user.rb', /# field :confirmed_at/, "field :confirmed_at"

data/recipes/gems.rb

@@ -22,7 +22,7 @@ end
 
 ## Database Adapter
 gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
-gem 'mongoid', '>= 3.0.3' if prefer :orm, 'mongoid'
+gem 'mongoid', '>= 3.0.5' if prefer :orm, 'mongoid'
 gem 'pg', '>= 0.14.0' if prefer :database, 'postgresql'
 gem 'mysql2', '>= 0.3.11' if prefer :database, 'mysql'
 
@@ -70,7 +70,7 @@ gem 'bootstrap-sass', '>= 2.0.4.0' if prefer :bootstrap, 'sass'
 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
+  gem 'twitter-bootstrap-rails', '>= 2.1.3', :group => :assets
   # install gem 'therubyracer' to use Less
   gem 'therubyracer', '>= 0.10.2', :group => :assets, :platform => :ruby
 end
@@ -84,7 +84,7 @@ gem 'devise', '>= 2.1.2' if prefer :authentication, 'devise'
 gem 'devise_invitable', '>= 1.0.3' if prefer :devise_modules, 'invitable'
 
 ## Authentication (OmniAuth)
-gem 'omniauth', '>= 1.1.0' if prefer :authentication, 'omniauth'
+gem 'omniauth', '>= 1.1.1' if prefer :authentication, 'omniauth'
 gem 'omniauth-twitter' if prefer :omniauth_provider, 'twitter'
 gem 'omniauth-facebook' if prefer :omniauth_provider, 'facebook'
 gem 'omniauth-github' if prefer :omniauth_provider, 'github'

data/recipes/init.rb

@@ -9,9 +9,11 @@ after_everything do
       ## DEVISE-CONFIRMABLE
       append_file 'db/seeds.rb' do <<-FILE
 puts 'SETTING UP DEFAULT USER LOGIN'
-user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please', :confirmed_at => Time.now.utc
+user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
+user.confirm!
 puts 'New user created: ' << user.name
-user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please', :confirmed_at => Time.now.utc
+user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please'
+user2.confirm!
 puts 'New user created: ' << user2.name
 FILE
       end

data/recipes/models.rb

@@ -9,10 +9,11 @@ after_bundler do
       copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-devise/master/' if prefer :orm, 'mongoid'
     else
       generate 'migration AddNameToUsers name:string'
+      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/'
       if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
         generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
+        gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
       end
-      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/'
     end
   end
   ### OMNIAUTH ###

data/recipes/railsapps.rb

@@ -13,7 +13,6 @@ case prefs[:railsapps]
   when 'rails3-bootstrap-devise-cancan'
     prefs[:git] = true
     prefs[:database] = 'sqlite'
-    prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
@@ -28,7 +27,6 @@ case prefs[:railsapps]
   when 'rails3-devise-rspec-cucumber'
     prefs[:git] = true
     prefs[:database] = 'sqlite'
-    prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
@@ -43,7 +41,6 @@ case prefs[:railsapps]
     prefs[:git] = true
     prefs[:database] = 'mongodb'
     prefs[:orm] = 'mongoid'
-    prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
@@ -58,7 +55,6 @@ case prefs[:railsapps]
     prefs[:git] = true
     prefs[:database] = 'mongodb'
     prefs[:orm] = 'mongoid'
-    prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
@@ -73,7 +69,6 @@ case prefs[:railsapps]
     prefs[:git] = true
     prefs[:database] = 'mongodb'
     prefs[:orm] = 'mongoid'
-    prefs[:templates] = 'haml'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'

data/recipes/setup.rb

@@ -90,7 +90,9 @@ if recipes.include? 'auth'
       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
+  if prefer :authentication, 'devise'
+    prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["CanCan with Rolify", "cancan"]] unless prefs.has_key? :authorization
+  end
 end
 
 ## MVC

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.1.9"
+  VERSION = "2.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-25 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: -2221592407130434466
+      hash: -4342401758096405890
 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: -2221592407130434466
+      hash: -4342401758096405890
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24