cl-magic 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae4cae1197514890ab80299d8f0379f89661e2b8d731ac714e0b99cdcd7f4ba
-  data.tar.gz: 47588e897f238d68a9edbbb3bd13ca418018c85aade5006bd9ea7c1f742bf192
+  metadata.gz: b9bfdddcb9366c9f4ae7572f90e62c8936164cf6ed297df875a3ec1a4aafc352
+  data.tar.gz: fbf1b6e10a1da40be5aecdff53e3c2a61ebbb17141b1c43261ea58df70043089
 SHA512:
-  metadata.gz: 1446ea456116138116613b93d732ee02dfead51c66df386be273b36dc660bc762892d9bc6b110cadab620d4b6023922ce4a5e79c3261230ddfffd8c685f577db
-  data.tar.gz: bc3d680c504cf92f88ed5da9743068256c9245234d86e656c272b168e69ea611d45a8ed0d976ea6033738bd4eb7e69fd3cbd38cd10238e3030632450db53699f
+  metadata.gz: 318b84707e1b6317b6a1284cb5ccb8850bcd8d99b43fe49b329157de83fe3bd89590fd3300f2117bcefd3d096a610d32d1f69021af8c1bb3b2a3da445bcf1425
+  data.tar.gz: 47715835311863a6b08a15a0fb4ff95f6b8b0fdf73a2e77432708d3ed15fd4b2d5386007b62ba9ab0e64e3022057976f6a095dfd67bd31b3203765afdd785001

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl-magic (1.2.1)
+    cl-magic (1.2.3)
       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/cl-dk-parts

@@ -69,12 +69,25 @@ def do_set(options)
       case options[:action]
       when :set
         unless parts.any?
-          options = dk_parts_hash.keys.collect {|k| [k.ljust(25, ' '), dk_parts_hash[k]['help'].rjust(25, ' ')]}
+          @logger.info "spacebar to select"
+          @logger.info "enter to complete"
+          @logger.puts ""
+          options = dk_parts_hash.keys.collect {|k| [k.ljust(25, ' '), dk_parts_hash[k]['help']]}
           selected_parts = pick_multiple_result(options, "Which parts?", nil, false)
           parts = selected_parts.collect {|o| o.first.strip}
         end
         File.open(filepath, 'w') { |file| file.write(parts.to_yaml) }
-        @logger.success "parts set"
+        if parts.any?
+          @logger.success "parts set"
+          @logger.puts ""
+          parts.each do |p|
+            @logger.puts p
+          end
+          @logger.puts ""
+        else
+          @logger.warn "no parts selected"
+          do_clear(options)
+        end
       when :add
         data = YAML.load_file(filepath)
         parts.each {|p| data << p}

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.3"
   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.3
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake