refactor

Author: apocas

README.md

@@ -29,7 +29,7 @@ var docker = new Dockerode();
 var compose = new DockerodeCompose(docker);
 
 (async () => {
-  var state = await compose.compose('./test/wordpress.yml', 'wordpress');
+  var state = await compose.up('./test/wordpress.yml', 'wordpress');
   console.log(state);
 })();
 ```

lib/compose.js compose.jslib/compose.js renamed to compose.js

@@ -1,18 +1,18 @@
 const yaml = require('js-yaml');
 const fs = require('fs');
 
-const secrets = require('./secrets');
-const volumes = require('./volumes');
-const configs = require('./configs');
-const networks = require('./networks');
-const services = require('./services');
+const secrets = require('./lib/secrets');
+const volumes = require('./lib/volumes');
+const configs = require('./lib/configs');
+const networks = require('./lib/networks');
+const services = require('./lib/services');
 
 class Compose {
   constructor(dockerode) {
     this.docker = dockerode;
   }
 
-  async compose(file, projectName) {
+  async up(file, projectName) {
     var self = this;
     var output = {};
     if (projectName === undefined) {
@@ -21,11 +21,11 @@ class Compose {
     self.projectName = projectName;
     try {
       self.recipe = yaml.load(fs.readFileSync(file, 'utf8'));
-      output.secrets = await secrets(self.docker, self.projectName, self.recipe);
-      output.volumes = await volumes(self.docker, self.projectName, self.recipe);
-      output.configs = await configs(self.docker, self.projectName, self.recipe);
-      output.networks = await networks(self.docker, self.projectName, self.recipe);
-      output.services = await services(self.docker, self.projectName, self.recipe);
+      output.secrets = await secrets(self.docker, self.projectName, self.recipe, output);
+      output.volumes = await volumes(self.docker, self.projectName, self.recipe, output);
+      output.configs = await configs(self.docker, self.projectName, self.recipe, output);
+      output.networks = await networks(self.docker, self.projectName, self.recipe, output);
+      output.services = await services(self.docker, self.projectName, self.recipe, output);
       return output;
     } catch (e) {
       throw e;

examples/compose.js

@@ -5,6 +5,6 @@ var docker = new Dockerode();
 var compose = new DockerodeCompose(docker);
 
 (async () => {
-  var state = await compose.compose('./test/wordpress.yml', 'wordpress');
+  var state = await compose.up('./test/wordpress.yml', 'wordpress');
   console.log(state);
 })();

lib/configs.js

@@ -1,4 +1,4 @@
-module.exports = async function (docker, projectName, recipe) {
+module.exports = async function (docker, projectName, recipe, output) {
   var configs = [];
   var configNames = Object.keys(recipe.configs || []);
   for (var configName of configNames) {

lib/networks.js

@@ -1,4 +1,4 @@
-module.exports = async function (docker, projectName, recipe) {
+module.exports = async function (docker, projectName, recipe, output) {
   var networks = [];
   var networkNames = Object.keys(recipe.networks || []);
   for (var networkName of networkNames) {

lib/secrets.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 
-module.exports = async function(docker, projectName, recipe) {
+module.exports = async function(docker, projectName, recipe, output) {
   var secrets = [];
   var secretNames = Object.keys(recipe.secrets || []);
   for (var secretName of secretNames) {

lib/services.js

@@ -1,6 +1,6 @@
 const tools = require('./tools');
 
-module.exports = async function (docker, projectName, recipe) {
+module.exports = async function (docker, projectName, recipe, output) {
   var services = [];
   var serviceNames = tools.sortServices(recipe);
   for (var serviceName of serviceNames) {

lib/volumes.js

@@ -1,4 +1,4 @@
-module.exports = async function(docker, projectName, recipe) {
+module.exports = async function(docker, projectName, recipe, output) {
   var volumes = [];
   var volumeNames = Object.keys(recipe.volumes || []);
   for (var volumeName of volumeNames) {

package.json

@@ -2,7 +2,7 @@
   "name": "dockerode-compose",
   "version": "1.0.1",
   "description": "docker-compose in nodejs using dockerode",
-  "main": "./lib/compose.js",
+  "main": "./compose.js",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha -R spec --exit"
   },