cl-magic 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6967402db7c32f3077e4ae254f3ac3654375440e41a66f8225d66fb204e1f8f5
-  data.tar.gz: 88c12801db8a8a1a02f767e42e7eb8dd846b0da697faa052c9222e4abeeff2fb
+  metadata.gz: 2e26140cc95c280b62ba2fbdfba15bb2c76183ca1bab0abd27cd41489f9fe4fc
+  data.tar.gz: bb1e3783a4bddf51aff6f7b5e937095d0909f2a4c27f1973c02dfedbc0d2e1d3
 SHA512:
-  metadata.gz: bf66f0485b1e40ac998168f9ae7420f5d0cd2a14ecc83b6f3336b045349efb2c098ac0c0d9e26e5bf7bebeeedec98e30ecd4901268b47e75df5b8892113a18eb
-  data.tar.gz: 476128662c389749a19e557fc0ec334f392b0333983bf823b8f91d7e1d06d0bf20e15ba7112a60acc261c4121cb8e393fd3a6887bc39b82cbdaea891329be77e
+  metadata.gz: c66ec59e78d1a8d1c440740c43e605a5785e33300d436f454c436597e56aceeee88259c027936d6054f4e7cf97ceb913f1cff302b039daa626f8689a1ece3f42
+  data.tar.gz: ea004d5cc57a0b1a109eb7d64991185f21d6a66009318ec24fa0303a906a4dc8e497c73e595e2a672718c6e91110c4f9a583cb7bf690b0be6545bf9e0ad5a7c8

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    cl-magic (1.2.9)
+    cl-magic (1.2.10)
       activesupport
       baran
       concurrent-ruby
-      optparse-subcommand
       pastel
+      selenium-webdriver
       tty-command
       tty-logger
       tty-progressbar
@@ -16,21 +16,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.7)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    baran (0.1.7)
+    baran (0.1.9)
     byebug (11.1.3)
     concurrent-ruby (1.2.2)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.18.0)
-    optparse-subcommand (1.0.0)
+    minitest (5.20.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
     rake (13.0.6)
+    rexml (3.2.6)
+    rubyzip (2.3.2)
+    selenium-webdriver (4.14.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     strings-ansi (0.2.0)
     tty-color (0.6.0)
     tty-command (0.10.1)
@@ -55,11 +60,13 @@ GEM
       tty-cursor (~> 0.7)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
+    websocket (1.2.10)
     wisper (2.0.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   byebug
@@ -68,4 +75,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.1.4
+   2.3.7

data/README.md

@@ -35,3 +35,9 @@ Then sim-link to your cl-magic source code's bin script
 ```
 ln -s $(pwd)/bin/cl /usr/local/bin
 ```
+
+if using `dk make-world`, you'll need to reset your world path
+
+```
+dk world set --path ./dk-world
+```

data/bin/cl

@@ -14,4 +14,4 @@ MAGIC_DIR="$( cd -P "$( dirname "$SOURCE" )/../lib/cl/magic" >/dev/null 2>&1 &&
 
 # make magic - with the correct version of ruby & the bundle
 cd $MAGIC_DIR
-RBENV_VERSION=2.7.5 CL_WORKING_DIR=$CL_WORKING_DIR bundle exec cl $@
+RBENV_VERSION=3.1.2 CL_WORKING_DIR=$CL_WORKING_DIR bundle exec cl $@

data/bin/install_gem

@@ -6,14 +6,14 @@ set -euo pipefail
 #
 
 has_ruby=$(ruby -v)
-if [[ $has_ruby != *"2.7.5"* ]]; then
+if [[ $has_ruby != *"3.1.2"* ]]; then
     echo ""
-    echo "(missing) ruby 2.7.5"
-    echo "Please install ruby 2.7.5"
+    echo "(missing) ruby 3.1.2"
+    echo "Please install ruby 3.1.2"
     exit 1
 else
     echo ""
-    echo "✅ Ruby 2.7.5"
+    echo "✅ Ruby 3.1.2"
 fi
 
 #

data/cl-magic.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
 
   # dependencies
   spec.add_development_dependency "rake"
-  spec.add_dependency "optparse-subcommand"
   spec.add_dependency "tty-logger"
   spec.add_dependency "tty-command"
   spec.add_dependency "tty-prompt"
@@ -39,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pastel"
   spec.add_dependency "activesupport"
   spec.add_dependency "baran"
+  spec.add_dependency "selenium-webdriver"
 
   spec.add_development_dependency "byebug"
 

data/lib/cl/magic/cl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-require 'optparse'
 require 'tty-command'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 

data/lib/cl/magic/cl-ai-chat

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 # Call open ai chat api
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
+require 'cl/magic/common/sub_command.rb'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/ai_prompt.rb'

data/lib/cl/magic/cl-ai-query

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Prompt for similar content
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -11,6 +9,7 @@ require 'cl/magic/common/jira.rb'
 require 'cl/magic/common/ai_prompt.rb'
 require 'cl/magic/common/milvus.rb'
 require 'cl/magic/common/elastic.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 

data/lib/cl/magic/cl-ai-store-jira

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Store jira json for AI
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -11,6 +9,7 @@ require 'cl/magic/common/jira.rb'
 require 'cl/magic/common/ai_prompt.rb'
 require 'cl/magic/common/milvus.rb'
 require 'cl/magic/common/elastic.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 

data/lib/cl/magic/cl-auth

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Need to authenticate? Check here first
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = "cl auth"

data/lib/cl/magic/cl-chrome

@@ -0,0 +1,108 @@
+#!/usr/bin/env ruby
+# Request a page with the chrome browser
+require 'tty-command'
+require 'tty-prompt'
+
+require 'cl/magic/common/common_options.rb'
+require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/gcloud.rb'
+require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
+
+require 'selenium-webdriver'
+
+@logger = get_logger()
+@cl_cmd_name = File.basename(__FILE__).split('-').join(' ')
+
+#
+# Features
+#
+
+def do_work(options)
+  @logger.info "start #{Time.now.strftime("%H:%M:%S")}"
+  concurrent = options[:concurrent]
+
+  begin
+
+    # create drivers
+    drivers = []
+    concurrent.times { drivers << Selenium::WebDriver.for(:chrome) }
+
+    # browse pages
+    options[:ids].each_slice(concurrent) do |ids|
+      ids.each_with_index do |id, i|
+        drivers[i].navigate.to URI.join(options[:uri], id)
+      end
+      sleep options[:sleep]
+    end
+
+  ensure
+    drivers.each {|d| d.quit }
+  end
+  @logger.info "end #{Time.now.strftime("%H:%M:%S")}"
+end
+
+#
+# Options
+#
+
+options = {
+  concurrent: 1,
+  sleep: 0.1
+}
+global_banner = <<DOC
+
+ A sandbox to try things
+
+ Usage: #{@cl_cmd_name} [options]
+
+DOC
+
+global = OptionParser.new do |g|
+  g.banner = global_banner
+  add_help_and_verbose(g)
+
+  g.on("--base-uri URI", "uri to attach identifier to and browse") do |v|
+    options[:uri] = v
+  end
+
+  g.on("--ids CSV", "comma separated list of ids") do |v|
+    options[:ids] = v.split(',')
+  end
+
+  g.on("-c", "--concurrent NUMBER", "number of concurrent chromes to open (default: 1)") do |v|
+    options[:concurrent] = v.to_i
+  end
+
+  g.on("-s", "--sleep NUMBER", "number of seconds to sleep after opening page (default: 0.1)") do |v|
+    options[:sleep] = v.to_f
+  end
+end
+
+#
+# Run
+#
+
+@working_dir = ENV['CL_WORKING_DIR'] # passed through cl-magic to here
+global.parse(ARGV)
+
+
+if options[:uri].nil?
+  @logger.error "missing --base-uri"
+  exit
+end
+if options[:ids].nil?
+  @logger.error "missing --ids"
+  exit
+end
+
+
+# display full command
+write_history("""#{@cl_cmd_name} \\
+  --base-uri='#{options[:uri]}' \\
+  --ids=#{options[:ids].join(',')} \\
+  --sleep=#{options[:sleep]} \\
+  --concurrent=#{options[:concurrent]}
+""")
+
+do_work(options)

data/lib/cl/magic/cl-dk-make

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 # cli for your compose projects
-require 'optparse'
-require 'optparse/subcommand'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require_relative 'dk/help_printer'
 require_relative 'dk/yaml_arg_munger'

data/lib/cl/magic/cl-dk-make-world

@@ -1,12 +1,12 @@
+
 #!/usr/bin/env ruby
 # cli for your world
 require 'yaml'
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require_relative 'dk/help_printer'
 require_relative 'dk/world_settings'
@@ -102,29 +102,19 @@ end
 #
 
 def do_work()
-
-  # world yaml
-  world_yaml_filepath = File.join(@world_path, "world.yml")
-  if File.exist?(world_yaml_filepath)
-
-    # read file, replace & yaml load
-    contents = File.read(world_yaml_filepath)
-    contents.gsub!('<dk-working-path>', @working_dir)
-    yml_hash = YAML.load(contents)
-
-    # run command
-    if yml_hash and yml_hash.key? "x-dk-make-world"
+  yml_hash = @world_settings.get_world_yml_hash()
+  if yml_hash
+    if yml_hash.key? "x-dk-make-world"
       run_dk_make(ARGV, yml_hash["x-dk-make-world"])
     else
       @logger.puts ""
-      @logger.warn "no commands available"
-      @logger.info "#{world_yaml_filepath}"
+      @logger.warn "missing: x-dk-make-world in world.yml"
       @logger.puts ""
     end
   else
     @logger.puts ""
-    @logger.warn "Current world context has no world.yml"
-    @logger.info "#{world_path}"
+    @logger.warn "missing: world.yml"
+    @logger.info "#{@world_path}"
     @logger.puts ""
   end
 end

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

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 # set, list and clear parts for a compose project
 require 'yaml'
-require 'optparse'
-require 'optparse/subcommand'
 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 'cl/magic/common/sub_command.rb'
 
 require_relative 'dk/help_printer'
 require_relative 'dk/yaml_arg_munger'

data/lib/cl/magic/cl-dk-world

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 # set world and context for dk tool
 require 'yaml'
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/parse_and_pick.rb'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require_relative 'dk/world_settings'
 

data/lib/cl/magic/cl-envkey

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Human readable envkeys
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-gc-sql

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 # Connect to google cloud sql instance
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-gc-tags

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 # Work with gcloud docker image tags
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-glab-commit

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Find a commit and open in a browser
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-history

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 # History of 'cl' commands you run
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-jira-fetch

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 # Fetch jira issues by jql
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/jira.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require 'net/http'
 require 'json'

data/lib/cl/magic/cl-jira-fetch-by-epics

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 # Fetch jira issues, status changelogs and save them to a file
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/jira.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require 'net/http'
 require 'json'

data/lib/cl/magic/cl-jira-to-elastic

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Jira fetch datafile to markdown
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'active_support/all'
@@ -10,6 +8,7 @@ require 'cl/magic/common/parse_and_pick.rb'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/jira.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require 'json'
 

data/lib/cl/magic/cl-jira-to-markdown

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Jira fetch datafile to markdown
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'active_support/all'
@@ -10,6 +8,7 @@ require 'cl/magic/common/parse_and_pick.rb'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/jira.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require 'json'
 

data/lib/cl/magic/cl-jira-to-stats

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Jira fetch datafile to stats
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'active_support/all'
@@ -9,6 +7,7 @@ require 'active_support/all'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/jira.rb'
+require 'cl/magic/common/sub_command.rb'
 
 require 'net/http'
 require 'json'

data/lib/cl/magic/cl-kube-cp

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Copy a file to a container in K8
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-deployment

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Find deployment in K8 and describe it
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'json'
@@ -10,6 +8,7 @@ require 'pastel'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-ktx

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Find/save K8 cluster & namespace;then '--ktx' other kube commands
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'json'
@@ -10,6 +8,7 @@ require 'pastel'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-logs

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Find pods in k8 and follow the logs
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-restart

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Find K8 deployment and reboot pods
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-search

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 # Search resources in k8 and list them;then select one to describe it
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-search-all

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Same as search, but across all clusters
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'json'
@@ -10,6 +8,7 @@ require 'pastel'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-kube-ssh

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Find container in k8 and ssh into it
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 require 'json'
@@ -10,6 +8,7 @@ require 'pastel'
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-poll

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Run any command every second
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-sandbox

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Where cl commands are made
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

data/lib/cl/magic/cl-vault

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 # Explore HashiCorp vault
-require 'optparse'
-require 'optparse/subcommand'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -9,6 +7,7 @@ require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
 require 'cl/magic/common/gcloud.rb'
 require 'cl/magic/common/kubectl.rb'
+require 'cl/magic/common/sub_command.rb'
 
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')

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

@@ -0,0 +1,51 @@
+require 'optparse'
+
+OptionParser.send(:alias_method, :summarize_without_subcommand, :summarize)
+
+class OptionParser
+  module Subcommand
+    def subcommand(key, &block)
+      subcommand = lambda { OptionParser.new(&block) }
+      subcommands[key.to_s] = subcommand
+    end
+
+    private
+
+    def parse_with_subcommand!(*args)
+      subcommand = catch(:subcommand) do
+        args.delete({:into=>nil}) # lose the {:into=>nil}
+        return order!(*args) { |sub| throw :subcommand, sub }
+      end
+
+      sub_parser = subcommands[subcommand.to_s]
+      if sub_parser
+        sub_parser.call.send(:parse!, *args)
+      end
+    end
+
+    def summarize_with_subcommand(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
+      summarize_without_subcommand(to, width, max, indent, &blk)
+      to << "\n"
+      subcommands.each do |key, sub_parser|
+        to << indent + key + "\n"
+        sub_parser.call.send(:summarize, to, width, max, indent + "  ", &blk)
+      end
+      to
+    end
+
+    def subcommands
+      @subcommands ||= {}
+    end
+  end
+
+  include Subcommand
+
+  def parse!(*args)
+    parse_with_subcommand!(*args)
+    self
+  end
+
+  def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
+    summarize_with_subcommand(to, width, max, indent, &blk)
+  end
+end

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

@@ -7,6 +7,24 @@ class WorldSettings
     @working_dir = working_dir
   end
 
+  #
+  # world yaml
+  #
+
+  def get_world_yml_hash()
+    yaml_filepath = File.join(self.get_world_path_from_settings, "world.yml")
+    if File.exist?(yaml_filepath)
+      contents = File.read(yaml_filepath)
+      contents.gsub!('<dk-working-path>', @working_dir)
+      return YAML.load(contents)
+    end
+    return nil
+  end
+
+  #
+  # world settings
+  #
+
   def get_world_settings_hash()
     filepath = get_world_settings_filepath()
     return File.exist?(filepath) ? YAML.load_file(filepath) : {}

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

@@ -50,6 +50,8 @@ class YamlArgMunger
   def get_base_compose_hash()
     cmd = "cd #{@working_dir} && docker compose config 2> /dev/null"
     hash = YAML.load(`#{cmd}`)
+    hotfix_environment_array(hash)
+
     return hash ? hash : {}
   end
 
@@ -75,12 +77,38 @@ class YamlArgMunger
 
         # yml merge
         yml_hash = YAML.load(contents)
+        hotfix_environment_array(yml_hash)
         compose_hash = dk_merge_and_remove(compose_hash, yml_hash)
       end
     end
     return compose_hash
   end
 
+  #
+  # docker compose config - converts 'environment' into an object
+  # and that messes up munging.  So we are reversing that
+  #
+
+  def hotfix_environment_array(h)
+    stack = [h]
+    while stack.any?
+      ch = stack.pop
+      ch.each do |key, value|
+        if key.to_s == "environment"
+          if value.is_a?(Hash)
+            ch[key] = value.map { |k, v| "#{k}=#{v}" }
+          end
+        elsif value.is_a?(Hash)
+          stack.push(value)
+        end
+      end
+    end
+  end
+
+  #
+  # our dk hash merging process
+  #
+
   class ::Hash
     def dk_merge(second)
       merger = proc { |_, v1, v2|

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "1.2.9"
+    VERSION = "1.2.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Don Najd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: optparse-subcommand
+  name: tty-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-logger
+  name: tty-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-command
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-spinner
+  name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-progressbar
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: baran
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: baran
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,6 +199,7 @@ files:
 - lib/cl/magic/cl-ai-query
 - lib/cl/magic/cl-ai-store-jira
 - lib/cl/magic/cl-auth
+- lib/cl/magic/cl-chrome
 - lib/cl/magic/cl-dk
 - lib/cl/magic/cl-dk-make
 - lib/cl/magic/cl-dk-make-world
@@ -235,6 +236,7 @@ files:
 - lib/cl/magic/common/logging.rb
 - lib/cl/magic/common/milvus.rb
 - lib/cl/magic/common/parse_and_pick.rb
+- lib/cl/magic/common/sub_command.rb
 - lib/cl/magic/dk/help_printer.rb
 - lib/cl/magic/dk/parts_merger.rb
 - lib/cl/magic/dk/world_settings.rb
@@ -248,7 +250,7 @@ metadata:
   homepage_uri: https://gitlab.com/beesbot/cl-magic
   source_code_uri: https://gitlab.com/beesbot/cl-magic
   changelog_uri: https://gitlab.com/beesbot/cl-magic
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -263,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Magic tools for a turnkey developer experience
 test_files: []