Compare commits

...

10 Commits

Author SHA1 Message Date
a48f8b9c54 2.1.56 2016-06-11 21:14:25 +02:00
b8079e0bc9 now correctly adding spaces in wrapped commands 2016-06-11 21:14:20 +02:00
61c00f31ea 2.1.55 2016-06-11 21:02:05 +02:00
7fc8648d40 now detects wrapped command correctly 2016-06-11 21:01:44 +02:00
973c55e147 2.1.54 2016-06-11 20:45:01 +02:00
a3523ad7c4 fixed command 2016-06-11 20:44:56 +02:00
216c28d76e 2.1.53 2016-06-11 20:30:41 +02:00
b22b2fa802 fix npmci command 2016-06-11 20:30:35 +02:00
e81592ae38 2.1.52 2016-06-11 20:22:05 +02:00
b3572d512d now using npmts-g 2016-06-11 20:22:00 +02:00
6 changed files with 55 additions and 4 deletions

9
dist/index.js vendored

File diff suppressed because one or more lines are too long

2
dist/npmci.command.d.ts vendored Normal file
View File

@@ -0,0 +1,2 @@
import "typings-global";
export declare let command: () => any;

19
dist/npmci.command.js vendored Normal file
View File

@@ -0,0 +1,19 @@
"use strict";
require("typings-global");
var plugins = require("./npmci.plugins");
var npmci_bash_1 = require("./npmci.bash");
exports.command = function () {
var done = plugins.q.defer();
var wrappedCommand = "";
var argvArray = process.argv;
for (var i = 3; i < argvArray.length; i++) {
wrappedCommand = wrappedCommand + argvArray[i];
if (i + 1 != argvArray.length)
wrappedCommand = wrappedCommand + " ";
}
npmci_bash_1.bash(wrappedCommand);
done.resolve();
return done.promise;
};
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUV2QixlQUFPLEdBQUc7SUFDakIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLGNBQWMsR0FBVSxFQUFFLENBQUM7SUFDL0IsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztJQUM3QixHQUFHLENBQUEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUMsQ0FBQztRQUN0QyxjQUFjLEdBQUcsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMvQyxFQUFFLENBQUEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUM7WUFBQyxjQUFjLEdBQUcsY0FBYyxHQUFHLEdBQUcsQ0FBQztJQUN4RSxDQUFDO0lBQ0QsaUJBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUNyQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kuY29tbWFuZC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xuXG5leHBvcnQgbGV0IGNvbW1hbmQgPSAoKSA9PiB7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKVxuICAgIGxldCB3cmFwcGVkQ29tbWFuZDpzdHJpbmcgPSBcIlwiO1xuICAgIGxldCBhcmd2QXJyYXkgPSBwcm9jZXNzLmFyZ3Y7XG4gICAgZm9yKGxldCBpID0gMzsgaSA8IGFyZ3ZBcnJheS5sZW5ndGg7IGkrKyl7XG4gICAgICAgIHdyYXBwZWRDb21tYW5kID0gd3JhcHBlZENvbW1hbmQgKyBhcmd2QXJyYXlbaV07XG4gICAgICAgIGlmKGkgKyAxICE9IGFyZ3ZBcnJheS5sZW5ndGgpIHdyYXBwZWRDb21tYW5kID0gd3JhcHBlZENvbW1hbmQgKyBcIiBcIjsgXG4gICAgfVxuICAgIGJhc2god3JhcHBlZENvbW1hbmQpO1xuICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgIHJldHVybiBkb25lLnByb21pc2Vcbn0iXX0=

View File

@@ -1,6 +1,6 @@
{ {
"name": "npmci", "name": "npmci",
"version": "2.1.51", "version": "2.1.56",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
@@ -20,7 +20,7 @@
}, },
"homepage": "https://gitlab.com/pushrocks/npmci#README", "homepage": "https://gitlab.com/pushrocks/npmci#README",
"devDependencies": { "devDependencies": {
"npmts": "^5.3.0", "npmts-g": "^5.2.6",
"should": "^9.0.1", "should": "^9.0.1",
"typings-test": "^1.0.1" "typings-test": "^1.0.1"
}, },

View File

@@ -6,6 +6,7 @@ let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
plugins.beautylog.log("npmci version: " + npmciInfo.version); plugins.beautylog.log("npmci version: " + npmciInfo.version);
import {build} from "./npmci.build" import {build} from "./npmci.build"
import {command as command2} from "./npmci.command";
import {install} from "./npmci.install"; import {install} from "./npmci.install";
import {publish} from "./npmci.publish"; import {publish} from "./npmci.publish";
import {prepare} from "./npmci.prepare"; import {prepare} from "./npmci.prepare";
@@ -19,7 +20,7 @@ export {install} from "./npmci.install";
export {publish} from "./npmci.publish"; export {publish} from "./npmci.publish";
let command; let command;
let commandOption; let commandOption:string;
plugins.commander plugins.commander
.arguments('<commandarg> [commandoptionarg]') .arguments('<commandarg> [commandoptionarg]')
@@ -40,6 +41,10 @@ switch (command){
build(commandOption) build(commandOption)
.then(NpmciEnv.configStore); .then(NpmciEnv.configStore);
break; break;
case "command":
command2()
.then(NpmciEnv.configStore);
break;
case "install": case "install":
install(commandOption) install(commandOption)
.then(NpmciEnv.configStore);; .then(NpmciEnv.configStore);;
@@ -60,6 +65,8 @@ switch (command){
trigger(); trigger();
break; break;
default: default:
plugins.beautylog.error("command " + commandOption.blue + " not recognised");
process.exit(1);
break; break;
} }

16
ts/npmci.command.ts Normal file
View File

@@ -0,0 +1,16 @@
import "typings-global";
import * as plugins from "./npmci.plugins";
import {bash} from "./npmci.bash";
export let command = () => {
let done = plugins.q.defer()
let wrappedCommand:string = "";
let argvArray = process.argv;
for(let i = 3; i < argvArray.length; i++){
wrappedCommand = wrappedCommand + argvArray[i];
if(i + 1 != argvArray.length) wrappedCommand = wrappedCommand + " ";
}
bash(wrappedCommand);
done.resolve();
return done.promise
}