rdeis 0.0.13 → 0.0.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rdeis/deploy.rb +4 -0
- data/lib/rdeis/git.rb +1 -1
- data/lib/rdeis/version.rb +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7cf228ee970c63ef81770f956e515ecbc7ef974f
|
4
|
+
data.tar.gz: 0595ac9f67d7c0440af14ac8d0697acb70ffa86e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d2feacfb5603b98075b4583b7b048ee48f8603ec84092b73b64989c1c7372de58bf5e1895a50b0b1103a997fb6f5ef37bfaf588b699ac9ea270b1e998d57b044
|
7
|
+
data.tar.gz: 164176c089980e17aa49dc55d896e8e7622bc71a386f3dff197520ff57fecdd008cdb3f8465dd0f3b4593d8837838258e42679ce214a85152d67f080d2646535
|
data/lib/rdeis/deploy.rb
CHANGED
@@ -136,6 +136,10 @@ module DEIS
|
|
136
136
|
checkout = run ("cd #{@deploy_to} && #{DEIS::Git.checkout_to_ref_cmd(@ref, @branch)}")
|
137
137
|
output[" checkout to #{@ref[0..8]}"] = if checkout then DEIS::Deploy::YES else DEIS::Deploy::NO end
|
138
138
|
print_table output
|
139
|
+
if ! checkout || checkout.nil?
|
140
|
+
say "Failed to checkout correctly", :red
|
141
|
+
exit
|
142
|
+
end
|
139
143
|
end
|
140
144
|
|
141
145
|
# parse the remotes that have been created and add to local version if proxy is set
|
data/lib/rdeis/git.rb
CHANGED
@@ -44,7 +44,7 @@ module DEIS
|
|
44
44
|
end
|
45
45
|
6
|
46
46
|
def self.checkout_to_ref_cmd(ref, branch)
|
47
|
-
"git fetch origin && git checkout -f origin/#{branch}
|
47
|
+
"git fetch origin && git checkout -f origin/#{branch} && git branch -d #{branch} ; git checkout -f #{branch} && git checkout -f #{ref} 2>&1 | grep 'error:' | wc -l"
|
48
48
|
end
|
49
49
|
|
50
50
|
# find env based token
|
data/lib/rdeis/version.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
1
|
module DEIS
|
2
|
-
VERSION='0.0.
|
3
|
-
LAST_VERSION='0.0.
|
4
|
-
end
|
2
|
+
VERSION='0.0.14'
|
3
|
+
LAST_VERSION='0.0.13'
|
4
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rdeis
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Charles Marshall
|
@@ -79,7 +79,7 @@ files:
|
|
79
79
|
- lib/rdeis/version.rb
|
80
80
|
- lib/ssh.rb
|
81
81
|
- rdeis.gemspec
|
82
|
-
homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.
|
82
|
+
homepage: https://github.com/charlesmarshall/deis_deploy/tree/0.0.14
|
83
83
|
licenses:
|
84
84
|
- MIT
|
85
85
|
metadata: {}
|