refactoring

Author: siloenix

command/BaseCommand.js

@@ -1,14 +1,14 @@
 const log = require('../logger');
 
-module.exports = class Command {
+class BaseCommand {
   constructor(name, options) {
     this.name = name;
     this.options = options;
     this.dependencies = [];
   }
 
   addDependency(dependency) {
-    if (dependency instanceof Command) {
+    if (dependency instanceof BaseCommand) {
       this.dependencies.push(dependency);
       log.info(`${this.name} -> ${dependency.name}`)
     }
@@ -41,4 +41,6 @@ module.exports = class Command {
     const message = 'Method "cleanUp()" not defined. Please define "cleanUp()" on the child class';
     return Promise.reject(new Error(message));
   }
-};
+}
+
+module.exports = BaseCommand;

command/NetworkCommand.js

@@ -5,7 +5,7 @@ const BaseCommand = require('./BaseCommand');
 /**
  * simulated network creation
  * */
-module.exports = class NetworkCommand extends BaseCommand {
+class NetworkCommand extends BaseCommand {
   constructor(name, options) {
     super(name, options)
   }
@@ -18,4 +18,6 @@ module.exports = class NetworkCommand extends BaseCommand {
   async cleanUp() {
     log.info(`network removed: '${this.name}'`);
   }
-};
+}
+
+module.exports = NetworkCommand;

command/ServiceCommand.js

@@ -1,10 +1,9 @@
 const log = require('../logger');
-const timer = require('../helpers/timer');
 const BaseCommand = require('./BaseCommand');
 const docker = require('../docker/client');
 
 
-module.exports = class ServiceCommand extends BaseCommand {
+class ServiceCommand extends BaseCommand {
   constructor(name, options) {
     super(name, options)
   }
@@ -44,4 +43,6 @@ module.exports = class ServiceCommand extends BaseCommand {
       log.info(`Service removed: '${this.name}'`)
     }
   }
-};
+}
+
+module.exports = ServiceCommand;

command/VolumeCommand.js

@@ -5,7 +5,7 @@ const BaseCommand = require('./BaseCommand');
 /**
  * simulated volume creation
  * */
-module.exports = class VolumeCommand extends BaseCommand {
+class VolumeCommand extends BaseCommand {
   constructor(name, options) {
     super(name, options)
   }
@@ -18,4 +18,6 @@ module.exports = class VolumeCommand extends BaseCommand {
   async cleanUp() {
     log.info(`network removed: '${this.name}'`);
   }
-};
+}
+
+module.exports = VolumeCommand;

controllers/DockerController.js

@@ -1,8 +1,8 @@
-const log = require('../logger');
 const ValidationError = require('../errors/ValidationError');
 const DockerService = require('../services/DockerService');
+const extractYaml = require('../helpers/extractYaml');
 
-module.exports = class DockerController {
+class DockerController {
   static async applyYaml(req, res, next) {
     try {
       const file = extractYaml(req.files);
@@ -17,19 +17,8 @@ module.exports = class DockerController {
       next(e);
     }
   }
-};
+}
+
+module.exports = DockerController;
 
-const mimetype = 'text/yaml';
 
-/**
- * extract first yaml from request
- * */
-function extractYaml(files) {
-  for (const name in files) {
-    if (files.hasOwnProperty(name) && files[name].mimetype === mimetype) {
-      log.info(`file found: ${name}`);
-      return files[name];
-    }
-  }
-  return null;
-}

helpers/extractYaml.js

@@ -0,0 +1,16 @@
+const mimetype = 'text/yaml';
+
+/**
+ * extract first yaml from request
+ * */
+function extractYaml(files) {
+  for (const name in files) {
+    if (files.hasOwnProperty(name) && files[name].mimetype === mimetype) {
+      log.info(`file found: ${name}`);
+      return files[name];
+    }
+  }
+  return null;
+}
+
+module.exports = extractYaml;

services/DockerService.js

@@ -8,7 +8,7 @@ const VolumeCommand = require('../command/VolumeCommand');
 /**
  * Service for applying "docker-compose" files.
  * */
-module.exports = class DockerService {
+class DockerService {
   static applyYaml(fileContent) {
     const directives = yaml.parseSync(fileContent);
     return this.applyDirectives(directives);
@@ -73,7 +73,7 @@ module.exports = class DockerService {
     timer(5000).then(() => runnable.forEach(c => c.cleanUp()));
     return {ok: true}
   }
-};
+}
 
 function getCommand(name, directives, commands, CommandType) {
   let command = commands[name];
@@ -82,4 +82,6 @@ function getCommand(name, directives, commands, CommandType) {
     commands[name] = command;
   }
   return command;
-}
+}
+
+module.exports = DockerService;