From 7d9668d6055cfbb166a937d82db48a9e6cae5a4f Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 14 Jan 2015 13:52:57 +0200 Subject: [PATCH] improved deploy setup logic --- config/deploy.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index b41ed3088..fb581df2e 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -51,12 +51,8 @@ set :shared_paths, [ # This task is the environment that is loaded for most commands, such as # `mina deploy` or `mina rake`. task :environment do - # If you're using rbenv, use this to load the rbenv environment. - # Be sure to commit your .rbenv-version to your repository. + # Be sure to commit your .ruby-version to your repository. invoke :'rbenv:load' - - # For those using RVM, use this to load an RVM version@gemset. - # invoke :'rvm:use[ruby-1.9.3-p125@default]' end # Put any custom mkdir's in here for when `mina setup` is ran. @@ -82,7 +78,14 @@ task setup: :environment do queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/export/zonefiles") queue! %(touch "#{deploy_to}/shared/config/database.yml") - queue %(echo '-----> Be sure to edit 'shared/config/database.yml'.') + deploy do + invoke :'git:clone' + invoke :'deploy:link_shared_paths' + to :launch do + invoke :'bundle:install' + queue %(echo '\n NB! Please edit 'shared/config/database.yml'\n') + end + end end desc 'Deploys the current version to the server.'