From 294ce191fee566747cb77138a4fd4fabf7e696e1 Mon Sep 17 00:00:00 2001 From: Vasily Polovnyov Date: Mon, 16 Sep 2013 14:23:34 +0400 Subject: [PATCH] address code review --- Gemfile | 5 ++++- script/bootstrap | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f411101..603b5e0 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ gem 'active_model_serializers' gem 'seedbank', github: 'james2m/seedbank' gem 'dotenv' gem 'devise', '~> 3.1.0' -gem 'rails_12factor', group: [:production, :staging] group :development do gem 'letter_opener' @@ -59,3 +58,7 @@ group :staging do gem 'uglifier' gem 'coffee-rails' end + +group :staging, :production do + gem 'rails_12factor' +end diff --git a/script/bootstrap b/script/bootstrap index bd2ca91..7544e79 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -45,7 +45,7 @@ def install_bundler end end -def install_gems(without = 'production staging') +def install_gems(without: 'production staging') check(:gemfile) do |old_version| # check both Gemfile and Gemfile.lock as there might be local changes that hasn't been bundled yet version = File.read('Gemfile') + File.read('Gemfile.lock') @@ -82,7 +82,7 @@ is_ci = ARGV.shift == 'ci' setup_database_yml setup_dotenv install_bundler -install_gems(is_ci ? 'development' : '') +install_gems(without: is_ci ? 'development' : '') is_ci ? prepare_test_db : migrate_db