cl-magic 1.2.3 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9bfdddcb9366c9f4ae7572f90e62c8936164cf6ed297df875a3ec1a4aafc352
-  data.tar.gz: fbf1b6e10a1da40be5aecdff53e3c2a61ebbb17141b1c43261ea58df70043089
+  metadata.gz: ee9d7e3bde502a316983f3a3e60bce059f2db898be8bd14c16c3af083366814c
+  data.tar.gz: 4c122eff717df5d5b41c9e0e1aa900d263bb285aa3e21df5d20782da18ad2e1d
 SHA512:
-  metadata.gz: 318b84707e1b6317b6a1284cb5ccb8850bcd8d99b43fe49b329157de83fe3bd89590fd3300f2117bcefd3d096a610d32d1f69021af8c1bb3b2a3da445bcf1425
-  data.tar.gz: 47715835311863a6b08a15a0fb4ff95f6b8b0fdf73a2e77432708d3ed15fd4b2d5386007b62ba9ab0e64e3022057976f6a095dfd67bd31b3203765afdd785001
+  metadata.gz: 1d99fc06858b996a81885198a5eb599dc02ca571aa438782c4f73ab62bfad523a332f2a1202f3c8d44ee12c7be9f4d787719494893569c72dff6fbce84f51748
+  data.tar.gz: fd550cf63318a0615c32d410d5a588811d19de59d1c7f0df7f18c8dcb099ff7cbd21904ed509d6ed8987857205c7491676086da31c0a7d62ec4eb406614d4ef7

data/Gemfile.lock

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

data/lib/cl/magic/cl-dk-parts

@@ -65,7 +65,11 @@ def do_set(options)
 
       # save parts
       filepath = get_save_parts_filepath()
+      prev_saved_parts = YAML.load_file(filepath)
+
+      # passed in parts
       parts = ARGV[1..]
+
       case options[:action]
       when :set
         unless parts.any?
@@ -73,7 +77,8 @@ def do_set(options)
           @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)
+          default = prev_saved_parts.collect{|p| p.ljust(25, ' ')}
+          selected_parts = pick_multiple_result(options, "Which parts?", nil, false, default)
           parts = selected_parts.collect {|o| o.first.strip}
         end
         File.open(filepath, 'w') { |file| file.write(parts.to_yaml) }
@@ -89,14 +94,12 @@ def do_set(options)
           do_clear(options)
         end
       when :add
-        data = YAML.load_file(filepath)
-        parts.each {|p| data << p}
-        File.open(filepath, 'w') { |file| file.write(data.uniq.to_yaml) }
+        parts.each {|p| prev_saved_parts << p}
+        File.open(filepath, 'w') { |file| file.write(prev_saved_parts.uniq.to_yaml) }
         @logger.success "parts added"
       when :remove
-        data = YAML.load_file(filepath)
-        data.reject! { |p| parts.include?(p) }
-        File.open(filepath, 'w') { |file| file.write(data.to_yaml) }
+        prev_saved_parts.reject! { |p| parts.include?(p) }
+        File.open(filepath, 'w') { |file| file.write(prev_saved_parts.to_yaml) }
         @logger.success "parts removed"
       end
     else

data/lib/cl/magic/common/parse_and_pick.rb

@@ -63,7 +63,7 @@ def pick_single_result(results, prompt_message, exact=nil, default=nil, selectio
 end
 
 
-def pick_multiple_result(results, prompt_message, exacts=nil, echo=true)
+def pick_multiple_result(results, prompt_message, exacts=nil, echo=true, default=[])
 
   # exact match?
   return results.select {|r| exacts.split(',').include? r.first} if exacts
@@ -72,9 +72,17 @@ def pick_multiple_result(results, prompt_message, exacts=nil, echo=true)
   return results if results.count < 2
 
   selections = TTY::Prompt.new(interrupt: :exit).multi_select(prompt_message, filter: true, per_page: 20, echo: echo) do |menu|
+    # add choices
     results.each do |result|
       menu.choice result.join(' | '), result.first
     end
+
+    # defaults
+    keys = results.collect {|r|r.first}
+    default_indexes = default.map {|d| keys.index(d) + 1}
+    if default.any?
+      menu.default *default_indexes
+    end
   end
 
   return results.select {|r| selections.include? r.first}

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

@@ -53,11 +53,18 @@ class YamlArgMunger
     return hash ? hash : {}
   end
 
-  def merge_world_files(compose_hash, show_help=false)
+  def merge_world_files(compose_hash, show_help=false)    
     if @dk_proj_path
       print_dk_help_line("dk-project-path", "#{@dk_proj_path}") if show_help and $stdout.isatty
 
-      Dir.glob("#{@dk_proj_path}/*.yml").sort.each do |filepath|
+      # sorted yaml files
+      sorted_files = Dir.glob("#{@dk_proj_path}/*.{yml,yaml}", File::FNM_DOTMATCH).sort
+
+      # apply .local.yml last
+      sorted_files.push(sorted_files.shift) if sorted_files.first == "#{@dk_proj_path}/.local.yml"
+
+      # merge each file
+      sorted_files.each do |filepath|
         print_dk_help_line("dk-world", "#{filepath}") if show_help and $stdout.isatty
 
         # read file and replace

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "1.2.3"
+    VERSION = "1.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.6
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake