bjira 0.0.3 → 0.0.7

package/src/issue.js

@@ -1,10 +1,7 @@
-import color from 'chalk';
-import Table from 'cli-table3';
-
 import Command from './command.js';
-import ErrorHandler from './errorhandler.js'
 import Field from './field.js';
 import Jira from './jira.js';
+import Table from './table.js';
 
 const DEFAULT_QUERY_LIMIT = 20;
 
@@ -21,22 +18,9 @@ class Issue extends Command {
       .action(async id => {
         const jira = new Jira(program);
 
-        let resultFields;
-        try {
-          resultFields = await Field.listFields(jira);
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-          return;
-        }
-
-        let result;
-        try {
-          result = await jira.spin('Running query...', jira.api.findIssue(id));
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-          return;
-        }
+        const resultFields = await Field.listFields(jira);
 
+        const result = await jira.spin('Running query...', jira.api.findIssue(id));
         const issue = Issue.replaceFields(result, resultFields);
 
         let epicIssue = null;
@@ -46,71 +30,107 @@ class Issue extends Command {
           epicIssue = Issue.replaceFields(epicResult, resultFields);
         }
 
-        const table = new Table({
-          chars: jira.tableChars
-        });
-
-        table.push({
-          'Summary': issue.fields['Summary'].trim()
-        }, {
-          'URL:': color.blue(Issue.url(jira, id))
-        }, {
-          'Status': color.green(issue.fields['Status'].name)
-        }, {
-          'Type': issue.fields['Issue Type'].name
-        }, {
-          'Project': issue.fields['Project'].name + ' (' + issue.fields['Project'].key + ')'
-        }, {
-          'Reporter': this.showUser(issue.fields['Reporter'])
-        }, {
-          'Assignee': this.showUser(issue.fields['Assignee'])
-        }, {
-          'Priority': issue.fields['Priority'].name
-        }, {
-          'Epic Link': this.showEpicIssue(epicIssue)
-        }, {
-          'Labels': issue.fields['Labels'].join(', ')
-        }, {
-          'Sprint': issue.fields['Sprint']?.map(sprint => this.showSprint(sprint)).join(', ')
-        }, );
-
-        jira.fields.forEach(fieldName => {
-          const data = {};
-          data[fieldName] = issue.fields[fieldName] || "unset"
-          table.push(data);
-        });
-
-        table.push({
-          '': ''
-        }, {
-          'Created on': issue.fields['Created']
-        }, {
-          'Updated on': issue.fields['Updated']
-        }, {
-          '': ''
-        }, {
-          'Description': issue.fields['Description']
-        }, {
-          '': ''
-        }, {
-          'Comments': issue.fields['Comment'].total
-        }, );
+        const table = new Table({});
+
+        table.addRows([
+          [
+            'Summary', issue.fields['Summary'].trim()
+          ],
+          [
+            'URL', {
+              color: "blue",
+              text: Issue.url(jira, id)
+            },
+          ],
+          [
+            'Status', {
+              color: "green",
+              text: issue.fields['Status'].name
+            }
+          ],
+          [
+            'Type', issue.fields['Issue Type'].name
+          ],
+          [
+            'Project', issue.fields['Project'].name + ' (' + issue.fields['Project'].key + ')'
+          ],
+          [
+            'Reporter', Issue.showUser(issue.fields['Reporter'])
+          ],
+          [
+            'Assignee', Issue.showUser(issue.fields['Assignee'])
+          ],
+          [
+            'Priority', issue.fields['Priority'].name
+          ],
+          [
+            'Epic Link', {
+              color: "yellow",
+              text: this.showEpicIssue(epicIssue)
+            }
+          ],
+          [
+            'Labels', issue.fields['Labels'].join(', ')
+          ],
+          [
+            'Sprint', {
+              color: "yellow",
+              text: issue.fields['Sprint']?.map(sprint => this.showSprint(sprint)).join(', ')
+            }
+          ]
+        ]);
+
+        jira.fields.forEach(fieldName => table.addRow([fieldName, issue.fields[fieldName] || "unset"]));
+
+        table.addRows([
+          [
+            '', ''
+          ],
+          [
+            'Created on', issue.fields['Created']
+          ],
+          [
+            'Updated on', issue.fields['Updated']
+          ],
+          [
+            '', ''
+          ],
+          [
+            'Description', issue.fields['Description']
+          ],
+          [
+            '', ''
+          ],
+          [
+            'Comments', issue.fields['Comment'].total
+          ]
+        ]);
 
         if (cmd.opts().comments) {
           issue.fields['Comment'].comments.forEach(comment => {
-            table.push({
-              '': ''
-            }, {
-              'Comment': color.yellow(comment.id)
-            }, {
-              'Author': this.showUser(comment.author)
-            }, {
-              'Created on': comment['Created']
-            }, {
-              'Updated on': comment['Updated']
-            }, {
-              'Body': comment.body
-            }, );
+            table.addRows([
+              [
+                '', ''
+              ],
+              [
+                'Comment', {
+                  color: "yellow",
+                  text: comment.id
+                }
+              ],
+              [
+                'Author', Issue.showUser(comment.author)
+              ],
+              [
+                'Created on', comment['Created']
+              ],
+              [
+                'Updated on', comment['Updated']
+              ],
+              [
+                'Body', comment.body
+              ]
+            ]);
           });
         }
 
@@ -143,20 +163,20 @@ class Issue extends Command {
     return obj;
   }
 
-  showUser(user) {
+  static showUser(user) {
     if (!user) return "(null)";
     let str = user.displayName;
-    if (user.emailAddress) str += ` (${color.yellow(user.emailAddress)})`;
+    if (user.emailAddress) str += ` (${user.emailAddress})`;
     return str;
   }
 
   showEpicIssue(issue) {
     if (!issue) return "";
-    return `${color.blue(issue.key)} (${color.yellow(issue.fields['Summary'].trim())})`;
+    return `${issue.key} (${issue.fields['Summary'].trim()})`;
   }
 
   showSprint(sprint) {
-    return `${color.blue(sprint.name)} (${color.yellow(sprint.state)})`;
+    return `${sprint.name} (${sprint.state})`;
   }
 };
 

package/src/jira.js

@@ -2,6 +2,8 @@ import jiraClient from 'jira-client';
 import fs from 'fs';
 import ora from 'ora';
 
+import ErrorHandler from './errorhandler.js'
+
 class Jira {
   constructor(program) {
     const opts = program.opts();
@@ -74,11 +76,12 @@ class Jira {
 
     try {
       const result = await promise;
+      spinner.stop();
       return result;
     } catch (e) {
-      throw e;
-    } finally {
       spinner.stop();
+      ErrorHandler.showError(this, e);
+      process.exit(1);
     }
   }
 

package/src/preset.js

@@ -1,9 +1,6 @@
-import color from 'chalk';
-import inquirer from 'inquirer';
-import Table from 'cli-table3';
-
 import Command from './command.js';
 import Jira from './jira.js';
+import Table from './table.js';
 
 class Preset extends Command {
   addOptions(program) {
@@ -44,13 +41,16 @@ class Preset extends Command {
         const jira = new Jira(program);
 
         const table = new Table({
-          chars: jira.tableChars,
           head: ['Name', 'Query']
         });
 
-        Object.keys(jira.config.presets).forEach(key => table.push([color.blue(key),
-          color.green(jira.config.presets[key])
-        ]));
+        Object.keys(jira.config.presets).forEach(key => table.addRow([{
+          color: "blue",
+          text: key
+        }, {
+          color: "green",
+          text: jira.config.presets[key]
+        }, ]));
         console.log(table.toString());
       });
   }

package/src/project.js

@@ -1,9 +1,7 @@
-import color from 'chalk';
-import Table from 'cli-table3';
-import inquirer from 'inquirer';
-
+import Ask from './ask.js';
 import Command from './command.js';
 import Jira from './jira.js';
+import Table from './table.js';
 
 class Project extends Command {
   addOptions(program) {
@@ -17,11 +15,13 @@ class Project extends Command {
         const projects = await jira.spin("Loading projects...", jira.api.listProjects());
 
         const table = new Table({
-          chars: jira.tableChars,
           head: ['Key', 'Name']
         });
 
-        projects.forEach(project => table.push([color.blue(project.key), project.name]));
+        projects.forEach(project => table.addRow([{
+          color: "blue",
+          text: project.key
+        }, project.name]));
         console.log(table.toString());
       });
   }
@@ -42,39 +42,16 @@ class Project extends Command {
       return a.name > b.name;
     });
 
-    const projectNames = [];
-    const projectKeys = [];
-    const issueTypes = [];
-
-    meta.projects.forEach(project => {
-      projectNames.push(project.name);
-      projectKeys.push(project.key);
-      issueTypes.push(project.issuetypes);
-    });
-
-    const projectQuestion = [{
-      type: 'list',
-      name: 'project',
-      message: 'Project:',
-      choices: projectNames,
-      filter: name => {
-        const pos = projectNames.indexOf(name);
-        return {
-          pos,
-          name,
-          key: projectKeys[pos]
-        };
-      }
-    }];
-
-    const projectAnswer = await inquirer.prompt(projectQuestion);
+    const projectPos = await Ask.askList('Project:', meta.projects.map(project => project.name));
+    const project = meta.projects[projectPos];
 
-    jira.latestProject = projectAnswer.project.key
+    jira.latestProject = project.key;
     jira.syncConfig();
 
     return {
-      issueTypes: issueTypes[projectAnswer.project.pos],
-      ...projectAnswer.project
+      name: project.name,
+      key: project.key,
+      issueTypes: project.issuetypes,
     };
   }
 };

package/src/query.js

@@ -1,10 +1,9 @@
-import color from 'chalk';
-import Table from 'cli-table3';
-
 import Command from './command.js';
 import ErrorHandler from './errorhandler.js';
 import Field from './field.js';
+import Issue from './issue.js';
 import Jira from './jira.js';
+import Table from './table.js';
 
 const DEFAULT_QUERY_LIMIT = 20;
 
@@ -20,29 +19,17 @@ class Query extends Command {
         const jira = new Jira(program);
         const opts = cmd.opts();
 
-        let resultFields;
-        try {
-          resultFields = await Field.listFields(jira);
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-          return;
-        }
+        const resultFields = await Field.listFields(jira);
 
         let expectedResult = opts.limit;
         let issues = [];
 
         while (issues.length < opts.limit) {
-          let result;
-          try {
-            result = await jira.spin('Running query...',
-              jira.api.searchJira(query, {
-                startAt: issues.lengh,
-                maxResults: opts.limit - issues.length
-              }));
-          } catch (e) {
-            ErrorHandler.showError(jira, e);
-            return;
-          }
+          const result = await jira.spin('Running query...',
+            jira.api.searchJira(query, {
+              startAt: issues.lengh,
+              maxResults: opts.limit - issues.length
+            }));
 
           if (result.warningMessages) {
             ErrorHandler.showWarningMessages(result.warningMessages);
@@ -59,15 +46,25 @@ class Query extends Command {
 
   static showIssues(jira, issues, fields) {
     const table = new Table({
-      chars: jira.tableChars,
-      head: ['Key', 'Status', 'Type', 'Summary']
+      head: ['Key', 'Status', 'Type', 'Assignee', 'Summary']
     });
 
-    issues.forEach(issue => table.push([color.blue(issue.key),
-      color.green(issue.fields.status.name),
-      color.green(issue.fields.issuetype.name),
+    issues.forEach(issue => table.addRow([{
+        color: "blue",
+        text: issue.key
+      }, {
+        color: "green",
+        text: issue.fields.status.name
+      }, {
+        color: "green",
+        text: issue.fields.issuetype.name
+      }, {
+        color: "yellow",
+        text: Issue.showUser(issue.fields.assignee)
+      },
       issue.fields.summary
     ]))
+
     console.log(table.toString());
   }
 };

package/src/run.js

@@ -1,6 +1,3 @@
-import color from 'chalk';
-import Table from 'cli-table3';
-
 import Command from './command.js';
 import ErrorHandler from './errorhandler.js';
 import Field from './field.js';
@@ -42,29 +39,17 @@ class Run extends Command {
           return;
         }
 
-        let resultFields;
-        try {
-          resultFields = await Field.listFields(jira);
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-          return;
-        }
+        const resultFields = await Field.listFields(jira);
 
         let expectedResult = opts.limit;
         let issues = [];
 
         while (issues.length < opts.limit) {
-          let result;
-          try {
-            result = await jira.spin('Running query...',
-              jira.api.searchJira(query, {
-                startAt: issues.lengh,
-                maxResults: opts.limit - issues.length
-              }));
-          } catch (e) {
-            ErrorHandler.showError(jira, e);
-            return;
-          }
+          const result = await jira.spin('Running query...',
+            jira.api.searchJira(query, {
+              startAt: issues.lengh,
+              maxResults: opts.limit - issues.length
+            }));
 
           if (result.warningMessages) {
             ErrorHandler.showWarningMessages(result.warningMessages);

package/src/set.js

@@ -1,9 +1,8 @@
-import inquirer from 'inquirer';
-
+import Ask from './ask.js';
 import Command from './command.js';
 import Field from './field.js';
 import Jira from './jira.js';
-import ErrorHandler from './errorhandler.js';
+import User from './user.js';
 
 class Set extends Command {
   addOptions(program) {
@@ -14,46 +13,7 @@ class Set extends Command {
       .argument('<id>', 'The issue ID')
       .action(async id => {
         const jira = new Jira(program);
-
-        const userList = await User.pickUser(jira);
-        const userNames = [];
-        const userIds = [];
-        userList.forEach(user => {
-          if (user.active) {
-            userNames.push(user.displayName);
-            userIds.push(user.accountId);
-          }
-        });
-
-        const assigneeQuestion = [{
-          type: 'list',
-          name: 'assignee',
-          message: 'Assignee:',
-          choices: userNames,
-          filter: name => {
-            const pos = userNames.indexOf(name);
-            return {
-              pos,
-              name,
-              id: userIds[pos]
-            };
-          }
-        }];
-
-        const assigneeAnswer = await inquirer.prompt(assigneeQuestion);
-        const issue = {
-          fields: {
-            assignee: {
-              accountId: assigneeAnswer.assignee.id
-            }
-          }
-        }
-
-        try {
-          await jira.spin('Updating the issue...', jira.api.updateIssue(id, issue));
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-        }
+        await Set.assignIssue(jira, id);
       });
 
     setCmd.command('status')
@@ -61,42 +21,7 @@ class Set extends Command {
       .argument('<id>', 'The issue ID')
       .action(async id => {
         const jira = new Jira(program);
-
-        const transitionList = await jira.spin('Retrieving transitions...', jira.api.listTransitions(id));
-        const transitionNames = [];
-        const transitionIds = [];
-        transitionList.transitions.forEach(transition => {
-          transitionNames.push(transition.name);
-          transitionIds.push(transition.id);
-        });
-
-        const transitionQuestion = [{
-          type: 'list',
-          name: 'transition',
-          message: 'Status:',
-          choices: transitionNames,
-          filter: name => {
-            const pos = transitionNames.indexOf(name);
-            return {
-              pos,
-              name,
-              id: transitionIds[pos]
-            };
-          }
-        }];
-
-        const transitionAnswer = await inquirer.prompt(transitionQuestion);
-
-        const transition = {
-          transition: {
-            id: transitionAnswer.transition.id
-          }
-        };
-        try {
-          await jira.spin('Updating the issue...', jira.api.transitionIssue(id, transition));
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-        }
+        await Set.setStatus(jira, id);
       });
 
     setCmd.command('custom')
@@ -105,34 +30,53 @@ class Set extends Command {
       .argument('<id>', 'The issue ID')
       .action(async (fieldName, id) => {
         const jira = new Jira(program);
+        await Set.setCustomField(jira, fieldName, id);
+      });
+  }
+
+  static async assignIssue(jira, id) {
+    const userList = await User.pickUser(jira);
+    const activeUsers = userList.filter(user => user.active);
+    const assignee = await Ask.askList('Assignee:', activeUsers.map(user => user.displayName));
 
-        const fieldData = await Field.getFieldDataIfSupported(jira, fieldName);
-        if (!fieldData) {
-          console.log("Unsupported field type");
-          return;
+    const issue = {
+      fields: {
+        assignee: {
+          accountId: activeUsers[assignee].accountId
         }
+      }
+    }
 
-        const question = [{
-          type: fieldData.type,
-          name: 'value',
-          message: `${fieldName}:`,
-        }];
+    await jira.spin('Updating the issue...', jira.api.updateIssue(id, issue));
+  }
 
-        const answer = await inquirer.prompt(question);
+  static async setCustomField(jira, fieldName, id) {
+    const field = await Field.askFieldIfSupported(jira, fieldName);
+    if (!field) {
+      console.log("Unsupported field type");
+      return;
+    }
+
+    const data = {};
+    data[field.key] = field.value;
+
+    await jira.spin('Updating the issue...', jira.api.updateIssue(id, {
+      fields: {
+        ...data
+      }
+    }));
+  }
 
-        const data = {};
-        data[fieldData.key] = answer.value;
+  static async setStatus(jira, id) {
+    const transitionList = await jira.spin('Retrieving transitions...', jira.api.listTransitions(id));
+    const transitionPos = await Ask.askList('Status:', transitionList.transitions.map(transition => transition.name));
+    const transition = {
+      transition: {
+        id: transitionList.transitions[transitionPos].id
+      }
+    };
 
-        try {
-          await jira.spin('Updating the issue...', jira.api.updateIssue(id, {
-            fields: {
-              ...data
-            }
-          }));
-        } catch (e) {
-          ErrorHandler.showError(jira, e);
-        }
-      });
+    await jira.spin('Updating the issue...', jira.api.transitionIssue(id, transition));
   }
 };