cl-magic 1.2.9 → 1.3.1

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/load_runner.rb

@@ -0,0 +1,127 @@
+
+module LoadRunner
+
+	class Queue
+		attr_accessor :failures
+
+		def initialize(logger = nil)
+			@logger = logger if logger!=nil
+
+			# setup
+			@threads = []
+			@transactions = 0
+			@num_threads = 1
+			@failures = 0
+		end
+
+		def load(num_threads=1, &work)
+			@num_threads = num_threads
+			@work = work  # save work for new threads
+
+			# create threads
+			num_threads.times do
+
+				# do work
+				create_thread
+
+				# log
+				@logger.debug "action=create|name=thread" if @logger!=nil
+		  end
+		end
+
+		def run()
+			@start_time = Time.now
+			start_all
+			wait_until_finished
+		end
+
+		def run_and_stagger(max_sleep=10)
+			@start_time = Time.now
+			start_all { rand_sleep(max_sleep) }
+			wait_until_finished
+		end
+
+		def run_for_durration(num_seconds, max_sleep=0)
+			@start_time = Time.now
+
+			# keep them running
+			to_time = Time.now + num_seconds
+
+			# log
+			@logger.info "action=run_for_durration|until=#{to_time}" if @logger!=nil
+
+			# durration
+			while (Time.now <= to_time)
+
+				# start threads
+				@threads.each do |t|
+					break if Time.now > to_time
+
+					# restart threads
+					if (t.status=="sleep")
+						rand_sleep(max_sleep)
+						t.run
+					end
+
+					if (t.status==false or t.status == nil)
+						@transactions += 1
+						@threads.delete t
+						thread = create_thread
+						rand_sleep(max_sleep)
+						thread.run
+
+						# log
+						@logger.debug "thread_count=#{@threads.count}" if @logger!=nil
+					end
+				end
+			end
+		end
+
+		private
+
+		def create_thread()
+		  	thread = Thread.new do
+		  		@work.call
+		  	end
+		  	@threads << thread
+				sleep(0.1)
+		  	return thread
+		end
+
+		def start_all(&block)
+			@threads.each do |t|
+
+				# pausing block?
+				block
+
+				# log
+				@logger.debug "action=start|name=thread|status=#{t.status}" if @logger!=nil
+
+				# run thread
+				t.run unless t.status==false
+			end
+		end
+
+		# wait for threads to complete
+		def wait_until_finished()
+			@threads.each do |t|
+				@logger.debug "action=check_status|name=thread|status=#{t.status}" if @logger!=nil
+				if (t.status=="run" or t.status=="sleep")
+					t.join;  # wait to finish
+					@logger.debug "action=done|name=thread|status=#{t.status}" if @logger!=nil
+				end
+			end
+
+			# log
+			@logger.success "transactions=#{@transactions}|threads=#{@num_threads}|failures=#{@failures}|durration=#{Time.now - @start_time}" if @logger!=nil
+		end
+
+		# random sleep
+		def rand_sleep(max_sleep=10)
+			if max_sleep > 0
+				time_to_sleep = rand(max_sleep)
+				sleep(time_to_sleep)
+			end
+		end
+	end
+end

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) : {}
@@ -34,6 +52,14 @@ class WorldSettings
     return ""
   end
 
+  def get_code_path_from_settings()
+    world_settings = get_world_settings_hash()
+    if world_settings.key?(:code_path)
+      return File.join(world_settings[:code_path])
+    end
+    return ""
+  end
+
   private
 
   def get_repo_basename()

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

@@ -12,11 +12,10 @@ class YamlArgMunger
     compose_hash = get_base_compose_hash()
     dk_parts_hash = {}
     dk_make_hash = {}
-    if compose_hash
-      compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
-      dk_parts_hash = compose_hash['x-dk-parts'] ? compose_hash.delete('x-dk-parts') : {}
-      dk_make_hash = compose_hash['x-dk-make'] ? compose_hash.delete('x-dk-make') : {}
-    end
+
+    compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
+    dk_parts_hash = compose_hash['x-dk-parts'] ? compose_hash.delete('x-dk-parts') : {}
+    dk_make_hash = compose_hash['x-dk-make'] ? compose_hash.delete('x-dk-make') : {}
     return compose_hash, dk_parts_hash, dk_make_hash
   end
 
@@ -48,9 +47,27 @@ class YamlArgMunger
   private
 
   def get_base_compose_hash()
-    cmd = "cd #{@working_dir} && docker compose config 2> /dev/null"
-    hash = YAML.load(`#{cmd}`)
-    return hash ? hash : {}
+    p2_file_path=".cl-dk-config.output"
+    cmd = "cd #{@working_dir} && docker compose config --no-normalize 2> #{p2_file_path}"
+    config_output = `#{cmd}`
+    if $?.success?
+      hash = YAML.load(config_output)
+      hotfix_environment_array(hash)
+      hotfix_x_dk_settings(hash)
+      return hash ? hash : {}
+    else
+
+      # is config invalid?
+      p2_output = `cd #{@working_dir} && cat #{p2_file_path}` # get p2 output
+      `cd #{@working_dir} && rm #{p2_file_path}`              # clean up file
+      unless p2_output.include? "no configuration file provided"
+        puts "🔥 invalid docker config"
+        exit 1
+      end
+
+      # otherwise support no base config
+      return {}
+    end
   end
 
   def merge_world_files(compose_hash, show_help=false)    
@@ -75,12 +92,74 @@ 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
+
+  #
+  # docker compose config - alphabetizes everything
+  # so we'll only get x-dk settings from a file docker-compose.yml
+  #
+
+  def hotfix_x_dk_settings(compose_hash)
+
+    # remove x-dk settings
+    compose_hash.delete('x-dk-parts')
+    compose_hash.delete('x-dk-make')
+
+    # fetch them directly
+    supported_paths = [
+      'compose.yaml',
+      'compose.yml',
+      'docker-compose.yaml',
+      'docker-compose.yml'
+    ]
+    raw_compose_hash = nil
+    supported_paths.each do |filepath|
+      full_filepath = File.join(@working_dir, filepath)
+      if File.exist?(full_filepath)
+        begin
+          raw_compose_hash = YAML.safe_load(File.read(full_filepath))
+          break;
+        rescue StandardError => e
+          # Handle any errors during parsing
+          puts "Error parsing YAML file #{full_filepath}: #{e.message}"
+          exit 1
+        end
+      end
+    end
+    compose_hash['x-dk-parts'] = raw_compose_hash['x-dk-parts']
+    compose_hash['x-dk-make'] = raw_compose_hash['x-dk-make']
+  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.3.1"
   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.3.1
 platform: ruby
 authors:
 - Don Najd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2024-04-13 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:
     - - ">="
@@ -189,9 +189,15 @@ files:
 - Gemfile.lock
 - README.md
 - bin/cl
+- bin/common/process_pids
 - bin/console
 - bin/install_gem
 - bin/setup
+- bin/world-scripts/build
+- bin/world-scripts/down
+- bin/world-scripts/get
+- bin/world-scripts/rm
+- bin/world-scripts/up
 - cl-magic.gemspec
 - lib/cl/magic.rb
 - lib/cl/magic/cl
@@ -199,6 +205,8 @@ 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-curl
 - lib/cl/magic/cl-dk
 - lib/cl/magic/cl-dk-make
 - lib/cl/magic/cl-dk-make-world
@@ -232,9 +240,11 @@ files:
 - lib/cl/magic/common/gcloud.rb
 - lib/cl/magic/common/jira.rb
 - lib/cl/magic/common/kubectl.rb
+- lib/cl/magic/common/load_runner.rb
 - 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 +258,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 +273,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: []