diff --git a/bashUtils/auto-completion.sh b/bashUtils/auto-completion.sh new file mode 100644 index 0000000..da80f22 --- /dev/null +++ b/bashUtils/auto-completion.sh @@ -0,0 +1,40 @@ +#/usr/bin/env zsh +autoload -U compinit +compinit + +function findJJSource { + # @source http://stackoverflow.com/a/246128/330439 + local SOURCE="$jjCpmmandRunPoint" + local DIR="" + while [[ -h "$SOURCE" ]]; do + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" + done + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + while [[ ! -e "${DIR}/jj.filelocation" ]]; do + DIR=$(dirname "${DIR}") + done + echo "${DIR}" +} + + +export JJ_SOURCE_DIR=$(findJJSource) + +if [[ -e "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" ]]; then + source $JJ_SOURCE_DIR/~~tmp/shEnvs.sh +fi + + +typeset -A opt_args + +function _AuctoCompletion(){ + # echo $words + COMMANDS_WITH_HELP=$($JJ_SOURCE_DIR/bashUtils/auto-completion.ts "1" $words ) + COMMANDS=$($JJ_SOURCE_DIR/bashUtils/auto-completion.ts "0" $words ) + + _arguments "1: :($COMMANDS)" + _describe 'command' "$COMMANDS_WITH_HELP" && ret=0 +} + +compdef _AuctoCompletion jj \ No newline at end of file diff --git a/bashUtils/auto-completion.ts b/bashUtils/auto-completion.ts new file mode 100755 index 0000000..a35ab6f --- /dev/null +++ b/bashUtils/auto-completion.ts @@ -0,0 +1,110 @@ +#!/usr/bin/env bun + +import { bashRunAndReturnSync } from "@helpers/bashUtils" +import { getJJConfigByKeyChain } from "@helpers/jjConfigUtils" + +async function main() { + const inputArgs = [...process.argv] + inputArgs.shift() + inputArgs.shift() + const displayHelp = inputArgs[0] + inputArgs.shift() + inputArgs.shift() + + let remainingArgsCount = inputArgs.length + const commandConfig = getJJConfigByKeyChain(`commands`) + const jjCommandsList = Object.keys(commandConfig).map((cmdKey) => ({ + key: cmdKey, + ...commandConfig[cmdKey] + })) + let lastArrayOfKeys = [...jjCommandsList] + + let commands = "" + let preHelp = `` + + while (remainingArgsCount > 0) { + const matchingCommand = lastArrayOfKeys.find((item) => { + return item?.key == inputArgs[0] + }) + + if (matchingCommand?.commandForRetrieveKeys) { + if (remainingArgsCount == 2 && matchingCommand?.commandForRetrieveKeys2) { + matchingCommand.commandForRetrieveKeys = matchingCommand?.commandForRetrieveKeys2 + } + const oldArgOrder = remainingArgsCount + remainingArgsCount = 0 + const command = + matchingCommand?.commandForRetrieveKeys + ` ${matchingCommand?.commandForRetrieveKeys?.includes("auto-completion") ? ` auto-completion ${process.argv.join(" ")}` : ""}` + const res = await bashRunAndReturnSync(command) + const newCommands = res?.split("\n") || [] + newCommands.push(String("")) + lastArrayOfKeys = [] + + newCommands.forEach((element) => { + if (element.includes(".") && !element.includes(".com")) { + return + } + lastArrayOfKeys.push({ + key: element, + desc: "", + keys: [], + }) + }) + } + + if (matchingCommand?.keysOnly && matchingCommand?.keysOnly?.length > 0) { + remainingArgsCount = 0 + lastArrayOfKeys = [] + + matchingCommand?.keysOnly.forEach((element) => { + lastArrayOfKeys.push({ + key: element, + desc: "", + keys: [], + }) + }) + } + + if (matchingCommand?.postCommandsForce && matchingCommand?.postCommandsForce?.length > 0) { + remainingArgsCount = 0 + + matchingCommand?.postCommandsForce.forEach((element) => { + lastArrayOfKeys.push({ + key: element, + desc: "", + keys: [], + }) + }) + } + + if (matchingCommand?.key && matchingCommand?.keys && remainingArgsCount > 0) { + preHelp += `${matchingCommand?.desc || ""} ` + lastArrayOfKeys = matchingCommand?.keys + inputArgs.shift() + remainingArgsCount -= 1 + } else { + // lastArrayOfKeys = []; + remainingArgsCount = 0 + } + } + + if (remainingArgsCount == 0) { + for (const item of lastArrayOfKeys) { + if (displayHelp == "1") { + commands += `'${item?.key}:${preHelp}${item?.desc}' ` + } else { + commands += `${item?.key} ` + } + if (item?.commandForRetrieveKeys) { + commands += `-- ` + } + } + } + + console.log(`(${commands})`) +} + +main().catch((err) => { + console.error("FATAL ERROR:", err) + process.exit(1) +}) diff --git a/bashUtils/ensureDependency.sh b/bashUtils/ensureDependency.sh index 023541c..d10f490 100755 --- a/bashUtils/ensureDependency.sh +++ b/bashUtils/ensureDependency.sh @@ -1,10 +1,6 @@ -#!/usr/bin/env zsh +#!/usr/bin/env bash -# source "$JJ_SOURCE_DIR/bashUtils/index.sh" - -osDependencies=(${=OS_DEPENDENCIES}) - -for osDependency in $osDependencies ; do +for osDependency in $OS_DEPENDENCIES ; do if ! hash $osDependency; then jjCliLog jjLogWarning "bashUtils/ensureDependency.sh Unable to find OS package '$osDependency'. Installing now..." eval "$PACKAGE_MANAGER_INSTALL $osDependency" @@ -20,11 +16,7 @@ if [[ -e $ASDF_DIR/asdf.sh ]]; then fi -asdfInstalledVersionPrefix=$(asdf info 2> /dev/null | grep -A 1 'ASDF VERSION' | tail -1 | grep "^${ASDF_VERSION}") - -if [[ -z "${asdfInstalledVersionPrefix}" ]] || \ - ! hash asdf || \ - [[ "${asdfInstalledVersionPrefix}" != "$ASDF_VERSION" ]] || \ +if ! hash asdf || \ [[ ! -e $JJ_SOURCE_DIR/~~tmp/deps/asdf-tools-installed ]] \ || jjIsFileNewerFile "$ASDF_DEFAULT_TOOL_VERSIONS_FILENAME" "$JJ_SOURCE_DIR/~~tmp/deps/asdf-tools-installed" ; then rm -rf $ASDF_DIR @@ -39,11 +31,11 @@ if [[ -z "${asdfInstalledVersionPrefix}" ]] || \ set +e while read tool_and_version; do jjCliLog jjLog "... checking tool: $tool_and_version" - tool_and_version_split=(${=tool_and_version}) - # echo ${tool_and_version_split[1]} - # echo ${tool_and_version_split[2]} - asdf plugin add ${tool_and_version_split[1]} || true - asdf install ${tool_and_version_split[1]} ${tool_and_version_split[2]} + tool_and_version_split=(${tool_and_version}) + echo ${tool_and_version_split[0]} + echo ${tool_and_version_split[1]} + asdf plugin add ${tool_and_version_split[0]} || true + asdf install ${tool_and_version_split[0]} ${tool_and_version_split[1]} done <${ASDF_DEFAULT_TOOL_VERSIONS_FILENAME} asdf install set -e diff --git a/bashUtils/index.sh b/bashUtils/index.sh index 4b9ae3e..92dfe83 100755 --- a/bashUtils/index.sh +++ b/bashUtils/index.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env zsh +#!/usr/bin/env bash set -e diff --git a/bun.lockb b/bun.lockb index ae99940..4e3947e 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/cli/help.ts b/cli/help.ts index 18e90b9..007d798 100644 --- a/cli/help.ts +++ b/cli/help.ts @@ -29,16 +29,15 @@ const generateHelp = ({ cmds, prefixCmd = "", prefixDesc = "" }) => { const commandLabel = cmd?.postCommand ? `${cmd?.key} ${cmd?.postCommand}` : cmd?.key if (cmd?.mainTitle) { italicEmphasizeGreen(cmd?.mainTitle) - if (cmd?.subCommands?.length > 0) { + if (cmd?.keys?.length > 0) { generateHelp({ - cmds: cmd?.subCommands || [], + cmds: cmd?.keys || [], prefixCmd: cmd?.key, prefixDesc: cmd?.desc, }) } else { emphasizeText(formatCommandSection(commandLabel, prefixCmd, cmd?.maxLength), formatHelpSection(cmd?.desc, prefixDesc)) } - console.groupEnd() } else { emphasizeText(formatCommandSection(commandLabel, prefixCmd, cmd?.maxLength), formatHelpSection(cmd?.desc, prefixDesc)) } @@ -46,10 +45,14 @@ const generateHelp = ({ cmds, prefixCmd = "", prefixDesc = "" }) => { } const cliHelp = async () => { + if (process.env.JJ_CLI_ARG_2 == "auto-completion") { + + // const aaa = getJJConfigByKeyChain(`commands`) + console.log(`add this to .zshrc: "source ${process.env.JJ_SOURCE_DIR}/bashUtils/auto-completion.sh" `) + return + } console.log(chalk.blue.italic.bold("Usage: jj ")) - console.log("") console.group(chalk.blue.italic.bold("Commands:")) - console.log("") cliConfig.commandsObject = getJJConfigByKeyChain(`commands`) cliConfig.commandList = Object.keys(cliConfig.commandsObject).map((cmdKey) => ({ @@ -61,7 +64,8 @@ const cliHelp = async () => { cmds: cliConfig.commandList, }) - console.groupEnd() + return + } export default cliHelp; diff --git a/helpers/dynamicStringHandler.ts b/helpers/dynamicStringHandler.ts new file mode 100644 index 0000000..c78fa4e --- /dev/null +++ b/helpers/dynamicStringHandler.ts @@ -0,0 +1,13 @@ +export const dynamicStringHandler = (string: string, prefix: string, objectSource = {}, forceString = true) => { + let newString = string + Object.keys(objectSource).forEach((key) => { + const value = objectSource[key] + const keyReg = new RegExp(`__${prefix}${key}__`, "g") + if (forceString) { + newString = newString.replace(keyReg, typeof value == "string" ? `"${value}"` : value) + } else { + newString = newString.replace(keyReg, value) + } + }) + return newString +} \ No newline at end of file diff --git a/helpers/jjCli.ts b/helpers/jjCli.ts index 178c97b..47cf457 100755 --- a/helpers/jjCli.ts +++ b/helpers/jjCli.ts @@ -1,38 +1,28 @@ #!/usr/bin/env bun -import { - dynamicStringHandler, -} from "portainer_wrapper/src/server/portainerExpressMiddleware" - -import { getJJConfigByKeyChain, getJjYamlObj, jjConfigsExp } from "./jjConfigUtils"; -import _ from 'lodash'; -import { jjLogError } from "./jjLogger"; -import cliHelp from "cli/help"; - -const JJ_CLI_ARG_1 = process.env.JJ_CLI_ARG_1 +import { jjCliYargs } from "./jjCliYargs"; +jjCliYargs(false) const requiredProcessEnvs = { JJ_SOURCE_DIR: process.env.JJ_SOURCE_DIR } -if (JJ_CLI_ARG_1 == 'help') { - await cliHelp() - process.exit(0) -} +import { getJJConfigByKeyChain, getJjYamlObj, jjConfigsExp } from "./jjConfigUtils"; +import _ from 'lodash'; +import { dynamicStringHandler } from "./dynamicStringHandler"; - - - -const jjCommandConfig = getJJConfigByKeyChain(`commands['${JJ_CLI_ARG_1}']`) +const jjCommandConfig = getJJConfigByKeyChain(`commands['${process.env.JJ_CLI_ARG_1}']`) if (!jjCommandConfig || _.isEmpty(jjCommandConfig)) { - jjLogError(`Command ${JJ_CLI_ARG_1} is not available`) + console.error(`Command ${process.env.JJ_CLI_ARG_1} is not available`) + process.exit(0) +} else { + const scriptToRunPath = dynamicStringHandler(`${jjCommandConfig.scriptToRun.prePath}/${jjCommandConfig.scriptToRun.path}`, "", requiredProcessEnvs, false) + const scriptToRunFn = (await import(scriptToRunPath)).default + await scriptToRunFn() process.exit(0) } -const scriptToRunPath = dynamicStringHandler(`${jjCommandConfig.scriptToRun.prePath}/${jjCommandConfig.scriptToRun.path}`, "", requiredProcessEnvs, false) -const scriptToRunFn = (await import(scriptToRunPath)).default -await scriptToRunFn() -process.exit(0) + diff --git a/helpers/jjCliYargs.ts b/helpers/jjCliYargs.ts index dbe7196..948e375 100755 --- a/helpers/jjCliYargs.ts +++ b/helpers/jjCliYargs.ts @@ -5,75 +5,104 @@ import { hideBin } from "yargs/helpers"; import fs from "fs-extra"; import { jjConfigsExp } from "./jjConfigUtils"; -try { - const parsedConfig = jjConfigsExp; - const availableEnvironments = parsedConfig?.jjYamlObj?.environments || {}; - const cliArgs = yargs(hideBin(process.argv)).help(false).argv; - const argumentsObj = { ...cliArgs }; - const doubleDashIndex = process.argv.findIndex((arg) => arg === "--"); - const remainingArgs = doubleDashIndex === -1 ? [] : process.argv.filter((_, index) => index > doubleDashIndex); - const mainCommands = (argumentsObj?._ || []).filter((cmd) => !remainingArgs.includes(cmd.toString())); +export const jjCliYargs = (cli = true) => { + const envsObj = { - let commandString = ""; - const commandList = []; - mainCommands.forEach((command, index) => { - console.log(`export JJ_CLI_ARG_${index + 1}="${command}"`); - commandString += `"${command}" `; - commandList.push(command); - }); - - console.log(`export JJ_CLI_COMMANDS="${commandString}"`); - console.log(`export JJ_CLI_COMMANDS_COMMA_SEPTATE="${commandList.join(",")}"`); - console.log(`export JJ_CLI_ADDITIONAL_ARGS="${remainingArgs.reduce((str, arg) => (str += `${arg} `), "").trim()}"`); - console.log(`export JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE="${remainingArgs.join(",")}"`); - - delete argumentsObj._; - delete argumentsObj["$0"]; - - if (!argumentsObj["env"]) { - argumentsObj["env"] = "development"; } + try { + const parsedConfig = jjConfigsExp; + const availableEnvironments = parsedConfig?.jjYamlObj?.environments || {}; - const allOptionsMap = {}; - Object.keys(argumentsObj).forEach((key) => { - argumentsObj[`${key}_alias`] = argumentsObj[key]; - if (key === "env") { - const selectedEnv = argumentsObj["env"]; + const cliArgs = yargs(hideBin(process.argv)).help(false).argv; + const argumentsObj = { ...cliArgs }; - const envKeys = []; - const envAliases = []; - Object.keys(availableEnvironments).forEach((envKey) => { - const envConfig = availableEnvironments[envKey]; - envKeys.push(`${envKey}`); - envAliases.push(`${envConfig?.alias}`); - }); + const doubleDashIndex = process.argv.findIndex((arg) => arg === "--"); + const remainingArgs = doubleDashIndex === -1 ? [] : process.argv.filter((_, index) => index > doubleDashIndex); + const mainCommands = (argumentsObj?._ || []).filter((cmd) => !remainingArgs.includes(cmd.toString())); - const keyIndex = envKeys.findIndex((item) => item === selectedEnv); - const aliasIndex = envAliases.findIndex((item) => item === selectedEnv); + let commandString = ""; + const commandList = []; + mainCommands.forEach((command, index) => { + envsObj[`JJ_CLI_ARG_${index + 1}`] = command + commandString += `"${command}" `; + commandList.push(command); + }); - if (keyIndex < 0 && aliasIndex < 0) { - return; - } + envsObj[`JJ_CLI_COMMANDS`] = commandString + envsObj[`JJ_CLI_COMMANDS_COMMA_SEPTATE`] = commandList.join(",") + envsObj[`JJ_CLI_ADDITIONAL_ARGS`] = remainingArgs.reduce((str, arg) => (str += `${arg} `), "").trim() + envsObj[`JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE`] = remainingArgs.join(",") - if (keyIndex < 0) { - argumentsObj["env"] = envKeys[aliasIndex]; - } + delete argumentsObj._; + delete argumentsObj["$0"]; - const matchedEnvIndex = keyIndex > -1 ? keyIndex : aliasIndex; - argumentsObj[`${key}_alias`] = envAliases[matchedEnvIndex]; + if (!argumentsObj["env"]) { + argumentsObj["env"] = "development"; } - console.log(`export JJ_CLI_OPTION_${key.toUpperCase().split("-").join("_")}="${argumentsObj[key]}"`); - console.log(`export JJ_CLI_OPTION_${key.toUpperCase().split("-").join("_")}_ALIAS="${argumentsObj[`${key}_alias`]}"`); - allOptionsMap[`${key.toUpperCase().split("-").join("_")}`] = argumentsObj[key]; - allOptionsMap[`${key.toUpperCase().split("-").join("_")}_ALIAS`] = argumentsObj[`${key}_alias`]; - }); - console.log(`export JJ_CLI_OPTIONS="${JSON.stringify(allOptionsMap)}"`); - process.exit(0) + const allOptionsMap = {}; + Object.keys(argumentsObj).forEach((key) => { + argumentsObj[`${key}_alias`] = argumentsObj[key]; + if (key === "env") { + const selectedEnv = argumentsObj["env"]; -} catch (exception) { - console.error(exception); - process.exit(1); + const envKeys = []; + const envAliases = []; + Object.keys(availableEnvironments).forEach((envKey) => { + const envConfig = availableEnvironments[envKey]; + envKeys.push(`${envKey}`); + envAliases.push(`${envConfig?.alias}`); + }); + + const keyIndex = envKeys.findIndex((item) => item === selectedEnv); + const aliasIndex = envAliases.findIndex((item) => item === selectedEnv); + + if (keyIndex < 0 && aliasIndex < 0) { + return; + } + + if (keyIndex < 0) { + argumentsObj["env"] = envKeys[aliasIndex]; + } + + const matchedEnvIndex = keyIndex > -1 ? keyIndex : aliasIndex; + argumentsObj[`${key}_alias`] = envAliases[matchedEnvIndex]; + } + envsObj[`JJ_CLI_OPTION_${key.toUpperCase().split("-").join("_")}`] = argumentsObj[key] + envsObj[`JJ_CLI_OPTION_${key.toUpperCase().split("-").join("_")}_ALIAS`] = argumentsObj[`${key}_alias`] + allOptionsMap[`${key.toUpperCase().split("-").join("_")}`] = argumentsObj[key]; + allOptionsMap[`${key.toUpperCase().split("-").join("_")}_ALIAS`] = argumentsObj[`${key}_alias`]; + }); + envsObj[`JJ_CLI_OPTIONS`] = JSON.stringify(allOptionsMap) + + if(!envsObj['JJ_CLI_OPTION_COMMIT']){ + envsObj['JJ_CLI_SELECTED_COMMIT'] = envsObj['JJ_WORKSPACE_CURRENT_COMMIT'] + } else { + envsObj['JJ_CLI_SELECTED_COMMIT'] = envsObj['JJ_CLI_OPTION_COMMIT'] + } + + + if (cli) { + Object.keys(envsObj).forEach(envKey => { + console.log(`export ${envKey}="${envsObj[envKey]}"`) + }) + process.exit(0) + } else { + process.env = { + ...process.env, + ...envsObj + } + } + + } catch (exception) { + console.error(exception); + process.exit(1); + } } + +if(process.argv[process.argv.length - 1]== "cli"){ + process.argv.pop() + jjCliYargs() +} \ No newline at end of file diff --git a/helpers/jjEnsure.ts b/helpers/jjEnsure.ts index 12a8ae1..342a9e6 100755 --- a/helpers/jjEnsure.ts +++ b/helpers/jjEnsure.ts @@ -19,6 +19,7 @@ export const jjConfigs: any = { export const jjEnsure = async ({ returnProcessEnvs = false }) => { + // return jjConfigs.modulePath = path.resolve(__dirname, "../") jjConfigs.tmpDir = `${jjConfigs.modulePath}/~~tmp` jjConfigs.configSaveFilePath = `${jjConfigs.tmpDir}/configSaveFilePath.txt` @@ -39,20 +40,21 @@ export const jjEnsure = async ({ message: '', }, ]) - if (!fs.existsSync(answer.jjYamlPath)) { - jjLogError(`can not find ${answer.jjYamlPath}`) + jjConfigs.jjYamlPath = answer.jjYamlPath + if (!fs.existsSync(jjConfigs.jjYamlPath)) { + jjLogError(`can not find ${jjConfigs.jjYamlPath}`) } - const jjYamlRawContent = await fs.readFile(answer.jjYamlPath, "utf8") + const jjYamlRawContent = await fs.readFile(jjConfigs.jjYamlPath, "utf8") const jjYamlObj: any = YAML.load(jjYamlRawContent) if (_.isEmpty(jjYamlObj?.environments || {})) { - jjLogError(`Wrong ${answer.jjYamlPath} file`) + jjLogError(`Wrong ${jjConfigs.jjYamlPath} file`) } - jjConfigs.jjWorkSpacePath = path.dirname(answer.jjYamlPath) + jjConfigs.jjWorkSpacePath = path.dirname(jjConfigs.jjYamlPath) jjConfigs.jjYamlObj = jjYamlObj - await fs.writeFile(jjConfigs.configSaveFilePath, answer.jjYamlPath, "utf8") + await fs.writeFile(jjConfigs.configSaveFilePath, jjConfigs.jjYamlPath, "utf8") } else { jjConfigs.jjYamlPath = await fs.readFile(jjConfigs.configSaveFilePath, "utf8") @@ -104,8 +106,8 @@ export const jjEnsure = async ({ email: jjConfigs.processEnvs.JJ_GIT_USER_EMAIL, } } - fs.writeFileSync( - jjConfigs.jjYamlPath, + + saveFileIfItChanged( YAML.dump( jjConfigs.jjYamlObj, { @@ -115,36 +117,41 @@ export const jjEnsure = async ({ // sortKeys: true } ), - "utf8" + jjConfigs.jjYamlPath ) - - - saveFileIfItChanged(JSON.stringify(jjConfigs, null, 4), `${jjConfigs.tmpDir}/jjConfigs.json`) if (returnProcessEnvs) { - Object.keys(jjConfigs.processEnvs).forEach((envKey) => { - console.log(`export ${envKey.toUpperCase().split("-").join("_")}="${jjConfigs.processEnvs[envKey]}"`) - }) - } else { - console.log(jjConfigs.jjYamlObj) + let shEnvs = '' + Object.keys(jjConfigs.processEnvs).forEach((envKey) => { + const command = `export ${envKey.toUpperCase().split("-").join("_")}="${jjConfigs.processEnvs[envKey]}"` + shEnvs += `${command}\n` + console.log(command) + }) + + fs.writeFileSync(`${jjConfigs.tmpDir}/shEnvs.sh`, shEnvs, 'utf-8'); } + return jjConfigs } if ( - // _.get(process.argv, "[1]", "")?.includes('helpers/jjEnsure.ts') - && _.get(process.argv, "[2]", "") == 'returnProcessEnvs' ) { - - const jj = await jjEnsure({ returnProcessEnvs: true }) + if (_.get(process.argv, "[2]", "") == 'returnProcessEnvs') { + const jj = await jjEnsure({ returnProcessEnvs: true }) + process.exit(0) + } + if (_.get(process.argv, "[2]", "") == 'init') { + const jj = await jjEnsure({ returnProcessEnvs: false }) + process.exit(0) + } process.exit(0) } \ No newline at end of file diff --git a/jj.sh b/jj.sh index 4059da3..7504eb8 100755 --- a/jj.sh +++ b/jj.sh @@ -1,23 +1,27 @@ -#!/usr/bin/env zsh +#!/usr/bin/env bash +MILLISECONDS_START=$(echo "$EPOCHREALTIME * 1000" | bc) + +get_milliseconds() { + local current_time=$(echo "$EPOCHREALTIME * 1000" | bc) + echo "$(echo "$current_time - $MILLISECONDS_START" | bc | awk '{printf "%.0f", $0}')" +} + set -e trap '[[ "$?" == "1" ]] && echo -e "\033[1;31m[jj] ERROR !\033[0m" >&2' EXIT # set + - -autoload -U compinit -compinit +# ZSH specific +# autoload -U compinit +# compinit jjCpmmandRunPoint=$(echo ${BASH_SOURCE[0]}) - - - function findJJSource { # @source http://stackoverflow.com/a/246128/330439 local SOURCE="$jjCpmmandRunPoint" @@ -37,10 +41,15 @@ function findJJSource { export JJ_SOURCE_DIR=$(findJJSource) + + + if [[ "$1" == "--clean" ]]; then rm -rf $JJ_SOURCE_DIR/~~tmp/deps fi + + if [[ -e ~/.bun/bin/bun ]]; then export PATH="~/.bun/bin:${PATH}" fi @@ -53,38 +62,42 @@ if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then export PATH="~/.bun/bin:${PATH}" fi - mkdir -p "$JJ_SOURCE_DIR/~~tmp/deps" alias jj="$JJ_SOURCE_DIR/jj.sh" - source "$JJ_SOURCE_DIR/bashUtils/index.sh" +if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/configSaveFilePath.txt" ]]; then + $JJ_SOURCE_DIR/helpers/jjEnsure.ts init +fi + # $JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs # exit 0 -eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs) -# echo $JJ_WORKSPACE_DIR +if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/configSaveFilePath.txt" ]]; then + $JJ_SOURCE_DIR/helpers/jjEnsure.ts init +fi -# jjCliLog jjLog testjjLog a b c s -# jjCliLog jjLogInfo testjjLogInfo -# jjCliLog jjLogHeading testjjLogHeading +if [[ -e "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" ]]; then + source $JJ_SOURCE_DIR/~~tmp/shEnvs.sh +fi - -source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh" - - - -# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ -eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ ) -set -- $(echo $JJ_CLI_COMMANDS) - -echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE - +if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" ]] \ + || [[ -z $JJ_WORKSPACE_DIR ]] \ + || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/jj.yaml" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \ + || jjIsFileNewerFile "$JJ_SOURCE_DIR/~~tmp/jjConfigs.json" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \ + || jjIsFileNewerFile "$JJ_SOURCE_DIR/package.json" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \ + || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \ + ; then + MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 01 $MILLISECONDS" + eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs) + MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 02 $MILLISECONDS" +fi +source $JJ_SOURCE_DIR/~~tmp/shEnvs.sh export JJ_WORKSPACE_CURRENT_COMMIT=$(cd $JJ_WORKSPACE_DIR ; git rev-parse HEAD) export JJ_WORKSPACE_CURRENT_BRANCH=$(cd $JJ_WORKSPACE_DIR ; git rev-parse --abbrev-ref HEAD) @@ -93,18 +106,27 @@ export JJ_WORKSPACE_CURRENT_VERSION=$(cat $JJ_WORKSPACE_DIR/package.json | jq -r export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") -if [[ -z "$JJ_CLI_OPTION_COMMIT" ]]; then - export JJ_CLI_SELECTED_COMMIT=$JJ_WORKSPACE_CURRENT_COMMIT -else - export JJ_CLI_SELECTED_COMMIT=$JJ_CLI_OPTION_COMMIT -fi + +source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh" + +# echo 2 +# # exit 0 +# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ +# eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli) +# set -- $(echo $JJ_CLI_COMMANDS) + +# echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE + + + + # if [[ ! -e $JJ_SOURCE_DIR/~~tmp/pa ]]; then # echo "asdadasd" # fi -${JJ_SOURCE_DIR}/helpers/jjCli.ts +${JJ_SOURCE_DIR}/helpers/jjCli.ts $@ diff --git a/package.json b/package.json index 7cfc86f..33f6a9e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jj-command-line", "description": "jj cli", - "version": "0.0.7", + "version": "1.0.1", "author": "Jason Jafari", "bin": { "jj": "./jj.sh $@" @@ -27,7 +27,6 @@ "moment": "^2.30.1", "pino": "^9.5.0", "pino-pretty": "^12.1.0", - "portainer_wrapper": "1.0.50", "shelljs": "^0.8.5", "winston": "^3.16.0", "yargs": "^17.7.2"