diff --git a/@packaged/angular-star-rating.tgz b/@packaged/angular-star-rating.tgz deleted file mode 100644 index 99c5da7..0000000 Binary files a/@packaged/angular-star-rating.tgz and /dev/null differ diff --git a/chore/README.md b/chore/README.md index cb3e8fd..ed058cb 100644 --- a/chore/README.md +++ b/chore/README.md @@ -10,12 +10,14 @@ # Preconditions node modules to install globally: +- color - conventional-recommended-bump +- conventional-changelog-angular - conventional-changelog - conventional-github-releaser - conventional-commits-detector -`npm i -g color conventional-recommended-bump conventional-changelog conventional-github-releaser conventional-commits-detector` +`npm i -g color conventional-changelog-angular conventional-recommended-bump conventional-changelog conventional-github-releaser conventional-commits-detector` # Travis CI - automated integration of travis into the build process diff --git a/chore/scripts/release.js b/chore/scripts/release.js index 525af3d..f1802a9 100644 --- a/chore/scripts/release.js +++ b/chore/scripts/release.js @@ -18,11 +18,10 @@ process.env.DEBUG = config.debugMode console.info('Start release'.gray) return Promise.resolve() //.then(() => ciCheck()) - //.then(() => refresh()) - .then(function(r) {console.log(r)}) - .then(() => build()) + // .then(() => refresh()) + //.then(() => build()) .then(() => changelog()) - .then(() => versionBump()) + //.then(() => versionBump()) //.then(() => releaseGithub()) //.then(() => releaseNpm()) .catch((err) => console.info('release error'.red, err.red)) diff --git a/chore/scripts/tasks/changelog.js b/chore/scripts/tasks/changelog.js index 2db6ab1..c8a94d0 100644 --- a/chore/scripts/tasks/changelog.js +++ b/chore/scripts/tasks/changelog.js @@ -25,7 +25,7 @@ function changelog () { // ensures that the right convention was detected .then(() => utils.getPreset()) .then((preset) => { - detectedPreset = preset + detectedPreset = preset; return (detectedPreset === config.validPreset) ? Promise.resolve(detectedPreset) : Promise.reject(detectedPreset) }) // ensures that a bump type was detected diff --git a/chore/scripts/tasks/ci-check.js b/chore/scripts/tasks/ci-check.js index 4349165..a719a4e 100644 --- a/chore/scripts/tasks/ci-check.js +++ b/chore/scripts/tasks/ci-check.js @@ -17,7 +17,8 @@ function ciCheck() { if (result.stdout === config.ci.validState) { return Promise.resolve(result) } else { - return Promise.reject(result) + const errorMsg = 'Travis status should be ' + config.ci.validState + ' ' + result.stdout + ' given'; + return Promise.reject(errorMsg); } }) } diff --git a/chore/scripts/utils.js b/chore/scripts/utils.js index 6a2d7bb..a6ead4d 100644 --- a/chore/scripts/utils.js +++ b/chore/scripts/utils.js @@ -1,24 +1,24 @@ 'use strict' -const colors = require('colors'); -const fs = require('fs') -const path = require('path') -const util = require('util') -const exec = util.promisify(require('child_process').exec) - -const config = require('../config') -const utils = {} - -utils.exec = exec -utils.deleteFile = deleteFile -utils.copyFile = copyFile -utils.copyFilePromise = copyFilePromise -utils.copyMultiFilePromise = copyMultiFilePromise -utils.backupPackageJson = backupPackageJson -utils.restorePackageJson = restorePackageJson -utils.getPreset = getCommitConvention -utils.getBump = getBump -utils.getPackageVersion = getPackageVersion +const colors = require('colors') +const fs = require('fs'); +const path = require('path'); +const util = require('util'); +const exec = util.promisify(require('child_process').exec); + +const config = require('../config'); +const utils = {}; + +utils.exec = exec; +utils.deleteFile = deleteFile; +utils.copyFile = copyFile; +utils.copyFilePromise = copyFilePromise; +utils.copyMultiFilePromise = copyMultiFilePromise; +utils.backupPackageJson = backupPackageJson; +utils.restorePackageJson = restorePackageJson; +utils.getPreset = getCommitConvention; +utils.getBump = getBump; +utils.getPackageVersion = getPackageVersion; module.exports = utils; @@ -31,7 +31,6 @@ function deleteFile (source) { .catch((err) => { console.error('remove files error: ', err) }) - } function copyFile (source, target, cb) { @@ -42,26 +41,29 @@ function copyFile (source, target, cb) { return new Promise((resolve, reject) => { console.info('copyFile', source, target) - let ensureDirectoryExistence = function (filePath) { - let dirname = path.dirname(filePath) + const ensureDirectoryExistence = function (filePath) { + const dirname = path.dirname(filePath) if (fs.existsSync(dirname)) { return true } ensureDirectoryExistence(dirname) fs.mkdirSync(dirname) } - ensureDirectoryExistence(target) - let rd = fs.createReadStream(source) + const rd = fs.createReadStream(source) rd.on('error', function (err) { reject(err) }) - let wr = fs.createWriteStream(target) + + ensureDirectoryExistence(target) + + const wr = fs.createWriteStream(target) + wr.on('error', function (err) { reject(err) }) wr.on('close', function (ex) { - resolve() + resolve(true) }) rd.pipe(wr) @@ -95,7 +97,6 @@ function backupPackageJson () { const source2 = path.join(config.libPath, 'package-lock.json') const target2 = path.join(config.libPath, '_package-lock.json') return copyFile(source1, target1) - //.then(() => copyFile(source2, target2)) } function restorePackageJson () { @@ -107,8 +108,8 @@ function restorePackageJson () { return copyFile(source1, target1) .then(() => utils.deleteFile(source1)) - //.then(() => copyFile(source2, target2)) - //.then(() => utils.deleteFile(source2)) + //.then(() => copyFile(source2, target2)) + //.then(() => utils.deleteFile(source2)) } function getCommitConvention () { @@ -125,17 +126,19 @@ function getCommitConvention () { }) } -function getBump () { +function getBump (preset) { // Detect the recommended bump type by the conventional-commit standard // source: https://github.com/conventional-changelog-archived-repos/conventional-recommended-bump/blob/master/README.md - return exec('conventional-recommended-bump -p angular', {cwd: __base}).then((bumpRes) => { - if (!bumpRes.stdout || bumpRes.stderr) { - return Promise.reject(bumpRes.stderr || false) - } else { - const bump = bumpRes.stdout.split('\n')[0] - return Promise.resolve(bump) - } - }) + return exec('conventional-recommended-bump -p ' + preset, {cwd: __base}) + .then((bumpRes) => { + + if (!bumpRes.stdout || bumpRes.stderr) { + return Promise.reject(bumpRes.stderr || false) + } else { + const bump = bumpRes.stdout.split('\n')[0] + return Promise.resolve(bump) + } + }) } function getPackageVersion () { diff --git a/libs/angular-star-rating/angular-star-rating-4.0.0-beta.2.tgz b/libs/angular-star-rating/angular-star-rating-4.0.0-beta.2.tgz deleted file mode 100644 index efb5ade..0000000 Binary files a/libs/angular-star-rating/angular-star-rating-4.0.0-beta.2.tgz and /dev/null differ