From 69742fd6a76498a0fbb3424eb3879158ba792992 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Thu, 6 Oct 2016 21:03:30 +0200 Subject: [PATCH] moved cli into its own file --- assets/cliNpmts.js | 2 +- dist/cli.js | 2 -- dist/index.js | 15 +++------------ dist/npmts.cli.d.ts | 3 +++ dist/npmts.cli.js | 19 +++++++++++++++++++ ts/index.ts | 16 +++------------- ts/npmts.cli.ts | 19 +++++++++++++++++++ 7 files changed, 48 insertions(+), 28 deletions(-) delete mode 100644 dist/cli.js create mode 100644 dist/npmts.cli.d.ts create mode 100644 dist/npmts.cli.js create mode 100644 ts/npmts.cli.ts diff --git a/assets/cliNpmts.js b/assets/cliNpmts.js index 99c7383..222d89a 100644 --- a/assets/cliNpmts.js +++ b/assets/cliNpmts.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -var index = require("../dist/index.js"); \ No newline at end of file +var index = require("../dist/index.js"); diff --git a/dist/cli.js b/dist/cli.js deleted file mode 100644 index c9808e7..0000000 --- a/dist/cli.js +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env node -var index = require("../{{pathToIndex}}"); \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index f199f56..ad97f3d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6,18 +6,9 @@ const early = require("early"); early.start('NPMTS'); const plugins = require("./npmts.plugins"); -const paths = require("./npmts.paths"); -const promisechain = require("./npmts.promisechain"); +const cli = require("./npmts.cli"); early.stop() .then(() => { - let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot); - let npmtsCli = new plugins.smartcli.Smartcli(); - npmtsCli.standardTask() - .then((argvArg) => { - plugins.beautylog.figletSync('NPMTS'); - plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version); - promisechain.run(argvArg).catch((err) => { console.log(err); }); - }); - npmtsCli.addVersion(npmtsProjectInfo.version); - npmtsCli.startParse(); + let loaded = plugins; // to make sure plugins get actually loaded + cli.run(); }); diff --git a/dist/npmts.cli.d.ts b/dist/npmts.cli.d.ts new file mode 100644 index 0000000..138ced2 --- /dev/null +++ b/dist/npmts.cli.d.ts @@ -0,0 +1,3 @@ +/// +import * as q from 'q'; +export declare let run: () => q.Promise<{}>; diff --git a/dist/npmts.cli.js b/dist/npmts.cli.js new file mode 100644 index 0000000..3598d7d --- /dev/null +++ b/dist/npmts.cli.js @@ -0,0 +1,19 @@ +"use strict"; +const plugins = require("./npmts.plugins"); +const paths = require("./npmts.paths"); +const promisechain = require("./npmts.promisechain"); +const q = require("q"); +exports.run = () => { + let done = q.defer(); + let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot); + let npmtsCli = new plugins.smartcli.Smartcli(); + npmtsCli.standardTask() + .then((argvArg) => { + plugins.beautylog.figletSync('NPMTS'); + plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version); + promisechain.run(argvArg).catch((err) => { console.log(err); }); + }); + npmtsCli.addVersion(npmtsProjectInfo.version); + npmtsCli.startParse(); + return done.promise; +}; diff --git a/ts/index.ts b/ts/index.ts index 400131e..c1fba09 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -6,19 +6,9 @@ import * as early from 'early' early.start('NPMTS') import * as plugins from './npmts.plugins' -import * as paths from './npmts.paths' -import * as promisechain from './npmts.promisechain' +import * as cli from './npmts.cli' early.stop() .then(() => { - let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot) - let npmtsCli = new plugins.smartcli.Smartcli() - npmtsCli.standardTask() - .then((argvArg) => { - plugins.beautylog.figletSync('NPMTS') - plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version) - promisechain.run(argvArg).catch((err) => { console.log(err) }) - }) - - npmtsCli.addVersion(npmtsProjectInfo.version) - npmtsCli.startParse() + let loaded = plugins // to make sure plugins get actually loaded + cli.run() }) diff --git a/ts/npmts.cli.ts b/ts/npmts.cli.ts new file mode 100644 index 0000000..055cad0 --- /dev/null +++ b/ts/npmts.cli.ts @@ -0,0 +1,19 @@ +import * as plugins from './npmts.plugins' +import * as paths from './npmts.paths' +import * as promisechain from './npmts.promisechain' +import * as q from 'q' + +export let run = () => { + let done = q.defer() + let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot) + let npmtsCli = new plugins.smartcli.Smartcli() + npmtsCli.standardTask() + .then((argvArg) => { + plugins.beautylog.figletSync('NPMTS') + plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version) + promisechain.run(argvArg).catch((err) => { console.log(err) }) + }) + npmtsCli.addVersion(npmtsProjectInfo.version) + npmtsCli.startParse() + return done.promise +}