Merge pull request #30 from cortex-lab/dev

Dev

Author: k1o0

.gitignore

@@ -0,0 +1,3 @@
+.idea/*
+.DS_Store
+node_modules/*

CHANGELOG.md

@@ -1,7 +1,17 @@
 # Changelog
 
-## [Latest](https://github.com/cortex-lab/matlab-ci/commits/master) [2.1.0]
+## [Latest](https://github.com/cortex-lab/matlab-ci/commits/master) [2.2.0]
 
+### Modified
+
+- test log formatted in html
+- coverage checks ignored for branches named 'documentation' 
+- switch from Serveo to localtunnel
+- increased timeout from 5 to 8 minutes
+- generalized some variables such as repo owner, ci context
+- updated documentation
+
+## [2.1.0]
 ### Added
 
 - coverage increase check on pull request events
@@ -13,7 +23,11 @@
 - suppress warnings about shadowing builtins in runAllTests
 - run tests in subfolders
 - filter out performance tests
+<<<<<<< HEAD
+- skip tests for commits to branches named 'documentation'
+=======
 - skip checks for commits to branches named 'documentation'
+>>>>>>> master
 
 ## [2.0.0]
 ### Added

README.md

@@ -12,7 +12,7 @@ Requires MATLAB 2017a or later, Node.js and Git Bash.  The following Node.js mod
 
 ```
 npm install --save express dotenv @octokit/app @octokit/request ...
-github-webhook-handler xml2js
+github-webhook-handler xml2js localtunnel
 ```
 
 ### Installing
@@ -32,7 +32,11 @@ GITHUB_PRIVATE_KEY=path\to\private-key.pem
 GITHUB_APP_IDENTIFIER=1234
 GITHUB_WEBHOOK_SECRET=
 WEBHOOK_PROXY_URL=
-RIGBOX_REPO_PATH=C:\Path\To\Code\Repo
+REPO_PATH=C:\Path\To\Code\Repo
+REPO_NAME=
+REPO_OWNER=
+TUNNEL_HOST=
+TUNNEL_SUBDOMAIN=
 ```
 
 To run at startup create a batch file with the following command:
@@ -45,8 +49,8 @@ Create a shortcut in your startup folder ([Windows-logo] + [R] in Windows-10 and
 
 ## Built With
 
-* [Serveo](https://serveo.net) - SSH tunneling service
-* [Shields.io](https://shields.io) - Display shields
+* [LocalTunnel](https://localtunnel.me) - A secure tunneling service
+* [Shields.io](shields.io) - Display shields
 
 ## Contributing
 

config.json

@@ -0,0 +1,4 @@
+{
+  "timeout": 480000,
+  "program": "matlab"
+}

coverage.js

@@ -28,7 +28,7 @@ var timestamp;
 var token = process.env.COVERALLS_TOKEN;
 
 /**
- * Formates list of classes from XML file and return object formatted for the Coveralls API.
+ * Formats list of classes from XML file and return object formatted for the Coveralls API.
  * @see {@link https://docs.coveralls.io/api-reference|Coveralls API docs}
  * @param {Array} classList - An array of class objects from the loaded XML file.
  * @param {String} path - The root path of the code repository.
@@ -41,7 +41,7 @@ var token = process.env.COVERALLS_TOKEN;
 const formatCoverage = function(classList, path, sha) {
   var job = {};
   var sourceFiles = [];
-  typeof path != "undefined" ? 'C:\\Users\\User\\' : path; // default FIXME
+  path = typeof path != "undefined" ? process.env.HOMEPATH : path; // default to home dir
   // For each class, create file object containing array of lines covered and add to sourceFile array
   classList.forEach( async c => {
     let file = {}; // Initialize file object
@@ -59,7 +59,7 @@ const formatCoverage = function(classList, path, sha) {
   });
 
   job.repo_token = token; // env secret token?
-  job.service_name = 'continuous-integration/ZTEST';
+  job.service_name = `continuous-integration/${process.env.USERDOMAIN}`;
   // The associated pull request ID of the build. Used for updating the status and/or commenting.
   job.service_pull_request = '';
   job.source_files = sourceFiles;
@@ -102,7 +102,7 @@ const coverage = function(path, repo, sha, callback) {
             if (e.$.filename.startsWith('signals\\')) {modules.signals.push(e); return false;}
             if (e.$.filename.startsWith('npy-matlab\\')) {modules['npy-matlab'].push(e); return false;}
             if (e.$.filename.startsWith('wheelAnalysis\\')) {modules.wheelAnalysis.push(e); return false;}
-            else {return true};
+            else {return true}
         });
         formatCoverage(modules[repo.toLowerCase()], rigboxPath, callback);
      });
@@ -123,4 +123,4 @@ md5 = function(path) {
 };
 
 // Export Coverage
-module.exports = coverage;
+module.exports = coverage;