- lets try a package.yaml instead

- added get_generator API to testing utilities (a nice way to setup default options)
- updated python scwrypts API to use latest pattern established in the nodejs library
2024-04-15 08:48:19 -06:00 · 2024-04-15 08:46:47 -06:00 · 2024-04-15 08:45:55 -06:00
20 changed files with 246 additions and 350 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -102,7 +102,6 @@ jobs:
            && echo "source=(scwrypts.tar.gz)" >> PKGBUILD
            && echo "sha256sums=(SKIP)" >> PKGBUILD
            && makepkg --noconfirm -si
-            && echo validating scwrypts version
            && scwrypts --version | grep "^scwrypts v$PKGVER$"
            ;

--- a/.config/env.template
+++ b/.config/env.template
@ -12,6 +12,10 @@ export DISCORD__DEFAULT_AVATAR_URL=
 export DISCORD__DEFAULT_CHANNEL_ID=
 export DISCORD__DEFAULT_USERNAME=
 export DISCORD__DEFAULT_WEBHOOK=
+export I3__BORDER_PIXEL_SIZE=
+export I3__DMENU_FONT_SIZE=
+export I3__GLOBAL_FONT_SIZE=
+export I3__MODEL_CONFIG=
 export LINEAR__API_TOKEN=
 export MEDIA_SYNC__S3_BUCKET
 export MEDIA_SYNC__TARGETS
--- a/.config/env.template.descriptions
+++ b/.config/env.template.descriptions
@ -15,6 +15,11 @@ DISCORD__DEFAULT_CHANNEL_ID |
 DISCORD__DEFAULT_USERNAME   |
 DISCORD__DEFAULT_WEBHOOK    |

+I3__BORDER_PIXEL_SIZE   | custom i3 configuration settings
+I3__DMENU_FONT_SIZE     |
+I3__GLOBAL_FONT_SIZE    |
+I3__MODEL_CONFIG        |
+
 LINEAR__API_TOKEN  | linear.app project management configuration

 MEDIA_SYNC__S3_BUCKET | s3 bucket name and filesystem targets for media backups
--- a/plugins/kubectl/driver/kubectl.driver.zsh
+++ b/plugins/kubectl/driver/kubectl.driver.zsh
@ -1,10 +1,11 @@
 [[ $SCWRYPTS_KUBECTL_DRIVER_READY -eq 1 ]] && return 0

-unalias k h f >/dev/null 2>&1
+unalias k h >/dev/null 2>&1
 k() { _SCWRYPTS_KUBECTL_DRIVER kubectl $@; }
 h() { _SCWRYPTS_KUBECTL_DRIVER helm $@; }
 f() { _SCWRYPTS_KUBECTL_DRIVER flux $@; }

+
 _SCWRYPTS_KUBECTL_DRIVER() {
 	[ ! $SCWRYPTS_ENV ] && {
 		ERROR "must set SCWRYPTS_ENV in order to use '$(echo $CLI | head -c1)'"
--- a/py/lib/scwrypts/env.py
+++ b/py/lib/scwrypts/env.py
@ -4,7 +4,7 @@ from .scwrypts.exceptions import MissingVariableError


 def getenv(name, required=True):
-    value = os_getenv(f'{name}__override', os_getenv(name))
+    value = os_getenv(name, None)

    if required and not value:
        raise MissingVariableError(name)
--- a/py/lib/scwrypts/http/conftest.py
+++ b/py/lib/scwrypts/http/conftest.py
@ -2,22 +2,23 @@ from types import SimpleNamespace

 from pytest import fixture

-from scwrypts.test import get_generator
+from scwrypts.test import generate
 from scwrypts.test.character_set import uri

-generate = get_generator({
+options = {
        'str_length_minimum':   8,
        'str_length_maximum': 128,
        'uuid_output_type':   str,
-        })
+        }

 def get_request_client_sample_data():
    return {
-            'base_url' : generate(str, {'character_set': uri}),
-            'endpoint' : generate(str, {'character_set': uri}),
-            'method'   : generate(str),
-            'response' : generate('requests_Response', {'depth': 4}),
+            'base_url' : generate(str, options | {'character_set': uri}),
+            'endpoint' : generate(str, options | {'character_set': uri}),
+            'method'   : generate(str, options),
+            'response' : generate('requests_Response', options | {'depth': 4}),
            'payload'  : generate(dict, {
+                **options,
                'depth': 1,
                'data_types': { str, 'uuid' },
                }),
@ -29,11 +30,13 @@ def fixture_sample():
            **get_request_client_sample_data(),

            headers = generate(dict, {
+                **options,
                'depth': 1,
                'data_types': { str, 'uuid' },
                }),

            payload_headers = generate(dict, {
+                **options,
                'depth': 1,
                'data_types': { str, 'uuid' },
                }),
--- a/py/lib/scwrypts/http/directus/conftest.py
+++ b/py/lib/scwrypts/http/directus/conftest.py
@ -2,14 +2,15 @@ from types import SimpleNamespace

 from pytest import fixture

+from scwrypts.test import generate
 from scwrypts.test.character_set import uri
-from ..conftest import generate, get_request_client_sample_data
+from ..conftest import options, get_request_client_sample_data


@fixture(name='sample')
 def fixture_sample():
    return SimpleNamespace(
            **get_request_client_sample_data(),
-            api_token = generate(str, {'character_set': uri}),
-            query     = generate(str),
+            api_token = generate(str, options | {'character_set': uri}),
+            query     = generate(str, options),
            )
--- a/py/lib/scwrypts/http/discord/conftest.py
+++ b/py/lib/scwrypts/http/discord/conftest.py
@ -3,8 +3,9 @@ from types import SimpleNamespace

 from pytest import fixture

+from scwrypts.test import generate
 from scwrypts.test.character_set import uri
-from ..conftest import generate, get_request_client_sample_data
+from ..conftest import options, get_request_client_sample_data

@fixture(name='sample')
 def fixture_sample():
@ -13,12 +14,12 @@ def fixture_sample():
                **get_request_client_sample_data(),
                'base_url': 'https://discord.com/api',
                },
-            bot_token  = generate(str, {'character_set': uri}),
-            username   = generate(str, {'character_set': ascii_letters + digits}),
-            avatar_url = generate(str, {'character_set': uri}),
-            webhook    = generate(str, {'character_set': uri}),
-            channel_id = generate(str, {'character_set': uri}),
-            content_header = generate(str),
-            content_footer = generate(str),
-            content = generate(str),
+            bot_token  = generate(str, options | {'character_set': uri}),
+            username   = generate(str, options | {'character_set': ascii_letters + digits}),
+            avatar_url = generate(str, options | {'character_set': uri}),
+            webhook    = generate(str, options | {'character_set': uri}),
+            channel_id = generate(str, options | {'character_set': uri}),
+            content_header = generate(str, options),
+            content_footer = generate(str, options),
+            content = generate(str, options),
        )
--- a/py/lib/scwrypts/http/linear/conftest.py
+++ b/py/lib/scwrypts/http/linear/conftest.py
@ -3,8 +3,9 @@ from types import SimpleNamespace

 from pytest import fixture

+from scwrypts.test import generate
 from scwrypts.test.character_set import uri
-from ..conftest import generate, get_request_client_sample_data
+from ..conftest import options, get_request_client_sample_data

@fixture(name='sample')
 def fixture_sample():
@ -13,6 +14,6 @@ def fixture_sample():
                **get_request_client_sample_data(),
                'base_url': 'https://api.linear.app',
                },
-            api_token = generate(str, {'character_set': uri}),
-            query     = generate(str),
+            api_token = generate(str, options | {'character_set': uri}),
+            query     = generate(str, options),
        )
--- a/147
+++ b/147
@ -1,12 +1,16 @@
 #!/bin/zsh
 export EXECUTION_DIR=$(pwd)
-export SCWRYPTS_RUNTIME_ID=$(uuidgen)
 source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 #####################################################################
 () {
 	cd "$SCWRYPTS_ROOT__scwrypts"
 	GIT_SCWRYPTS() { git -C "$SCWRYPTS_ROOT__scwrypts" $@; }

+	local INSTALLATION_TYPE
+	[ ! -d "$SCWRYPTS_ROOT__scwrypts/.git" ] && [ ! -f "$SCWRYPTS_ROOT__scwrypts/.git" ] \
+		&& INSTALLATION_TYPE=$(cat "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY" 2>/dev/null) \
+		|| INSTALLATION_TYPE=manual \
+		;

 	local ERRORS=0
 	local USAGE='
@ -22,7 +26,6 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 		  runtime
 		    -y, --yes              auto-accept all [yn] prompts through current scwrypt
 		    -e, --env <env-name>   set environment; overwrites SCWRYPTS_ENV
-
 		    -n                     shorthand for "--log-level 0"
 		    -v, --log-level [0-4]  set incremental scwrypts log level to one of the following:
 			                         0 : only command output and critical failures; skips logfile
@ -31,19 +34,12 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 									 3 : (default) include warning messages
 			                         4 : include debug messages

-			-o, --output           specify output format; one of:
-			                         pretty (default)
-									 json   (experimental)
-
 		  alternate commands
-		    -h, --help          display this message and exit
-		    -l, --list          print out command list and exit
-		        --list-envs     print out environment list and exit
-		        --list-groups   print out configured scwrypts groups and exit
-		        --config        "eval"-ed to enable config and "use" import in non-scwrypts environments
-		        --root          print out SCWRYPTS_ROOT__scwrypts and exit
-		        --update        update scwrypts library to latest version
-		        --version       print out scwrypts version and exit
+		    -h, --help        display this message and exit
+		    -l, --list        print out command list and exit
+		        --list-envs   print out environment list and exit
+		        --update      update scwrypts library to latest version
+		        --version     print out scwrypts version and exit

 		patterns:
 		  - a list of glob patterns to loose-match a scwrypt by name
@ -64,10 +60,8 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42

 	[ ! $SCWRYPTS_LOG_LEVEL ] && local SCWRYPTS_LOG_LEVEL=3

-	local SHIFT_COUNT
 	while [[ $# -gt 0 ]]
 	do
-		SHIFT_COUNT=1
 		case $1 in
 			-[a-z][a-z]* )
 				VARSPLIT=$(echo "$1 " | sed 's/^\(-.\)\(.*\) /\1 -\2/')
@ -91,33 +85,16 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 				return 0
 				;;

-			--list-groups )
-				echo "${SCWRYPTS_GROUPS[@]}" | sed 's/\s\+/\n/g' | sort -u
-				return 0
-				;;
-
 			--version )
-				case $SCWRYPTS_INSTALLATION_TYPE in
+				case $INSTALLATION_TYPE in
 					manual ) echo "scwrypts $(GIT_SCWRYPTS describe --tags) (via GIT)" ;;
-					     * ) echo "scwrypts $(cat "$SCWRYPTS_ROOT__scwrypts/VERSION")" ;;
+					     * ) echo scwrypts $(cat "$SCWRYPTS_ROOT__scwrypts/VERSION")   ;;
 				esac
 				return 0
 				;;

-			--root )
-				echo "$SCWRYPTS_ROOT__scwrypts"
-				return 0
-				;;
-
-			--config )
-				echo "source '$SCWRYPTS_ROOT__scwrypts/zsh/lib/import.driver.zsh'"
-				echo "CHECK_ENVIRONMENT --no-fail --no-usage"
-				echo "unset __SCWRYPT"
-				return 0
-				;;
-
 			--update )
-				case $SCWRYPTS_INSTALLATION_TYPE in
+				case $INSTALLATION_TYPE in
 					aur )
 						SCWRYPTS_LOG_LEVEL=3 REMINDER " 
 							This installation is built from the AUR. Update through 'makepkg' or use
@ -125,10 +102,6 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 							 "
 						;;

-					homebrew )
-						SCWRYPTS_LOG_LEVEL=3 REMINDER "This installation is managed by homebrew. Update me with 'brew update'"
-						;;
-
 					manual )
 						GIT_SCWRYPTS fetch --quiet origin main
 						GIT_SCWRYPTS fetch --quiet origin main --tags
@ -164,52 +137,46 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 			### scwrypts filters #####################

 			-m | --name )
-				((SHIFT_COUNT+=1))
 				[ $2 ] || { ERROR "missing value for argument $1"; break; }
 				SEARCH_NAME=$2
+				shift 1
 				;;

 			-g | --group )
-				((SHIFT_COUNT+=1))
 				[ $2 ] || { ERROR "missing value for argument $1"; break; }
 				SEARCH_GROUP=$2
+				shift 1
 				;;

 			-t | --type )
-				((SHIFT_COUNT+=1))
 				[ $2 ] || { ERROR "missing value for argument $1"; break; }
 				SEARCH_TYPE=$2
+				shift 1
 				;;

 			### runtime settings #####################

 			-y | --yes ) export __SCWRYPTS_YES=1 ;;

-			-n ) SCWRYPTS_LOG_LEVEL=0 ;;
-
-			-v | --log-level )
-				((SHIFT_COUNT+=1))
-				[[ $2 =~ ^[0-4]$ ]] || ERROR "invalid setting for log-level '$2'"
-				SCWRYPTS_LOG_LEVEL=$2
+			-n | --no-log )
+				SCWRYPTS_LOG_LEVEL=0
+				[[ $1 =~ ^--no-log$ ]] && WARNING 'the --no-log flag is deprecated and will be removed in scwrypts v4.2'
 				;;

-			-o | --output )
-				((SHIFT_COUNT+=1))
-				export SCWRYPTS_OUTPUT_FORMAT=$2
-				case $SCWRYPTS_OUTPUT_FORMAT in
-					pretty | json ) ;;
-					* ) ERROR "unsupported format '$SCWRYPTS_OUTPUT_FORMAT'" ;;
-				esac
+			-v | --log-level )
+				[[ $2 =~ ^[0-4]$ ]] || ERROR "invalid setting for log-level '$2'"
+				SCWRYPTS_LOG_LEVEL=$2
+				shift 1
 				;;

 			-e | --env )
-				((SHIFT_COUNT+=1))
 				[ $2 ] || { ERROR "missing value for argument $1"; break; }

 				[ $ENV_NAME ] && DEBUG 'overwriting session environment'

 				ENV_NAME="$2"
 				STATUS "using CLI environment '$ENV_NAME'"
+				shift 1
 				;;

 			##########################################
@ -218,11 +185,9 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 			--* ) ERROR "unrecognized argument '$1'" ;;
 			*   ) SEARCH_PATTERNS+=($1) ;;
 		esac
-		shift $SHIFT_COUNT
+		shift 1
 	done

-	[ $SCWRYPTS_OUTPUT_FORMAT ] || export SCWRYPTS_OUTPUT_FORMAT=pretty
-
 	[ $SEARCH_NAME ] && {
 		[ $SEARCH_TYPE  ] || ERROR '--name requires --type argument'
 		[ $SEARCH_GROUP ] || ERROR '--name requires --group argument'
@ -329,17 +294,9 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42

 	[[ $ENV_REQUIRED =~ true ]] && {
 		[ ! $ENV_NAME ] && ENV_NAME=$(SCWRYPTS__SELECT_ENV)
-		[ ! $ENV_NAME ] && ABORT
-
-		export ENV_NAME
-		export SCWRYPTS_ENV=$ENV_NAME

 		for GROUP in ${SCWRYPTS_GROUPS[@]}
 		do
-			local REQUIRED_REGEX=$(eval echo '$SCWRYPTS_REQUIRED_ENVIRONMENT_REGEX__'$GROUP)
-			[ $REQUIRED_REGEX ] && {
-				[[ $ENV_NAME =~ $REQUIRED_REGEX ]] || continue
-			}
 			local ENV_FILE=$(SCWRYPTS__GET_ENV_FILE "$ENV_NAME" "$GROUP")
 			source "$ENV_FILE" || FAIL 5 "missing or invalid environment '$GROUP/$ENV_NAME'"

@ -348,6 +305,8 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 				source "$f" || FAIL 5 "invalid static config '$f'"
 			done
 		done
+
+		export ENV_NAME
 	}

 	[ $REQUIRED_ENVIRONMENT_REGEX ] && {
@ -355,12 +314,11 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 			|| FAIL 5 "group '$SCWRYPT_GROUP' requires current environment name to match '$REQUIRED_ENVIRONMENT_REGEX' (currently $ENV_NAME)"
 	}

-
 	##########################################

 	[ ! $SUBSCWRYPT ] && export SUBSCWRYPT=0

-	[[ $SCWRYPTS_INSTALLATION_TYPE =~ ^manual$ ]] && {
+	[[ $INSTALLATION_TYPE =~ ^manual$ ]] && {
 		[[ $SUBSCWRYPT -eq 0 ]] && [[ $ENV_NAME =~ prod ]] && [[ $SCWRYPTS_LOG_LEVEL -gt 0 ]] && {
 			STATUS "on '$ENV_NAME'; checking diff against origin/main"

@ -414,42 +372,25 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 	[[ $SCWRYPT_NAME =~ interactive ]] && RUN_MODE=interactive

 	local HEADER FOOTER
-	[[ $SCWRYPTS_LOG_LEVEL -ge 2 ]] && {
-		case $SCWRYPTS_OUTPUT_FORMAT in
-			pretty )
-				HEADER=$(
-					echo "
-						=====================================================================
-						scwrypt   : $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME
-						run at    : $(date)
-						config    : $ENV_NAME
-						log level : $SCWRYPTS_LOG_LEVEL
-						\\033[1;33m--- SCWRYPT BEGIN ---------------------------------------------------\\033[0m
-					" | sed 's/^\s\+//; 1d'
-				)

-				FOOTER="\\033[1;33m--- SCWRYPT END   ---------------------------------------------------\\033[0m"
-				;;
-			json )
-				HEADER=$(echo '{}' | jq -c ".
-					| .timestamp  = \"$(date +%s)\"
-					| .runtime    = \"$SCWRYPTS_RUNTIME_ID\"
-					| .scwrypt    = \"start of $SCWRYPT_NAME $SCWRYPT_GROUP $SCWRYPT_TYPE\"
-					| .config     = \"$ENV_NAME\"
-					| .logLevel   = \"$SCWRYPTS_LOG_LEVEL\"
-					| .subscwrypt = $SUBSCWRYPT
-					")
-				;;
-		esac
+	[[ $SCWRYPTS_LOG_LEVEL -ge 2 ]] && {
+		HEADER=$(
+			echo "
+				=====================================================================
+				script    : $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME
+				run at    : $(date)
+				config    : $ENV_NAME
+				log level : $SCWRYPTS_LOG_LEVEL
+				\\033[1;33m--- SCWRYPT BEGIN ---------------------------------------------------\\033[0m
+			" | sed 's/^\s\+//; 1d'
+		)
+
+		FOOTER="\\033[1;33m--- SCWRYPT END   ---------------------------------------------------\\033[0m"
 	}

 	[[ $SUBSCWRYPT -eq 0 ]] || {
-		case $SCWRYPTS_OUTPUT_FORMAT in
-			pretty )
-				HEADER="\\033[0;33m--- ($SUBSCWRYPT) BEGIN $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME ---"
-				FOOTER="\\033[0;33m--- ($SUBSCWRYPT) END   $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME ---"
-				;;
-		esac
+		HEADER="\\033[0;33m--- ($SUBSCWRYPT) BEGIN $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME ---"
+		FOOTER="\\033[0;33m--- ($SUBSCWRYPT) END   $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME ---"
 	}

 	#####################################################################
@ -480,5 +421,5 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 			&& echo "terminated with\\033[1;$EXIT_COLOR code $EXIT_CODE\\033[0m"

 		return $EXIT_CODE
-	} | tee --append "$LOGFILE"
+	} 2>&1 | tee --append "$LOGFILE"
 } $@
--- a/scwrypts.plugin.zsh
+++ b/scwrypts.plugin.zsh
@ -1,45 +1,46 @@
 #####################################################################

-: \
-	&& command -v scwrypts &>/dev/null \
-	&& eval "$(scwrypts --config)" \
-	|| {
-		echo 'scwrypts must be in PATH and properly configured; skipping zsh plugin setup' >&2
-		return 0
-	}
-
-__SCWRYPTS_PARSE() {
-	SCWRYPT_SELECTION=$(scwrypts --list | fzf --prompt 'select a script : ' --header-lines 1)
-	LBUFFER= RBUFFER=
-	[ $SCWRYPT_SELECTION ] || return 1
-
-	NAME=$(echo "$SCWRYPT_SELECTION" | awk '{print $1;}')
-	TYPE=$(echo "$SCWRYPT_SELECTION" | awk '{print $2;}')
-	GROUP=$(echo "$SCWRYPT_SELECTION" | awk '{print $3;}')
-
-	[ $NAME ] && [ $TYPE ] && [ $GROUP ]
+command -v scwrypts &>/dev/null || {
+	echo 'scwrypts is required in your PATH in order to use the zsh plugins; skipping' >&2
+	return 0
 }

+NO_EXPORT_CONFIG=1 source "${0:a:h}/zsh/lib/import.driver.zsh" || return 42
+
 #####################################################################

 SCWRYPTS__ZSH_PLUGIN() {
-	local SCWRYPT_SELECTION NAME TYPE GROUP
-	__SCWRYPTS_PARSE || { zle accept-line; return 0; }
+	local SCWRYPT_SELECTION=$(scwrypts --list | FZF 'select a script' --header-lines 1)
+	local NAME
+	local TYPE
+	local GROUP
+	LBUFFER= RBUFFER=
+	[ ! $SCWRYPT_SELECTION ] && { zle accept-line; return 0; }

-	RBUFFER="scwrypts --name $NAME --type $TYPE --group $GROUP"
+	SCWRYPTS__SEPARATE_SCWRYPT_SELECTION $SCWRYPT_SELECTION
+
+	which scwrypts >/dev/null 2>&1\
+		&& RBUFFER="scwrypts" || RBUFFER="$SCWRYPTS_ROOT/scwrypts"
+
+	RBUFFER+=" --name $NAME --group $GROUP --type $TYPE"
 	zle accept-line
 }

 zle -N scwrypts SCWRYPTS__ZSH_PLUGIN
 bindkey $SCWRYPTS_SHORTCUT scwrypts
-unset SCWRYPTS_SHORTCUT

 #####################################################################

 SCWRYPTS__ZSH_BUILDER_PLUGIN() {
-	local SCWRYPT_SELECTION NAME TYPE GROUP
-	__SCWRYPTS_PARSE || { echo >&2; zle accept-line; return 0; }
+	local SCWRYPT_SELECTION=$(scwrypts --list  | FZF 'select a script' --header-lines 1)
 	echo $SCWRYPT_SELECTION >&2
+	local NAME
+	local TYPE
+	local GROUP
+	LBUFFER= RBUFFER=
+	[ ! $SCWRYPT_SELECTION ] && { zle accept-line; return 0; }
+
+	SCWRYPTS__SEPARATE_SCWRYPT_SELECTION $SCWRYPT_SELECTION

 	scwrypts -n --name $NAME --group $GROUP --type $TYPE -- --help >&2 || {
 		zle accept-line
@ -48,20 +49,22 @@ SCWRYPTS__ZSH_BUILDER_PLUGIN() {
 	echo

 	zle reset-prompt
-	LBUFFER="scwrypts --name $NAME --type $TYPE --group $GROUP -- "
+	which scwrypts >/dev/null 2>&1\
+		&& LBUFFER="scwrypts" || LBUFFER="$SCWRYPTS_ROOT/scwrypts"
+
+	LBUFFER+=" --name $NAME --group $GROUP --type $TYPE -- "
 }

 zle -N scwrypts-builder SCWRYPTS__ZSH_BUILDER_PLUGIN
 bindkey $SCWRYPTS_BUILDER_SHORTCUT scwrypts-builder
-unset SCWRYPTS_BUILDER_SHORTCUT

 #####################################################################

 SCWRYPTS__ZSH_PLUGIN_ENV() {
 	local RESET='reset'
 	local SELECTED=$(\
-		{ [ $SCWRYPTS_ENV ] && echo $RESET; scwrypts --list-envs; } \
-			| fzf --prompt 'select an environment : ' \
+		{ [ $SCWRYPTS_ENV ] && echo $RESET; SCWRYPTS__GET_ENV_NAMES; } \
+			| FZF 'select an environment' \
 	)

 	zle clear-command-line
@ -75,6 +78,3 @@ SCWRYPTS__ZSH_PLUGIN_ENV() {

 zle -N scwrypts-setenv SCWRYPTS__ZSH_PLUGIN_ENV
 bindkey $SCWRYPTS_ENV_SHORTCUT scwrypts-setenv
-unset SCWRYPTS_ENV_SHORTCUT
-
-#####################################################################
--- a/scwrypts.scwrypts.zsh
+++ b/scwrypts.scwrypts.zsh
@ -1,11 +0,0 @@
-SCWRYPTS_GROUPS+=(scwrypts)
-
-export SCWRYPTS_ROOT__scwrypts="$SCWRYPTS_ROOT"
-export SCWRYPTS_COLOR__scwrypts='\033[0;32m'
-#export SCWRYPTS_TYPE__scwrypts=
-#export SCWRYPTS_LIBRARY_ROOT__scwrypts=
-
-export SCWRYPTS_VIRTUALENV_PATH__scwrypts="$SCWRYPTS_DATA_PATH/virtualenv"
-
-export SCWRYPTS_PREFERRED_PYTHON_VERSIONS__scwrypts=(3.12 3.11 3.10)
-export SCWRYPTS_NODE_VERSION__scwrypts=18.0.0
--- a/zsh/lib/config.group.zsh
+++ b/zsh/lib/config.group.zsh
@ -0,0 +1,10 @@
+export SCWRYPTS_ROOT__scwrypts="$SCWRYPTS_ROOT"
+export SCWRYPTS_LIBRARY_ROOT__scwrypts="$SCWRYPTS_ROOT/zsh/lib"
+export SCWRYPTS_COLOR__scwrypts='\033[0;32m'
+
+
+export SCWRYPTS_VIRTUALENV_PATH__scwrypts="$SCWRYPTS_DATA_PATH/virtualenv"
+[ ! -d "$SCWRYPTS_VIRTUALENV_PATH__scwrypts" ] && mkdir -p "$SCWRYPTS_VIRTUALENV_PATH__scwrypts"
+
+export SCWRYPTS_PREFERRED_PYTHON_VERSIONS__scwrypts=(3.11 3.10 3.9)
+export SCWRYPTS_NODE_VERSION__scwrypts=18.0.0
--- a/zsh/lib/config.zsh
+++ b/zsh/lib/config.zsh
@ -1,28 +1,14 @@
 [[ $__SCWRYPT -eq 1 ]] && return 0
 #####################################################################

-# Apparently MacOS puts ALL of the homebrew stuff inside of a top level git repository
-# with bizarre git ignores; so:
-#  - USE the git root if it's a manual install...
-#  - UNLESS that git root is just the $(brew --prefix)
-SCWRYPTS_ROOT="$(cd -- ${0:a:h}; git rev-parse --show-toplevel 2>/dev/null | grep -v "^$(brew --prefix 2>/dev/null)$")"
+[ ! $SCWRYPTS_ROOT ] \
+	&& SCWRYPTS_ROOT="$(cd $(dirname "${0:a:h}"); git rev-parse --show-toplevel 2>/dev/null)"

-[ $SCWRYPTS_ROOT ] && [ -d "$SCWRYPTS_ROOT" ] \
-	|| SCWRYPTS_ROOT="$(echo "${0:a:h}" | sed -n 's|\(share/scwrypts\).*$|\1|p')"
-
-[ $SCWRYPTS_ROOT ] && [ -d "$SCWRYPTS_ROOT" ] || {
-	echo "cannot determine scwrypts root path for current installation; aborting"
-	exit 1
-}
+[ ! $SCWRYPTS_ROOT ] && [ -d /usr/share/scwrypts ] \
+	&& SCWRYPTS_ROOT=/usr/share/scwrypts

 export SCWRYPTS_ROOT__scwrypts="$SCWRYPTS_ROOT"

-[ -f "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY" ] \
-	&& export SCWRYPTS_INSTALLATION_TYPE=$(cat "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY") \
-	|| export SCWRYPTS_INSTALLATION_TYPE=manual \
-	;
-
-
 #####################################################################

 DEFAULT_CONFIG="$SCWRYPTS_ROOT/zsh/lib/config.user.zsh"
@ -35,13 +21,11 @@ USER_CONFIG_OVERRIDES="$SCWRYPTS_CONFIG_PATH/config.zsh"
 }
 source "$USER_CONFIG_OVERRIDES"

-mkdir -p \
-	"$SCWRYPTS_CONFIG_PATH" \
-	"$SCWRYPTS_DATA_PATH" \
-	"$SCWRYPTS_ENV_PATH" \
-	"$SCWRYPTS_LOG_PATH" \
-	"$SCWRYPTS_OUTPUT_PATH" \
-	;
+[ ! -d $SCWRYPTS_CONFIG_PATH ] && mkdir -p $SCWRYPTS_CONFIG_PATH
+[ ! -d $SCWRYPTS_DATA_PATH   ] && mkdir -p $SCWRYPTS_DATA_PATH
+[ ! -d $SCWRYPTS_ENV_PATH    ] && mkdir -p $SCWRYPTS_ENV_PATH
+[ ! -d $SCWRYPTS_LOG_PATH    ] && mkdir -p $SCWRYPTS_LOG_PATH
+[ ! -d $SCWRYPTS_OUTPUT_PATH ] && mkdir -p $SCWRYPTS_OUTPUT_PATH

 export \
 	SCWRYPTS_GROUPS \
@ -53,10 +37,10 @@ export \
 	SCWRYPTS_OUTPUT_PATH \
 	;

-source "$SCWRYPTS_ROOT/scwrypts.scwrypts.zsh" \
-	|| FAIL 69 'failed to set up scwrypts group; aborting'
+SCWRYPTS_GROUPS=(scwrypts $(echo $SCWRYPTS_GROUPS | sed 's/\s\+/\n/g' | sort -u))

-SCWRYPTS_GROUPS=(scwrypts $(echo $SCWRYPTS_GROUPS | sed 's/\s\+/\n/g' | sort -u | grep -v '^scwrypts$'))
+source "$SCWRYPTS_ROOT/zsh/lib/config.group.zsh" \
+	|| FAIL 69 'failed to set up scwrypts group; aborting'

 #####################################################################

@ -78,8 +62,7 @@ done
 	&& [ ! "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] \
 	&& [ $GITHUB_WORKSPACE ] \
 	&& [ ! $SCWRYPTS_GITHUB_NO_AUTOLOAD ] \
-	&& SCWRYPTS_AUTODETECT_GROUP_BASEDIR="$GITHUB_WORKSPACE" \
-	;
+	&& SCWRYPTS_AUTODETECT_GROUP_BASEDIR="$GITHUB_WORKSPACE"

 [ "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] && [ -d "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" ] && {
 	for GROUP_LOADER in $(find "$SCWRYPTS_AUTODETECT_GROUP_BASEDIR" -type f -name \*scwrypts.zsh)
@ -89,4 +72,5 @@ done
 }

 #####################################################################
-__SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt
+[ $NO_EXPORT_CONFIG ] || __SCWRYPT=1 # arbitrary; indicates currently inside a scwrypt
+true
--- a/zsh/lib/import.driver.zsh
+++ b/zsh/lib/import.driver.zsh
@ -34,7 +34,7 @@ source "${0:a:h}/config.zsh"

 use() {
 	local SCWRYPTS_LIBRARY SCWRYPTS_LIBRARY_ROOT SCWRYPTS_LIBRARY_GROUP
-	local DEFER_ENVIRONMENT_CHECK=true
+	local DEFER_ENVIRONMENT_CHECK=1

 	while [[ $# -gt 0 ]]
 	do
@ -49,8 +49,8 @@ use() {
 				SCWRYPTS_LIBRARY_ROOT=$2
 				shift 1
 				;;
-			-c | --check-environment )
-				DEFER_ENVIRONMENT_CHECK=false
+			--check-environment )
+				DEFER_ENVIRONMENT_CHECK=0
 				;;
 			* )
 				[ ! $SCWRYPTS_LIBRARY ] \
@ -106,7 +106,7 @@ use() {
 		return 1
 	}

-	[[ $DEFER_ENVIRONMENT_CHECK =~ false ]] && {
+	[[ $DEFER_ENVIRONMENT_CHECK -eq 0 ]] && {
 		CHECK_ENVIRONMENT || {
 			((IMPORT_ERRORS+=1))
 			ERROR "import error for '$SCWRYPTS_LIBRARY_GROUP/$SCWRYPTS_LIBRARY'"
--- a/zsh/lib/scwrypts/virtualenv.module.zsh
+++ b/zsh/lib/scwrypts/virtualenv.module.zsh
@ -74,8 +74,6 @@ _VIRTUALENV__GET_PATH() {
 	local ENV_PATH="$(eval echo '$SCWRYPTS_VIRTUALENV_PATH__'$GROUP 2>/dev/null)"
 	[ ! $ENV_PATH ] && ENV_PATH="$SCWRYPTS_VIRTUALENV_PATH__scwrypts"

-	mkdir -p "$ENV_PATH/$TYPE" &>/dev/null
-
 	echo $ENV_PATH/$TYPE
 }

@ -97,7 +95,7 @@ CREATE_VIRTUALENV__scwrypts__py() {
 		}
 	done
 	[ ! $PYTHON ] && {
-		ERROR 'python>=3.10 not available; skipping python env'
+		ERROR 'python>=3.9 not available; skipping python env'
 		return 1
 	}

--- a/zsh/lib/utils/io.print.zsh
+++ b/zsh/lib/utils/io.print.zsh
@ -5,61 +5,34 @@ PRINT() {
 	local STDOUT=0

 	local LTRIM=1
-	local FORMAT=$SCWRYPTS_OUTPUT_FORMAT
-	local _S
 	while [[ $# -gt 0 ]]
 	do
-		_S=1
 		case $1 in
 			-n | --no-trim-tabs ) LTRIM=0 ;;
 			-x | --no-line-end  ) LAST_LINE_END='' ;;
 			-o | --use-stdout   ) STDOUT=1; STDERR=0 ;;
-
-			-f | --format ) ((_S+=1)); FORMAT=$2 ;;
-
 			* ) MESSAGE+="$(echo $1) " ;;
 		esac
-		shift $_S
+		shift 1
 	done

-	[ $FORMAT ] || FORMAT=pretty
-	local STYLED_MESSAGE
-	case $FORMAT in
-		pretty )
-			STYLED_MESSAGE="$(echo "$MESSAGE" | sed 's/%/%%/g')"
-			STYLED_MESSAGE="$({
-				printf "${COLOR}"
-				while IFS='' read line
-				do
-					[[ $PREFIX =~ ^[[:space:]]\+$ ]] && printf '\n'
+	MESSAGE="$(echo "$MESSAGE" | sed 's/%/%%/g')"

-					printf "${PREFIX} : $(echo "$line" | sed 's/^	\+//; s/ \+$//')"
+	local STYLED_MESSAGE="$({
+		printf "${COLOR}"
+		while IFS='' read line
+		do
+			[[ $PREFIX =~ ^[[:space:]]\+$ ]] && printf '\n'

-					PREFIX=$(echo $PREFIX | sed 's/./ /g')
-				done <<< $MESSAGE
-			})"
-			STYLED_MESSAGE="${COLOR}$(echo "$STYLED_MESSAGE" | sed 's/%/%%/g')${__COLOR_RESET}${LAST_LINE_END}"
-			;;
-		json )
-			STYLED_MESSAGE="$(
-				echo '{}' | jq -c ".
-					| .timestamp = \"$(date +%s)\"
-					| .runtime   = \"$SCWRYPTS_RUNTIME_ID\"
-					| .status    = \"$(echo "$PREFIX" | sed 's/ .*//')\"
-					| .message   = $(echo $MESSAGE | sed 's/^\t\+//' | jq -Rs)
-					" | sed 's/\\/\\\\/g'
-			)\n"
-			;;
-		* )
-			echo "ERROR : unsupported format '$FORMAT'" >&2
-			return 1
-			;;
-	esac
+			printf "${PREFIX} : $(echo "$line" | sed 's/^	\+//; s/ \+$//')"

+			PREFIX=$(echo $PREFIX | sed 's/./ /g')
+		done <<< $MESSAGE
+	})"
+	STYLED_MESSAGE="${COLOR}$(echo "$STYLED_MESSAGE" | sed 's/%/%%/g')${__COLOR_RESET}${LAST_LINE_END}"

-
-	[[ $STDERR -eq 1 ]] && printf -- "$STYLED_MESSAGE" >&2
-	[[ $STDOUT -eq 1 ]] && printf -- "$STYLED_MESSAGE"
+	[[ $STDERR -eq 1 ]] && printf $STYLED_MESSAGE >&2
+	[[ $STDOUT -eq 1 ]] && printf $STYLED_MESSAGE

 	return 0
 }
--- a/zsh/lib/utils/utils.module.zsh
+++ b/zsh/lib/utils/utils.module.zsh
@ -72,7 +72,7 @@ CHECK_ENVIRONMENT() {
 		$E "environment errors found (see above)\n$ERROR_MESSAGE"
 	}

-	[[ $MISSING_ENVIRONMENT_VARIABLES -ne 0 ]] && [[ $__SCWRYPT ]] && {
+	[[ $MISSING_ENVIRONMENT_VARIABLES -ne 0 ]] && {
 		REMINDER "
 			to quickly update missing environment variables, run:
 			'scwrypts zsh/scwrypts/environment/edit'
--- a/zx/lib/package.json
+++ b/zx/lib/package.json
@ -1,100 +0,0 @@
-{
-	"name": "scwrypts",
-	"main": "dist/index.js",
-	"type": "module",
-	"files": [
-		"dist"
-	],
-	"description": "scwrypts integration for typescript",
-	"scripts": {
-		"build": "rm -rf ./dist && tsc",
-		"test": "jest",
-		"lint": "eslint . && prettier --check src/",
-		"format": "prettier --write src/"
-	},
-	"author": "Wryn (yage) Wagner",
-	"license": "GPL-3.0",
-	"devDependencies": {
-		"@jest/globals": "^29.7.0",
-		"@types/jest": "^29.5.12",
-		"@types/node": "^20.11.19",
-		"@types/uuid": "^9.0.8",
-		"@typescript-eslint/eslint-plugin": "^7.0.2",
-		"@typescript-eslint/parser": "^7.0.2",
-		"eslint": "^8.56.0",
-		"jest": "^29.7.0",
-		"prettier": "^3.2.5",
-		"ts-jest": "^29.1.2",
-		"ts-node": "^10.9.2",
-		"typescript": "^5.3.3",
-		"uuid": "^9.0.1"
-	},
-	"eslintConfig": {
-		"ignorePatterns": [
-			"dist",
-			"node_modules"
-		],
-		"env": {
-			"node": true,
-			"es2021": true
-		},
-		"extends": [
-			"eslint:recommended",
-			"plugin:@typescript-eslint/recommended"
-		],
-		"overrides": [
-			{
-				"env": {
-					"node": true
-				},
-				"files": [
-					".eslintrc.{js,cjs}"
-				],
-				"parserOptions": {
-					"sourceType": "script"
-				}
-			}
-		],
-		"parser": "@typescript-eslint/parser",
-		"parserOptions": {
-			"ecmaVersion": "latest",
-			"sourceType": "module"
-		},
-		"plugins": [
-			"@typescript-eslint"
-		],
-		"rules": {
-			"linebreak-style": [
-				"error",
-				"unix"
-			],
-			"quotes": [
-				"error",
-				"single"
-			],
-			"semi": [
-				"error",
-				"always"
-			],
-			"comma-dangle": [
-				"error",
-				"always-multiline"
-			]
-		}
-	},
-	"prettier": {
-		"printWidth": 120,
-		"singleQuote": true,
-		"trailingComma": "all"
-	},
-	"jest": {
-		"preset": "ts-jest",
-		"clearMocks": true,
-		"moduleNameMapper": {
-			"^(\\.{1,2}/.*)\\.js$": "$1"
-		}
-	},
-	"dependencies": {
-		"execa": "^8.0.1"
-	}
-}
--- a/zx/lib/package.yaml
+++ b/zx/lib/package.yaml
@ -0,0 +1,86 @@
+---
+name: scwrypts
+author: Wryn (yage) Wagner
+description: scwrypts integration for typescript
+license: GPL-3.0
+type: module
+main: dist/index.js
+
+files:
+  - dist
+
+scripts:
+  build: rm -rf ./dist && tsc
+  test: jest
+  lint: eslint . && prettier --check src/
+  format: prettier --write src/
+
+#####################################################################
+
+dependencies:
+  execa: ^8.0.1
+
+devDependencies:
+  '@jest/globals': ^29.7.0
+  '@types/jest': ^29.5.12
+  '@types/node': ^20.11.19
+  '@types/uuid': ^9.0.8
+  '@typescript-eslint/eslint-plugin': ^7.0.2
+  '@typescript-eslint/parser': ^7.0.2
+  eslint: ^8.56.0
+  jest: ^29.7.0
+  prettier: ^3.2.5
+  ts-jest: ^29.1.2
+  ts-node: ^10.9.2
+  typescript: ^5.3.3
+  uuid: ^9.0.1
+
+#####################################################################
+
+eslintConfig:
+  ignorePatterns:
+    - dist
+    - node_modules
+  env:
+    node: true
+    es2021: true
+  extends:
+    - eslint:recommended
+    - plugin:@typescript-eslint/recommended
+  overrides:
+    - env:
+        node: true
+      files:
+        - .eslintrc.{js,cjs}
+      parserOptions:
+        sourceType: script
+  parser: '@typescript-eslint/parser'
+  parserOptions:
+    ecmaVersion: latest
+    sourceType: module
+  plugins:
+    - '@typescript-eslint'
+  rules:
+    linebreak-style:
+      - error
+      - unix
+    quotes:
+      - error
+      - single
+    semi:
+      - error
+      - always
+    comma-dangle:
+      - error
+      - always-multiline
+
+prettier:
+  printWidth: 120
+  singleQuote: true
+  trailingComma: all
+
+jest:
+  preset: ts-jest
+  clearMocks: true
+  moduleNameMapper:
+    ^(\.{1,2}/.*)\.js$: $1
Author	SHA1	Message	Date
yage	41da641ab9	- lets try a package.yaml instead	2024-04-15 08:48:19 -06:00
yage	6ba628f80e	- added get_generator API to testing utilities (a nice way to setup default options)	2024-04-15 08:46:47 -06:00
yage	1f10268aa0	- updated python scwrypts API to use latest pattern established in the nodejs library	2024-04-15 08:45:55 -06:00