geordi 0.12.7 → 0.12.8

Sign up to get free protection for your applications and to get access to all the features.
@@ -81,7 +81,11 @@ header("You are about to deploy the following commits from #{master_branch} to #
81
81
  call_or_fail("git log #{production_branch}..#{master_branch} --oneline")
82
82
 
83
83
  if prompt("Go ahead with the deployment? (y/n)", "n").downcase == 'y'
84
- call_or_fail("git merge #{master_branch} && git push && bundle exec cap #{production_stage} deploy:migrations")
84
+ capistrano_call = "cap #{production_stage} deploy:migrations"
85
+ if File.exists?('Gemfile') && File.open('Gemfile').read.scan(/capistrano/).any?
86
+ capistrano_call = "bundle exec #{capistrano_call}"
87
+ end
88
+ call_or_fail("git merge #{master_branch} && git push && #{capistrano_call}")
85
89
  success 'Deployment complete.'
86
90
  else
87
91
  error 'Deployment cancelled.'
@@ -1,3 +1,3 @@
1
1
  module Geordi
2
- VERSION = '0.12.7'
2
+ VERSION = '0.12.8'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geordi
3
3
  version: !ruby/object:Gem::Version
4
- hash: 33
4
+ hash: 63
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 12
9
- - 7
10
- version: 0.12.7
9
+ - 8
10
+ version: 0.12.8
11
11
  platform: ruby
12
12
  authors:
13
13
  - Henning Koch