From e3b84af278a0029b54237d48663711c9a2b003e2 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 10 Jun 2016 00:53:30 +0200 Subject: [PATCH] now stating npmts version --- dist/index.js | 4 ++++ dist/npmts.jsdoc.js | 28 ---------------------------- dist/npmts.paths.js | 3 +++ dist/npmts.publish.js | 6 +----- ts/index.ts | 5 +++++ ts/npmts.jsdoc.ts | 35 ----------------------------------- ts/npmts.paths.ts | 5 +++++ ts/npmts.plugins.ts | 6 +++--- ts/npmts.publish.ts | 6 +----- 9 files changed, 22 insertions(+), 76 deletions(-) diff --git a/dist/index.js b/dist/index.js index 940a7cd..c517b51 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,11 +1,15 @@ "use strict"; require("typings-global"); +// start early and load modules var early = require("early"); early.start("NPMTS"); var plugins = require("./npmts.plugins"); +var paths = require("./npmts.paths"); var npmts_promisechain_1 = require("./npmts.promisechain"); early.stop(); plugins.beautylog.figletSync("NPMTS"); +var projectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot); +plugins.beautylog.info("npmts version: " + projectInfo.version); try { npmts_promisechain_1.promisechain(); } diff --git a/dist/npmts.jsdoc.js b/dist/npmts.jsdoc.js index 1014905..1e3278c 100644 --- a/dist/npmts.jsdoc.js +++ b/dist/npmts.jsdoc.js @@ -20,34 +20,6 @@ var genJsdoc = function (configArg) { })); return done.promise; }; -exports.publishDocs = function (configArg) { - var done = plugins.Q.defer(); - var gitUrl = plugins.projectinfo.npm(paths.cwd, { - gitAccessToken: process.env.GITHUB_TOKEN - }).git.httpsUrl; - var deployScript = "" - + "cd " + paths.docsDir + " " - + "&& git init " + "> /dev/null 2>&1 " - + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 " - + "&& git config user.email \"travis@shipzone.io\" " + "> /dev/null 2>&1 " - + "&& git add . " + "> /dev/null 2>&1 " - + "&& git commit -m \"Deploy to GitHub Pages\" " + "> /dev/null 2>&1 " - + "&& git push --force --quiet " - + "\"" + gitUrl + "\" " - + "master:gh-pages " + "> /dev/null 2>&1"; - plugins.beautylog.log("now publishing JsDoc documentation to GitHub"); - if (!plugins.shelljs.which('git')) { - plugins.beautylog.error('Git is not installed!'); - plugins.shelljs.exit(1); - } - else if (plugins.shelljs.exec(deployScript).code !== 0) { - plugins.beautylog.error('Git failed!'); - plugins.shelljs.exit(1); - } - plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!"); - done.resolve(configArg); - return done.promise; -}; exports.run = function (configArg) { var done = plugins.Q.defer(); genJsdoc(configArg) diff --git a/dist/npmts.paths.js b/dist/npmts.paths.js index d691de5..234c656 100644 --- a/dist/npmts.paths.js +++ b/dist/npmts.paths.js @@ -1,6 +1,9 @@ "use strict"; require("typings-global"); var plugins = require("./npmts.plugins"); +//Npmts Paths +exports.npmtsPackageRoot = plugins.path.join(__dirname, "../"); +//Project paths exports.cwd = plugins.smartcli.get.cwd().path; //Directories exports.tsDir = plugins.path.join(exports.cwd, "ts/"); diff --git a/dist/npmts.publish.js b/dist/npmts.publish.js index 211ec15..7fd7892 100644 --- a/dist/npmts.publish.js +++ b/dist/npmts.publish.js @@ -1,13 +1,9 @@ "use strict"; require("typings-global"); var plugins = require("./npmts.plugins"); -var NpmtsJsdoc = require("./npmts.jsdoc"); exports.run = function (configArg) { var done = plugins.Q.defer(); var config = configArg; - var promiseArray = []; - config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void (0); - promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void (0); - plugins.Q.all(promiseArray).then(done.resolve); + done.resolve(); return done.promise; }; diff --git a/ts/index.ts b/ts/index.ts index 7b0a292..98d3552 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,11 +1,16 @@ import "typings-global"; + +// start early and load modules import * as early from "early"; early.start("NPMTS"); import * as plugins from "./npmts.plugins" +import * as paths from "./npmts.paths"; import {promisechain} from "./npmts.promisechain"; early.stop(); plugins.beautylog.figletSync("NPMTS"); +let projectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot); +plugins.beautylog.info("npmts version: " + projectInfo.version); try { promisechain(); diff --git a/ts/npmts.jsdoc.ts b/ts/npmts.jsdoc.ts index e5c492e..42717e7 100644 --- a/ts/npmts.jsdoc.ts +++ b/ts/npmts.jsdoc.ts @@ -21,41 +21,6 @@ let genJsdoc = function(configArg){ return done.promise; }; -export let publishDocs = function(configArg){ - let done = plugins.Q.defer(); - let gitUrl = plugins.projectinfo.npm( - paths.cwd, - { - gitAccessToken:process.env.GITHUB_TOKEN - } - ).git.httpsUrl; - - let deployScript = "" - + "cd " + paths.docsDir + " " - + "&& git init " + "> /dev/null 2>&1 " - + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 " - + "&& git config user.email \"travis@shipzone.io\" " + "> /dev/null 2>&1 " - + "&& git add . " + "> /dev/null 2>&1 " - + "&& git commit -m \"Deploy to GitHub Pages\" " + "> /dev/null 2>&1 " - + "&& git push --force --quiet " - + "\"" + gitUrl + "\" " - + "master:gh-pages " + "> /dev/null 2>&1"; - - - plugins.beautylog.log("now publishing JsDoc documentation to GitHub"); - if (!plugins.shelljs.which('git')) { - plugins.beautylog.error('Git is not installed!'); - plugins.shelljs.exit(1); - } else if (plugins.shelljs.exec(deployScript).code !== 0) { - plugins.beautylog.error('Git failed!'); - plugins.shelljs.exit(1); - } - plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!"); - done.resolve(configArg); - - return done.promise; -}; - export let run = function(configArg){ let done = plugins.Q.defer(); diff --git a/ts/npmts.paths.ts b/ts/npmts.paths.ts index f7d8b05..2130de7 100644 --- a/ts/npmts.paths.ts +++ b/ts/npmts.paths.ts @@ -1,6 +1,11 @@ import "typings-global"; import plugins = require("./npmts.plugins"); +//Npmts Paths +export let npmtsPackageRoot = plugins.path.join(__dirname,"../"); + + +//Project paths export let cwd = plugins.smartcli.get.cwd().path; //Directories diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts index c2c7b48..c0f96f7 100644 --- a/ts/npmts.plugins.ts +++ b/ts/npmts.plugins.ts @@ -15,15 +15,15 @@ export let g = { }; export let lodashObject = require('lodash/fp/object'); export let merge2 = require("merge2"); -export let projectinfo = require("projectinfo"); +export import projectinfo = require("projectinfo"); export let path = require("path"); export let Q = require("q"); export let shelljs = require("shelljs"); export let smartci = require("smartci"); export let smartcli = require("smartcli"); export let smartcov = require("smartcov"); -export let smartenv = require("smartenv"); -export let smartfile = require("smartfile"); +export import smartenv = require("smartenv"); +export import smartfile = require("smartfile"); export import smartpath = require("smartpath"); export import smartstring = require("smartstring"); export let sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing \ No newline at end of file diff --git a/ts/npmts.publish.ts b/ts/npmts.publish.ts index cad82db..36c0330 100644 --- a/ts/npmts.publish.ts +++ b/ts/npmts.publish.ts @@ -6,10 +6,6 @@ import NpmtsJsdoc = require("./npmts.jsdoc"); export let run = function(configArg){ let done = plugins.Q.defer(); let config = configArg; - let promiseArray = []; - config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void(0); - promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void(0); - - plugins.Q.all(promiseArray).then(done.resolve); + done.resolve(); return done.promise; }; \ No newline at end of file