Adds functionality to package a custom libraries path. Also adds serverless-logging (This breaks the tests!).

Author: Benjamin Weigel

lib/index.js

@@ -3,14 +3,14 @@
 const path = require('path');
 const fs = require('fs');
 const archiver = require('archiver');
-const BbPromise = require('bluebird');
 
 class ServerlessPlugin {
   constructor(serverless, options) {
     this.options = options;
     this.cwd = process.cwd();
     this.functions = serverless.service.functions;
     this.serverless = serverless;
+    this.log = serverless.cli.log.bind(serverless.cli);
 
     this.hooks = {
       'after:package:cleanup': () => this.createCustomPackages(this.functions),
@@ -19,7 +19,7 @@ class ServerlessPlugin {
   }
 
   async createCustomPackages(functions) {
-    console.log("Custom packaging lambdas...");
+    this.log("Custom packaging lambdas...");
     const fNames = Object.keys(functions);
     return await
         Promise.all(fNames.map(name => this.createCustomFunctionPackage(name)));
@@ -35,21 +35,30 @@ class ServerlessPlugin {
   }
 
   async createCustomFunctionPackage(functionName) {
-    console.log("Processing " + functionName);
+    this.log("Processing " + functionName);
     const functionObject = this.serverless.service.getFunction(functionName);
     return await
         Promise.resolve(this.createPackage(functionObject, functionName))
   }
 
   async createPackage(functionObject, functionName) {
-    const source = this.getFnSourceDir(functionObject) || functionName;
-    const target = this.getFnTarget(functionObject) || `${functionName}.zip`;
+    const getAbsPath = inputPath => {
+      if (inputPath) {
+        return path.join(this.cwd, inputPath);
+      }
+      else {
+        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 zipWithGlobs = globs => source => target => this.zipSources(source, target, globs);
+    const zipWithGlobs = globs => libs => source => target => this.zipSources(source, target, globs, libs);
 
     return await
-        zipWithGlobs(globs)(path.join(this.cwd, source))(path.join(this.cwd, target)).then((artifactPath) => {
+        zipWithGlobs(globs)(libs)(source)(target).then((artifactPath) => {
           return artifactPath;
         });
   }
@@ -75,7 +84,14 @@ class ServerlessPlugin {
     return false
   }
 
-  async   createDirIfNotExists(dir) {
+  getLibDir(functionObject) {
+    if ('package' in functionObject && 'libs' in functionObject.package) {
+      return functionObject.package.libs
+    }
+    return false
+  }
+
+  async createDirIfNotExists(dir) {
     if (!fs.existsSync(dir)) {
       await
           new Promise(async (resolve, reject) => {
@@ -92,14 +108,14 @@ class ServerlessPlugin {
     return true
   }
 
-  async   zipSources(source, target, globs) {
+  async zipSources(source, target, globs, libs) {
 
     this.createDirIfNotExists(path.dirname(target));
 
     const output = fs.createWriteStream(target);
     const archive = archiver('zip');
 
-    console.log("Zipping " + source + " to " + target);
+    this.log("Zipping " + source + " to " + target);
 
     output.on('finish', function () {
       console.log(archive.pointer() + ' total bytes');
@@ -130,6 +146,11 @@ class ServerlessPlugin {
       addGlob(archive)(globs)
     }
 
+    if (libs) {
+      this.log("Adding libraries in: " + libs);
+      archive.glob("*/**", {cwd: libs, absolute: false})
+    }
+
     archive.finalize();
 
     return new Promise((resolve, reject) => {

lib/test/index.test.js

@@ -1,5 +1,6 @@
 const scpp = require('../../lib/index.js');
 const chai = require('chai');
+const serverless = require('serverless');
 const expect = chai.expect;
 
 const sls = {
@@ -16,7 +17,10 @@ const sls = {
     }
   }
 };
-const instance = new scpp(sls, {});
+//const instance = new scpp(sls, {});
+const instance = new serverless(sls, {});
+
+console.log(instance);
 
 describe('custom packaging', function () {
   const functions = sls.service.functions;