INO-101: Fix generating release version name

Author: gr-miroslava-filcakova

src/SourceControl.js

@@ -45,29 +45,17 @@ export default class SourceControl {
    * Return top-level commit logs for a range.
    * Commits which were the result of a merge are nested under `<log>.graph.merged`.
    *
-   * @param {String} dir The source control workspace directory.
+   * @param {String} workspaceDir The source control workspace directory.
    * @param {Object} range An object defining the range boundaries (see above)
    *
-   * @return {Promsie} Resolves to a list of top-level commit objects
+   * @return {Promise} Resolves to a list of top-level commit objects
    */
   async getCommitLogs(workspaceDir, range) {
     const workspace = git(workspaceDir);
     if (this.slack.isEnabled()) {
       await this.slack.getSlackUsers()
     }
 
-    if (Object.keys(range).length < 2) {
-      await workspace.tags((e, tags) => {
-        console.log(tags.length)
-        if (tags.all.length > 1) {
-          range.from = tags.all[tags.all.length - 2]
-          range.to = tags.all[tags.all.length - 1]
-        } else {
-          throw new Error('No range defined for the changelog.');
-        }
-      })
-    }
-
     return new Promise((resolve, reject) => {
 
       const opts = {
@@ -124,7 +112,7 @@ export default class SourceControl {
    * reverts and confirm the diff is exactly the opposite, but that might be overkill.
    *
    * @param {Object} log - A single commit log objedt
-   * @return {String or null} - The reverted sha or null if it is not a revert
+   * @return {String | null} - The reverted sha or null if it is not a revert
    */
   isRevert(log) {
     const oneLine = log.fullText.replace(/\n/g, ' ').trim();
@@ -280,7 +268,7 @@ export default class SourceControl {
     const commits = [ ...graph ];
 
     commits.forEach((item) => {
-      let { summary, fullText } = item;
+      let { fullText } = item;
 
       item.graph.merged.forEach((merged) => {
         // Skip reverted commits

src/cli.js

@@ -17,6 +17,7 @@ import { generateTemplateData, renderTemplate } from './template';
 import {readConfigFile} from './Config';
 import SourceControl from './SourceControl';
 import Jira from './Jira';
+import git from "simple-git";
 
 /**
  * Parse command line arguments
@@ -67,10 +68,11 @@ async function runProgram() {
     gitPath = path.resolve(gitPath);
 
     const config = readConfigFile(gitPath);
+    config.gitPath = gitPath;
     const jira = new Jira(config);
     const source = new SourceControl(config);
 
-    const range = getRangeObject(config, options);
+    const range = await getRangeObject(config, options);
 
     // Release flag used, but no name passed
     if (options.release === true) {
@@ -182,9 +184,10 @@ export function parseRange(rangeStr) {
  * Construct the range object from the CLI arguments and config
  *
  * @param {Object} config - The config object provided by Config.getConfigForPath
+ * @param {Object} options - Command line arguments parsed in options object
  * @return {Object}
  */
-function getRangeObject(config, options) {
+async function getRangeObject(config, options) {
   const range = {};
   const defaultRange = (config.sourceControl && config.sourceControl.defaultRange) ? config.sourceControl.defaultRange : {};
 
@@ -203,9 +206,19 @@ function getRangeObject(config, options) {
     Object.assign(range, defaultRange);
   }
 
-  // if (!Object.keys(range).length){
-  //     throw new Error('No range defined for the changelog.');
-  // }
+  if (Object.keys(range).length < 2) {
+    const workspace = git(config.gitPath);
+    await workspace.tags((e, tags) => {
+      if (tags.all.length > 1) {
+        range.from = tags.all[tags.all.length - 2]
+        range.to = tags.all[tags.all.length - 1]
+      }
+    })
+  }
+
+  if (!Object.keys(range).length){
+      throw new Error('No range defined for the changelog.');
+  }
 
   // Ensure symmetric is explicitly set
   range.symmetric = !!range.symmetric;