Merge pull request #53 from sul-dlss/deploy-tweaks

cap deploy prompts for branch and does info level logging

config/deploy.rb

@@ -5,7 +5,7 @@
 set :repo_url, 'https://github.com/sul-dlss/digital_stacks_rails.git'
 
 # Default branch is :master
-# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
+ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
 # Default deploy_to directory is /var/www/my_app
 set :deploy_to, '/opt/app/stacks/stacks'
@@ -17,7 +17,7 @@
 # set :format, :pretty
 
 # Default value for :log_level is :debug
-# set :log_level, :debug
+set :log_level, :info
 
 # Default value for :pty is false
 # set :pty, true
@@ -34,4 +34,4 @@
 # Default value for keep_releases is 5
 # set :keep_releases, 5
 
-before 'deploy:publishing', 'squash:write_revision'
+before 'deploy:publishing', 'squash:write_revision'

config/deploy/staging.rb

@@ -2,5 +2,3 @@
 
 Capistrano::OneTimeKey.generate_one_time_key!
 set :rails_env, "production"
-set :branch, ENV["BRANCH"] || "master"
-