cl-magic 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae4cae1197514890ab80299d8f0379f89661e2b8d731ac714e0b99cdcd7f4ba
-  data.tar.gz: 47588e897f238d68a9edbbb3bd13ca418018c85aade5006bd9ea7c1f742bf192
+  metadata.gz: 05c962112f0a47a3945adf9b9908e73f22daa851bf3b2cd0ace70eda9dfba797
+  data.tar.gz: a73878d00fa0c615b5440fc9240d1de2b63c42ea5b64336e5a364473fd8cd06d
 SHA512:
-  metadata.gz: 1446ea456116138116613b93d732ee02dfead51c66df386be273b36dc660bc762892d9bc6b110cadab620d4b6023922ce4a5e79c3261230ddfffd8c685f577db
-  data.tar.gz: bc3d680c504cf92f88ed5da9743068256c9245234d86e656c272b168e69ea611d45a8ed0d976ea6033738bd4eb7e69fd3cbd38cd10238e3030632450db53699f
+  metadata.gz: 3a26ba4568305f27ceea37e20cbd8c5fd7dfa3b080b18e0160e76a11d02683ea53fc8addf3ffd0588cb1b3ffcde600faf9f6a7171821543fa5992d7a856f0dab
+  data.tar.gz: 165fb1fa74a7a84870378ed68ac67ee00509cbfb08d6d6e65a546dcd7623d075d52b81c435b20516e7de12cfffbdef23e4f374ec41bc2a954cff37fa7baf7424

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl-magic (1.2.1)
+    cl-magic (1.2.2)
       activesupport
       baran
       concurrent-ruby

data/lib/cl/magic/cl-dk

@@ -71,9 +71,10 @@ def do_work()
 
   # world files
   compose_hash, dk_parts_hash, dk_make_hash = @yaml_arg_munger.get_base_compose_parts_and_make_hashes()
-  if compose_hash
-    try_print_dk_help(dk_parts_hash, dk_make_hash, ARGV.clone)
-    compose_hash, selected_parts, shifted_args = @parts_merger.merge_parts(compose_hash, dk_parts_hash, ARGV.clone)
+
+  try_print_dk_help(dk_parts_hash, dk_make_hash, ARGV.clone)
+  compose_hash, selected_parts, shifted_args = @parts_merger.merge_parts(compose_hash, dk_parts_hash, ARGV.clone)
+  if compose_hash and compose_hash.keys.any?
     final_args = @yaml_arg_munger.save_yaml_and_adjust_args(compose_hash, shifted_args)
     run_dk(final_args)
   else

data/lib/cl/magic/dk/yaml_arg_munger.rb

@@ -49,7 +49,8 @@ class YamlArgMunger
 
   def get_base_compose_hash()
     cmd = "cd #{@working_dir} && docker compose config 2> /dev/null"
-    return YAML.load(`#{cmd}`)
+    hash = YAML.load(`#{cmd}`)
+    return hash ? hash : {}
   end
 
   def merge_world_files(compose_hash, show_help=false)

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake