hu 1.4.9 → 1.4.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/hu/deploy.rb +1 -3
- data/lib/hu/version.rb +1 -1
- 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: 2fa71a7a25729dcea7296127560128794e2e6408
|
|
4
|
+
data.tar.gz: 572062fd161619e69307c9766146756c106b0583
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ae9880bb29fe26d9f79b2ec7beb6155f8cf92e236363ecb9578f555f5d86b5790a2af48f3e22eeeaaeb189f8c106fe89e78a0cdce9babcf35684462753c9fb2d
|
|
7
|
+
data.tar.gz: f32c2c854db2856200d2fc1afe8971aea75ffcdd87afb8ecff99552c34ded616831dde3e84a0b11c42c040198142062a8dfa43b10c691dfd54c4661281102611
|
data/lib/hu/deploy.rb
CHANGED
|
@@ -143,15 +143,13 @@ module Hu
|
|
|
143
143
|
stag_app_name = app['name']
|
|
144
144
|
busy 'synchronizing', :dots
|
|
145
145
|
prod_app_name = h.app.info(prod_app_id)['name']
|
|
146
|
-
unbusy
|
|
147
146
|
|
|
148
|
-
busy 'update working copy', :dots
|
|
149
147
|
wc_update.join
|
|
150
148
|
unbusy
|
|
151
149
|
|
|
152
150
|
unless develop_can_be_merged_into_master?
|
|
153
151
|
puts
|
|
154
|
-
puts "ERROR: It
|
|
152
|
+
puts "ERROR: It looks like a merge of 'develop' into 'master' would fail.".color(:red)
|
|
155
153
|
puts " Aborting early to prevent a merge conflict.".color(:red)
|
|
156
154
|
puts
|
|
157
155
|
exit 1
|
data/lib/hu/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hu
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.4.
|
|
4
|
+
version: 1.4.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- moe
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-07-
|
|
11
|
+
date: 2016-07-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|