eitri-cli 1.4.0-beta.6 → 1.4.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.4.0-beta.6",
+  "version": "1.4.0-beta.8",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -78,7 +78,7 @@
     "lint-staged": "^9.5.0",
     "nock": "^13.3.0",
     "puppeteer": "^21.4.1",
-    "semantic-release": "^22.0.5"
+    "semantic-release": "^22.0.8"
   },
   "resolutions": {
     "lodash": "4.17.21",

package/src/cmd/push-version.js

@@ -17,6 +17,8 @@ const trackingService = new TrackingService(blindGuardian)
 const targetService = new TargetService(workspace)
 const vegvisirService = new VegvisirService()
 const standardVersion = require('standard-version')
+const releaseService = require('../service/ReleaseService')
+const {isGitRepo} = require('../util/GenericUtils')
 
 module.exports = async function pushVersion(cmdObj) {
     try {
@@ -27,6 +29,8 @@ module.exports = async function pushVersion(cmdObj) {
         return
     }
 
+    const separator = '======================================================================='
+
     try {
         await validator.assertPushVersionMessage(cmdObj.message)
         await validator.assertCommandNotRunning('push-version')
@@ -42,9 +46,43 @@ module.exports = async function pushVersion(cmdObj) {
         const miniConf = workspace.getMiniConf()
 
         if (cmdObj?.release) {
+            if (!isGitRepo()) {
+                const emptyGitRepoMessages = [
+                    "Este projeto não tem um repositório git. Processo interrompido.",
+                    "Por favor, inicialize o git neste repositório antes de",
+                    "realizar [push-version --release]"
+                ]
+                console.log(`\x1b[1m\x1b[31m${emptyGitRepoMessages?.join("\n")}\x1b[0m`);
+                return
+            }
+
+            const currentBranch = childProcess.execSync("git branch --show-current", {encoding: 'utf-8'}).trim();
+            const allowedBranchs = ["main", "master"]
+            const isAllowedFlow = allowedBranchs?.includes(currentBranch)
+            if(!isAllowedFlow){
+                const warningMessages = [
+                    '\n\n',
+                    separator,
+                    'Aviso: As condições obrigatórias não foram contempladas.',
+                    '\n',
+                    'Por favor, certifique-se de:',
+                    '- Informar o comando "release" ao executar o script.',
+                    '- Estar na branch "master" ou "main".',
+                    `   - Branch atual: [${currentBranch}]`,
+                    '\n',
+                    'Nenhuma versão foi gerada e enviada.',
+                    separator,
+                    '\n\n',
+                ]
+
+                console.log(`\x1b[1m\x1b[33m${warningMessages?.join("\n")}\x1b[0m`);
+
+                return
+            }
+
             console.log("Iniciando geração de versão com CI")
             try {
-                await releaseGenerator(cmdObj)
+                await releaseService()
                 const lastTag = childProcess.execSync('git describe --tags --abbrev=0').toString().trim();
                 const newVersion = lastTag?.replace(/^v/, "");
                 console.log(`Nova versão preparada: ${newVersion}`)
@@ -100,7 +138,6 @@ ${await targetService.getAppConfExampleSnippet()}
 
             return
         }
-        const separator = '======================================================================='
         blindGuardian.readConf()
         workspace.setServerUrl(config.get('workspace').url)
         console.log('Conectando ao Eitri...')
@@ -217,23 +254,3 @@ async function logPermissionsAndOpenPrompt(addedPermissions, removedPermissions,
         }
     }
 }
-
-
-async function releaseGenerator(cmdObj) {
-    return new Promise((resolve, reject) => {
-        standardVersion({
-            noVerify: true,
-            silent: true,
-            releaseCommitMessageFormat: "[skip ci]"
-        }).then(() => {
-            resolve()
-        }).catch(err => {
-            if (cmdObj?.verbose) {
-                console.error(`standard-version failed with message: ${err?.message}`)
-            }
-            const errorMessage = "Ocorreu um erro ao gerar a versão. Por favor, verifique se a versão foi gerada no Console."
-            reject(errorMessage)
-        })
-
-    })
-}

package/src/service/ReleaseService.js

@@ -0,0 +1,126 @@
+const path = require('path')
+const fs = require('fs')
+const childProcess = require('child_process')
+const rimraf = require('rimraf');
+
+const TEMP_FOLDER_NAME = "temp_eitri_ci"
+const TEMP_CHANGELOG_FILE_NAME = "CHANGELOG_TEMP"
+const CHANGELOG_FILE_NAME = "CHANGELOG.md"
+
+module.exports = async function releaseService() {
+    _printLog(`\x1b[1m\x1b[32mIniciando Geração Automática de Versão\x1b[0m`)
+    await _factoryTempFolder()
+    await _factoryReleaseConfig()
+    await _downloadDependencies()
+    await _installDependencies()
+    await _updateChangeLog()
+    await _clearResources()
+}
+
+async function _factoryTempFolder() {
+    try {
+        fs.mkdirSync(TEMP_FOLDER_NAME, {recursive: true})
+    } catch (error) {
+        _throwError("Erro ao gerar pasta temporária", error?.message)
+    }
+}
+
+async function _factoryReleaseConfig() {
+    try {
+        const releasercContent = {
+            "branches": [
+                "main",
+                "master",
+            ],
+            "plugins": [
+                "@semantic-release/commit-analyzer",
+                "@semantic-release/release-notes-generator",
+                [
+                    "@semantic-release/changelog",
+                    {
+                        "changelogFile": `${TEMP_CHANGELOG_FILE_NAME}.md`
+                    }
+                ],
+                [
+                    "@semantic-release/git",
+                    {
+                        "assets": [
+                            `${CHANGELOG_FILE_NAME}`,
+                            "eitri-app.conf.js",
+                            `!${TEMP_FOLDER_NAME}`
+                        ],
+                        "message": "chore(release): ${nextRelease.version}[skip ci]\n\n${nextRelease.notes}"
+                    }
+                ]
+            ]
+        };
+
+        const releasercFilePath = path.join(TEMP_FOLDER_NAME, '.releaserc.json');
+        fs.writeFileSync(releasercFilePath, JSON.stringify(releasercContent, null, 2));
+    } catch (error) {
+        _throwError("Erro ao criar o arquivo de configuração da release", error?.message)
+    }
+}
+
+async function _downloadDependencies() {
+    _printLog("Baixando as configurações. Este processo pode demorar alguns segundos.")
+    childProcess.execSync(`cd ${TEMP_FOLDER_NAME}/ && npm i semantic-release @semantic-release/git @semantic-release/changelog`)
+}
+
+async function _installDependencies() {
+    _printLog("Instalando configuração temporária de CI. Este processo pode demorar alguns segundos.")
+    childProcess.execSync(`cd ${TEMP_FOLDER_NAME}/ && npx semantic-release --no-ci --no-npm-publish --no-github-publish --working-directory=${TEMP_FOLDER_NAME} --skip-verify-conditions`)
+    _printLog("Configuração de CI instalada", TEMP_CHANGELOG_FILE_NAME)
+}
+
+async function _updateChangeLog() {
+    const hasTempChangelog = fs.existsSync(`${TEMP_FOLDER_NAME}/${TEMP_CHANGELOG_FILE_NAME}.md`)
+    if (hasTempChangelog) {
+        _printLog(`Iniciando atualização do ${CHANGELOG_FILE_NAME}`)
+        const contentNewChangelog = fs.readFileSync(`${TEMP_FOLDER_NAME}/${TEMP_CHANGELOG_FILE_NAME}.md`, "utf-8");
+        const newPath = path.join(`${CHANGELOG_FILE_NAME}`)
+
+        if (!fs.existsSync(newPath)) {
+            await _createChangeLogMd()
+        }
+
+        const contentOriginalChangelog = fs.readFileSync(newPath, "utf-8")
+        const newContent = contentNewChangelog + "\n\n" + contentOriginalChangelog
+        fs.writeFileSync(newPath, newContent)
+
+        _printLog(`Arquivo ${CHANGELOG_FILE_NAME} atualizado`)
+        return
+    }
+
+    _throwError("Arquivo temporário de Changelog não gerado", {hasTempChangelog})
+}
+
+async function _clearResources() {
+    rimraf(TEMP_FOLDER_NAME, (error) => {
+        if (error) {
+            _throwError(`Erro ao remover a pasta ${TEMP_FOLDER_NAME}:`, error?.message)
+        } else {
+            _printLog(`Limpando pasta temporária ${TEMP_FOLDER_NAME}`);
+        }
+    });
+}
+
+async function _createChangeLogMd(newPath) {
+    _printLog(`Arquivo de ${CHANGELOG_FILE_NAME} inexistente. [Changelog: ${newPath}]`)
+    _printLog("Criando arquivo")
+    fs.writeFileSync(`${CHANGELOG_FILE_NAME}`, "");
+}
+
+function _printLog(text = "", isError = false) {
+    if (isError) {
+        console.error("\n" + text)
+    } else {
+        console.log("\n" + text)
+    }
+}
+
+function _throwError(text = "", errorMessage = "") {
+    const error = `${text} [message: ${errorMessage}]`
+    _printLog(error, !!error)
+    throw new Error(error)
+}

package/src/util/GenericUtils.js

@@ -1,3 +1,4 @@
+const childProcess = require('child_process')
 class GenericUtils {
 
     static formatQrCodeCurrentDateTime = () => {
@@ -19,6 +20,16 @@ class GenericUtils {
         return uuid && typeof uuid === "string" && regexExp.test(uuid)
     }
 
+    static isGitRepo() {
+        try {
+            const gitCommand = "git branch --show-current";
+            const res = childProcess.execSync(gitCommand, {encoding: 'utf-8'}).trim();
+            return !!res
+        } catch (error) {
+            return false;
+        }
+    }
+
 }
 
 module.exports = GenericUtils

package/test/Executor.js

@@ -20,7 +20,7 @@ class Executor {
         });
         this.child.stderr.on('data', (lines) => {
             if (lines && lines.includes('Error:')) {
-                reject(lines);
+                throw new Error(lines)
             }
         });
         return this

package/test/e2e/cli.test.js

@@ -9,6 +9,7 @@ const Helper = require("../Helper.js");
 const ConfigService = require("../../src/service/ConfigService.js");
 const Http = require("../../src/service/Http.js");
 const BlindGuardian = require("../../src/service/BlindGuardian.js");
+const childProcess = require('child_process')
 
 describe("eitri-cli", () => {
     const EITRI_WORK_DIR = path.join(__dirname, "..", "..", "developer-folder");