dapp 0.23.3 → 0.23.4
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 10aba50841edaf51a638a9c6343f4aadaacfd131
|
4
|
+
data.tar.gz: d711f069cc88acae89e5f95566e769d06c99e137
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d18bd976c005d9123e1d4c45a809319b2ebe427d23062324e5c9e171d06a45934b1ce0477e4c1da6af96ca0addec1bf9a07805c35651d4fe23b14753ffff733e
|
7
|
+
data.tar.gz: e0a31de68d9c6f569a16029774d9c4a96e9ce245cde1d469d9124cf71790fe757d4263ac95465b737999e05bf92da4578fe3af6ff81d793ce8156b4af53ea8da
|
@@ -2,6 +2,18 @@ module Dapp
|
|
2
2
|
class Dapp
|
3
3
|
module Logging
|
4
4
|
module Base
|
5
|
+
class << self
|
6
|
+
def included(base)
|
7
|
+
base.send(:extend, ClassMethods)
|
8
|
+
end
|
9
|
+
end
|
10
|
+
|
11
|
+
module ClassMethods
|
12
|
+
def log_time
|
13
|
+
"#{DateTime.now.strftime('%Y-%m-%dT%T%z')} "
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
5
17
|
def log_quiet?
|
6
18
|
option_quiet
|
7
19
|
end
|
@@ -87,10 +99,6 @@ module Dapp
|
|
87
99
|
self.class.log_time
|
88
100
|
end
|
89
101
|
|
90
|
-
def self.log_time
|
91
|
-
"#{DateTime.now.strftime('%Y-%m-%dT%T%z')} "
|
92
|
-
end
|
93
|
-
|
94
102
|
def log_format_string(str, time: true, indent: true, style: nil)
|
95
103
|
str.to_s.lines.map do |line|
|
96
104
|
line = paint_string(line, style) if style
|
@@ -54,7 +54,11 @@ module Dapp
|
|
54
54
|
end
|
55
55
|
|
56
56
|
def update_project_images_cache(project_images)
|
57
|
-
dapp_project_images
|
57
|
+
array_hash_delete_if_by_id(dapp_project_images, project_images)
|
58
|
+
end
|
59
|
+
|
60
|
+
def array_hash_delete_if_by_id(project_images, *images)
|
61
|
+
project_images.delete_if { |image| images.flatten.any? { |i| image[:id] == i[:id] } }
|
58
62
|
end
|
59
63
|
|
60
64
|
def project_images_to_delete(project_images)
|
@@ -64,7 +64,7 @@ module Dapp
|
|
64
64
|
dapp_project_image_artifacts_ids_in_labels(image).each { |aiid| except_image_id_with_parents(aiid, dimgstages) }
|
65
65
|
i = image
|
66
66
|
loop do
|
67
|
-
dimgstages
|
67
|
+
array_hash_delete_if_by_id(dimgstages, i)
|
68
68
|
break if (i = dapp_project_image_parent(i)).nil?
|
69
69
|
end
|
70
70
|
end
|
@@ -13,7 +13,7 @@ module Dapp
|
|
13
13
|
repo_dimgs = repo_dimgs_images(registry)
|
14
14
|
repo_dimgstages = repo_dimgstages_images(registry)
|
15
15
|
|
16
|
-
repo_dimgstages
|
16
|
+
array_hash_delete_if_by_id(repo_dimgstages, repo_dimgs) # ignoring stages with dimgs ids (v2)
|
17
17
|
|
18
18
|
proper_repo_cache(registry, repo_dimgstages) if proper_cache_version?
|
19
19
|
repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages) if proper_repo_cache?
|
@@ -48,7 +48,7 @@ module Dapp
|
|
48
48
|
|
49
49
|
ri = repo_image
|
50
50
|
loop do
|
51
|
-
repo_dimgstages
|
51
|
+
array_hash_delete_if_by_id(repo_dimgstages, ri)
|
52
52
|
ri_parent_id = registry.image_parent_id(ri[:tag], ri[:dimg])
|
53
53
|
break if ri_parent_id.empty? || (ri = repo_image_by_id(ri_parent_id, repo_dimgstages)).nil?
|
54
54
|
end
|
data/lib/dapp/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dapp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.23.
|
4
|
+
version: 0.23.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dmitry Stolyarov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-01-
|
11
|
+
date: 2018-01-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|