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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.4.0-beta.7",
+  "version": "1.4.0-beta.8",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/cmd/push-version.js

@@ -18,6 +18,7 @@ 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 {
@@ -28,6 +29,8 @@ module.exports = async function pushVersion(cmdObj) {
         return
     }
 
+    const separator = '======================================================================='
+
     try {
         await validator.assertPushVersionMessage(cmdObj.message)
         await validator.assertCommandNotRunning('push-version')
@@ -43,6 +46,40 @@ 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 releaseService()
@@ -101,7 +138,6 @@ ${await targetService.getAppConfExampleSnippet()}
 
             return
         }
-        const separator = '======================================================================='
         blindGuardian.readConf()
         workspace.setServerUrl(config.get('workspace').url)
         console.log('Conectando ao Eitri...')

package/src/service/ReleaseService.js

@@ -5,6 +5,7 @@ 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`)
@@ -44,7 +45,7 @@ async function _factoryReleaseConfig() {
                     "@semantic-release/git",
                     {
                         "assets": [
-                            "CHANGELOG.md",
+                            `${CHANGELOG_FILE_NAME}`,
                             "eitri-app.conf.js",
                             `!${TEMP_FOLDER_NAME}`
                         ],
@@ -73,29 +74,31 @@ async function _installDependencies() {
 }
 
 async function _updateChangeLog() {
-    if (fs.existsSync(`${TEMP_FOLDER_NAME}/${TEMP_CHANGELOG_FILE_NAME}.md`)) {
-        _printLog("Iniciando geração de changelog")
-        // if(fs.existsSync(""))
+    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");
-        _printLog("FIM Iniciando geração de changelog")
-        const newPath = path.join("CHANGELOG.md")
-        _printLog("INICIO 2 Iniciando geração de changelog", newPath)
+        const newPath = path.join(`${CHANGELOG_FILE_NAME}`)
+
         if (!fs.existsSync(newPath)) {
             await _createChangeLogMd()
         }
+
         const contentOriginalChangelog = fs.readFileSync(newPath, "utf-8")
-        _printLog("FIM 2 Iniciando geração de changelog")
         const newContent = contentNewChangelog + "\n\n" + contentOriginalChangelog
         fs.writeFileSync(newPath, newContent)
-        _printLog("Changelog gerado")
+
+        _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) {
-            console.error("\n" + `Erro ao remover a pasta ${TEMP_FOLDER_NAME}:`, error?.message ? error?.message : "");
-            reject(error)
+            _throwError(`Erro ao remover a pasta ${TEMP_FOLDER_NAME}:`, error?.message)
         } else {
             _printLog(`Limpando pasta temporária ${TEMP_FOLDER_NAME}`);
         }
@@ -103,9 +106,9 @@ async function _clearResources() {
 }
 
 async function _createChangeLogMd(newPath) {
-    _printLog(`Arquivo de Changelog inexistente. [Changelog: ${newPath}]`)
+    _printLog(`Arquivo de ${CHANGELOG_FILE_NAME} inexistente. [Changelog: ${newPath}]`)
     _printLog("Criando arquivo")
-    fs.writeFileSync("CHANGELOG.md", "");
+    fs.writeFileSync(`${CHANGELOG_FILE_NAME}`, "");
 }
 
 function _printLog(text = "", isError = false) {

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");