From b4c5e251e83dcd580dfb4aaf4fea558d03258cc1 Mon Sep 17 00:00:00 2001 From: Sirius Wang Date: Tue, 28 Oct 2014 21:06:29 +0800 Subject: [PATCH 1/2] fix some gem updating in Ubuntu 14.04 --- lib/bootstrappers/app_builder.rb | 2 +- templates/Gemfile_additions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bootstrappers/app_builder.rb b/lib/bootstrappers/app_builder.rb index 34dcdaf..27ab727 100644 --- a/lib/bootstrappers/app_builder.rb +++ b/lib/bootstrappers/app_builder.rb @@ -14,7 +14,7 @@ def add_common_rake_tasks end def add_devise_gem - inject_into_file 'Gemfile', "\ngem 'devise', '3.0.2'", + inject_into_file 'Gemfile', "\ngem 'devise', '3.4.0'", :after => /gem 'jquery-rails'/ end diff --git a/templates/Gemfile_additions b/templates/Gemfile_additions index fb70d4c..04372e6 100644 --- a/templates/Gemfile_additions +++ b/templates/Gemfile_additions @@ -21,7 +21,7 @@ gem "rvm-capistrano" gem "omniauth" gem "omniauth-facebook" -gem "auto-facebook", "0.4" +gem "auto-facebook", "~> 0.42" gem "whenever" From 5701f99310d6a02bccbdb32edfdbf87889e3140a Mon Sep 17 00:00:00 2001 From: Sirius Wang Date: Tue, 28 Oct 2014 21:55:30 +0800 Subject: [PATCH 2/2] new modify --- lib/bootstrappers/app_builder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bootstrappers/app_builder.rb b/lib/bootstrappers/app_builder.rb index 27ab727..2b1ff28 100644 --- a/lib/bootstrappers/app_builder.rb +++ b/lib/bootstrappers/app_builder.rb @@ -50,7 +50,7 @@ def insert_admin_method_to_user end def replace_email_sender_for_devise - replace_in_file 'config/initializers/devise.rb', /config\.mailer_sender = \".+\"/ , "config.mailer_sender = Setting.email_sender" + replace_in_file 'config/initializers/devise.rb', /config\.mailer_sender = \'.+\'/ , "config.mailer_sender = Setting.email_sender" end def gitignore_files @@ -87,7 +87,7 @@ def add_common_method_to_application_controller def remove_routes_comment_lines - replace_in_file 'config/routes.rb', /Application\.routes\.draw do.*end/m, "Application.routes.draw do\nend" + replace_in_file 'config/routes.rb', /Rails\.application\.routes\.draw do.*end/m, "Rails.application.routes.draw do\nend" end def use_mysql_config_template