This commit is contained in:
2024-11-14 16:11:00 -05:00
parent b4a8dd848a
commit 1af25d6c61
7 changed files with 199 additions and 62 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ import fs from 'fs-extra';
import _ from 'lodash';
const rawConfigData = fs.readFileSync(`${process.env.JJ_SOURCE_DIR}/~~tmp/jjConfigs.json`, 'utf8');
const rawConfigData = fs.readFileSync(`${process.env.JJ_DATA_DIR}/~~tmp/jjConfigs.json`, 'utf8');
export const jjConfigsExp = JSON.parse(rawConfigData)
+153 -21
View File
@@ -8,6 +8,7 @@ import { _ } from "lodash";
import { jjLog, jjLogAction, jjLogError } from "./jjLogger";
import { saveFileIfItChanged } from "./saveFileIfItChanged";
import { gitUserEmail, gitUserName, jjUserName } from "./userUtils";
import chalk from "chalk";
export const jjConfigs: any = {
processEnvs: {}
@@ -20,36 +21,74 @@ export const jjEnsure = async ({
returnProcessEnvs = false
}) => {
// return
jjConfigs.modulePath = path.resolve(__dirname, "../")
jjConfigs.tmpDir = `${jjConfigs.modulePath}/~~tmp`
jjConfigs.configSaveFilePath = `${jjConfigs.tmpDir}/configSaveFilePath.txt`
jjConfigs.JJ_SOURCE_DIR = process.env.JJ_SOURCE_DIR
jjConfigs.JJ_DATA_DIR = process.env.JJ_DATA_DIR
jjConfigs.JJ_TMP_DIR = `${jjConfigs.JJ_DATA_DIR}/~~tmp`
jjConfigs.JJ_DEPS_DIR = `${jjConfigs.JJ_DATA_DIR}/~~tmp/deps`
jjConfigs.configSaveFilePath = `${jjConfigs.JJ_TMP_DIR}/configSaveFilePath.txt`
jjConfigs.workspacesFilePath = `${jjConfigs.JJ_TMP_DIR}/workspacesFilePath.json`
if (!fs.existsSync(jjConfigs.tmpDir)) {
jjLog(`tmp folder ${jjConfigs.tmpDir} is not exist creating`)
fs.mkdirSync(jjConfigs.tmpDir, { recursive: true })
if (!fs.existsSync(jjConfigs.JJ_TMP_DIR)) {
jjLog(`tmp folder ${jjConfigs.JJ_TMP_DIR} is not exist creating`)
fs.mkdirSync(jjConfigs.JJ_TMP_DIR, { recursive: true })
}
if (!fs.existsSync(jjConfigs.workspacesFilePath)) {
await fs.writeFile(jjConfigs.workspacesFilePath, JSON.stringify([], null, 4), "utf8")
}
jjConfigs.workspaces = JSON.parse((await fs.readFile(jjConfigs.workspacesFilePath, "utf8")))
if (!fs.existsSync(jjConfigs.configSaveFilePath)) {
jjLogAction(`JJ cli require jj.yaml path please add it here in absolute way`)
console.log(chalk.yellow.bold(`JJ cli require jj.yaml absolute`))
const answer: any = await inquirer.prompt([
{
type: 'input',
name: 'jjYamlPath',
message: '',
},
])
jjConfigs.jjYamlPath = answer.jjYamlPath
if (jjConfigs.workspaces.length > 0) {
console.log(chalk.magenta.bold(`please select following options:`))
jjConfigs.workspaces.forEach((jjYamlPath, index) => {
console.log(chalk.magenta.bold(`${index + 1} ${jjYamlPath}`))
})
console.log(chalk.magenta.bold(`${jjConfigs.workspaces.length + 1} new workspace`))
const optionSelect: any = await inquirer.prompt([
{
type: 'input',
name: 'optionSelect',
message: '',
},
])
if (optionSelect?.optionSelect - 1 != jjConfigs.workspaces.length) {
jjConfigs.jjYamlPath = jjConfigs.workspaces[optionSelect?.optionSelect - 1]
}
}
if (!jjConfigs.jjYamlPath) {
console.log(chalk.magenta.bold(`please add it here in absolute path`))
const answer: any = await inquirer.prompt([
{
type: 'input',
name: 'jjYamlPath',
message: '',
},
])
jjConfigs.jjYamlPath = answer.jjYamlPath
}
if (!fs.existsSync(jjConfigs.jjYamlPath)) {
jjLogError(`can not find ${jjConfigs.jjYamlPath}`)
}
const jjYamlRawContent = await fs.readFile(jjConfigs.jjYamlPath, "utf8")
const jjYamlObj: any = YAML.load(jjYamlRawContent)
if (_.isEmpty(jjYamlObj?.environments || {})) {
jjLogError(`Wrong ${jjConfigs.jjYamlPath} file`)
}
jjConfigs.workspaces = [... new Set([...jjConfigs.workspaces, jjConfigs.jjYamlPath])]
await fs.writeFile(jjConfigs.workspacesFilePath, JSON.stringify(jjConfigs.workspaces, null, 4), "utf8")
jjConfigs.jjWorkSpacePath = path.dirname(jjConfigs.jjYamlPath)
jjConfigs.jjYamlObj = jjYamlObj
@@ -70,10 +109,13 @@ export const jjEnsure = async ({
jjConfigs.processEnvs.JJ_WORKSPACE_DIR = jjConfigs.jjWorkSpacePath
jjConfigs.processEnvs.JJ_SOURCE_DIR = jjConfigs.JJ_SOURCE_DIR
jjConfigs.processEnvs.JJ_DATA_DIR = jjConfigs.JJ_DATA_DIR
jjConfigs.JJ_WORKSPACE_DIR = jjConfigs.JJ_WORKSPACE_DIR
jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME = jjConfigs.jjYamlObj.name
jjConfigs.processEnvs.ASDF_DIR = `${process.env.JJ_SOURCE_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`
jjConfigs.processEnvs.ASDF_DATA_DIR = `${process.env.JJ_SOURCE_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`
jjConfigs.processEnvs.ASDF_DEFAULT_TOOL_VERSIONS_FILENAME = `${jjConfigs.tmpDir}/.tool-versions`
jjConfigs.processEnvs.ASDF_DIR = `${process.env.JJ_DATA_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`
jjConfigs.processEnvs.ASDF_DATA_DIR = `${process.env.JJ_DATA_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`
jjConfigs.processEnvs.ASDF_DEFAULT_TOOL_VERSIONS_FILENAME = `${jjConfigs.JJ_TMP_DIR}/.tool-versions`
const asdfToolsVersionFileContent = Object.keys(jjConfigs.jjYamlObj.asdf.tools).map(key => `${key} ${jjConfigs.jjYamlObj.asdf.tools[key].version}`).join('\n')
@@ -84,7 +126,7 @@ export const jjEnsure = async ({
jjConfigs.processEnvs.OS_DEPENDENCIES = jjConfigs.jjYamlObj.osDependencies.join(' ')
const bunGlobalDependencies = jjConfigs.jjYamlObj.bun.globals.join(' ')
saveFileIfItChanged(bunGlobalDependencies, `${jjConfigs.tmpDir}/bunGlobalDependencies.txt`)
saveFileIfItChanged(bunGlobalDependencies, `${jjConfigs.JJ_TMP_DIR}/bunGlobalDependencies.txt`)
jjConfigs.processEnvs.BUN_GLOBAL_DEPENDENCIES = bunGlobalDependencies
jjConfigs.processEnvs.JJ_GIT_METADATA_DIR = `${jjConfigs.processEnvs.JJ_WORKSPACE_DIR}/${jjConfigs.jjYamlObj.metadataRepo.path}`
@@ -120,7 +162,97 @@ export const jjEnsure = async ({
jjConfigs.jjYamlPath
)
saveFileIfItChanged(JSON.stringify(jjConfigs, null, 4), `${jjConfigs.tmpDir}/jjConfigs.json`)
jjConfigs.jjYamlObj.commands = {
"help": {
"desc": "This help info.",
"mainTitle": "Help",
"postCommand": "",
"maxLength": 12,
"keys": [
{
"key": "auto-completion",
"desc": "auto-completion",
"keys": []
},
{
"key": "workDirs",
"desc": "workDirs",
"keys": []
},
{
"key": "version-source",
"desc": "version-source",
"keys": []
},
{
"key": "version-workspace",
"desc": "version-workspace",
"keys": []
},
{
"key": "change-workspace",
"desc": "change-workspace",
"keys": []
},
{
"key": "clean-workspace",
"desc": "clean-workspace",
"keys": []
}
],
"scriptToRun": {
"prePath": "__JJ_SOURCE_DIR__",
"path": "cli/help.ts"
}
},
"secrets": {
"desc": "Secrets",
"mainTitle": "Secrets",
"postCommand": "",
"maxLength": 12,
"keys": [
{
"key": "setSecret",
"desc": "Set a secret to the given file",
"postCommand": " file key val",
"maxLength": 50,
"keys": [],
"postCommandsForce": []
},
{
"key": "setSecretFromFile",
"desc": "Set a secret to the given file",
"postCommand": " file key absFile",
"maxLength": 50,
"keys": [],
"postCommandsForce": []
},
{
"key": "decryptFile",
"desc": "decrypt file",
"postCommand": " file",
"maxLength": 50,
"keys": [],
"postCommandsForce": []
},
{
"key": "commitSecretMeta",
"desc": "",
"postCommand": "",
"maxLength": 50,
"keys": [],
"postCommandsForce": []
}
],
"scriptToRun": {
"prePath": "__JJ_SOURCE_DIR__",
"path": "cli/secrets.ts"
}
},
...jjConfigs.jjYamlObj.commands
}
saveFileIfItChanged(JSON.stringify(jjConfigs, null, 4), `${jjConfigs.JJ_TMP_DIR}/jjConfigs.json`)
if (returnProcessEnvs) {
@@ -133,7 +265,7 @@ export const jjEnsure = async ({
console.log(command)
})
fs.writeFileSync(`${jjConfigs.tmpDir}/shEnvs.sh`, shEnvs, 'utf-8');
fs.writeFileSync(`${jjConfigs.JJ_TMP_DIR}/shEnvs.sh`, shEnvs, 'utf-8');
}
+1 -1
View File
@@ -11,7 +11,7 @@ export const jjLoggerObj = {}
const __filename = fileURLToPath(import.meta.url);
const logFilePath = `${process.env.JJ_SOURCE_DIR}/~~tmp/jj.log`;
const logFilePath = `${process.env.JJ_DATA_DIR}/~~tmp/jj.log`;
jjLoggerObj['logFilePath'] = logFilePath