eitri-cli 1.7.0-beta.2 → 1.7.0

package/package.json

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

package/src/cmd/push-version.js

@@ -19,6 +19,7 @@ const vegvisirService = new VegvisirService()
 const standardVersion = require('standard-version')
 const releaseService = require('../service/ReleaseService')
 const {isGitRepo} = require('../util/GenericUtils')
+const debug = require('debug')('eitri:pushVersion')
 
 module.exports = async function pushVersion(cmdObj) {
     try {
@@ -29,6 +30,9 @@ module.exports = async function pushVersion(cmdObj) {
         return
     }
 
+    const {slug: miniConfSlug} = workspace.getMiniConf()
+    await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConfSlug)
+
     const separator = '======================================================================='
 
     try {

package/src/cmd/start.js

@@ -16,11 +16,14 @@ const blindGuardian = workspace.blindGuardian
 const hashFolder = workspace.hashFolder
 const trackingService = new TrackingService(blindGuardian, { ignoreCredentialError: true })
 const watcher = new Watcher(workspace, hashFolder, trackingService)
-const vegvisirService = new VegvisirService()
+const vegvisirService = new VegvisirService(workspace)
 const debug = require('debug')('eitri:start')
 
 module.exports = async function start(args) {
     debug("Iniciando start()")
+    const miniConf = workspace.getMiniConf()
+
+    await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConf.slug)
     
     const separator = '======================================================================='
     let displayFriendlyErrorAtEnd = ""
@@ -48,7 +51,6 @@ module.exports = async function start(args) {
             workspace.setResourceFolder2Watch(resourceFolders2watch)
         }
 
-        const miniConf = workspace.getMiniConf()
         await vegvisirService.check(miniConf.slug)
         debug("Fim da busca e validação do EitriAppConf", {miniConf})
         

package/src/modules/vegvisir/VegvisirService.js

@@ -9,6 +9,8 @@ const {validateUUID} = require("../../util/GenericUtils");
 const path = require("path");
 const fs = require('fs')
 const debug = require('debug')('eitri:VegvisirService')
+const inquirer = require("inquirer");
+const chalk = require("chalk");
 
 module.exports = class VegvisirService {
     constructor() {
@@ -134,4 +136,57 @@ module.exports = class VegvisirService {
             return process.exit(1)
         }
     };
+
+    async isCurrentWorkspaceOwnedByUser(slug = "") {
+        const localWorkspace = await this.getWorkspace()
+        if (!localWorkspace?.id) {
+            return
+        }
+
+        const workspacesRemote = await this.listMyWorkspaces()
+
+        const isOwner = workspacesRemote.find(w => w?.id === localWorkspace?.id)
+        if (isOwner) return
+
+        debug("Workspace local é diferente do remoto para esse usuário", {localWorkspace, workspacesRemote})
+
+        const reseted = await this.redefineWorkspace(slug)
+        if (reseted) return debug("Workspace validado com sucesso. Continuando...")
+
+        console.log("Parece que você está usando um workspace de outro usuário. Como não foi redefinido, não podemos prosseguir.")
+        process.exit(1)
+    };
+
+    async redefineWorkspace(slug = "") {
+        const question1 = "\n Deseja redefinir o seu workspace?"
+        const question2 = chalk.italic(" O workspace atual pertence a outro usuário, portanto, é necessária a redefinição.")
+        const question3 = chalk.italic(" Atenção! A redefinição do workspace poderá acarretar na alteração do tema.")
+
+        const res = await inquirer.prompt([
+            {
+                name: "confirm",
+                type: "confirm",
+                message:
+                    question1 + "\n" + question2 + "\n" + question3 + "\n",
+                default: true,
+            },
+        ]);
+
+        if (res.confirm) {
+            const workspaceGlobalPath = path.resolve(
+                os.homedir(),
+                ".eitri",
+                "workspaces",
+                "workspace"
+            );
+
+            if (fs.existsSync(workspaceGlobalPath)) {
+                fs.unlinkSync(workspaceGlobalPath);
+            }
+
+            await this.check(slug)
+        }
+
+        return res.confirm
+    }
 };

package/src/service/Emulator/IOSEmulatorService.js

@@ -1,5 +1,6 @@
 const util = require('util');
 const exec = util.promisify(require("child_process").exec)
+const inquirer = require("inquirer");
 
 module.exports = class IOSEmulatorService {