From d02a51eae4b02cd8a323029c381e81cb00503804 Mon Sep 17 00:00:00 2001 From: Mate Pek Date: Thu, 3 Jan 2019 15:22:58 +0100 Subject: [PATCH] deploy.ts fix --- CHANGELOG.md | 4 +- src/repo_scripts/deploy.ts | 283 +++++++++++++++++++------------------ 2 files changed, 144 insertions(+), 143 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee4c1c8b..89df2bf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [2.3.8] - 2019-001-03 +## [2.3.8] - 2019-01-03 ### Fixed - a bug related to Google Test framework: `INSTANTIATE_TEST_CASE_P`. -## [2.3.7] - 2019-001-02 +## [2.3.7] - 2019-01-02 ### Fixed diff --git a/src/repo_scripts/deploy.ts b/src/repo_scripts/deploy.ts index b278091d..07bc359c 100644 --- a/src/repo_scripts/deploy.ts +++ b/src/repo_scripts/deploy.ts @@ -11,7 +11,7 @@ import * as fs from 'fs'; import * as path from 'path'; import * as request from 'request'; import * as requestP from 'request-promise'; -import {promisify} from 'util'; +import { promisify } from 'util'; import * as vsce from 'vsce'; @@ -22,14 +22,14 @@ const vscodeExtensionId = githubOwnerId + '-' + githubRepoId; main(process.argv.slice(2)) - .then( - () => { - process.exit(0); - }, - (err: any) => { - console.error('Unhandled error under deployment.', err); - process.exit(-1); - }); + .then( + () => { + process.exit(0); + }, + (err: any) => { + console.error('Unhandled error under deployment.', err); + process.exit(-1); + }); interface Info { version: string; @@ -40,7 +40,7 @@ interface Info { label: string; date: string; full: string; - packagePath: string|undefined; + packagePath: string | undefined; } function main(argv: string[]): Promise { @@ -55,18 +55,18 @@ function main(argv: string[]): Promise { return Promise.resolve(); } - return updateChangelog().then((info: Info|undefined) => { + return updateChangelog().then((info: Info | undefined) => { if (info != undefined) { return Promise.resolve(info!) - .then(updatePackageJson) - .then(gitCommitAndTag) - .then(createPackage) - .then(gitPush) - .then(createGithubRelease) - .then(publishPackage) - .then(() => { - console.log('deploying is finished'); - }); + .then(updatePackageJson) + .then(gitCommitAndTag) + .then(createPackage) + .then(gitPush) + .then(createGithubRelease) + .then(publishPackage) + .then(() => { + console.log('deploying is finished'); + }); } else { console.log('No deployment has happened.'); return Promise.resolve(); @@ -76,15 +76,15 @@ function main(argv: string[]): Promise { /// -function updateChangelog(): Promise { +function updateChangelog(): Promise { console.log('Parsing CHANGELOG.md'); return promisify(fs.readFile)('CHANGELOG.md').then((changelogBuffer) => { const changelog = changelogBuffer.toString(); // example:'## [0.1.0-beta] - 2018-04-12' const re = new RegExp( - /## \[(([0-9]+)\.([0-9]+)\.([0-9]+)(?:|(?:-([^\]]+))))\](?: - (\S+))?/); + /## \[(([0-9]+)\.([0-9]+)\.([0-9]+)(?:|(?:-([^\]]+))))\](?: - (\S+))?/); - const match: RegExpMatchArray|null = changelog.match(re); + const match: RegExpMatchArray | null = changelog.match(re); if (match === null) throw Error('Release error: Couldn\'t find version entry.'); @@ -93,37 +93,38 @@ function updateChangelog(): Promise { if (match[6] != undefined) { // we dont want to release it now console.log( - 'CHANGELOG.md doesn\'t contain unreleased version entry (ex.: "## [1.2.3]" (without date)).'); + 'CHANGELOG.md doesn\'t contain unreleased version entry (ex.: "## [1.2.3]" (without date)).'); console.log('(Last released version: ' + match[0] + ')'); return Promise.resolve(undefined); } const now = new Date(); - const month = now.getUTCMonth() + 1 < 10 ? '0' + now.getUTCMonth() + 1 : - now.getUTCMonth() + 1; + const month = now.getUTCMonth() + 1 < 10 + ? '0' + (now.getUTCMonth() + 1) + : now.getUTCMonth() + 1; const day = - now.getUTCDate() < 10 ? '0' + now.getUTCDate() : now.getUTCDate(); + now.getUTCDate() < 10 ? '0' + now.getUTCDate() : now.getUTCDate(); const date = now.getUTCFullYear() + '-' + month + '-' + day; const changelogWithReleaseDate = - changelog.substr(0, match.index! + match[0].length) + ' - ' + date + - changelog.substr(match.index! + match[0].length); + changelog.substr(0, match.index! + match[0].length) + ' - ' + date + + changelog.substr(match.index! + match[0].length); console.log('Updating CHANGELOG.md'); return promisify(fs.writeFile)('CHANGELOG.md', changelogWithReleaseDate) - .then(() => { - return { - 'version': match[1], - 'vver': 'v' + match[1], - 'major': match[2], - 'minor': match[3], - 'patch': match[4], - 'label': match[5], - 'date': date, - 'full': match[0].substr(3).trim() + ' - ' + date, - 'packagePath': undefined - }; - }); + .then(() => { + return { + 'version': match[1], + 'vver': 'v' + match[1], + 'major': match[2], + 'minor': match[3], + 'patch': match[4], + 'label': match[5], + 'date': date, + 'full': match[0].substr(3).trim() + ' - ' + date, + 'packagePath': undefined + }; + }); }); } @@ -134,7 +135,7 @@ function updatePackageJson(info: Info) { // example:'"version": "1.2.3"' const re = new RegExp(/(['"]version['"]\s*:\s*['"])([^'"]*)(['"])/); - const match: RegExpMatchArray|null = packageJson.match(re); + const match: RegExpMatchArray | null = packageJson.match(re); assert.notStrictEqual(match, null); if (match === null) throw Error('Release error: Couldn\'t find version entry.'); @@ -145,14 +146,14 @@ function updatePackageJson(info: Info) { assert.notStrictEqual(match[3], undefined); const packageJsonWithVer = - packageJson.substr(0, match.index! + match[1].length) + info.version + - packageJson.substr(match.index! + match[1].length + match[2].length); + packageJson.substr(0, match.index! + match[1].length) + info.version + + packageJson.substr(match.index! + match[1].length + match[2].length); console.log('Updating package.json'); return promisify(fs.writeFile)('package.json', packageJsonWithVer) - .then(() => { - return info; - }); + .then(() => { + return info; + }); }); } @@ -160,42 +161,42 @@ function gitCommitAndTag(info: Info) { console.log('Creating commit and tag'); return Promise.resolve() - .then(() => { - assert.ok(process.env['TRAVIS_BRANCH']); - return spawn('git', 'checkout', process.env['TRAVIS_BRANCH']!); - }) - .then(() => { - return spawn( - 'git', 'config', '--local', 'user.name', 'deploy.js script'); - }) - .then(() => { - const deployerMail = - process.env['DEPLOYER_MAIL'] || 'deployer@deployer.de'; - return spawn('git', 'config', '--local', 'user.email', deployerMail); - }) - .then(() => { - return spawn('git', 'status'); - }) - .then(() => { - return spawn( - 'git', 'add', '--', 'CHANGELOG.md', 'package.json', - 'package-lock.json'); - }) - .then(() => { - return spawn('git', 'status'); - }) - .then(() => { - return spawn( - 'git', 'commit', '-m', - '[Updated] Release info in CHANGELOG.md: ' + info.full!); - }) - .then(() => { - return spawn( - 'git', 'tag', '-a', info.vver!, '-m', 'Version ' + info.vver!); - }) - .then(() => { - return info; - }); + .then(() => { + assert.ok(process.env['TRAVIS_BRANCH']); + return spawn('git', 'checkout', process.env['TRAVIS_BRANCH']!); + }) + .then(() => { + return spawn( + 'git', 'config', '--local', 'user.name', 'deploy.js script'); + }) + .then(() => { + const deployerMail = + process.env['DEPLOYER_MAIL'] || 'deployer@deployer.de'; + return spawn('git', 'config', '--local', 'user.email', deployerMail); + }) + .then(() => { + return spawn('git', 'status'); + }) + .then(() => { + return spawn( + 'git', 'add', '--', 'CHANGELOG.md', 'package.json', + 'package-lock.json'); + }) + .then(() => { + return spawn('git', 'status'); + }) + .then(() => { + return spawn( + 'git', 'commit', '-m', + '[Updated] Release info in CHANGELOG.md: ' + info.full!); + }) + .then(() => { + return spawn( + 'git', 'tag', '-a', info.vver!, '-m', 'Version ' + info.vver!); + }) + .then(() => { + return info; + }); } function gitPush(info: Info) { @@ -203,19 +204,19 @@ function gitPush(info: Info) { assert.ok(process.env['GITHUB_API_KEY'] != undefined); return spawn( - 'git', 'push', '--follow-tags', - 'https://' + githubOwnerId + ':' + process.env['GITHUB_API_KEY']! + - '@github.com/' + githubRepoFullId + '.git') - .then(() => { - return info; - }); + 'git', 'push', '--follow-tags', + 'https://' + githubOwnerId + ':' + process.env['GITHUB_API_KEY']! + + '@github.com/' + githubRepoFullId + '.git') + .then(() => { + return info; + }); } function createPackage(info: Info) { console.log('Creating vsce package'); const packagePath = - './out/' + vscodeExtensionId + '-' + info.version + '.vsix'; - return vsce.createVSIX({'cwd': '.', 'packagePath': packagePath}).then(() => { + './out/' + vscodeExtensionId + '-' + info.version + '.vsix'; + return vsce.createVSIX({ 'cwd': '.', 'packagePath': packagePath }).then(() => { info.packagePath = packagePath; return info; }); @@ -225,7 +226,7 @@ function publishPackage(info: Info) { console.log('Publishing vsce package'); assert.ok(process.env['VSCE_PAT'] != undefined); assert.ok(info.packagePath != undefined); - return vsce.publishVSIX(info.packagePath!, {'pat': process.env['VSCE_PAT']!}); + return vsce.publishVSIX(info.packagePath!, { 'pat': process.env['VSCE_PAT']! }); } async function createGithubRelease(info: Info) { @@ -235,63 +236,63 @@ async function createGithubRelease(info: Info) { return requestP - .get({ - url: 'https://api.github.com/repos/' + githubRepoFullId + - '/releases/latest', - headers: {'User-Agent': githubOwnerId + '-deploy.js'}, - auth: {user: githubOwnerId, pass: key} - }) - .then((response) => { - const responseJson = JSON.parse(response.toString()); - assert.notStrictEqual(responseJson.tag_name, info.vver) - }) - .then(() => { - return requestP.post({ - url: 'https://api.github.com/repos/' + githubRepoFullId + '/releases', - headers: {'User-Agent': githubOwnerId + '-deploy.js'}, - json: { - 'tag_name': info.vver, - 'name': info.full, - 'body': 'See [CHANGELOG.md](CHANGELOG.md) for details.', + .get({ + url: 'https://api.github.com/repos/' + githubRepoFullId + + '/releases/latest', + headers: { 'User-Agent': githubOwnerId + '-deploy.js' }, + auth: { user: githubOwnerId, pass: key } + }) + .then((response) => { + const responseJson = JSON.parse(response.toString()); + assert.notStrictEqual(responseJson.tag_name, info.vver) + }) + .then(() => { + return requestP.post({ + url: 'https://api.github.com/repos/' + githubRepoFullId + '/releases', + headers: { 'User-Agent': githubOwnerId + '-deploy.js' }, + json: { + 'tag_name': info.vver, + 'name': info.full, + 'body': 'See [CHANGELOG.md](CHANGELOG.md) for details.', + }, + auth: { user: githubOwnerId, pass: key } + }); + }) + .then((createReleaseResponse) => { + return new Promise((resolve, reject) => { + assert.ok(info.packagePath != undefined); + var stats = fs.statSync(info.packagePath!); + const uploadAssetRequest = request.post({ + url: createReleaseResponse.upload_url.replace( + '{?name,label}', + '?name=' + vscodeExtensionId + '-' + info.version + '.vsix'), + headers: { + 'User-Agent': githubOwnerId + '-deploy.js', + 'Content-Type': 'application/zip', + 'Content-Length': stats.size }, - auth: {user: githubOwnerId, pass: key} + auth: { user: githubOwnerId, pass: key } }); - }) - .then((createReleaseResponse) => { - return new Promise((resolve, reject) => { - assert.ok(info.packagePath != undefined); - var stats = fs.statSync(info.packagePath!); - const uploadAssetRequest = request.post({ - url: createReleaseResponse.upload_url.replace( - '{?name,label}', - '?name=' + vscodeExtensionId + '-' + info.version + '.vsix'), - headers: { - 'User-Agent': githubOwnerId + '-deploy.js', - 'Content-Type': 'application/zip', - 'Content-Length': stats.size - }, - auth: {user: githubOwnerId, pass: key} - }); - - fs.createReadStream(info.packagePath!).pipe(uploadAssetRequest); - - uploadAssetRequest.on('complete', (resp) => { - resolve(resp); - }); - uploadAssetRequest.on('error', (e) => { - reject(e); - }); + + fs.createReadStream(info.packagePath!).pipe(uploadAssetRequest); + + uploadAssetRequest.on('complete', (resp) => { + resolve(resp); + }); + uploadAssetRequest.on('error', (e) => { + reject(e); }); - }) - .then(() => { - return info; }); + }) + .then(() => { + return info; + }); } async function spawn(command: string, ...args: string[]) { console.log('$ ' + command + ' "' + args.join('" "') + '"'); return new Promise((resolve, reject) => { - const c = cp.spawn(command, args, {stdio: 'inherit'}); + const c = cp.spawn(command, args, { stdio: 'inherit' }); c.on('exit', (code: number) => { code == 0 ? resolve() : reject(new Error('Process exited with: ' + code)); });