From 47907affb2095ae99ded0eade11554e4ade63099 Mon Sep 17 00:00:00 2001
From: Angelos Chalaris <chalarangelo@gmail.com>
Date: Sat, 22 Sep 2018 13:29:27 +0300
Subject: [PATCH] Script cleanup

---
 scripts/module.js |  4 +---
 scripts/tdd.js    |  4 +---
 scripts/util.js   |  2 ++
 scripts/web.js    | 25 +++++++++----------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/scripts/module.js b/scripts/module.js
index f9d1f5c8f..7489f10ca 100644
--- a/scripts/module.js
+++ b/scripts/module.js
@@ -8,9 +8,7 @@ const path = require('path');
 const chalk = require('chalk');
 const util = require('./util');
 if (
-  util.isTravisCI() &&
-  process.env['TRAVIS_EVENT_TYPE'] !== 'cron' &&
-  process.env['TRAVIS_EVENT_TYPE'] !== 'api'
+  util.isTravisCI() && util.isNotTravisCronOrApi()
 ) {
   console.log(
     `${chalk.green('NOBUILD')} Module build terminated, not a cron job or a custom build!`
diff --git a/scripts/tdd.js b/scripts/tdd.js
index 4be6da936..2c77df306 100644
--- a/scripts/tdd.js
+++ b/scripts/tdd.js
@@ -10,9 +10,7 @@ const childProcess = require('child_process');
 const chalk = require('chalk');
 const util = require('./util');
 if (
-  util.isTravisCI() &&
-  process.env['TRAVIS_EVENT_TYPE'] !== 'cron' &&
-  process.env['TRAVIS_EVENT_TYPE'] !== 'api'
+  util.isTravisCI() && util.isNotTravisCronOrApi()
 ) {
   console.log(`${chalk.green('NOBUILD')} Testing terminated, not a cron job or a custom build!`);
   process.exit(0);
diff --git a/scripts/util.js b/scripts/util.js
index 79d53f277..f607fe50d 100644
--- a/scripts/util.js
+++ b/scripts/util.js
@@ -102,6 +102,8 @@ const capitalize = (str, lowerRest = false) =>
   str.slice(0, 1).toUpperCase() + (lowerRest ? str.slice(1).toLowerCase() : str.slice(1));
 // Checks if current environment is Travis CI
 const isTravisCI = () => 'TRAVIS' in process.env && 'CI' in process.env;
+const isNotTravisCronOrAPI = () => process.env['TRAVIS_EVENT_TYPE'] !== 'cron' &&
+  process.env['TRAVIS_EVENT_TYPE'] !== 'api';
 // Creates a hash for a value using the SHA-256 algorithm.
 const hashData = val =>
   crypto
diff --git a/scripts/web.js b/scripts/web.js
index 80e1bf56b..6af0ede0e 100644
--- a/scripts/web.js
+++ b/scripts/web.js
@@ -39,6 +39,13 @@ const unescapeHTML = str =>
         '&quot;': '"'
       }[tag] || tag)
   );
+const filterSnippets = (snippetList, excludedFiles) =>
+  Object.keys(snippetList)
+    .filter(key => !excludedFiles.includes(key))
+    .reduce((obj, key) => {
+      obj[key] = snippetList[key];
+      return obj;
+    }, {});
 if (
   util.isTravisCI() &&
   /^Travis build: \d+/g.test(process.env['TRAVIS_COMMIT_MESSAGE']) &&
@@ -241,14 +248,7 @@ try {
   archivedOutput += `${archivedStartPart}\n`;
 
   // Filter README.md from folder
-  const excludeFiles = ['README.md'];
-
-  const filteredArchivedSnippets = Object.keys(archivedSnippets)
-    .filter(key => !excludeFiles.includes(key))
-    .reduce((obj, key) => {
-      obj[key] = archivedSnippets[key];
-      return obj;
-    }, {});
+  const filteredArchivedSnippets = filterSnippets(archivedSnippets, ['README.md']);
 
   // Generate archived snippets from md files
   for (let snippet of Object.entries(filteredArchivedSnippets))
@@ -314,14 +314,7 @@ try {
   glossaryOutput += `${glossaryStartPart}\n`;
 
   // Filter README.md from folder
-  const excludeFiles = ['README.md'];
-
-  const filteredGlossarySnippets = Object.keys(glossarySnippets)
-    .filter(key => !excludeFiles.includes(key))
-    .reduce((obj, key) => {
-      obj[key] = glossarySnippets[key];
-      return obj;
-    }, {});
+  const filteredGlossarySnippets = filterSnippets(glossarySnippets, ['README.md']);
 
   // Generate glossary snippets from md files
   for (let snippet of Object.entries(filteredGlossarySnippets))