cl-magic 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7f003696dcc6355ea8ee76ac94c01d8d8b324032a1c5214352de53ef0d90fd8
-  data.tar.gz: bf5e85e1e57a35a840eae95707af831e8079ce0fc85b1da87e229c89fb20c292
+  metadata.gz: bae4cae1197514890ab80299d8f0379f89661e2b8d731ac714e0b99cdcd7f4ba
+  data.tar.gz: 47588e897f238d68a9edbbb3bd13ca418018c85aade5006bd9ea7c1f742bf192
 SHA512:
-  metadata.gz: 80a97ad2355650603ac4627fc9fecc11cf5b7f558f1a835c3824d579de3bb82ac627a49d0f46cac119518a12b0215f107467e5753dff202d003d7bd578dd6f5a
-  data.tar.gz: 65023f6827983ddcd9f4fddca778f1cd8df8566764a943f6b7e0d6bce7b81743358262900b63964a7e5f511499293573c46bb5ce8f4e73f049f739ecb50be71b
+  metadata.gz: 1446ea456116138116613b93d732ee02dfead51c66df386be273b36dc660bc762892d9bc6b110cadab620d4b6023922ce4a5e79c3261230ddfffd8c685f577db
+  data.tar.gz: bc3d680c504cf92f88ed5da9743068256c9245234d86e656c272b168e69ea611d45a8ed0d976ea6033738bd4eb7e69fd3cbd38cd10238e3030632450db53699f

data/Gemfile.lock

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

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

@@ -7,6 +7,7 @@ require 'tty-command'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/parse_and_pick.rb'
 
 require_relative 'dk/help_printer'
 require_relative 'dk/yaml_arg_munger'
@@ -47,7 +48,7 @@ def do_set(options)
   yield_all_parts do |dk_parts_hash|
     parts = ARGV[1..]
 
-    if parts.any?
+    if parts.any? or options[:action] == :set
 
       # validate parts
       parts.each do |part|
@@ -67,6 +68,11 @@ def do_set(options)
       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)
+          parts = selected_parts.collect {|o| o.first.strip}
+        end
         File.open(filepath, 'w') { |file| file.write(parts.to_yaml) }
         @logger.success "parts set"
       when :add
@@ -105,26 +111,28 @@ def do_clear(options)
   end
 end
 
+def get_saved_parts()
+  filepath = get_save_parts_filepath()
+  return YAML.load_file(filepath) if File.exist?(filepath)
+  return []
+end
+
 def do_list_saved_parts(options)
 
   is_tty = $stdout.isatty
 
   yield_all_parts do |dk_parts_hash|
 
-    saved_part_keys = []
-    filepath = get_save_parts_filepath()
-
-    # merge
-    if File.exist?(filepath)
-      saved_parts = YAML.load_file(filepath)
-
+    saved_parts = get_saved_parts()
+    if saved_parts.any?
       puts "" if is_tty
       dk_parts_hash.keys.each do |part|
         if is_tty
+          part_desc = "#{part.ljust(27, ' ')} | #{dk_parts_hash[part]['help']}"
           if saved_parts.include? part
-            puts "* #{part}"
+            puts "* #{part_desc}"
           else
-            puts "  #{part}"
+            puts "  #{part_desc}"
           end
         else
           puts part if saved_parts.include? part # terminal only

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

@@ -22,7 +22,7 @@ def parse_table_results(command, error_message, num_headers=1, split=nil, workin
   # run command
   TTY::Command.new(:printer => :null).run(command).each { |line| results << line.split(split) }
   num_headers.times { results.delete_at(0) } # remove header
-   
+
   if not results.any?
     @logger.error error_message
     exit(1)
@@ -33,7 +33,7 @@ end
 
 #
 # Prompt the user to pick a single result
-# 
+#
 # results - and array of arrays
 # prompt_message - the message for our picker
 # exact - if provided, we'll return whatever matches this exactly
@@ -41,7 +41,7 @@ end
 #
 
 def pick_single_result(results, prompt_message, exact=nil, default=nil, selection_index=0)
-  
+
   # exact match?
   results = results.select {|r| r[selection_index] == exact} if exact
 
@@ -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)
+def pick_multiple_result(results, prompt_message, exacts=nil, echo=true)
 
   # exact match?
   return results.select {|r| exacts.split(',').include? r.first} if exacts
@@ -71,11 +71,11 @@ def pick_multiple_result(results, prompt_message, exacts=nil)
   # 0 or 1 result?
   return results if results.count < 2
 
-  selections = TTY::Prompt.new(interrupt: :exit).multi_select(prompt_message, filter: true, per_page: 20) do |menu|
+  selections = TTY::Prompt.new(interrupt: :exit).multi_select(prompt_message, filter: true, per_page: 20, echo: echo) do |menu|
     results.each do |result|
       menu.choice result.join(' | '), result.first
     end
   end
 
   return results.select {|r| selections.include? r.first}
-end
+end

data/lib/cl/magic/version.rb

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

metadata

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