Fix Module Include

Fixes a bug where individual "include" files/directories are ignored for a package.

Author: Aubtin

lib/inject.js

@@ -54,20 +54,30 @@ function injectRequirements(requirementsPath, packagePath, options) {
  * @param {string} source path to original package
  * @param {string} target path to result package
  * @param {string} module module to keep
+ * @param {[string]} include files to keep
  * @return {Promise} the JSZip object written out.
  */
-function moveModuleUp(source, target, module) {
+function moveModuleUp(source, target, module, include) {
   const targetZip = new JSZip();
+  let included = new Set();
+
+  if (!!include && include.length > 0)
+    included = new Set(glob.sync(include));
+
+  console.log("To include:", included);
 
   return fse
     .readFileAsync(source)
     .then(buffer => JSZip.loadAsync(buffer))
     .then(sourceZip =>
       sourceZip.filter(
-        file =>
-          file.startsWith(module + '/') ||
+        file => {
+          // return true;
+          return file.startsWith(module + '/') ||
           file.startsWith('serverless_sdk/') ||
-          file.match(/^s_.*\.py/) !== null
+          file.match(/^s_.*\.py/) !== null ||
+          included.has(file)
+        }
       )
     )
     .map(srcZipObj =>
@@ -93,13 +103,13 @@ function injectAllRequirements(funcArtifact) {
   }
 
   this.serverless.cli.log('Injecting required Python packages to package...');
-
+  this.serverless.cli.log("SERVERLESS INFO:", this.servicePath);
   if (this.serverless.service.package.individually) {
     return BbPromise.resolve(this.targetFuncs)
       .filter(func =>
         (func.runtime || this.serverless.service.provider.runtime).match(
-          /^python.*/
-        )
+            /^python.*/
+          )
       )
       .map(func => {
         if (!get(func, 'module')) {
@@ -108,14 +118,17 @@ function injectAllRequirements(funcArtifact) {
         return func;
       })
       .map(func => {
+
         if (func.module !== '.') {
           const artifact = func.package ? func.package.artifact : funcArtifact;
           const newArtifact = path.join(
             '.serverless',
             `${func.module}-${func.name}.zip`
           );
           func.package.artifact = newArtifact;
-          return moveModuleUp(artifact, newArtifact, func.module).then(
+          const package_include = func.package ? func.package.include : [];
+          this.serverless.cli.log("Package Include:", package_include);
+          return moveModuleUp(artifact, newArtifact, func.module, package_include).then(
             () => func
           );
         } else {