Merge pull request #2144 from sakshamsaxena/almost-eased-up

lmccart · web-flow · commit 5badf86af3db · 2017-08-28T16:50:54.000-07:00
Automating the release process
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,7 @@ docs/yuidoc-p5-theme/assets/js/reference.js*
 examples/3d/
 .idea
 .vscode
+dist/
+p5.zip
+bower-repo/
+p5-website/
diff --git a/.jshintrc b/.jshintrc
@@ -11,6 +11,7 @@
   "trailing": true,
   "undef": true,
   "unused": "vars",
-
+  "esnext": true,
+  "predef": ["Promise"],
   "node": true
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -96,7 +96,7 @@ module.exports = function(grunt) {
       build: {
         src: [
           'Gruntfile.js',
-          'build/**/*.js'
+          'tasks/**/*.js'
         ]
       },
       source: {
@@ -118,7 +118,7 @@ module.exports = function(grunt) {
         },
         src: [
           'Gruntfile.js',
-          'build/**/*.js'
+          'tasks/**/*.js'
         ]
       },
       source: {
@@ -273,24 +273,6 @@ module.exports = function(grunt) {
 
     // this builds the documentation for the codebase.
     yuidoc: getYuidocOptions(),
-    'release-it': {
-      options: {
-        pkgFiles: ['package.json'],
-        commitMessage: 'release v%s',
-        tagName: '%s',
-        tagAnnotation: 'release v%s',
-        buildCommand: 'grunt',
-        changelogCommand: 'git log --pretty=format:"* %s (%h)" [REV_RANGE]',
-        distRepo: 'git@github.com:lmccart/p5.js-release.git',
-        distStageDir: '.stage',
-        distFiles: ['lib/*.js', 'lib/addons/*.js'],
-        distBase: 'lib/',
-        npm: {
-          publish: false,
-          publishPath: 'lib/'
-        }
-      }
-    },
 
     // This is a static server which is used when testing connectivity for the
     // p5 library. This avoids needing an internet connection to run the tests.
@@ -345,23 +327,29 @@ module.exports = function(grunt) {
   // `grunt combineModules:module_1:module_2` where core
   // is included by default in all combinations always.
   // NOTE: "module_x" is the name of it's folder in /src.
-  grunt.loadTasks('build/tasks');
+  grunt.loadTasks('tasks/build');
+
+  // Load release task
+  grunt.loadTasks('tasks/release');
 
   // Load the external libraries used.
-  grunt.loadNpmTasks('grunt-jscs');
+  grunt.loadNpmTasks('grunt-contrib-compress');
+  grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
-  grunt.loadNpmTasks('grunt-mocha');
   grunt.loadNpmTasks('grunt-contrib-yuidoc');
-  grunt.loadNpmTasks('grunt-update-json');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-http');
+  grunt.loadNpmTasks('grunt-jscs');
+  grunt.loadNpmTasks('grunt-minjson');
+  grunt.loadNpmTasks('grunt-mocha');
+  grunt.loadNpmTasks('grunt-mocha-test');
   grunt.loadNpmTasks('grunt-newer');
   grunt.loadNpmTasks('grunt-release-it');
   grunt.loadNpmTasks('grunt-saucelabs');
-  grunt.loadNpmTasks('grunt-mocha-test');
-  grunt.loadNpmTasks('grunt-minjson');
+  grunt.loadNpmTasks('grunt-update-json');
 
   // Create the multitasks.
   grunt.registerTask('build', ['browserify', 'uglify', 'requirejs']);
diff --git a/lib/empty-example/index.html b/lib/empty-example/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src="../p5.min.js"></script>
+    <script src="../addons/p5.dom.min.js"></script>
+    <script src="../addons/p5.sound.min.js"></script>
+    <script src="sketch.js"></script>
+    <style> body {padding: 0; margin: 0;} </style>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/lib/empty-example/sketch.js b/lib/empty-example/sketch.js
diff --git a/package.json b/package.json
@@ -19,26 +19,30 @@
     "derequire": "^2.0.0",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
+    "grunt-contrib-compress": "^1.4.3",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-connect": "^0.9.0",
+    "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-jshint": "^0.11.2",
     "grunt-contrib-requirejs": "~0.4.1",
     "grunt-contrib-uglify": "^0.7.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-contrib-yuidoc": "1.0.0",
+    "grunt-http": "^2.2.0",
     "grunt-jscs": "^3.0.1",
     "grunt-lib-phantomjs": "~0.4.0",
     "grunt-minjson": "^0.4.0",
     "grunt-mocha": "^1.0.4",
     "grunt-mocha-test": "^0.12.7",
     "grunt-newer": "^1.1.0",
-    "grunt-release-it": "^0.2.1",
+    "grunt-release-it": "^1.0.1",
     "grunt-saucelabs": "8.6.1",
     "grunt-update-json": "^0.2.1",
     "jscs-stylish": "^0.3.1",
     "marked": "^0.3.5",
     "mocha": "^3.2.0",
-    "phantomjs": "^2.1.7"
+    "phantomjs": "^2.1.7",
+    "request": "^2.81.0"
   },
   "license": "LGPL-2.1",
   "dependencies": {
@@ -54,7 +58,9 @@
     "lib/p5.min.js",
     "lib/p5.js",
     "lib/addons/p5.sound.js",
-    "lib/addons/p5.dom.js"
+    "lib/addons/p5.sound.min.js",
+    "lib/addons/p5.dom.js",
+    "lib/addons/p5.dom.min.js"
   ],
   "description": "[![Build Status](https://travis-ci.org/processing/p5.js.svg?branch=master)](https://travis-ci.org/processing/p5.js) [![npm version](https://badge.fury.io/js/p5.svg)](https://www.npmjs.com/package/p5)",
   "bugs": {
diff --git a/tasks/build/browserify.js b/tasks/build/browserify.js
diff --git a/tasks/build/combineModules.js b/tasks/build/combineModules.js
diff --git a/tasks/release/release-bower.js b/tasks/release/release-bower.js
@@ -0,0 +1,63 @@
+/* Grunt Task to Release the Library files on dist repo for Bower */
+
+// Using native exec instead of Grunt spawn so as to utilise Promises
+const exec = require('child_process').exec;
+
+module.exports = function(grunt) {
+
+  grunt.registerTask('release-bower', 'Publishes the new release of p5.js on Bower', function() {
+
+    // Async Task
+    var done = this.async();
+    // Keep the version handy
+    var version = require('../../package.json').version;
+    // Avoiding Callback Hell and using Promises
+    new Promise(function(resolve, reject) {
+      // Clone the repo. NEEDS TO BE QUIET. Took 3 hours to realise this.
+      // Otherwise the stdout screws up
+      console.log('Cloning the Release repo ...');
+      exec('rm -rf bower-repo/ && git clone -q https://github.com/lmccart/p5.js-release.git bower-repo',function(err, stdout, stderr) {
+        if (err) {
+          reject(err);
+        }
+        if (stderr) {
+          reject(stderr);
+        }
+        resolve();
+      });
+    }).then(function(resolve, reject) {
+      // Copy the lib to bower-repo.
+      // NOTE : Uses 'cp' of UNIX. Make sure it is unaliased in your .bashrc,
+      // otherwise it may prompt always for overwrite (not desirable)
+      console.log('Copying new files ...');
+      return new Promise(function(resolve, reject) {
+        exec('cp lib/*.js lib/addons bower-repo/lib -r', function(err, stdout, stderr) {
+          if (err) {
+            reject(err);
+          }
+          if (stderr) {
+            reject(stderr);
+          }
+          resolve();
+        });
+      });
+    }).then(function(resolve, reject) {
+      // Git add, commit, push
+      console.log('Pushing out changes ...');
+      return new Promise(function(resolve, reject) {
+        exec('git add --all && git commit -am "' + version + '" && git push -q', { cwd: './bower-repo' },function(err, stdout, stderr) {
+          if (err) {
+            reject(err);
+          }
+          if (stderr) {
+            reject(stderr);
+          }
+          resolve();
+          done();
+        });
+      });
+    }).catch(function(err) {
+      throw new Error(err);
+    });
+  });
+};
diff --git a/tasks/release/release-docs.js b/tasks/release/release-docs.js
@@ -0,0 +1,60 @@
+/* Grunt Task to Release the DOcs on website repo */
+
+// Using native exec instead of Grunt spawn so as to utilise Promises
+const exec = require('child_process').exec;
+
+module.exports = function(grunt) {
+
+  grunt.registerTask('release-docs', 'Publishes the new docs of p5.js on the website', function() {
+
+    // Async Task
+    var done = this.async();
+    // Keep the version handy
+    var version = require('../../package.json').version;
+    // Avoiding Callback Hell and using Promises
+    new Promise(function(resolve, reject) {
+      // Clone the website locally
+      console.log('Cloning the website ...');
+      exec('rm -rf p5-website/ && git clone -q https://github.com/sakshamsaxena/p5.js-website.git p5-website',function(err, stdout, stderr) {
+        if (err) {
+          reject(err);
+        }
+        if (stderr) {
+          reject(stderr);
+        }
+        resolve();
+      });
+    }).then(function() {
+      // Copy the new docs over
+      console.log('Copying new docs ...');
+      return new Promise(function(resolve, reject) {
+        exec('cp -r docs/reference p5-website/dist/', function(err, stdout, stderr) {
+          if (err) {
+            reject(err);
+          }
+          if (stderr) {
+            reject(stderr);
+          }
+          resolve();
+        });
+      });
+    }).then(function() {
+      // Add, Commit, Push
+      console.log('Pushing to GitHub ...');
+      return new Promise(function(resolve, reject) {
+        exec('git add --all && git commit -am "Updated Reference for version ' + version + '" && git push', {cwd: './p5-website' }, function(err, stdout, stderr) {
+          if (err) {
+            reject(err);
+          }
+          if (stderr) {
+            reject(stderr);
+          }
+          resolve();
+          done();
+        });
+      });
+    }).catch(function(err) {
+      throw new Error(err);
+    });
+  });
+};
diff --git a/tasks/release/release-github.js b/tasks/release/release-github.js
@@ -0,0 +1,93 @@
+/* Grunt task to release p5.js on GitHub */
+
+var fs = require('fs');
+var req = require('request');
+
+module.exports = function(grunt) {
+  grunt.registerTask('release-github', 'Publish a Release on GitHub', function(args) {
+
+    // Async Task
+    var done = this.async();
+
+    // Prepare the data
+    var data = {
+      'tag_name': '',
+      'target_commitish': 'master',
+      'name': '',
+      'body': '',
+      'draft': true,
+      'prerelease': false
+    };
+
+    var newTag = require('../../package.json').version;
+    data.tag_name = newTag;
+    data.name = newTag;
+
+    // Set up vars for requests
+    var accessTokenParam = '?access_token=' + process.env.GITHUB_TOKEN;
+    var createURL = 'https://api.github.com/repos/processing/p5.js/releases' + accessTokenParam;
+    var uploadURL = 'https://uploads.github.com/repos/processing/p5.js/releases/';
+    var ID = '';
+    var count = 0;
+
+    var createReleaseData = {
+      url: createURL,
+      headers: { 'User-Agent': 'Grunt Task' },
+      body: JSON.stringify(data)
+    };
+
+    var uploadReleaseData = {
+      'p5js': ['p5.js', './lib/p5.js', 'application/javascript'],
+      'p5minjs': ['p5.min.js', './lib/p5.min.js', 'application/javascript'],
+      'p5domjs': ['p5.dom.js', './lib/addons/p5.dom.js', 'application/javascript'],
+      'p5domminjs': ['p5.dom.min.js', './lib/addons/p5.dom.min.js', 'application/javascript'],
+      'p5soundjs': ['p5.sound.js', './lib/addons/p5.sound.js', 'application/javascript'],
+      'p5soundminjs': ['p5.sound.min.js', './lib/addons/p5.sound.min.js', 'application/javascript'],
+      'p5zip': ['p5.zip', './p5.zip', 'application/zip']
+    };
+
+    var uploadAsset = function(arr) {
+      console.log('Uploading ' + arr[0] + ' ...');
+      fs.createReadStream(arr[1]).pipe(
+        req.post({
+          url: uploadURL + ID + '/assets' + accessTokenParam + '&name=' + arr[0],
+          headers: {
+            'User-Agent': 'Grunt',
+            'Content-Type': arr[2],
+            'Content-Length': fs.statSync(arr[1]).size
+          }
+        }, function(err, resp, body) {
+          if (err) {
+            throw err;
+          }
+          console.log('Uploaded ' + arr[0]);
+          count++;
+          if (count === 7) {
+            done();
+          }
+        }));
+    };
+
+    new Promise(function(resolve, reject) {
+      // Create the release
+      console.log('Posting Release ...');
+      req.post(createReleaseData, function(error, response, body) {
+        if (error) {
+          reject(error);
+        }
+        resolve(JSON.parse(body).id);
+      });
+    }).then(function(releaseID) {
+      // Upload the Library
+      console.log('Uploading Assets ...');
+      ID = releaseID;
+      // Upload assets
+      for (var file in uploadReleaseData) {
+        let arr = uploadReleaseData[file];
+        uploadAsset(arr);
+      }
+    }).catch(function(err) {
+      throw new Error(err);
+    });
+  });
+};
diff --git a/tasks/release/release-p5.js b/tasks/release/release-p5.js

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`"trailing": true,`
`12`	`12`	`"undef": true,`
`13`	`13`	`"unused": "vars",`
`14`		`-`
	`14`	`+ "esnext": true,`
	`15`	`+ "predef": ["Promise"],`
`15`	`16`	`"node": true`
`16`	`17`	`}`