rails_apps_composer 2.4.23 → 2.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a85a29d6752662d6e530a798f6a7e1d6a00df4
-  data.tar.gz: 5e1f4d69490f13fe8a372842af44667a68edf57b
+  metadata.gz: dc11acc4801ecb3ed6ce3773226ef3275eee4e8b
+  data.tar.gz: 9070dd6dccb53e371147935f6c3070a766515925
 SHA512:
-  metadata.gz: fe32c44b8561b4324af85f4772852ae1c3f252ee26e11fd01361cc6990801e6c6a6469004851288e426c2971a49ac3fdd9976b32b327af24ad4b6a43b7396eca
-  data.tar.gz: feb7574cc8424ad211fdcaef858344f12301ac60ff65a5087ef0abbe60a59ed78a7586046af95604b363cb7f425211c79e2a0ad859d2f4027c91f61fcddab59e
+  metadata.gz: b083e57012b616a2191f348b2f2542d41d83a19c9466a0e0459b53869f7baf3e14e81c715b38f3f35ab3703302bef3bca0ff3a532f4b7f125d4e70f1d62a2122
+  data.tar.gz: 658c2251d7c01202170e2c4e24dd174fba01c74845a2ca7580352b718520f3207ae992a3ceb2c03927c6925b0e1aab825aafa844c3dab667766f4369a26305c4

data/recipes/admin.rb

@@ -10,12 +10,12 @@ end
 
 if prefer :admin, 'activeadmin'
   if rails_4?
-    gem 'activeadmin', github: 'gregbell/active_admin'
+    add_gem 'activeadmin', github: 'gregbell/active_admin'
   else
-    gem 'activeadmin'
+    add_gem 'activeadmin'
   end
 end
-gem 'rails_admin' if prefer :admin, 'rails_admin'
+add_gem 'rails_admin' if prefer :admin, 'rails_admin'
 
 after_bundler do
   if prefer :admin, 'activeadmin'

data/recipes/email_dev.rb

@@ -6,12 +6,12 @@ prefs[:mail_view] = true if config['mail_view']
 
 if prefs[:mailcatcher]
   if rails_4?
-    gem 'mailcatcher', github: 'sj26/mailcatcher', group: :development
+    add_gem 'mailcatcher', github: 'sj26/mailcatcher', group: :development
   else
-    gem 'mailcatcher', group: :development
+    add_gem 'mailcatcher', group: :development
   end
 end
-gem 'mail_view', group: :development if prefs[:mail_view]
+add_gem 'mail_view', group: :development if prefs[:mail_view]
 
 after_bundler do
   if prefs[:mailcatcher]

data/recipes/gems.rb

@@ -66,7 +66,7 @@ if prefer :unit_test, 'rspec'
   add_gem 'database_cleaner', '1.0.1', :group => :test
   if prefer :orm, 'mongoid'
     if rails_4?
-      add_gem 'mongoid-rspec', '>= 1.6.0', github: 'evansagge/mongoid-rspec', :group => :test
+      add_gem 'mongoid-rspec', '>= 1.10.0', :group => :test
     else
       add_gem 'mongoid-rspec', :group => :test
     end

data/recipes/models.rb

@@ -81,16 +81,9 @@ RUBY
       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 Role User'
+      generate 'rolify Role User'
     else
-      generate 'rolify:role Role User mongoid'
-      # correct the generation of rolify 3.1 with mongoid
-      # the call to `rolify` should be *after* the inclusion of mongoid
-      # (see https://github.com/EppO/rolify/issues/61)
-      # This isn't needed for rolify>=3.2.0.beta4, but should cause no harm
-      gsub_file 'app/models/user.rb',
-          /^\s*(rolify.*?)$\s*(include Mongoid::Document.*?)$/,
-          "  \\2\n  extend Rolify\n  \\1\n"
+      generate 'rolify Role User --orm=mongoid'
     end
   end
   ### GIT ###

data/recipes/readme.rb

@@ -14,67 +14,71 @@ after_everything do
   # add placeholder READMEs and humans.txt file
   copy_from_repo 'public/humans.txt'
   copy_from_repo 'README'
-  copy_from_repo 'README.textile'
+  copy_from_repo 'README.md'
   gsub_file "README", /App_Name/, "#{app_name.humanize.titleize}"
-  gsub_file "README.textile", /App_Name/, "#{app_name.humanize.titleize}"
+  gsub_file "README.md", /App_Name/, "#{app_name.humanize.titleize}"
 
   # Diagnostics
-  gsub_file "README.textile", /recipes that are known/, "recipes that are NOT known" if diagnostics[:recipes] == 'fail'
-  gsub_file "README.textile", /preferences that are known/, "preferences that are NOT known" if diagnostics[:prefs] == 'fail'
+  gsub_file "README.md", /recipes that are known/, "recipes that are NOT known" if diagnostics[:recipes] == 'fail'
+  gsub_file "README.md", /preferences that are known/, "preferences that are NOT known" if diagnostics[:prefs] == 'fail'
   print_recipes = recipes.sort.map { |r| "\n* #{r}" }.join('')
   print_preferences = prefs.map { |k, v| "\n* #{k}: #{v}" }.join('')
-  gsub_file "README.textile", /RECIPES/, print_recipes
-  gsub_file "README.textile", /PREFERENCES/, print_preferences
+  gsub_file "README.md", /RECIPES/, print_recipes
+  gsub_file "README.md", /PREFERENCES/, print_preferences
   gsub_file "README", /RECIPES/, print_recipes
   gsub_file "README", /PREFERENCES/, print_preferences
 
   # Ruby on Rails
-  gsub_file "README.textile", /\* Ruby/, "* Ruby version #{RUBY_VERSION}"
-  gsub_file "README.textile", /\* Rails/, "* Rails version #{Rails::VERSION::STRING}"
+  gsub_file "README.md", /\* Ruby/, "* Ruby version #{RUBY_VERSION}"
+  gsub_file "README.md", /\* 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'
-  gsub_file "README.textile", /SQLite/, "MongoDB" if prefer :database, 'mongodb'
-  gsub_file "README.textile", /ActiveRecord/, "the Mongoid ORM" if prefer :orm, 'mongoid'
+  gsub_file "README.md", /SQLite/, "PostgreSQL" if prefer :database, 'postgresql'
+  gsub_file "README.md", /SQLite/, "MySQL" if prefer :database, 'mysql'
+  gsub_file "README.md", /SQLite/, "MongoDB" if prefer :database, 'mongodb'
+  gsub_file "README.md", /ActiveRecord/, "the Mongoid ORM" if prefer :orm, 'mongoid'
 
   # Template Engine
-  gsub_file "README.textile", /ERB/, "Haml" if prefer :templates, 'haml'
-  gsub_file "README.textile", /ERB/, "Slim" if prefer :templates, 'slim'
+  gsub_file "README.md", /ERB/, "Haml" if prefer :templates, 'haml'
+  gsub_file "README.md", /ERB/, "Slim" if prefer :templates, 'slim'
 
   # Testing Framework
-  gsub_file "README.textile", /Test::Unit/, "RSpec" if prefer :unit_test, 'rspec'
-  gsub_file "README.textile", /RSpec/, "RSpec and Cucumber" if prefer :integration, 'cucumber'
-  gsub_file "README.textile", /RSpec/, "RSpec and Factory Girl" if prefer :fixtures, 'factory_girl'
-  gsub_file "README.textile", /RSpec/, "RSpec and Machinist" if prefer :fixtures, 'machinist'
+  gsub_file "README.md", /Test::Unit/, "RSpec" if prefer :unit_test, 'rspec'
+  gsub_file "README.md", /RSpec/, "RSpec and Cucumber" if prefer :integration, 'cucumber'
+  gsub_file "README.md", /RSpec/, "RSpec and Factory Girl" if prefer :fixtures, 'factory_girl'
+  gsub_file "README.md", /RSpec/, "RSpec and Machinist" if prefer :fixtures, 'machinist'
 
   # Front-end Framework
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 2.3 (Sass)" if prefer :frontend, 'bootstrap2'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 3.0 (Sass)" if prefer :frontend, 'bootstrap3'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation 4" if prefer :frontend, 'foundation4'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation 5" if prefer :frontend, 'foundation5'
+  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 2.3 (Sass)" if prefer :frontend, 'bootstrap2'
+  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 3.0 (Sass)" if prefer :frontend, 'bootstrap3'
+  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation 4" if prefer :frontend, 'foundation4'
+  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation 5" if prefer :frontend, 'foundation5'
 
   # Form Builder
-  gsub_file "README.textile", /Form Builder: None/, "Form Builder: SimpleForm" if prefer :form_builder, 'simple_form'
+  gsub_file "README.md", /Form Builder: None/, "Form Builder: SimpleForm" if prefer :form_builder, 'simple_form'
 
   # Email
   unless prefer :email, 'none'
-    gsub_file "README.textile", /Gmail/, "SMTP" if prefer :email, 'smtp'
-    gsub_file "README.textile", /Gmail/, "SendGrid" if prefer :email, 'sendgrid'
-    gsub_file "README.textile", /Gmail/, "Mandrill" if prefer :email, 'mandrill'
+    gsub_file "README.md", /Gmail/, "SMTP" if prefer :email, 'smtp'
+    gsub_file "README.md", /Gmail/, "SendGrid" if prefer :email, 'sendgrid'
+    gsub_file "README.md", /Gmail/, "Mandrill" if prefer :email, 'mandrill'
+    gsub_file "README.md", /Email delivery is disabled in development./, "Email delivery is configured via MailCatcher in development." if prefer :mailcatcher, true
+    insert_into_file 'README.md', "\nEmail rendering in development enabled via MailView.", :after => /Email delivery is.*\n/ if prefer :mail_view, true
   else
-    gsub_file "README.textile", /h2. Email/, ""
-    gsub_file "README.textile", /The application is configured to send email using a Gmail account./, ""
+    gsub_file "README.md", /Email/, ""
+    gsub_file "README.md", /-----/, ""
+    gsub_file "README.md", /The application is configured to send email using a Gmail account./, ""
+    gsub_file "README.md", /Email delivery is disabled in development./, ""
   end
 
   # Authentication and Authorization
-  gsub_file "README.textile", /Authentication: None/, "Authentication: Devise" if prefer :authentication, 'devise'
-  gsub_file "README.textile", /Authentication: None/, "Authentication: OmniAuth" if prefer :authentication, 'omniauth'
-  gsub_file "README.textile", /Authorization: None/, "Authorization: CanCan" if prefer :authorization, 'cancan'
+  gsub_file "README.md", /Authentication: None/, "Authentication: Devise" if prefer :authentication, 'devise'
+  gsub_file "README.md", /Authentication: None/, "Authentication: OmniAuth" if prefer :authentication, 'omniauth'
+  gsub_file "README.md", /Authorization: None/, "Authorization: CanCan" if prefer :authorization, 'cancan'
 
   # Admin
-  append_file "README.textile", "\nh2. Admin\n\n Admin: ActiveAdmin" if prefer :admin, 'activeadmin'
-  append_file "README.textile", "\nh2. Admin\n\n Admin: RailsAdmin" if prefer :admin, 'rails_admin'
+  gsub_file "README.md", /Admin: None/, "Admin: ActiveAdmin" if prefer :admin, 'activeadmin'
+  gsub_file "README.md", /Admin: None/, "Admin: RailsAdmin" if prefer :admin, 'rails_admin'
 
   git :add => '-A' if prefer :git, true
   git :commit => '-qm "rails_apps_composer: add README files"' if prefer :git, true

data/templates/layout.erb

@@ -210,23 +210,7 @@ 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}
 
 @current_recipe = nil
-if diagnostics[:recipes] == 'success'
-  say_wizard("WOOT! The recipes you've selected are known to work together.")
-  say_wizard("If they don't, open an issue for rails_apps_composer on GitHub.")
-else
-  say_wizard("\033[1m\033[36m" + "WARNING! The recipes you've selected might not work together." + "\033[0m")
-  say_wizard("Help us out by reporting whether this combination works or fails.")
-  say_wizard("Please open an issue for rails_apps_composer on GitHub.")
-  say_wizard("Your new application will contain diagnostics in its README file.")
-end
-if diagnostics[:prefs] == 'success'
-  say_wizard("WOOT! The preferences you've selected are known to work together.")
-  say_wizard("If they don't, open an issue for rails_apps_composer on GitHub.")
-else
-  say_wizard("\033[1m\033[36m" + "WARNING! The preferences you've selected might not work together." + "\033[0m")
-  say_wizard("Help us out by reporting whether this combination works or fails.")
-  say_wizard("Please open an issue for rails_apps_composer on GitHub.")
-  say_wizard("Your new application will contain diagnostics in its README file.")
-end
+say_wizard("Your new application will contain diagnostics in its README file.")
+say_wizard("When reporting an issue on GitHub, include the README diagnostics.")
 say_wizard "Finished running the rails_apps_composer app template."
 say_wizard "Your new Rails app is ready. Time to run 'bundle install'."

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.23"
+  VERSION = "2.4.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.23
+  version: 2.4.24
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n