handle layers paths with trailing slash and leading ./ or just .

lib/plugins/package/lib/packageService.js

@@ -132,8 +132,9 @@ module.exports = {
     const zipFileName = `${layerName}.zip`;
 
     return this.resolveFilePathsLayer(layerName)
+      .then(filePaths => filePaths.map(f => path.resolve(path.join(layerObject.path, f))))
       .then(filePaths =>
-        this.zipFiles(filePaths, zipFileName, layerObject.path).then(artifactPath => {
+        this.zipFiles(filePaths, zipFileName, path.resolve(layerObject.path)).then(artifactPath => {
           layerObject.package = {
             artifact: artifactPath,
           };

lib/plugins/package/lib/packageService.test.js

@@ -418,4 +418,57 @@ describe('#packageService()', () => {
       ]));
     });
   });
+  describe('#packageLayer()', () => {
+    const exclude = ['test-exclude'];
+    const include = ['test-include'];
+    const files = [];
+    const artifactFilePath = '/some/fake/path/test-artifact.zip';
+    let getExcludesStub;
+    let getIncludesStub;
+    let resolveFilePathsFromPatternsStub;
+    let zipFilesStub;
+
+    beforeEach(() => {
+      getExcludesStub = sinon
+        .stub(packagePlugin, 'getExcludes').returns(exclude);
+      getIncludesStub = sinon
+        .stub(packagePlugin, 'getIncludes').returns(include);
+      resolveFilePathsFromPatternsStub = sinon
+        .stub(packagePlugin, 'resolveFilePathsFromPatterns').returns(files);
+      zipFilesStub = sinon
+        .stub(packagePlugin, 'zipFiles').resolves(artifactFilePath);
+    });
+
+    afterEach(() => {
+      packagePlugin.getExcludes.restore();
+      packagePlugin.getIncludes.restore();
+      packagePlugin.resolveFilePathsFromPatterns.restore();
+      packagePlugin.zipFiles.restore();
+    });
+
+    it('should call zipService with settings', () => {
+      const servicePath = 'test';
+      const layerName = 'test-layer';
+
+      const zipFileName = 'test-layer.zip';
+
+      serverless.config.servicePath = servicePath;
+      serverless.service.layers = {};
+      serverless.service.layers[layerName] = { path: './foobar' };
+
+      return expect(packagePlugin.packageLayer(layerName)).to.eventually.equal(artifactFilePath)
+      .then(() => BbPromise.all([
+        expect(getExcludesStub).to.be.calledOnce,
+        expect(getIncludesStub).to.be.calledOnce,
+        expect(resolveFilePathsFromPatternsStub).to.be.calledOnce,
+
+        expect(zipFilesStub).to.be.calledOnce,
+        expect(zipFilesStub).to.have.been.calledWithExactly(
+          files,
+          zipFileName,
+          path.resolve('./foobar')
+        ),
+      ]));
+    });
+  });
 });

lib/plugins/package/lib/zipService.js

@@ -80,8 +80,7 @@ module.exports = {
       output.on('open', () => {
         zip.pipe(output);
 
-        const filePaths = files.map(file => (prefix ? path.join(prefix, file) : file));
-        BbPromise.all(filePaths.map(this.getFileContentAndStat.bind(this))).then((contents) => {
+        BbPromise.all(files.map(this.getFileContentAndStat.bind(this))).then((contents) => {
           _.forEach(_.sortBy(contents, ['filePath']), (file) => {
             const name = file.filePath.slice(prefix ? `${prefix}${path.sep}`.length : 0);
             zip.append(file.data, {