Merge branch 'master' into refactor

Author: dschep

index.js

@@ -2,13 +2,13 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const _ = require('lodash');
 const fse = require('fs-extra');
 const {addVendorHelper, removeVendorHelper, packRequirements} = require('./lib/zip');
 const {installRequirements} = require('./lib/pip');
 const {pipfileToRequirements} = require('./lib/pipenv');
 const {linkRequirements, unlinkRequirements} = require('./lib/link');
 const {cleanup} = require('./lib/clean');
+const {excludeRequirementsFolder} = require('./lib/excludeRequirementsFolder');
 
 BbPromise.promisifyAll(fse);
 
@@ -54,12 +54,6 @@ class ServerlessPythonRequirements {
     this.serverless = serverless;
     this.servicePath = this.serverless.config.servicePath;
 
-    if (!_.get(this.serverless.service, 'package.exclude'))
-      _.set(this.serverless.service, ['package', 'exclude'], []);
-    this.serverless.service.package.exclude.push('.requirements/**');
-    if (!_.get(this.serverless.service, 'package.include'))
-      _.set(this.serverless.service, ['package', 'include'], []);
-
     this.commands = {
       requirements: {
         commands: {
@@ -80,6 +74,7 @@ class ServerlessPythonRequirements {
     };
 
     const before = () => BbPromise.bind(this)
+      .then(excludeRequirementsFolder)
       .then(pipfileToRequirements)
       .then(addVendorHelper)
       .then(installRequirements)

lib/excludeRequirementsFolder.js

@@ -0,0 +1,14 @@
+const _ = require('lodash');
+
+/**
+ * Inject '.requirements' folder into serverless package exclude list.
+ */
+function excludeRequirementsFolder() {
+  if (!_.get(this.serverless.service, 'package.exclude'))
+    _.set(this.serverless.service, ['package', 'exclude'], []);
+  this.serverless.service.package.exclude.push('.requirements/**');
+  if (!_.get(this.serverless.service, 'package.include'))
+    _.set(this.serverless.service, ['package', 'include'], []);
+}
+
+module.exports = {excludeRequirementsFolder};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-python-requirements",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "engines": {
     "node": ">=6.0"
   },