@fishawack/lab-env 4.4.0 → 4.5.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 4.5.0 (2022-11-21)
+* [Feature] Preset choice on `fw diagnose` now gives commands suitable to option chosen
+* [Feature] Added preset option of external to `fw diagnose` prompt
+* [Change] Preset is now stored in `.lab-env` config
+* [Change] Bumped diagnose version
+
 ### 4.4.0 (2022-11-17)
 * [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
 * [Bug] Increase nginx buffer size

package/cli.js

@@ -28,7 +28,25 @@ const args = hideBin(process.argv);
             });
         
         // Repo commands
-        let commands = ['start', 'watch', 'setup', 'content', 'production', 'test', 'deploy', 'reinstall', 'install', 'uninstall', 'run', 'check', 'clean', 'nuke', 'regenerate', 'connect', 'execute', 'origin', 'npm', 'script'];
+        let commands = ['start', 'watch', 'setup'];
+
+        if(_.config.preset !== 'external'){
+            commands.push('content');
+        }
+
+        commands.push('production', 'test');
+
+        if(_.config.preset === 'permanent'){
+            commands.push('deploy');
+        }
+
+        commands.push('reinstall', 'install', 'uninstall', 'run', 'check', 'clean', 'nuke', 'regenerate', 'connect', 'execute');
+
+        if(_.config.preset === 'permanent'){
+            commands.push('origin');
+        }
+
+        commands.push('npm', 'script');
 
         if(_.platform === "laravel"){
             commands.push('artisan');
@@ -55,8 +73,12 @@ const args = hideBin(process.argv);
         // Docker commands
         ['build', 'config', 'down', 'mocha', 'rebuild', 'up', 'volumes', 'compose'].forEach(d => cli.command(...require(`./commands/docker/${d}.js`)));
 
-        // Create commands
-        ['new', 'provision', 'deprovision', 'diagnose', 'delete', 'key', 'dekey'].forEach(d => cli.command(...require(`./commands/create/cmds/${d}.js`)));
+        if(_.config.preset === 'permanent'){
+            // Create commands
+            ['new', 'provision', 'deprovision', 'delete', 'key', 'dekey'].forEach(d => cli.command(...require(`./commands/create/cmds/${d}.js`)));
+        }
+
+        cli.command(...require(`./commands/create/cmds/diagnose.js`))
 
         cli.demandCommand(1, '')
             .wrap(null)

package/commands/create/cmds/diagnose.js

@@ -8,6 +8,7 @@ const _ = require('../../../globals.js');
 const path = require('path');
 const {writeFileSync} = require('fs');
 const os = require('os');
+const { Spinner } = require('../libs/utilities');
 
 module.exports = [
     ['diagnose', 'diag'],
@@ -40,21 +41,23 @@ module.exports = [
             while(!await test.strict()){
                 await guide.strict();
             };
-    
-            while(!await test.targets()){
-                await guide.targets();
-            }
-    
-            while(!await test.ftppass()){
-                await guide.ftppass();
-            }
-    
-            while(!await test.egnyte() || !await egnyte.check()){
-                await guide.egnyte();
-            };
 
-            while(!await test.watertight()){
-                await guide.watertight();
+            if(preset === "permanent" || preset === "freelancer"){
+                while(!await test.targets()){
+                    await guide.targets();
+                }
+        
+                while(!await test.ftppass()){
+                    await guide.ftppass();
+                }
+        
+                while(!await test.egnyte() || !await egnyte.check()){
+                    await guide.egnyte();
+                };
+
+                while(!await test.watertight()){
+                    await guide.watertight();
+                }
             }
     
             if(preset === "permanent"){
@@ -83,10 +86,11 @@ module.exports = [
             }
             
             // Update diagnosis version in ~/.lab-env config file
-            if(_.config.diagnosis !== _.diagnosis){
-                _.config.diagnosis = _.diagnosis;
-                writeFileSync(path.join(os.homedir(), '', '.lab-env'), JSON.stringify(_.config, null, 4));
-            }
+            let spinner = new Spinner(`Writing options to ${path.join(os.homedir(), '', '.lab-env')}`);
+            _.config.diagnosis = _.diagnosis;
+            _.config.preset = preset;
+            writeFileSync(path.join(os.homedir(), '', '.lab-env'), JSON.stringify(_.config, null, 4));
+            spinner.update(`Config updated at ${path.join(os.homedir(), '', '.lab-env')}`);
         } catch(e){
             if(e.message){
                 console.log(`\nError: ${e.message}`);

package/commands/create/services/guide.js

@@ -186,7 +186,8 @@ module.exports.preset = async () => {
             message: 'What type of developer are you?',
             choices: [
                 'permanent',
-                'freelancer'
+                'freelancer',
+                'external'
             ]
         }
     ]);

package/globals.js

@@ -25,7 +25,7 @@ var exec;
 var running;
 var services;
 var branch;
-var diagnosis = '1.0.1';
+var diagnosis = '2.0.1';
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
 
 try{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {