Fixed package individually:true (#163)

* Fixed package individually:true

* Fixed issue with SLS <1.18. Updated unit tests.

* Removed debug logging

Author: kikar

lib/cleanup.js

@@ -3,6 +3,7 @@
 const BbPromise = require('bluebird');
 const path = require('path');
 const fse = require('fs-extra');
+const _ = require('lodash');
 
 module.exports = {
   cleanup() {
@@ -20,11 +21,18 @@ module.exports = {
             } else {
               if (this.serverless.service.package.individually) {
                 const functionNames = this.serverless.service.getAllFunctions();
-                functionNames.forEach(name => {
-                  this.serverless.service.functions[name].artifact = path.join(
+
+                _.forEach(functionNames, name => {
+                  const func = this.serverless.service.getFunction(name);
+                  // The location of the artifact property changed from Serverless
+                  // 1.17 to 1.18 (damn, the guys should use SemVer!). We have to
+                  // use the new one if available here.
+                  const artifactParent = func.artifact ? func : func.package;
+
+                  artifactParent.artifact = path.join(
                       this.serverless.config.servicePath,
                       '.serverless',
-                      path.basename(this.serverless.service.functions[name].artifact)
+                      path.basename(artifactParent.artifact)
                   );
                 });
                 resolve();

tests/cleanup.test.js

@@ -122,6 +122,65 @@ describe('cleanup', () => {
     fseMock.copy.yields(null, {});
     serverless.service.package.individually = true;
 
+    const testFunctionsConfig = {
+      func1: {
+        handler: 'module1.func1handler',
+        package: {
+          artifact: 'artifact-func1.zip',
+        },
+        events: [{
+          http: {
+            method: 'get',
+            path: 'func1path',
+          },
+        }],
+      },
+      func2: {
+        handler: 'module2.func2handler',
+        package: {
+          artifact: 'artifact-func2.zip',
+        },
+        events: [{
+          http: {
+            method: 'POST',
+            path: 'func2path',
+          },
+        }, {
+          nonhttp: 'non-http',
+        }],
+      },
+      func3: {
+        handler: 'module2.func3handler',
+        package: {
+          artifact: 'artifact-func3.zip',
+        },
+        events: [{
+          nonhttp: 'non-http',
+        }],
+      },
+    };
+    serverless.service.functions = testFunctionsConfig;
+
+    return expect(module.cleanup()).to.be.fulfilled
+    .then(() => {
+      expect(serverless.config.servicePath).to.equal('my/Original/Service/Path');
+      expect(fseMock.copy).to.have.been.calledOnce;
+      expect(fseMock.copy).to.have.been
+        .calledWith('my/Output/Path/.serverless', 'my/Original/Service/Path/.serverless');
+      _.forEach(['func1', 'func2', 'func3'], funcName => {
+        expect(serverless.service.functions[funcName].package).to.have.a.property('artifact')
+          .that.equals(`my/Original/Service/Path/.serverless/artifact-${funcName}.zip`);
+      });
+    });
+  });
+
+  it('should call copy with the right parameters with individual packaging for old Serverless versions (<=1.17)', () => {
+    dirExistsSyncStub.returns(true);
+    module.originalServicePath = 'my/Original/Service/Path';
+    fseMock.copy.reset();
+    fseMock.copy.yields(null, {});
+    serverless.service.package.individually = true;
+
     const testFunctionsConfig = {
       func1: {
         handler: 'module1.func1handler',