aggkit 0.4.6.12970 → 0.4.6.12973
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/bin/aggmerge +12 -0
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1603fcf7f952e916447928bbadde7edd5f7ea2c9ea0d8dd0afc20d1580c1aca5
|
|
4
|
+
data.tar.gz: 1287785c09e10e7dc62387d767b3515d5f59abe7d712eb40d12708bc45cf349d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 60055810831e750b50266424bb311f70ba9dd6c6919fb6b4a4719947b2f43aa21564ef5979ab7b9469a455e3fce1a5972f5fb751dc25c46de56319b47f208e47
|
|
7
|
+
data.tar.gz: bb9be9c7854e16f6bff84dd7c94d28994163501e9c7b40ca0e4a3dfde7b976f1c6680855ea7159d7b858cb8f66417e15d9a84b87e4b5b26f4f632d3d8f486946
|
data/Gemfile.lock
CHANGED
data/bin/aggmerge
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
require 'English'
|
|
4
4
|
require 'yaml'
|
|
5
5
|
|
|
6
|
+
$aggdebug = ENV['AGGDEBUG']
|
|
7
|
+
|
|
8
|
+
def log(msg)
|
|
9
|
+
STDERR.puts "Debug: #{msg}" if $aggdebug
|
|
10
|
+
end
|
|
11
|
+
|
|
6
12
|
if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
|
|
7
13
|
unless ENV['COMPOSE_FILE']
|
|
8
14
|
STDERR.puts 'COMPOSE_FILE environment must point to one or more files'
|
|
@@ -109,6 +115,9 @@ def process_compose_hash(yml, dirname, parent = {})
|
|
|
109
115
|
file
|
|
110
116
|
end
|
|
111
117
|
|
|
118
|
+
log("SubPwd: #{Dir.pwd}")
|
|
119
|
+
log("SubFile: #{file_to_load}")
|
|
120
|
+
log("SubDir: #{File.dirname(file_to_load)}")
|
|
112
121
|
tmp = process_compose_hash(YAML.load(File.read(file_to_load)), File.dirname(file_to_load), service)
|
|
113
122
|
|
|
114
123
|
begin
|
|
@@ -145,8 +154,11 @@ def remove_build_section(hash)
|
|
|
145
154
|
end
|
|
146
155
|
|
|
147
156
|
if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
|
|
157
|
+
log("Pwd: #{Dir.pwd}")
|
|
148
158
|
# version в базовом хэше для того чтобы первым попасть в итоговый файл.
|
|
149
159
|
result = ENV['COMPOSE_FILE'].split(':').reduce('version' => nil) do |parent, file|
|
|
160
|
+
log("File: #{file}")
|
|
161
|
+
log("Dir: #{File.dirname(file)}")
|
|
150
162
|
yml = process_compose_hash(YAML.load(File.read(file)), File.dirname(file), parent)
|
|
151
163
|
if yml['version'] && parent['version'] && yml['version'] != parent['version']
|
|
152
164
|
raise "version mismatch: #{file}"
|