Saas 1281 output layer redone (#264)

* output layer redone

* output refactored

* dates redone

* remove "get" helper

* fix accidentally removed values

* remove draftlog from output

* remove gray color from repos + repo context validation

* update version

Author: yaroslav-codefresh

lib/interface/cli/commands/board/get.cmd.js

@@ -2,7 +2,7 @@ const debug = require('debug')('codefresh:cli:create:pipelines2');
 const Command = require('../../Command');
 const CFError = require('cf-errors');
 const { board: boardLogic } = require('../../../../logic').api;
-const { specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 
 const getRoot = require('../root/get.cmd');
 
@@ -25,11 +25,11 @@ const command = new Command({
             });
     },
     handler: async (argv) => {
-        const { id, name, output } = argv;
+        const { id, name } = argv;
         if (id) {
             try {
                 const board = await boardLogic.getBoardById(id);
-                specifyOutputForArray(output, [board], argv.pretty);
+                Output.print(board);
             } catch (err) {
                 debug(err.toString());
                 const message = `Board '${id}' was not found`;
@@ -41,7 +41,7 @@ const command = new Command({
         } else if (name) {
             try {
                 const board = await boardLogic.getBoardByName(name);
-                specifyOutputForArray(output, [board], argv.pretty);
+                Output.print(board);
             } catch (err) {
                 debug(err.toString());
                 const message = `Board '${name}' was not found`;
@@ -51,7 +51,8 @@ const command = new Command({
                 });
             }
         } else {
-            specifyOutputForArray(output, await boardLogic.getAll({ name }), argv.pretty);
+            const boards = await boardLogic.getAll({ name });
+            Output.print(boards);
         }
     },
 });

lib/interface/cli/commands/cluster/get.cmd.js

@@ -1,7 +1,7 @@
 const debug = require('debug')('codefresh:cli:get:cluster');
 const Command = require('../../Command');
 const { cluster } = require('../../../../logic').api;
-const { specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 const getRoot = require('../root/get.cmd');
 
 
@@ -21,7 +21,7 @@ const command = new Command({
     },
     handler: async (argv) => {
         const clusters = await cluster.getAllClusters();
-        specifyOutputForArray(argv.output, clusters, argv.pretty);
+        Output.print(clusters);
     },
 });
 

lib/interface/cli/commands/composition/get.cmd.js

@@ -1,11 +1,9 @@
-const debug = require('debug')('codefresh:cli:create:context');
 const Command = require('../../Command');
-const CFError = require('cf-errors');
 const _ = require('lodash');
 const { composition } = require('../../../../logic').api;
-const { specifyOutputForSingle, specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 const getRoot = require('../root/get.cmd');
-
+const Promise = require('bluebird');
 
 const command = new Command({
     command: 'compositions [id|name..]',
@@ -31,14 +29,11 @@ const command = new Command({
         let compositions = [];
         // TODO:need to decide for one way for error handeling
         if (!_.isEmpty(compositionIds)) {
-            for (const id of compositionIds) {
-                const currComposition = await composition.getCompositionByIdentifier(id);
-                compositions.push(currComposition);
-            }
+            compositions = await Promise.map(compositionIds, id => composition.getCompositionByIdentifier(id));
         } else {
             compositions = await composition.getCompositions();
         }
-        specifyOutputForArray(argv.output, compositions, argv.pretty);
+        Output.print(compositions);
     },
 });
 

lib/interface/cli/commands/context/get.cmd.js

@@ -1,12 +1,9 @@
-const debug = require('debug')('codefresh:cli:create:context');
 const Command = require('../../Command');
-const CFError = require('cf-errors');
 const _ = require('lodash');
-const { printError } = require('../../helpers/general');
 const { context } = require('../../../../logic').api;
-const { specifyOutputForSingle, specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 const getRoot = require('../root/get.cmd');
-
+const Promise = require('bluebird');
 
 const command = new Command({
     command: 'contexts [name..]',
@@ -47,14 +44,11 @@ const command = new Command({
 
         let contexts = [];
         if (!_.isEmpty(names)) {
-            for (const name of names) {
-                const currContext = await context.getContextByName(name, data.decrypt);
-                contexts.push(currContext);
-            }
+            contexts = await Promise.map(names, name => context.getContextByName(name, data.decrypt));
         } else {
             contexts = await context.getContexts(data);
         }
-        specifyOutputForArray(argv.output, contexts, argv.pretty);
+        Output.print(contexts);
     },
 });
 

lib/interface/cli/commands/environment/get.cmd.js

@@ -1,11 +1,9 @@
-const debug = require('debug')('codefresh:cli:create:context');
 const Command = require('../../Command');
-const CFError = require('cf-errors');
 const _ = require('lodash');
 const { environment } = require('../../../../logic').api;
-const { specifyOutputForSingle, specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 const getRoot = require('../root/get.cmd');
-
+const Promise = require('bluebird');
 
 const command = new Command({
     command: 'environments [id..]',
@@ -32,14 +30,11 @@ const command = new Command({
         let environments = [];
         // TODO:need to decide for one way for error handeling
         if (!_.isEmpty(environmentIds)) {
-            for (const id of environmentIds) {
-                const currEnvironment = await environment.getEnvironmentById(id);
-                environments.push(currEnvironment);
-            }
+            environments = await Promise.map(environments, id => environment.getEnvironmentById(id));
         } else {
             environments = await environment.getEnvironments();
         }
-        specifyOutputForArray(argv.output, environments, argv.pretty);
+        Output.print(environments);
     },
 });
 

lib/interface/cli/commands/helm/repo/apply.cmd.js

@@ -1,10 +1,5 @@
-const debug = require('debug')('codefresh:cli:create:pipelines2');
 const Command = require('../../../Command');
-const CFError = require('cf-errors');
-const _ = require('lodash');
 const { helm } = require('../../../../../logic').api;
-const { printError } = require('../../../helpers/general');
-const { specifyOutputForArray } = require('../../../helpers/get');
 
 const applyRoot = require('../../root/apply.cmd');
 

lib/interface/cli/commands/helm/repo/get.cmd.js

@@ -3,8 +3,7 @@ const Command = require('../../../Command');
 const CFError = require('cf-errors');
 const _ = require('lodash');
 const { helm } = require('../../../../../logic').api;
-const { printError } = require('../../../helpers/general');
-const { specifyOutputForArray } = require('../../../helpers/get');
+const Output = require('../../../../../output/Output');
 
 const getRoot = require('../../root/get.cmd');
 
@@ -28,7 +27,7 @@ const command = new Command({
         return yargs;
     },
     handler: async (argv) => {
-        const { name: names, output } = argv;
+        const { name: names } = argv;
 
         if (!_.isEmpty(names)) {
             const repos = [];
@@ -38,7 +37,7 @@ const command = new Command({
                     repos.push(currRepo);
                 } catch (err) {
                     if (repos.length) {
-                        specifyOutputForArray(output, repos, argv.pretty);
+                        Output.print(repos);
                     }
 
                     debug(err.toString());
@@ -49,9 +48,10 @@ const command = new Command({
                     });
                 }
             }
-            specifyOutputForArray(output, repos, argv.pretty);
+            Output.print(repos);
         } else {
-            specifyOutputForArray(output, await helm.getAllRepos(), argv.pretty);
+            const repos = await helm.getAllRepos();
+            Output.print(repos);
         }
     },
 });

lib/interface/cli/commands/image/get.cmd.js

@@ -1,12 +1,11 @@
-const debug = require('debug')('codefresh:cli:create:context');
 const Command = require('../../Command');
-const CFError = require('cf-errors');
 const _ = require('lodash');
 const DEFAULTS = require('../../defaults');
 const { prepareKeyValueFromCLIEnvOption } = require('../../helpers/general');
 const { image } = require('../../../../logic').api;
-const { specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 const getRoot = require('../root/get.cmd');
+const Promise = require('bluebird');
 
 const command = new Command({
     command: 'images [id..]',
@@ -83,15 +82,11 @@ const command = new Command({
         let images = [];
         // TODO:need to decide for one way for error handeling
         if (!_.isEmpty(imageIds)) {
-            for (const id of imageIds) {
-                const currImage = await image.getImageById({
-                    id,
-                    allRegistries,
-                });
-                _.forEach(currImage, (img) => {
-                    images.push(img);
-                });
-            }
+            images = await Promise.map(imageIds, id => image.getImageById({
+                id,
+                allRegistries,
+            }));
+            images = _.flatten(images);
         } else {
             images = await image.getAll({
                 labels,
@@ -105,7 +100,7 @@ const command = new Command({
                 offset,
             });
         }
-        specifyOutputForArray(argv.output, images, argv.pretty);
+        Output.print(images);
     },
 });
 

lib/interface/cli/commands/pipeline/get.cmd.js

@@ -5,7 +5,7 @@ const _ = require('lodash');
 const DEFAULTS = require('../../defaults');
 const { pipeline } = require('../../../../logic').api;
 const { prepareKeyValueFromCLIEnvOption, printError } = require('../../helpers/general');
-const { specifyOutputForArray } = require('../../helpers/get');
+const Output = require('../../../../output/Output');
 
 const getRoot = require('../root/get.cmd');
 
@@ -46,7 +46,7 @@ const command = new Command({
             });
     },
     handler: async (argv) => {
-        const { id: ids, name, output, d: decryptVariables, pretty} = argv;
+        const { id: ids, name, d: decryptVariables} = argv;
         const limit = argv.limit;
         const offset = (argv.page - 1) * limit;
         const labels = prepareKeyValueFromCLIEnvOption(argv.label);
@@ -60,7 +60,7 @@ const command = new Command({
                     pipelines.push(currPipeline);
                 } catch (err) {
                     if (pipelines.length) {
-                        specifyOutputForArray(output, pipelines, pretty);
+                        Output.print(pipelines);
                     }
 
                     debug(err.toString());
@@ -71,14 +71,15 @@ const command = new Command({
                     });
                 }
             }
-            specifyOutputForArray(output, pipelines, pretty);
+            Output.print(pipelines);
         } else {
-            specifyOutputForArray(output, await pipeline.getAll({
+            const pipelines = await pipeline.getAll({
                 limit,
                 offset,
                 name,
                 labels,
-            }), pretty);
+            });
+            Output.print(pipelines);
         }
     },
 });

lib/interface/cli/commands/repo/get.cmd.js

@@ -1,9 +1,10 @@
 const Command = require('../../Command');
 const _ = require('lodash');
-const { repository } = require('../../../../logic').api;
-const { specifyOutputForArray } = require('../../helpers/get');
+const { repository, context: Context } = require('../../../../logic').api;
+const Output = require('../../../../output/Output');
 const getRoot = require('../root/get.cmd');
 const Spinner = require('ora');
+const CFError = require('cf-errors'); // eslint-disable-line
 
 const command = new Command({
     command: 'repository [names..]',
@@ -41,32 +42,52 @@ const command = new Command({
         return yargs;
     },
     handler: async (argv) => {
-        const { context, names, available, limit } = argv;
+        let { context, names, available, limit } = argv;
+
+        let ctxList = await Context.getContexts({});
+        ctxList = ctxList.filter(c => c.type.startsWith('git')
+            && ((context && c.name === context) || (!context && c.info.metadata.default)));
+
+        if (_.isEmpty(ctxList)) {
+            throw new CFError(context ? `No such context: ${context}` : 'Default git context is not specified');
+        }
+
+        let contextText;
+        if (!context) {
+            context = ctxList[0].name;
+            contextText = `default user git context: "${context}"`;
+        } else {
+            contextText = `git context: "${context}"`;
+        }
 
         const loadRepos = available ? repository.getAllAvailableGitRepos : repository.getAll;
-        const contextText = context ? `git context "${context}"` : 'default user git context';
         const filterProperty = available ? 'info.repo_shortcut' : 'info.serviceName';
 
-        const spinner = Spinner(`Loading ${available ? `git repos for ${contextText}` : 'codefresh'}`).start();
+        const spinner = Spinner(`Loading git repos for ${contextText}`);
+        if (available) {
+            spinner.start();
+        }
         try {
             let repos = await loadRepos(context);
-            spinner.succeed('Successfully loaded repos!');
-
+            spinner.stop();
 
             if (!_.isEmpty(names)) {
                 repos = repos.filter((r) => {
                     return names.reduce((bool, name) => bool || _.get(r, filterProperty).includes(name), false);
                 });
             }
-            specifyOutputForArray(argv.output, repos.slice(0, limit), argv.pretty);
+            Output.print(repos.slice(0, limit));
 
             const lengthDiff = repos.length - limit;
             if (lengthDiff > 0) {
                 console.log(`... ${lengthDiff} more repos available - pass greater --limit option to show more`);
             }
         } catch (e) {
-            spinner.fail('Failed to load repositories:');
-            console.log(`  - ${e.message}`);
+            spinner.stop();
+            throw new CFError({
+                message: 'Failed to load repositories',
+                cause: e,
+            });
         }
     },
 });