Compare commits

...

40 Commits

Author SHA1 Message Date
964e1ce9ac 5.2.0 2016-06-03 16:43:56 +02:00
fba6e3d4c5 remove codecov 2016-06-03 16:43:46 +02:00
7df51bad07 Merge branch 'master' of gitlab.com:pushrocks/npmts 2016-06-02 13:11:14 +02:00
5c7af1e59f 5.1.20 2016-06-02 13:09:28 +02:00
e72f7fe5c6 Update .gitlab-ci.yml 2016-05-31 17:04:35 +00:00
da48b987ba update gitlab ci yml 2016-05-30 07:49:41 +02:00
9eabac7022 update gitlab yml 2016-05-30 07:30:01 +02:00
00683fbab1 fix gitlab.yml 2016-05-30 07:16:30 +02:00
3434bbf815 add pages to gitlab.yml 2016-05-30 07:05:17 +02:00
85ac242627 5.1.19 2016-05-30 05:44:40 +02:00
9b71872d12 Merge branch 'master' of gitlab.com:pushrocks/npmts 2016-05-30 05:44:21 +02:00
281595f8c8 update gitlab ci and use npmci 2016-05-30 05:42:24 +02:00
83f03994a9 Add contribution guide 2016-05-29 19:24:59 +00:00
01837f8420 Add changelog 2016-05-29 19:23:11 +00:00
b5735e3721 update .gitlab-ci.yml 2016-05-29 21:04:44 +02:00
0dc45f1414 improved GitLab compatibility 2016-05-29 20:56:53 +02:00
9d1c3f7457 disable codecov upload for now 2016-05-29 09:58:21 +02:00
017279730a Update README.md 2016-05-27 12:44:15 +00:00
0b50b14146 5.1.18 2016-05-27 01:00:25 +02:00
dfa27c0604 fix package.json 2016-05-27 01:00:19 +02:00
19e839a282 add .npmignore 2016-05-27 00:59:17 +02:00
647e2ec886 5.1.17 2016-05-26 23:56:02 +02:00
4e267850bf update repo URL 2016-05-26 23:55:57 +02:00
a52f6a9e9b 5.1.16 2016-05-26 23:34:00 +02:00
23b0ee1472 update gitlab.yml 2016-05-26 23:33:34 +02:00
c4d58b047c fix doPublish error 2016-05-26 22:53:59 +02:00
403b530a60 update ci-yml 2016-05-26 22:45:40 +02:00
7d6caaafce fix gitlab ci 2016-05-26 22:41:06 +02:00
8f47b95220 update ci 2016-05-26 22:38:23 +02:00
375d5cdfcc update ci yml 2016-05-26 22:37:13 +02:00
a3b1391b86 update gitlab ci 2016-05-26 21:21:35 +02:00
d2f5a81cfb update gitlab ci 2016-05-26 21:19:41 +02:00
2bc2d11a2d add gitlab ci 2016-05-26 21:18:14 +02:00
ecf0666103 5.1.15 2016-05-25 06:59:39 +02:00
ad05144bba update smartstring 2016-05-25 06:59:33 +02:00
1e77aba991 5.1.14 2016-05-25 05:24:05 +02:00
bb6c07845c update to typings-global 2016-05-25 05:23:48 +02:00
079b049a10 update dependencies 2016-05-25 05:14:56 +02:00
94f48afbbd 5.1.13 2016-05-23 05:34:30 +02:00
944e9b227c deactivate typings clean for now until nodehash is implemented 2016-05-23 05:34:25 +02:00
35 changed files with 131 additions and 86 deletions

43
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,43 @@
image: hosttoday/ht-docker-node:latest
stages:
- test
- release
- page
testLTS:
stage: test
script:
- npmci test lts
tags:
- docker
testSTABLE:
stage: test
script:
- npmci test stable
tags:
- docker
release:
stage: release
script:
- npmci publish
only:
- tags
tags:
- docker
pages:
stage: page
script:
- npmci test lts
- mkdir .public
- cp -r test/assets/docs/ .public
- cp -r test/assets/coverage/ .public
- mv .public public
artifacts:
paths:
- public
only:
- master

View File

@ -1,6 +1,6 @@
.idea/
support
compile
compile/
coverage/
test/
docs/
examples

7
CHANGELOG Normal file
View File

@ -0,0 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 6.0.0 (unreleased)
- handle bithound
- check package.json
- check .gitlab-ci-yml
- check appveyor.yml

4
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,4 @@
# Contribution Guide
This module is developed on the fabulous GitLab.com:
https://gitlab.com/pushrocks/npmts

View File

@ -2,8 +2,8 @@
Write npm modules with TypeScript without hassle.
## Status
[![Build Status](https://travis-ci.org/pushrocks/npmts.svg?branch=master)](https://travis-ci.org/pushrocks/npmts)
[![Build status](https://ci.appveyor.com/api/projects/status/iiljwhhcvbuqyvq0?svg=true)](https://ci.appveyor.com/project/philkunz/npmts)
[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
[![Build status](https://ci.appveyor.com/api/projects/status/22fuqa0uv21rcjh4/branch/master?svg=true)](https://ci.appveyor.com/project/philkunz/npmts/branch/master)
[![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts)
[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm)
[![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts)
@ -51,7 +51,10 @@ the npmts.json is the main config file. You can use it to customize the behaviou
```json
{
"mode":"default",
"codecov":true,
"codecov":{
"publish":true,
"token":"sometoken"
},
"ts":{
"./customdir/*.ts":"./"
},

2
dist/index.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var early = require("early");
early.start("NPMTS");
var plugins = require("./npmts.plugins");

View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain");

10
dist/npmts.clean.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain");
@ -8,8 +8,14 @@ var removeDist = function () {
return plugins.smartfile.fsaction.remove(paths.distDir);
};
var removeTypings = function () {
var done = plugins.Q.defer();
npmts_promisechain_1.npmtsOra.text("cleaning " + "typings".yellow + " folder");
return plugins.smartfile.fsaction.remove(paths.typingsDir);
if (false) {
}
else {
done.resolve();
}
return done.promise;
};
exports.run = function (configArg) {
npmts_promisechain_1.npmtsOra.text("cleaning up from previous builds...");

3
dist/npmts.cli.js vendored
View File

@ -1 +1,2 @@
/// <reference path="./typings/index.d.ts" />
"use strict";
require("typings-global");

View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
var helpers = require("./npmts.compile.helpers");

View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
exports.run = function () {

View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain");

2
dist/npmts.jsdoc.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain");

14
dist/npmts.options.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var npmts_promisechain_1 = require("./npmts.promisechain");
exports.isCi = function () {
@ -10,8 +10,13 @@ exports.isRelease = function () {
&& plugins.smartci.check.isTaggedCommit();
};
exports.doPublish = function () {
return exports.isRelease()
&& plugins.smartci.get.subJobNumber() == 1;
try {
return exports.isRelease()
&& plugins.smartci.get.subJobNumber() == 1;
}
catch (err) {
return false;
}
};
exports.run = function (configArg) {
var done = plugins.Q.defer();
@ -36,9 +41,6 @@ exports.run = function (configArg) {
: plugins.beautylog.info("NOT A RELEASE build!");
exports.isRelease() && exports.doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!")
: plugins.beautylog.info("We are not publishing anything!");
// handle coveralls
config.codecov ? void (0) : config.codecov = true;
exports.isCi() ? void (0) : config.codecov = false;
config.coverageTreshold ? void (0) : config.coverageTreshold = 70;
// handle docs
config.docs ? void (0) : config.docs = {};

2
dist/npmts.paths.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
exports.cwd = plugins.smartcli.get.cwd().path;
//Directories

View File

@ -1,10 +1,9 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
exports.beautylog = require("beautylog");
exports.fs = require("fs-extra");
exports.gulp = require("gulp");
exports.g = {
codecov: require("gulp-codecov"),
gFunction: require("gulp-function"),
istanbul: require("gulp-istanbul"),
jsdoc3: require("gulp-jsdoc3"),

View File

@ -1,5 +1,5 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
exports.npmtsOra = new plugins.beautylog.Ora("setting up TaskChain", "cyan");
exports.npmtsOra.start();

View File

@ -1,13 +1,11 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var NpmtsTests = require("./npmts.tests");
var NpmtsJsdoc = require("./npmts.jsdoc");
exports.run = function (configArg) {
var done = plugins.Q.defer();
var config = configArg;
var promiseArray = [];
config.codecov ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void (0);
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);

13
dist/npmts.tests.js vendored
View File

@ -1,19 +1,8 @@
"use strict";
/// <reference path="./typings/index.d.ts" />
require("typings-global");
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain");
exports.publishCoverage = function (configArg) {
var done = plugins.Q.defer();
plugins.beautylog.log("now uploading coverage data to codecov.io");
var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
.pipe(plugins.g.codecov())
.pipe(plugins.g.gFunction(function () {
plugins.beautylog.ok("Coverage data has been uploaded to codecov.io!");
done.resolve(configArg);
}, "atEnd"));
return done.promise;
};
/**
*
* @returns {*}

View File

@ -1,6 +1,6 @@
{
"name": "npmts",
"version": "5.1.12",
"version": "5.2.0",
"description": "write npm modules with TypeScript",
"main": "dist/index.js",
"bin": {
@ -13,7 +13,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/pushrocks/npmts.git"
"url": "git+https://gitlab.com/pushrocks/npmts.git"
},
"keywords": [
"TypeScript",
@ -22,15 +22,14 @@
"author": "Lossless Digital UG (haftungsbeschraenkt)",
"license": "MIT",
"bugs": {
"url": "https://github.com/pushrocks/npmts/issues"
"url": "https://gitlab.com/pushrocks/npmts/issues"
},
"homepage": "https://github.com/pushrocks/npmts#readme",
"homepage": "https://gitlab.com/pushrocks/npmts#readme",
"dependencies": {
"beautylog": "5.0.5",
"beautylog": "5.0.6",
"early": "^2.0.1",
"fs-extra": "^0.30.0",
"gulp": "3.9.1",
"gulp-codecov": "^2.0.1",
"gulp-concat": "^2.6.0",
"gulp-function": "^1.3.1",
"gulp-if": "^2.0.1",
@ -41,7 +40,7 @@
"gulp-sourcemaps": "^2.0.0-alpha",
"gulp-typescript": "2.13.4",
"gulp-typings": "2.0.0",
"lodash": "^4.12.0",
"lodash": "^4.13.1",
"merge2": "1.0.2",
"projectinfo": "1.0.1",
"q": "^1.4.1",
@ -50,10 +49,11 @@
"smartcli": "0.0.11",
"smartcov": "0.0.6",
"smartenv": "1.2.5",
"smartfile": "3.0.7",
"smartfile": "3.0.10",
"smartpath": "3.2.1",
"smartstring": "^1.0.3",
"source-map-support": "^0.4.0"
"smartstring": "^2.0.1",
"source-map-support": "^0.4.0",
"typings-global": "*"
},
"devDependencies": {}
}

View File

@ -12,7 +12,6 @@
"./subts2/typings.json",
"./customdir/typings.json"
],
"codecov":true,
"docs": {
"publish":true
},

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import * as early from "early";
early.start("NPMTS");
import * as plugins from "./npmts.plugins"

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import {npmtsOra} from "./npmts.promisechain";

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import {npmtsOra} from "./npmts.promisechain";
@ -9,8 +9,15 @@ let removeDist = function(){
};
let removeTypings = function(){
let done = plugins.Q.defer();
npmtsOra.text("cleaning " + "typings".yellow + " folder");
return plugins.smartfile.fsaction.remove(paths.typingsDir);
if(false){
//plugins.smartfile.fsaction.remove(paths.typingsDir)
// .then(done.resolve);
} else {
done.resolve();
}
return done.promise;
};
export let run = function(configArg){

View File

@ -1 +1 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import helpers = require("./npmts.compile.helpers");

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
export var run = function(){

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import {npmtsOra} from "./npmts.promisechain";

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import {npmtsOra} from "./npmts.promisechain";

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import {npmtsOra} from "./npmts.promisechain";
@ -12,8 +12,13 @@ export let isRelease = function():boolean {
};
export let doPublish = function():boolean {
return isRelease()
&& plugins.smartci.get.subJobNumber() == 1;
try {
return isRelease()
&& plugins.smartci.get.subJobNumber() == 1;
}
catch (err){
return false;
}
};
export var run = function(configArg){
@ -44,9 +49,7 @@ export var run = function(configArg){
isRelease() && doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!")
: plugins.beautylog.info("We are not publishing anything!");
// handle coveralls
config.codecov ? void(0) : config.codecov = true;
isCi() ? void(0) : config.codecov = false;
config.coverageTreshold ? void(0) : config.coverageTreshold = 70;

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
export let cwd = plugins.smartcli.get.cwd().path;

View File

@ -1,9 +1,8 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
export import beautylog = require("beautylog");
export let fs = require("fs-extra");
export let gulp = require("gulp");
export let g = {
codecov: require("gulp-codecov"),
gFunction: require("gulp-function"),
istanbul: require("gulp-istanbul"),
jsdoc3: require("gulp-jsdoc3"),

View File

@ -1,4 +1,4 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");

View File

@ -1,15 +1,12 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import NpmtsTests = require("./npmts.tests");
import NpmtsJsdoc = require("./npmts.jsdoc");
export let run = function(configArg){
let done = plugins.Q.defer();
let config = configArg;
let promiseArray = [];
config.codecov ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void(0);
config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void(0);
promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void(0);

View File

@ -1,20 +1,8 @@
/// <reference path="./typings/index.d.ts" />
import "typings-global";
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import {npmtsOra} from "./npmts.promisechain";
export let publishCoverage = function(configArg){
let done = plugins.Q.defer();
plugins.beautylog.log("now uploading coverage data to codecov.io");
var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
.pipe(plugins.g.codecov())
.pipe(plugins.g.gFunction(function(){
plugins.beautylog.ok("Coverage data has been uploaded to codecov.io!");
done.resolve(configArg);
},"atEnd"));
return done.promise;
};
/**
*
* @returns {*}