cl-magic 1.2.9 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6967402db7c32f3077e4ae254f3ac3654375440e41a66f8225d66fb204e1f8f5
-  data.tar.gz: 88c12801db8a8a1a02f767e42e7eb8dd846b0da697faa052c9222e4abeeff2fb
+  metadata.gz: bb8d14f6e383683f5e14fe5ada204b1f78c7024b22663ff05080fddfa7d23f40
+  data.tar.gz: 2ab5fb3e7faca8be5fae4d9e2c9ea503cab062d7fc496496574ba21e4dbfdd29
 SHA512:
-  metadata.gz: bf66f0485b1e40ac998168f9ae7420f5d0cd2a14ecc83b6f3336b045349efb2c098ac0c0d9e26e5bf7bebeeedec98e30ecd4901268b47e75df5b8892113a18eb
-  data.tar.gz: 476128662c389749a19e557fc0ec334f392b0333983bf823b8f91d7e1d06d0bf20e15ba7112a60acc261c4121cb8e393fd3a6887bc39b82cbdaea891329be77e
+  metadata.gz: 49d6817adf444b4c77bf546d5d4468cd0fed212e17e27703971a8172561deb58d501ad9f03b3a24d5f00621e009ecc94018ca31f091eb1260353524b8d4752c9
+  data.tar.gz: 874d23bca143e1fd4c34ffa77da6e969fa2e4ac3fe5789e9b026712ca6bc8dfb429e969da2025f937d19cc0dff10bf2cb2a4b6753d66783f231920d6e03df69c

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    cl-magic (1.2.9)
+    cl-magic (1.3.1)
       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)
+    concurrent-ruby (1.2.3)
     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

@@ -24,14 +24,22 @@ ln -s $MAGIC_DIR/bin/cl /usr/local/bin
 
 ## Development
 
-If you installed the gem, you need to remove the simlink
+For local development
+
+Remove any previously installed simlink
 
 ```
 rm /usr/local/bin/cl
 ```
 
-Then sim-link to your cl-magic source code's bin script
+Then sim-link the source code instead
 
 ```
 ln -s $(pwd)/bin/cl /usr/local/bin
 ```
+
+NOTE: if using `dk make-world`, you'll need to reset your world path
+
+```
+dk world set --path ./dk-world
+```

data/bin/cl

@@ -11,7 +11,8 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
   [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 MAGIC_DIR="$( cd -P "$( dirname "$SOURCE" )/../lib/cl/magic" >/dev/null 2>&1 && pwd )"
+MAGIC_BIN="$MAGIC_DIR/../../../bin"
 
 # 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 MAGIC_BIN=$MAGIC_BIN CL_WORKING_DIR=$CL_WORKING_DIR bundle exec cl $@

data/bin/common/process_pids

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+LOG_FILEPATHS_ARRAY=()
+PIDS_ARRAY=()
+
+process_pids () {
+
+    for pid in "${PIDS_ARRAY[@]}"
+    do
+        werr=0
+        wait $pid || werr=$?
+        if [ "$werr" != 0 ] && [ "$werr" != 127 ] ; then
+            echo "     ℹ failed - ${LOG_FILEPATHS_ARRAY[$pid]}"
+        else
+            echo "     ✔ ${LOG_FILEPATHS_ARRAY[$pid]}"
+        fi
+    done
+}

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/bin/world-scripts/build

@@ -0,0 +1,135 @@
+#!/bin/bash
+set -euo pipefail
+
+# source world constants
+source "$WORLD_DIR/_bin/common/repo_constants"
+
+# script path
+SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_PATH
+
+# source scripts
+source ../common/process_pids
+
+# code path
+if [ -z "$CODE_DIR" ]; thenw
+  echo "missing CODE_DIR"
+  exit 1
+fi
+code_path=$CODE_DIR
+
+# ensure shared net
+docker network create shared > /dev/null 2>&1 || true
+
+echo ""
+echo "------------------------"
+echo " make build"
+echo "------------------------"
+echo ""
+
+REPO_ARRAY=$(get_repo_array "$1")
+for repo in ${REPO_ARRAY[@]};
+do
+    repo_base_name=$(basename "${repo##*/}" .git)
+    repo_path=$code_path/$repo_base_name
+
+    echo " $repo_base_name"
+
+    if [ ! -d $repo_path ]; then
+        echo "      ℹ skip, project not cloned"
+    else
+        if [[ "$repo_base_name" =~ $(get_skip_build_regex) ]]; then
+            echo "      ℹ skip; please build manually"
+        else
+
+            cd $repo_path
+
+            # compose settings?
+            if cl dk config &> /dev/null; then
+
+                # has make init?
+                if echo $(cl dk make) | grep -q init; then
+
+                    # start: make init
+                    log_filepath="/tmp/make.build.$repo_base_name.output"
+                    echo "     ⌛ start make init"
+
+                    # set command
+                    MAKE_INIT_CMD="cl dk make init"
+
+                    # log header
+                    echo "" >> $log_filepath
+                    echo "start make init..." > $log_filepath
+                    echo $MAKE_INIT_CMD >> $log_filepath
+                    echo "" >> $log_filepath
+
+                    # go!
+                    $MAKE_INIT_CMD >> $log_filepath 2>&1  &
+
+                    # save
+                    pid=$!
+                    PIDS_ARRAY+=($pid)
+                    LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+                else
+                    echo "      ℹ skip, no 'dk make init'"
+                fi
+            else
+
+                # docker file?
+                dockerfile_filepath="$repo_path/Dockerfile"
+                if test -f "$dockerfile_filepath"; then
+                    cd $repo_path
+
+                    # arm version?
+                    ARCH=$(uname -m)
+                    if [[ ${ARCH} == 'arm64' ]]; then
+                        if test -f "$dockerfile_filepath.arm"; then
+                            echo "      ℹ found Dockerfile.arm"
+                            dockerfile_filepath="$repo_path/Dockerfile.arm"
+                        fi
+                    fi
+
+                    # start: docker build
+                    log_filepath="/tmp/make.build.$repo_base_name.output"
+                    echo "     ⌛ start docker build"
+
+                    # command
+                    DOCKER_BUILD_CMD="docker build -t dev-$repo_base_name -f $dockerfile_filepath ."
+
+                    # log header
+                    echo "" >> $log_filepath
+                    echo "start docker build..." > $log_filepath
+                    echo $DOCKER_BUILD_CMD >> $log_filepath
+                    echo "" >> $log_filepath
+
+                    # go!
+                    $DOCKER_BUILD_CMD >> $log_filepath 2>&1  &
+
+                    # save
+                    pid=$!
+                    PIDS_ARRAY+=($pid)
+                    LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+                else
+                    echo "      ℹ skip, no docker"
+                fi
+            fi
+        fi
+    fi
+    echo ""
+done
+
+if [ ! -z "${PIDS_ARRAY:-}" ]; then
+    echo ""
+    echo " waiting"
+    echo "     👀 tail -f /tmp/make.build.*.output"
+    process_pids
+else
+    echo " nothing to do.. did you 'make get' yet?"
+fi
+
+#
+# DONE
+#
+
+printf " DONE"
+echo ""

data/bin/world-scripts/down

@@ -0,0 +1,78 @@
+#!/bin/bash
+set -euo pipefail
+
+# source world constants
+source "$WORLD_DIR/_bin/common/repo_constants"
+
+# script path
+SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_PATH
+
+# source scripts
+source ../common/process_pids
+
+# code path
+if [ -z "$CODE_DIR" ]; then
+  echo "missing CODE_DIR"
+  exit 1
+fi
+code_path=$CODE_DIR
+
+
+log_filepaths=()
+pids=()
+
+echo ""
+echo "------------------------"
+echo " bring down services"
+echo "------------------------"
+echo ""
+
+REPO_ARRAY=$(get_repo_array "$1")
+for repo in ${REPO_ARRAY[@]};
+do
+    repo_base_name=$(basename "${repo##*/}" .git)
+    repo_path=$code_path/$repo_base_name
+
+    cd $repo_path
+
+    # compose settings?
+    if cl dk config &> /dev/null; then
+
+        # has make init?
+        if echo $(cl dk make) | grep -q down; then
+            echo " $repo_base_name"
+            dk_parts=$(get_repo_dk_parts $repo_base_name)
+
+            # run
+            log_filepath="/tmp/make.down.$repo_base_name.output"
+            echo "     ⌛ running dk down"
+            echo ""
+
+            # clear parts
+            cl dk parts clear > /dev/null 2>&1 || true
+
+            # down stack
+            cl dk make $dk_parts down > $log_filepath 2>&1 &
+
+            # save
+            pid=$!
+            PIDS_ARRAY+=($pid)
+            LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+        fi
+    fi
+done
+
+if [ ! -z "${PIDS_ARRAY:-}" ]; then
+    echo ""
+    echo " waiting"
+    echo "     👀 tail -f /tmp/make.down.*.output"
+    process_pids
+fi
+
+#
+# DONE
+#
+
+printf " DONE"
+echo ""

data/bin/world-scripts/get

@@ -0,0 +1,112 @@
+#!/bin/bash
+set -euo pipefail
+
+# source world constants
+source "$WORLD_DIR/_bin/common/repo_constants"
+
+# script path
+SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_PATH
+
+# source scripts
+source ../common/process_pids
+
+# code path
+if [ -z "$CODE_DIR" ]; then
+  echo "missing CODE_DIR"
+  exit 1
+fi
+code_path=$CODE_DIR
+
+# Check if the SSH agent is running
+if [ -z "$SSH_AUTH_SOCK" ]; then
+  SSH_VALID=false
+else
+  # Check if the SSH key is added to the agent
+  if ssh-add -l > /dev/null 2>&1; then
+    SSH_VALID=true
+  else
+    SSH_VALID=false
+  fi
+fi
+
+# Check if SSH_VALID is false and display an error message
+if [ "$SSH_VALID" = false ]; then
+  echo ""
+  echo "ERROR - SSH agent is not running"
+  echo ""
+  echo "This script clones multiple repositories asyncronously"
+  echo "You must have an SSH agent running with a valid key"
+  echo ""
+  echo "learn more: "
+  echo "https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent"
+  echo ""
+  exit 1
+fi
+
+echo ""
+echo "------------------------"
+echo " make get"
+echo "------------------------"
+echo ""
+
+REPO_ARRAY=$(get_repo_array "$1")
+for repo in ${REPO_ARRAY[@]};
+do
+    cd $code_path
+    repo_base_name=$(basename "${repo##*/}" .git)
+    repo_path=$code_path/$repo_base_name
+
+    echo " $repo_base_name"
+
+    log_filepath="/tmp/make.get.$repo_base_name.output"
+
+    if [ ! -d $repo_path ]; then
+        echo "     ⌛ clone repo"
+        git clone $repo >> $log_filepath 2>&1  &
+
+        # save
+        pid=$!
+        PIDS_ARRAY+=($pid)
+        LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+    else
+        # main branch?
+        cd $repo_path
+        co_branch_name=$(git rev-parse --abbrev-ref HEAD)
+        if echo $co_branch_name | grep -qE 'main|master'; then
+
+            # no local changes
+            if [[ ! `git status --porcelain` ]]; then
+
+                # then pull latest
+                echo "     ⌛ pull latest (main)"
+                git pull --rebase >> $log_filepath 2>&1  &
+
+                # save
+                pid=$!
+                PIDS_ARRAY+=($pid)
+                LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+            else
+                echo "      ℹ skip pull (repo has local changes)"
+            fi
+        else
+            echo "      ℹ skip pull ($co_branch_name)"
+        fi
+    fi
+    echo ""
+
+done
+
+if [ ! -z "${PIDS_ARRAY:-}" ]; then
+    echo ""
+    echo " waiting"
+    echo "     👀 tail -f /tmp/make.get.*.output"
+    process_pids
+fi
+
+#
+# DONE
+#
+
+printf " DONE"
+echo ""

data/bin/world-scripts/rm

@@ -0,0 +1,76 @@
+#!/bin/bash
+set -euo pipefail
+
+# source world constants
+source "$WORLD_DIR/_bin/common/repo_constants"
+
+# script path
+SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_PATH
+
+# source scripts
+source ../common/process_pids
+
+# code path
+if [ -z "$CODE_DIR" ]; then
+  echo "missing CODE_DIR"
+  exit 1
+fi
+code_path=$CODE_DIR
+
+
+echo ""
+echo "🔥 WARNING: This script will delete all the $1."
+echo ""
+read -p "Type \"DELETE EVERYTHING\" to proceed: " confirmation
+echo ""
+if [ "$confirmation" != "DELETE EVERYTHING" ]; then
+    echo "Aborting!"
+    exit 1
+fi
+
+echo ""
+echo "------------------------"
+echo " make rm"
+echo "------------------------"
+echo ""
+
+REPO_ARRAY=$(get_repo_array "$1")
+for repo in ${REPO_ARRAY[@]};
+do
+    cd $code_path
+    repo_base_name=$(basename "${repo##*/}" .git)
+    repo_path=$code_path/$repo_base_name
+
+    echo " $repo_base_name"
+
+    log_filepath="/tmp/make.rm.$repo_base_name.output"
+
+    if [ -d $repo_path ]; then
+        echo "     ⌛ removing project"
+        rm -rf $repo_path >> $log_filepath 2>&1  &
+
+        # save
+        pid=$!
+        PIDS_ARRAY+=($pid)
+        LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+    else
+        echo "      ℹ skip, no local copy"
+    fi
+    echo ""
+
+done
+
+if [ ! -z "${PIDS_ARRAY:-}" ]; then
+    echo ""
+    echo " waiting"
+    echo "     👀 tail -f /tmp/make.rm.*.output"
+    process_pids
+fi
+
+#
+# DONE
+#
+
+printf " DONE"
+echo ""

data/bin/world-scripts/up

@@ -0,0 +1,83 @@
+#!/bin/bash
+set -euo pipefail
+
+# source world constants
+source "$WORLD_DIR/_bin/common/repo_constants"
+
+# script path
+SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_PATH
+
+# source scripts
+source ../common/process_pids
+
+# code path
+if [ -z "$CODE_DIR" ]; then
+  echo "missing CODE_DIR"
+  exit 1
+fi
+code_path=$CODE_DIR
+
+# ensure shared net
+docker network create shared > /dev/null 2>&1 || true
+
+echo ""
+echo "------------------------"
+echo " bring up compose stacks"
+echo "------------------------"
+echo ""
+
+REPO_ARRAY=$(get_repo_array "$1")
+for repo in ${REPO_ARRAY[@]};
+do
+    repo_base_name=$(basename "${repo##*/}" .git)
+    repo_path=$code_path/$repo_base_name
+
+    cd $repo_path
+
+    # compose settings?
+    if cl dk config &> /dev/null; then
+
+        # has make init?
+        if echo $(cl dk make) | grep -q up; then
+            echo " $repo_base_name"
+            dk_parts=$(get_repo_dk_parts $repo_base_name)
+
+            # run
+            log_filepath="/tmp/make.up.$repo_base_name.output"
+            echo "     ⌛ up compose stack"
+
+            # set parts
+            cl dk parts set $dk_parts > /dev/null 2>&1 || true
+
+            # up stack
+            if [[ "$repo_base_name" =~ $(get_non_async_repo_regex) ]]; then
+                echo "     👀 tail -f $log_filepath"
+                cl dk make down up > $log_filepath 2>&1
+                echo "     ✔ complete"
+                echo ""
+            else
+                echo ""
+                cl dk make down up > $log_filepath 2>&1 &
+
+                # save
+                pid=$!
+                PIDS_ARRAY+=($pid)
+                LOG_FILEPATHS_ARRAY[$pid]=$log_filepath
+            fi
+        fi
+    fi
+done
+
+if [ ! -z "${PIDS_ARRAY:-}" ]; then
+    echo ""
+    echo " waiting"
+    echo "     👀 tail -f /tmp/make.up.*.output"
+    process_pids
+fi
+
+#
+# DONE
+#
+
+echo ""

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()