- make some mehtods static

- fix logging

Author: bweigel

lib/index.js

@@ -50,65 +50,37 @@ class ServerlessPlugin {
         return inputPath
       }
     };
-    const source = getAbsPath(this.getFnSourceDir(functionObject) || functionName);
-    const target = getAbsPath(this.getFnTarget(functionObject) || `${functionName}.zip`);
-    const libs = getAbsPath(this.getLibDir(functionObject));
-    const globs = this.getFnIncludeGlobs(functionObject);
+    const source = getAbsPath(getFnSourceDir(functionObject) || functionName);
+    const target = getAbsPath(getFnTarget(functionObject) || `${functionName}.zip`);
+    const libs = getAbsPath(getLibDir(functionObject));
+    const globs = getFnIncludeGlobs(functionObject);
 
-    const zipWithGlobs = globs => libs => source => target => this.zipSources(source, target, globs, libs);
+    const zipWithGlobs = globs => libs => source => target => this.zipSources(source, target, globs, libs, this.serverless);
 
     return await
-        zipWithGlobs(globs)(libs)(source)(target).then((artifactPath) => {
-          return artifactPath;
-        });
-  }
-
-  getFnIncludeGlobs(functionObject) {
-    if ('package' in functionObject && 'include_globs' in functionObject.package) {
-      return functionObject.package.include_globs
-    }
-    return '**/*.py'
-  }
-
-  getFnSourceDir(functionObject) {
-    if ('package' in functionObject && 'path' in functionObject.package) {
-      return functionObject.package.path
-    }
-    return false
-  }
-
-  getFnTarget(functionObject) {
-    if ('package' in functionObject && 'artifact' in functionObject.package) {
-      return functionObject.package.artifact
-    }
-    return false
-  }
-
-  getLibDir(functionObject) {
-    if ('package' in functionObject && 'libs' in functionObject.package) {
-      return functionObject.package.libs
-    }
-    return false
+      zipWithGlobs(globs)(libs)(source)(target).then((artifactPath) => {
+        return artifactPath;
+      });
   }
 
   async createDirIfNotExists(dir) {
     if (!fs.existsSync(dir)) {
       await
-          new Promise(async (resolve, reject) => {
-            fs.mkdir(dir, err => {
-              if (err) {
-                resolve(false)
-              }
-              else {
-                resolve(true)
-              }
-            })
-          });
+        new Promise(async (resolve, reject) => {
+          fs.mkdirSync(dir, err => {
+            if (err) {
+              resolve(false)
+            }
+            else {
+              resolve(true)
+            }
+          })
+        });
     }
     return true
   }
 
-  async zipSources(source, target, globs, libs) {
+  async zipSources(source, target, globs, libs, serverless) {
 
     this.createDirIfNotExists(path.dirname(target));
 
@@ -118,8 +90,7 @@ class ServerlessPlugin {
     this.log("Zipping " + source + " to " + target);
 
     output.on('finish', function () {
-      console.log(archive.pointer() + ' total bytes');
-      console.log(target + ' finalized and closed.');
+      serverless.cli.log(target + ' finalized and closed. (' + (archive.pointer() / 1024).toPrecision(3) + ' kB)');
     });
 
     archive.on('error', function (err) {
@@ -155,11 +126,41 @@ class ServerlessPlugin {
 
     return new Promise((resolve, reject) => {
       output.on('close', () => resolve(target));
-      archive.on('error', (err) => reject(err));
+      output.on('error', (err) => reject(err));
     });
 
   }
 
 }
 
+
+function getFnIncludeGlobs(functionObject) {
+  if ('package' in functionObject && 'include_globs' in functionObject.package) {
+    return functionObject.package.include_globs
+  }
+  return '**/*.py'
+}
+
+function getFnSourceDir(functionObject) {
+  if ('package' in functionObject && 'path' in functionObject.package) {
+    return functionObject.package.path
+  }
+  return false
+}
+
+function getFnTarget(functionObject) {
+  if ('package' in functionObject && 'artifact' in functionObject.package) {
+    return functionObject.package.artifact
+  }
+  return false
+}
+
+function getLibDir(functionObject) {
+  if ('package' in functionObject && 'libs' in functionObject.package) {
+    return functionObject.package.libs
+  }
+  return false
+}
+
+
 module.exports = ServerlessPlugin;