cl-magic 1.2.4 → 1.2.6
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/lib/cl/magic/dk/yaml_arg_munger.rb +9 -2
- data/lib/cl/magic/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ee9d7e3bde502a316983f3a3e60bce059f2db898be8bd14c16c3af083366814c
|
4
|
+
data.tar.gz: 4c122eff717df5d5b41c9e0e1aa900d263bb285aa3e21df5d20782da18ad2e1d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1d99fc06858b996a81885198a5eb599dc02ca571aa438782c4f73ab62bfad523a332f2a1202f3c8d44ee12c7be9f4d787719494893569c72dff6fbce84f51748
|
7
|
+
data.tar.gz: fd550cf63318a0615c32d410d5a588811d19de59d1c7f0df7f18c8dcb099ff7cbd21904ed509d6ed8987857205c7491676086da31c0a7d62ec4eb406614d4ef7
|
data/Gemfile.lock
CHANGED
@@ -53,11 +53,18 @@ class YamlArgMunger
|
|
53
53
|
return hash ? hash : {}
|
54
54
|
end
|
55
55
|
|
56
|
-
def merge_world_files(compose_hash, show_help=false)
|
56
|
+
def merge_world_files(compose_hash, show_help=false)
|
57
57
|
if @dk_proj_path
|
58
58
|
print_dk_help_line("dk-project-path", "#{@dk_proj_path}") if show_help and $stdout.isatty
|
59
59
|
|
60
|
-
|
60
|
+
# sorted yaml files
|
61
|
+
sorted_files = Dir.glob("#{@dk_proj_path}/*.{yml,yaml}", File::FNM_DOTMATCH).sort
|
62
|
+
|
63
|
+
# apply .local.yml last
|
64
|
+
sorted_files.push(sorted_files.shift) if sorted_files.first == "#{@dk_proj_path}/.local.yml"
|
65
|
+
|
66
|
+
# merge each file
|
67
|
+
sorted_files.each do |filepath|
|
61
68
|
print_dk_help_line("dk-world", "#{filepath}") if show_help and $stdout.isatty
|
62
69
|
|
63
70
|
# read file and replace
|
data/lib/cl/magic/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cl-magic
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Don Najd
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-09-
|
11
|
+
date: 2023-09-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|