kitchen_hooks 1.7.16 → 1.7.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/kitchen_hooks/app.rb +6 -2
- data/lib/kitchen_hooks/helpers.rb +2 -5
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c6cfa11e5aee782f6c1aacb372e7c818f1bbc2e8
|
4
|
+
data.tar.gz: b17acbe410ec2dff6277da787b608683819d1d7d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 78eaec1e5892e16955a761d740f4eddbd0088343a6271b922a522e5de1cb57193e7f18a7ab03a58852d554af17bc4574e9d09b978a2bad5c8fcf7c569e8bbcbd
|
7
|
+
data.tar.gz: 8afca13e38d32a8da834e1d09de4b492d3507b6a9becf2b3392afade0ac565084cb51677e7775b184036b1355bcf6f9378018197b47e65b1eae98fe623141c13
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.7.
|
1
|
+
1.7.17
|
data/lib/kitchen_hooks/app.rb
CHANGED
@@ -29,7 +29,7 @@ module KitchenHooks
|
|
29
29
|
def self.tmp! dir ; @@tmp = dir end
|
30
30
|
|
31
31
|
def self.close!
|
32
|
-
@@sync_worker.kill
|
32
|
+
@@sync_worker.kill if defined? @@sync_worker
|
33
33
|
@@backlog_worker.kill
|
34
34
|
@@db.flush
|
35
35
|
@@db.close
|
@@ -49,14 +49,15 @@ module KitchenHooks
|
|
49
49
|
return if @@sync_interval.nil?
|
50
50
|
@@sync_worker = Thread.new do
|
51
51
|
loop do
|
52
|
-
process_sync
|
53
52
|
sleep @@sync_interval
|
53
|
+
process_sync
|
54
54
|
end
|
55
55
|
end
|
56
56
|
end
|
57
57
|
|
58
58
|
|
59
59
|
def self.config! config
|
60
|
+
$stderr.puts 'ENV: %s' % JSON::pretty_generate(ENV.to_hash)
|
60
61
|
@@config = config
|
61
62
|
@@hipchat = nil
|
62
63
|
if config['hipchat']
|
@@ -144,6 +145,9 @@ module KitchenHooks
|
|
144
145
|
db[Time.now.to_f] = entry
|
145
146
|
end
|
146
147
|
db.flush
|
148
|
+
$stderr.puts 'MARK "%s": event=%s error=%s' % [
|
149
|
+
type, event.inspect, error.inspect
|
150
|
+
]
|
147
151
|
notify entry
|
148
152
|
end
|
149
153
|
|
@@ -109,13 +109,9 @@ module KitchenHooks
|
|
109
109
|
berksfile = File::join clone, 'Berksfile'
|
110
110
|
berksfile_lock = "#{berksfile}.lock"
|
111
111
|
|
112
|
-
# If no lockfile provided, use latest dependencies
|
113
|
-
do_update = !File::exist?(berksfile_lock)
|
114
|
-
|
115
112
|
$stdout.puts 'Uploading dependencies'
|
113
|
+
berks_install berksfile
|
116
114
|
knives.peach do |knife|
|
117
|
-
berks_install berksfile, knife
|
118
|
-
# berks_update berksfile, knife if do_update
|
119
115
|
berks_upload berksfile, knife
|
120
116
|
end
|
121
117
|
|
@@ -240,6 +236,7 @@ module KitchenHooks
|
|
240
236
|
begin
|
241
237
|
$stdout.puts "berks_upload: %s" % cmd
|
242
238
|
system cmd
|
239
|
+
raise unless $?.exitstatus.zero?
|
243
240
|
rescue
|
244
241
|
raise 'Could not perform berks_upload with config %s, knife %s' % [
|
245
242
|
berksfile.inspect, knife.inspect
|