v3.6.1

=====================================================================

--- Changes ------------------------------

- Adjusted USAGE (from zsh/lib/utils/io.zsh) to allow dynamic variable
  insertion in help dialogues by setting USAGE__<help-group> and using
  the syntax listed

- Various quality-of-life changes and and fixes to experimental kubectl
  plugin

--- Bug fixes ----------------------------

- sourcing 'scwrypts.plugin.zsh' no longer sets __SCWRYPT=1 in your
  current environment

plugins/kubectl/lib/kubectl.module.zsh

@@ -30,17 +30,17 @@ KUBECTL__SET_CONTEXT() {
 	local CONTEXT=$1
 	[ ! $CONTEXT ] && return 1
 
-	[[ $CONTEXT =~ default ]] && {
+	[[ $CONTEXT =~ reset ]] && {
 		: \
 			&& REDIS del --prefix "current:context" \
-			&& KUBECTL__SET_NAMESPACE default \
+			&& KUBECTL__SET_NAMESPACE reset \
 			;
 		return $?
 	}
 
 	: \
 		&& REDIS set --prefix "current:context" "$CONTEXT" \
-		&& KUBECTL__SET_NAMESPACE default \
+		&& KUBECTL__SET_NAMESPACE reset \
 		;
 }
 
@@ -49,8 +49,17 @@ KUBECTL__SELECT_CONTEXT() {
 }
 
 KUBECTL__LIST_CONTEXTS() {
-	echo default
-	KUBECTL config get-contexts -o name | sort
+	echo reset
+	local ALL_CONTEXTS=$(KUBECTL config get-contexts -o name | sort)
+
+	echo $ALL_CONTEXTS | grep -v '^arn:aws:eks'
+
+	[[ $AWS_ACCOUNT ]] && {
+		echo $ALL_CONTEXTS | grep "^arn:aws:eks:.*:$AWS_ACCOUNT"
+		true
+	} || {
+		echo $ALL_CONTEXTS | grep '^arn:aws:eks'
+	}
 }
 
 #####################################################################
@@ -61,7 +70,7 @@ KUBECTL__SET_NAMESPACE() {
 	local NAMESPACE=$1
 	[ ! $NAMESPACE ] && return 1
 
-	[[ $NAMESPACE =~ default ]] && {
+	[[ $NAMESPACE =~ reset ]] && {
 		REDIS del --prefix "current:namespace"
 		return $?
 	}
@@ -74,6 +83,7 @@ KUBECTL__SELECT_NAMESPACE() {
 }
 
 KUBECTL__LIST_NAMESPACES() {
+	echo reset
 	echo default
 	KUBECTL get namespaces -o name | sed 's/^namespace\///' | sort
 }

plugins/kubectl/lib/redis.module.zsh

@@ -19,22 +19,29 @@ REDIS() {
 		usage: [...options...]
 
 		options:
+		  --subsession [0-9]   use a particular subsession
+
 		  -p, --prefix   apply dynamic prefix to the next command line argument
 
-		  --get-prefix              output key prefix for current session
+		  --get-prefix              output key prefix for current session+subsession
 		  --get-static-definition   output the static ZSH function definition for REDIS
 
-		  other arguments are passed through to redis-cli
+		  additional arguments and options are passed through to 'redis-cli'
 	"
-	local REDIS_ARGS=() USER_ARGS=()
-	local REDIS_PREFIX=$(eval echo '$SCWRYPTS_KUBECTL_REDIS_KEY_PREFIX__'$SCWRYPTS_KUBECTL_REDIS)
 
-	local ECHO_STATIC_DEFINITION=0
+	local REDIS_ARGS=() USER_ARGS=()
+
+	[ $SUBSESSION ] || local SUBSESSION=0
+
+	local REDIS_PREFIX=$(eval echo '$SCWRYPTS_KUBECTL_REDIS_KEY_PREFIX__'$SCWRYPTS_KUBECTL_REDIS)
+	[ $REDIS_PREFIX ] && REDIS_PREFIX+=':'
 
 	while [[ $# -gt 0 ]]
 	do
 		case $1 in 
-			-p | --prefix ) USER_ARGS+=("${SCWRYPTS_ENV}:${REDIS_PREFIX}$2"); shift 1 ;;
+			-p | --prefix ) USER_ARGS+=("${REDIS_PREFIX}${SCWRYPTS_ENV}:${SUBSESSION}:$2"); shift 1 ;;
+
+			--subsession            ) SUBSESSION=$2; shift 1 ;;
 
 			--get-prefix            ) echo $REDIS_PREFIX; return 0 ;;
 			--get-static-definition ) ECHO_STATIC_DEFINITION=1 ;;
@@ -57,10 +64,11 @@ REDIS() {
 	[[ $ECHO_STATIC_DEFINITION -eq 1 ]] && {
 		echo "REDIS() {\
 			local USER_ARGS=(); \
+			[ ! \$SUBSESSION ] && local SUBSESSION=0 ;\
 			while [[ \$# -gt 0 ]]; \
 			do \
 				case \$1 in
-				-p | --prefix ) USER_ARGS+=(\"\${SCWRYPTS_ENV}:${REDIS_PREFIX}\$2\"); shift 1 ;; \
+				-p | --prefix ) USER_ARGS+=(\"${REDIS_PREFIX}\${SCWRYPTS_ENV}:\${SUBSESSION}:\$2\"); shift 1 ;; \
 				* ) USER_ARGS+=(\$1) ;; \
 				esac; \
 				shift 1; \
@@ -73,7 +81,6 @@ REDIS() {
 	redis-cli ${REDIS_ARGS[@]} ${USER_ARGS[@]}
 }
 
-
 REDIS ping | grep -qi pong || {
 	RPID=$(docker ps -a | grep scwrypts-kubectl-redis | awk '{print $1;}')
 	[ $RPID ] && STATUS 'refreshing redis instance' && docker rm -f $RPID