Skip to content

Commit

Permalink
apply version banners to dist files
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeGermuska committed Sep 6, 2017
1 parent 537cd81 commit 9f10d9b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 12 deletions.
6 changes: 6 additions & 0 deletions banner.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/*!
* <%= name %> ver. <%= version %>
* <%= homepage %>
* Copyright (c) 2016-<%= year %>, Northwestern University Knight Lab
* Licensed under the <%= license %> license.
*/
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storyline",
"version": "0.1.1",
"version": "0.1.6",
"description": "Storyline is a tool for journalists to provide narrative context to readable line charts in a form which is optimized for the mobile user experience.",
"main": "index.js",
"repository": {
Expand All @@ -12,7 +12,7 @@
"bugs": {
"url": "https://github.com/NUKnightLab/storyline/issues"
},
"homepage": "https://github.com/NUKnightLab/storyline#readme",
"homepage": "https://storyline.knightlab.com",
"dependencies": {
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.22.0",
Expand All @@ -24,6 +24,7 @@
"webpack": "^1.13.1"
},
"devDependencies": {
"add-banner": "github:jonschlinkert/add-banner#b2a824c466413677264364042bb4c30df0de2ebe",
"adm-zip": "^0.4.7",
"babel-core": "^6.22.1",
"babel-loader": "^6.2.10",
Expand All @@ -39,6 +40,7 @@
"es6-promise": "^4.0.5",
"exit-hook": "^1.1.1",
"fs-extra": "^0.30.0",
"glob": "^7.1.2",
"globby": "^5.0.0",
"hammerjs": "^2.0.8",
"json-loader": "^0.5.4",
Expand All @@ -55,6 +57,7 @@
"sinon-chai": "^2.8.0",
"stream-transform": "^0.1.1",
"tiny-lr": "^0.2.1",
"write-banner": "^0.1.3",
"xhr-stream": "^1.1.0"
},
"scripts": {
Expand Down
36 changes: 26 additions & 10 deletions tasks/stage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ const prompt = require('prompt'),
simpleGit = require('simple-git'),
fse = require('fs-extra'),
path = require('path'),
AdmZip = require('adm-zip');
AdmZip = require('adm-zip'),
writeBanner = require('write-banner'), // note needs override of 'add-banner' dependency to git repo version
glob = require('glob');

const CDN_ROOT = '../cdn.knightlab.com', // maybe parameterize later
PROJECT_NAME = 'storyline'; // can we read this from package.json?
Expand All @@ -12,6 +14,16 @@ function makeCDNPath(version) {
}

function stageToCDN(version, latest) {
var banner_version = (version == 'dev') ? new Date().toISOString() : version;

var to_banner = glob.sync('dist/**/*.+(js|css)');
for (var i = 0; i < to_banner.length; i++) {
writeBanner(to_banner[i], {
banner: 'banner.tmpl',
version: banner_version,
})
}

if (fse.existsSync(CDN_ROOT)) {
var dest = makeCDNPath(version);
var zip = new AdmZip();
Expand All @@ -35,7 +47,7 @@ function stageToCDN(version, latest) {
if (process.argv[2] == 'dev') {
stageToCDN('dev')
} else {

// if not 'dev' then ask for a new tag, update package.json, and tag the git repository
simpleGit().tags(function(_,tagList) {
if (tagList.latest) {
console.log("The last tag used was " + tagList.latest);
Expand All @@ -58,17 +70,21 @@ if (process.argv[2] == 'dev') {

prompt.get(properties, function (err, result) {
if (err) { return onErr(err); }
simpleGit().addTag(result.version, function() {
simpleGit().pushTags('origin', function() {
console.log(' Tagged with: ' + result.version);
var latest = ("latest" == process.argv[2]); // maybe later use a CLI arg parser
stageToCDN(result.version, latest);
})
});
});

var package_json = require('./package.json');
package_json.version = result.version;
fse.writeJsonSync('./package.json', package_json);
simpleGit.commit(`Update to ${result.version}`, ['package.json'])
.addTag(result.version)
.pushTags('origin', function() {
console.log(' Tagged with: ' + result.version);
var latest = ("latest" == process.argv[2]); // maybe later use a CLI arg parser
stageToCDN(result.version, latest);
});
})
})
}

function onErr(err) {
console.log(err);
return 1;
Expand Down

0 comments on commit 9f10d9b

Please sign in to comment.