ran prettier and did some refactoring to add a main file

Author: ajaymathur

.prettierignore

@@ -0,0 +1,2 @@
+.data
+dist

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - '8'
+  - "8"
 cache: yarn
-script: yarn test
+script: yarn test

README.md

@@ -65,7 +65,7 @@ build-stats <service>:<user>/<repo> <command> [...options]
 - `service`: CI Service (`travis` or `bitbucket` or `bamboo`)
 - `user/repo`: Project specifier (Example: `https://travis-ci.org/boltpkg/bolt` &rarr; `boltpkg/bolt`)
 
-**Note: In case for Bamboo, user is the url to the Bamboo server and repo is the plankey of the project.
+\*\*Note: In case for Bamboo, user is the url to the Bamboo server and repo is the plankey of the project.
 
 ### Commands
 

__fixtures__/testRepo/test.js

@@ -1 +1 @@
-// for test support
+// for test support

cli.ts

@@ -1,189 +1,59 @@
 #!/usr/bin/env node
-import meow from 'meow';
-import { calculate, download, history, success, clean, cache } from './index';
+import meow from "meow";
+import main from "./index";
+import Text from "./lib/text";
 
-interface Flags {
-  auth?: string;
-  branch?: string;
-  concurrency: number;
-  json?: boolean;
-  last?: number;
-  period?: number;
-  result?: string;
-  since?: number;
-  threshold?: number;
-}
-
-async function main(argv: string[]) {
+async function cli(argv: string[]) {
   const cli = meow({
     argv,
-    help: `
-      Usage
-        $ build-stats <service>:<user>/<repo> <command> [...opts]
-
-      Commands
-        download         Download history for a repository
-        calculate        Calculate average build time and success rates over time
-        history          List individual builds
-        success          Get quick stats of number of success and failed builds
-        clean            Delete the downloaded history of repository
-        cache            Outputs the directory where data will be cached
-
-      Options
-        --auth        [authentication]  (download)  Authentication to access private repo
-        --concurrency [number]          (download)  How many parallel downloads should be used when downloading data (Default: 10)
-        --since       [buildNumber]     (download)  Overrides the normal logic of which builds to download data for.
-                                                    This should only be required in debugging/fixing errors (Default: last downloaded build)
-        --branch      [name]            (calculate/history) Which branch(es) to display (Comma-separated list) (Default: *)
-        --result      [name]            (calculate/history) Which branch(es) to display (Comma-separated list) (Default: *)
-        --period      [days]            (calculate) How many days in a time period to calculate the means for (Default: 1)
-        --last        [count]           (calculate) How many periods to calculate back to (Default: 30)
-        --threshold   [time]            (calculate) Time under which builds graph is shown in green color. Default is mean of all the builds in that period
-
-      Services
-        - bitbucket      Bitbucket Pipelines
-        - travis         Travis CI
-
-      Examples
-        Download travis builds history to .data folder:
-        $ build-stats travis:boltpkg/bolt download
-
-        Download travis builds history to .data folder for private repository:
-        $ build-stats travis:boltpkg/bolt download --auth <token>
-
-        Download a subset of builds very quickly:
-        $ build-stats travis:boltpkg/bolt download --concurrency=20 --since=300
-
-        Calculate monthly average build time and success rate of a repo over the last year
-        $ build-stats travis:boltpkg/bolt calculate
-
-        Calculate daily average build time and success rate of a repo over the last month
-        $ build-stats travis:boltpkg/bolt calculate --period 1 --last 30
-
-        Calculate daily average build time and success rate of the master branch of a repo over the last 90 days
-        $ build-stats travis:boltpkg/bolt calculate --branch master --period 1 --last 90
-
-        Display build history
-        $ build-stats travis:boltpkg/bolt history
-
-        Display build history for master branch for builds that were either successful or failed
-        $ build-stats travis:boltpkg/bolt history --branch master --result SUCCESSFUL,FAILED
-
-        Display the number of success and failed builds
-        $ build-stats travis:boltpkg/bolt success
-
-        Delete the downloaded history of repository
-        $ build-stats travis:boltpkg/bolt clean
-
-        Output the cache directory of a repository
-        $ build-stats travis:boltpkg/bolt cache
-    `,
+    help: Text.mainText.help,
     flags: {
       auth: {
-        type: 'string'
+        type: "string",
       },
       branch: {
-        type: 'string'
+        type: "string",
       },
       concurrency: {
-        type: 'number',
-        default: 10
+        type: "number",
+        default: 10,
       },
       json: {
-        type: 'boolean'
+        type: "boolean",
       },
       last: {
-        type: 'number'
+        type: "number",
       },
       period: {
-        type: 'number'
+        type: "number",
       },
       since: {
-        type: 'number'
-      }
-    }
+        type: "number",
+      },
+    },
   });
 
   if (cli.input.length < 2) {
     cli.showHelp();
   }
 
-  let match = cli.input[0].match(/(.*):(.*)\/(.*)/);
+  const repoSlug = cli.input[0].match(/(.*):(.*)\/(.*)/);
 
-  if (!match) {
+  if (!repoSlug) {
     throw new Error(
       `Invalid repo "${cli.input[0]}", should be "host:user/repo"`
     );
   }
 
-  let [, host, user, repo]: string[] = match;
-  let command: string = cli.input[1];
-  let flags: Flags = cli.flags;
-  let cwd: string = __dirname;
-
-  if (command === 'download') {
-    await download({
-      cwd,
-      host,
-      user,
-      repo,
-      auth: flags.auth,
-      concurrency: flags.concurrency,
-      since: flags.since
-    });
-  } else if (command === 'calculate') {
-    await calculate({
-      cwd,
-      host,
-      user,
-      repo,
-      branch: flags.branch,
-      result: flags.result,
-      period: flags.period,
-      last: flags.last,
-      threshold: flags.threshold,
-      json: flags.json
-    });
-  } else if (command === 'history') {
-    await history({
-      cwd,
-      host,
-      user,
-      repo,
-      branch: flags.branch,
-      result: flags.result,
-      threshold: flags.threshold,
-      json: flags.json
-    });
-  } else if (command === 'success') {
-    await success({
-      cwd,
-      host,
-      user,
-      repo,
-      branch: flags.branch,
-      result: flags.result,
-      period: flags.period,
-      last: flags.last,
-      json: flags.json
-    });
-  } else if (command === 'clean') {
-    await clean({
-      cwd,
-      host,
-      user,
-      repo
-    });
-  } else if (command === 'cache') {
-    await cache({ cwd, host, user, repo });
-  } else {
-    throw new Error(
-      `Unknown command "${command}", should be "download", "calculate", "history", "success", "clean", "cache"`
-    );
-  }
+  await main({
+    cwd: __dirname,
+    repoSlug,
+    command: cli.input[1],
+    flags: cli.flags,
+  });
 }
 
-main(process.argv.slice(2)).catch(err => {
+cli(process.argv.slice(2)).catch((err) => {
   console.error(err);
   process.exit(1);
 });

index.ts

@@ -1,6 +1,93 @@
-export { default as cache } from './lib/commands/cache';
-export { default as calculate } from './lib/commands/calculate';
-export { default as clean } from './lib/commands/clean';
-export { default as download } from './lib/commands/download';
-export { default as history } from './lib/commands/history';
-export { default as success } from './lib/commands/success';
+import { default as cache } from "./lib/commands/cache";
+import { default as calculate } from "./lib/commands/calculate";
+import { default as clean } from "./lib/commands/clean";
+import { default as download } from "./lib/commands/download";
+import { default as history } from "./lib/commands/history";
+import { default as success } from "./lib/commands/success";
+import { flagsEnum, MainTypes } from "./types";
+import pick from "lodash.pick";
+
+export default async function main({
+  command,
+  repoSlug,
+  flags,
+  cwd,
+}: MainTypes) {
+  let [, host, user, repo]: string[] = repoSlug;
+
+  switch (command) {
+    case "download":
+      await download({
+        cwd,
+        host,
+        user,
+        repo,
+        ...pick(flags, [
+          flagsEnum.auth,
+          flagsEnum.concurrency,
+          flagsEnum.since,
+        ]),
+      });
+      break;
+    case "calculate":
+      await calculate({
+        cwd,
+        host,
+        user,
+        repo,
+        ...pick(flags, [
+          flagsEnum.branch,
+          flagsEnum.result,
+          flagsEnum.period,
+          flagsEnum.last,
+          flagsEnum.threshold,
+          flagsEnum.json,
+        ]),
+      });
+      break;
+    case "history":
+      await history({
+        cwd,
+        host,
+        user,
+        repo,
+        ...pick(flags, [
+          flagsEnum.branch,
+          flagsEnum.result,
+          flagsEnum.threshold,
+          flagsEnum.json,
+        ]),
+      });
+      break;
+    case "success":
+      await success({
+        cwd,
+        host,
+        user,
+        repo,
+        ...pick(flags, [
+          flagsEnum.branch,
+          flagsEnum.result,
+          flagsEnum.period,
+          flagsEnum.last,
+          flagsEnum.json,
+        ]),
+      });
+      break;
+    case "clean":
+      await clean({
+        cwd,
+        host,
+        user,
+        repo,
+      });
+      break;
+    case "cache":
+      await cache({ cwd, host, user, repo });
+      break;
+    default:
+      throw new Error(
+        `Unknown command "${command}", should be "download", "calculate", "history", "success", "clean", "cache"`
+      );
+  }
+}

lib/adapters/bamboo.ts

@@ -4,9 +4,7 @@ import got from "got";
 import ora from "ora";
 import path from "path";
 import * as fs from "../utils/fs";
-import {
-  getLastDownloadedBuildNumber
-} from "../utils/builds";
+import { getLastDownloadedBuildNumber } from "../utils/builds";
 
 /**
  * URL for build -> curl --user <userName>:<password> https://<url-to-bamboo>/rest/api/latest/result/<ProjectKey-<BuildKey>-latest.json
@@ -19,7 +17,7 @@ function toStandardBuildConfig(build) {
     duration: build.buildDurationInSeconds,
     result: build.buildState && build.buildState.toUpperCase(),
     refType: "not available",
-    refName: "master"
+    refName: "master",
   };
 }
 
@@ -31,7 +29,7 @@ async function getTotalBuilds(bambooUrl, planKey, auth) {
   // const bambooLatestBuild = `${bambooBuildUrl}.json?max-result=0`;
   const bambooLatestBuild = `${bambooBuildUrl}-latest.json`;
   let res = await got(bambooLatestBuild, {
-    auth
+    auth,
   });
   let resJson = JSON.parse(res.body);
   return resJson.buildNumber;
@@ -60,10 +58,7 @@ export default async function bambooBuilds(
    */
 
   // Get data for all the available buils
-  let urlGetAllBuilds = `${bambooApiUrl(
-    bambooUrl,
-    planKey
-  )}.json?max-result=0`;
+  let urlGetAllBuilds = `${bambooApiUrl(bambooUrl, planKey)}.json?max-result=0`;
 
   let res = await got(urlGetAllBuilds, { auth });
   let resJson = JSON.parse(res.body);
@@ -73,7 +68,7 @@ export default async function bambooBuilds(
     limit(async () => {
       let build = toStandardBuildConfig(buildData);
       let filePath = path.join(buildsDir, `${build.id}.json`);
-  
+
       downloaded += 1;
       spinner.text = chalk`Downloaded data for {green ${downloaded}} builds of {green ${totalBuilds}} builds`;
       downloadHook && downloadHook(downloaded, totalBuilds);