gitlab-radiator 3.3.6 → 3.3.10

package/src/app.js

@@ -54,9 +54,9 @@ app.disable('x-powered-by');
 app.use((0, _lessMiddleware.default)("".concat(__dirname, "/../public"), {
   dest: cacheDir,
   preprocess: {
-    less: function less(src) {
+    less: src => {
       var colorLess = '';
-      Object.keys(_config.config.colors).forEach(function (stateName) {
+      Object.keys(_config.config.colors).forEach(stateName => {
         colorLess += "@".concat(stateName, "-color:").concat(_config.config.colors[stateName], ";");
       });
       return src + colorLess;
@@ -67,7 +67,7 @@ app.use(_express.default.static(cacheDir));
 app.use(_express.default.static("".concat(__dirname, "/../public")));
 app.use((0, _compression.default)());
 app.use((0, _auth.basicAuth)(_config.config.auth));
-httpServer.listen(_config.config.port, function () {
+httpServer.listen(_config.config.port, () => {
   // eslint-disable-next-line no-console
   console.log("Listening on port *:".concat(_config.config.port));
 });
@@ -79,7 +79,7 @@ var globalState = {
   columns: _config.config.columns,
   groupSuccessfulProjects: _config.config.groupSuccessfulProjects
 };
-socketIoServer.on('connection', function (socket) {
+socketIoServer.on('connection', socket => {
   socket.emit('state', withDate(globalState));
 });
 
@@ -146,7 +146,7 @@ function _errorIfRunnerOffline() {
 
           case 2:
             offlineRunnersPerGitlab = _context2.sent;
-            _offlineRunnersPerGit = offlineRunnersPerGitlab.reduce(function (acc, runner) {
+            _offlineRunnersPerGit = offlineRunnersPerGitlab.reduce((acc, runner) => {
               return {
                 offline: acc.offline.concat(runner.offline),
                 totalCount: acc.totalCount + runner.totalCount
@@ -161,9 +161,7 @@ function _errorIfRunnerOffline() {
               break;
             }
 
-            names = offline.map(function (r) {
-              return r.name;
-            }).sort().join(', ');
+            names = offline.map(r => r.name).sort().join(', ');
             counts = offline.length === totalCount ? 'All' : "".concat(offline.length, "/").concat(totalCount);
             return _context2.abrupt("return", "".concat(counts, " runners offline: ").concat(names));
 

package/src/auth.js

@@ -13,14 +13,12 @@ function basicAuth(auth) {
   if (!auth || !auth.username || !auth.password) {
     // eslint-disable-next-line no-console
     console.log('No authentication configured');
-    return function (req, res, next) {
-      return next();
-    };
+    return (req, res, next) => next();
   } // eslint-disable-next-line no-console
 
 
   console.log('HTTP basic auth enabled');
-  return function (req, res, next) {
+  return (req, res, next) => {
     var _ref = (0, _basicAuth.default)(req) || {},
         name = _ref.name,
         pass = _ref.pass;

package/src/config.js

@@ -27,7 +27,7 @@ config.zoom = Number(config.zoom || 1.0);
 config.columns = Number(config.columns || 1);
 config.groupSuccessfulProjects = config.groupSuccessfulProjects || false;
 config.projectsOrder = config.projectsOrder || ['name'];
-config.gitlabs = config.gitlabs.map(function (gitlab) {
+config.gitlabs = config.gitlabs.map(gitlab => {
   return {
     url: gitlab.url,
     ignoreArchived: gitlab.ignoreArchived === undefined ? true : gitlab.ignoreArchived,
@@ -50,7 +50,7 @@ function expandTilde(path) {
 function validate(cfg) {
   _assert.default.ok(cfg.gitlabs, 'Mandatory gitlab properties missing from configuration file');
 
-  cfg.gitlabs.forEach(function (gitlab) {
+  cfg.gitlabs.forEach(gitlab => {
     _assert.default.ok(gitlab.url, 'Mandatory gitlab url missing from configuration file');
 
     _assert.default.ok(gitlab['access-token'] || process.env.GITLAB_ACCESS_TOKEN, 'Mandatory gitlab access token missing from configuration (and none present at GITLAB_ACCESS_TOKEN env variable)');

package/src/gitlab/index.js

@@ -41,9 +41,7 @@ function _update() {
 
           case 2:
             projectsWithPipelines = _context.sent;
-            return _context.abrupt("return", projectsWithPipelines.filter(function (project) {
-              return project.pipelines.length > 0;
-            }));
+            return _context.abrupt("return", projectsWithPipelines.filter(project => project.pipelines.length > 0));
 
           case 4:
           case "end":
@@ -80,13 +78,11 @@ function _loadProjectsWithPipelines() {
 
                       case 2:
                         projects = _context2.sent;
-                        projects.forEach(function (project) {
+                        projects.forEach(project => {
                           project.maxNonFailedJobsVisible = gitlab.maxNonFailedJobsVisible;
                         });
                         _context2.next = 6;
-                        return Promise.all(projects.map(function (project) {
-                          return projectWithPipelines(project, gitlab);
-                        }));
+                        return Promise.all(projects.map(project => projectWithPipelines(project, gitlab)));
 
                       case 6:
                         projectsWithPipelines = _context2.sent;
@@ -136,7 +132,7 @@ function _projectWithPipelines() {
           case 3:
             _context4.t1 = _context4.sent;
             pipelines = (0, _context4.t0)(_context4.t1).filter(excludePipelineStatusFilter(config));
-            status = masterBranchStatus(pipelines);
+            status = defaultBranchStatus(project, pipelines);
             return _context4.abrupt("return", _objectSpread(_objectSpread({}, project), {}, {
               pipelines,
               status
@@ -152,20 +148,18 @@ function _projectWithPipelines() {
   return _projectWithPipelines.apply(this, arguments);
 }
 
-function masterBranchStatus(pipelines) {
+function defaultBranchStatus(project, pipelines) {
   return (0, _lodash.default)(pipelines).filter({
-    ref: 'master'
+    ref: project.default_branch
   }).map('status').head();
 }
 
 function filterOutEmpty(pipelines) {
-  return pipelines.filter(function (pipeline) {
-    return pipeline.stages;
-  });
+  return pipelines.filter(pipeline => pipeline.stages);
 }
 
 function excludePipelineStatusFilter(config) {
-  return function (pipeline) {
+  return pipeline => {
     if (config.projects && config.projects.excludePipelineStatus) {
       return !config.projects.excludePipelineStatus.includes(pipeline.status);
     }

package/src/gitlab/pipelines.js

@@ -44,7 +44,7 @@ function _fetchLatestPipelines() {
 
           case 5:
             jobsForPipelines = _context.sent;
-            return _context.abrupt("return", pipelines.map(function (_ref3) {
+            return _context.abrupt("return", pipelines.map(_ref3 => {
               var id = _ref3.id,
                   ref = _ref3.ref,
                   status = _ref3.status;
@@ -146,9 +146,7 @@ function _fetchNonSkippedPipelines() {
           case 2:
             _yield$gitlabRequest = _context3.sent;
             pipelines = _yield$gitlabRequest.data;
-            return _context3.abrupt("return", pipelines.filter(function (pipeline) {
-              return pipeline.status !== 'skipped';
-            }));
+            return _context3.abrupt("return", pipelines.filter(pipeline => pipeline.status !== 'skipped'));
 
           case 5:
           case "end":
@@ -172,12 +170,8 @@ function _fetchJobsForPipelines() {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            includedPipelineIds = pipelines.map(function (pipeline) {
-              return pipeline.id;
-            });
-            _pipelines$map$sort = pipelines.map(function (pipeline) {
-              return pipeline.created_at;
-            }).sort(), _pipelines$map$sort2 = (0, _slicedToArray2.default)(_pipelines$map$sort, 1), oldestCreatedAt = _pipelines$map$sort2[0];
+            includedPipelineIds = pipelines.map(pipeline => pipeline.id);
+            _pipelines$map$sort = pipelines.map(pipeline => pipeline.created_at).sort(), _pipelines$map$sort2 = (0, _slicedToArray2.default)(_pipelines$map$sort, 1), oldestCreatedAt = _pipelines$map$sort2[0];
             jobs = [];
             SAFETY_MAX_PAGE = 10;
             page = 1;
@@ -197,11 +191,7 @@ function _fetchJobsForPipelines() {
           case 8:
             _yield$gitlabRequest2 = _context4.sent;
             jobsBatch = _yield$gitlabRequest2.data;
-            jobs.push(jobsBatch.filter(function (job) {
-              return includedPipelineIds.includes(job.pipeline.id);
-            }).filter(function (job) {
-              return job.created_at >= oldestCreatedAt;
-            }));
+            jobs.push(jobsBatch.filter(job => includedPipelineIds.includes(job.pipeline.id)).filter(job => job.created_at >= oldestCreatedAt));
 
             if (!(jobsBatch.length === 0 || jobsBatch[jobsBatch.length - 1].created_at < oldestCreatedAt)) {
               _context4.next = 13;
@@ -229,26 +219,22 @@ function _fetchJobsForPipelines() {
 }
 
 function matchJobs(pipelineId, gitlabJobsForMultiplePipelines) {
-  var gitlabJobs = gitlabJobsForMultiplePipelines.filter(function (job) {
-    return job.pipeline.id === pipelineId;
-  });
+  var gitlabJobs = gitlabJobsForMultiplePipelines.filter(job => job.pipeline.id === pipelineId);
 
   if (gitlabJobs.length === 0) {
     return {};
   }
 
   var commit = findCommit(gitlabJobs);
-  var stages = (0, _lodash.default)(gitlabJobs).map(function (job) {
-    return {
-      id: job.id,
-      status: job.status,
-      stage: job.stage,
-      name: job.name,
-      startedAt: job.started_at,
-      finishedAt: job.finished_at,
-      url: job.web_url
-    };
-  }).orderBy('id').groupBy('stage').mapValues(mergeRetriedJobs).mapValues(cleanup).toPairs().map(function (_ref) {
+  var stages = (0, _lodash.default)(gitlabJobs).map(job => ({
+    id: job.id,
+    status: job.status,
+    stage: job.stage,
+    name: job.name,
+    startedAt: job.started_at,
+    finishedAt: job.finished_at,
+    url: job.web_url
+  })).orderBy('id').groupBy('stage').mapValues(mergeRetriedJobs).mapValues(cleanup).toPairs().map(_ref => {
     var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
         name = _ref2[0],
         jobs = _ref2[1];
@@ -265,9 +251,7 @@ function matchJobs(pipelineId, gitlabJobsForMultiplePipelines) {
 }
 
 function findCommit(jobs) {
-  var _jobs$filter = jobs.filter(function (j) {
-    return j.commit;
-  }),
+  var _jobs$filter = jobs.filter(j => j.commit),
       _jobs$filter2 = (0, _slicedToArray2.default)(_jobs$filter, 1),
       job = _jobs$filter2[0];
 
@@ -282,10 +266,8 @@ function findCommit(jobs) {
 }
 
 function mergeRetriedJobs(jobs) {
-  return jobs.reduce(function (mergedJobs, job) {
-    var index = mergedJobs.findIndex(function (mergedJob) {
-      return mergedJob.name === job.name;
-    });
+  return jobs.reduce((mergedJobs, job) => {
+    var index = mergedJobs.findIndex(mergedJob => mergedJob.name === job.name);
 
     if (index >= 0) {
       mergedJobs[index] = job;
@@ -298,9 +280,5 @@ function mergeRetriedJobs(jobs) {
 }
 
 function cleanup(jobs) {
-  return (0, _lodash.default)(jobs).map(function (job) {
-    return _lodash.default.omitBy(job, _lodash.default.isNull);
-  }).map(function (job) {
-    return _lodash.default.omit(job, 'stage');
-  }).value();
+  return (0, _lodash.default)(jobs).map(job => _lodash.default.omitBy(job, _lodash.default.isNull)).map(job => _lodash.default.omit(job, 'stage')).value();
 }

package/src/gitlab/projects.js

@@ -30,9 +30,7 @@ function _fetchProjects() {
           case 2:
             projects = _context.sent;
             return _context.abrupt("return", projects // Ignore projects for which CI/CD is not enabled
-            .filter(function (project) {
-              return project.jobs_enabled;
-            }).map(projectMapper).filter(includeRegexFilter(gitlab)).filter(excludeRegexFilter(gitlab)).filter(archivedFilter(gitlab)));
+            .filter(project => project.jobs_enabled).map(projectMapper).filter(includeRegexFilter(gitlab)).filter(excludeRegexFilter(gitlab)).filter(archivedFilter(gitlab)));
 
           case 4:
           case "end":
@@ -111,10 +109,9 @@ function projectMapper(project) {
     nameWithoutNamespace: project.path,
     group: getGroupName(project),
     archived: project.archived,
+    default_branch: project.default_branch || 'master',
     url: project.web_url,
-    tags: (project.tag_list || []).map(function (t) {
-      return t.toLowerCase();
-    })
+    tags: (project.tag_list || []).map(t => t.toLowerCase())
   };
 }
 
@@ -124,7 +121,7 @@ function getGroupName(project) {
 }
 
 function includeRegexFilter(config) {
-  return function (project) {
+  return project => {
     if (config.projects && config.projects.include) {
       var includeRegex = new RegExp(config.projects.include, "i");
       return includeRegex.test(project.name);
@@ -135,7 +132,7 @@ function includeRegexFilter(config) {
 }
 
 function excludeRegexFilter(config) {
-  return function (project) {
+  return project => {
     if (config.projects && config.projects.exclude) {
       var excludeRegex = new RegExp(config.projects.exclude, "i");
       return !excludeRegex.test(project.name);
@@ -146,7 +143,7 @@ function excludeRegexFilter(config) {
 }
 
 function archivedFilter(config) {
-  return function (project) {
+  return project => {
     if (config.ignoreArchived) {
       return !project.archived;
     }

package/src/gitlab/runners.js

@@ -29,9 +29,7 @@ function _fetchOfflineRunners() {
 
           case 2:
             runners = _context.sent;
-            offline = runners.filter(function (r) {
-              return r.status === 'offline';
-            });
+            offline = runners.filter(r => r.status === 'offline');
             return _context.abrupt("return", {
               offline,
               totalCount: runners.length
@@ -65,12 +63,10 @@ function _fetchRunners() {
           case 2:
             _yield$gitlabRequest = _context2.sent;
             runners = _yield$gitlabRequest.data;
-            return _context2.abrupt("return", runners.map(function (r) {
-              return {
-                name: r.description || r.id,
-                status: r.status
-              };
-            }));
+            return _context2.abrupt("return", runners.map(r => ({
+              name: r.description || r.id,
+              status: r.status
+            })));
 
           case 5:
           case "end":