cl-magic 1.2.1 → 1.2.2
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/Gemfile.lock +1 -1
- data/lib/cl/magic/cl-dk +4 -3
- data/lib/cl/magic/dk/yaml_arg_munger.rb +2 -1
- 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: 05c962112f0a47a3945adf9b9908e73f22daa851bf3b2cd0ace70eda9dfba797
|
|
4
|
+
data.tar.gz: a73878d00fa0c615b5440fc9240d1de2b63c42ea5b64336e5a364473fd8cd06d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3a26ba4568305f27ceea37e20cbd8c5fd7dfa3b080b18e0160e76a11d02683ea53fc8addf3ffd0588cb1b3ffcde600faf9f6a7171821543fa5992d7a856f0dab
|
|
7
|
+
data.tar.gz: 165fb1fa74a7a84870378ed68ac67ee00509cbfb08d6d6e65a546dcd7623d075d52b81c435b20516e7de12cfffbdef23e4f374ec41bc2a954cff37fa7baf7424
|
data/Gemfile.lock
CHANGED
data/lib/cl/magic/cl-dk
CHANGED
|
@@ -71,9 +71,10 @@ def do_work()
|
|
|
71
71
|
|
|
72
72
|
# world files
|
|
73
73
|
compose_hash, dk_parts_hash, dk_make_hash = @yaml_arg_munger.get_base_compose_parts_and_make_hashes()
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
|
|
75
|
+
try_print_dk_help(dk_parts_hash, dk_make_hash, ARGV.clone)
|
|
76
|
+
compose_hash, selected_parts, shifted_args = @parts_merger.merge_parts(compose_hash, dk_parts_hash, ARGV.clone)
|
|
77
|
+
if compose_hash and compose_hash.keys.any?
|
|
77
78
|
final_args = @yaml_arg_munger.save_yaml_and_adjust_args(compose_hash, shifted_args)
|
|
78
79
|
run_dk(final_args)
|
|
79
80
|
else
|
|
@@ -49,7 +49,8 @@ class YamlArgMunger
|
|
|
49
49
|
|
|
50
50
|
def get_base_compose_hash()
|
|
51
51
|
cmd = "cd #{@working_dir} && docker compose config 2> /dev/null"
|
|
52
|
-
|
|
52
|
+
hash = YAML.load(`#{cmd}`)
|
|
53
|
+
return hash ? hash : {}
|
|
53
54
|
end
|
|
54
55
|
|
|
55
56
|
def merge_world_files(compose_hash, show_help=false)
|
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.2
|
|
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-08-
|
|
11
|
+
date: 2023-08-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|