cl-magic 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c962112f0a47a3945adf9b9908e73f22daa851bf3b2cd0ace70eda9dfba797
-  data.tar.gz: a73878d00fa0c615b5440fc9240d1de2b63c42ea5b64336e5a364473fd8cd06d
+  metadata.gz: e703c8de1ae89f408ce6e63cc1815522c50cfaa2c8eb378a6c66da8fce474dc5
+  data.tar.gz: 9f059bbe5db125cb443e5e3a460024efde164eaec3aa5b09beb1d353b3eed26e
 SHA512:
-  metadata.gz: 3a26ba4568305f27ceea37e20cbd8c5fd7dfa3b080b18e0160e76a11d02683ea53fc8addf3ffd0588cb1b3ffcde600faf9f6a7171821543fa5992d7a856f0dab
-  data.tar.gz: 165fb1fa74a7a84870378ed68ac67ee00509cbfb08d6d6e65a546dcd7623d075d52b81c435b20516e7de12cfffbdef23e4f374ec41bc2a954cff37fa7baf7424
+  metadata.gz: 242e2a6d1c7e455613e056144792ff941528f50592212435b495cc01dc335597d512617223a872a975ad062c9461ae3fb07226bf1079bd636cc7a4935d6ca31d
+  data.tar.gz: 4430e08eaa1b4f312a29a26ac649b789337812b3301899eca78ecbf1c8e063486687947f8ebd84b5d02305ba7865d4e5c68b3f2f9576594f5682b07ac1712215

data/Gemfile.lock

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

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

@@ -65,25 +65,41 @@ 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?
-          options = dk_parts_hash.keys.collect {|k| [k.ljust(25, ' '), dk_parts_hash[k]['help'].rjust(25, ' ')]}
-          selected_parts = pick_multiple_result(options, "Which parts?", nil, false)
+          @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']]}
+          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) }
-        @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}
-        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/version.rb

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

metadata

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