refactor: Adapt zip to modern logs

Author: pgrzesik

lib/zip.js

@@ -30,17 +30,25 @@ function addVendorHelper() {
         })
         .then((functions) => uniqBy(functions, (func) => func.module))
         .map((f) => {
-          this.serverless.cli.log(
-            `Adding Python requirements helper to ${f.module}...`
-          );
+          if (this.log) {
+            this.log.info(`Adding Python requirements helper to ${f.module}`);
+          } else {
+            this.serverless.cli.log(
+              `Adding Python requirements helper to ${f.module}...`
+            );
+          }
 
           return fse.copyAsync(
             path.resolve(__dirname, '../unzip_requirements.py'),
             path.join(this.servicePath, f.module, 'unzip_requirements.py')
           );
         });
     } else {
-      this.serverless.cli.log('Adding Python requirements helper...');
+      if (this.log) {
+        this.log.info('Adding Python requirements helper');
+      } else {
+        this.serverless.cli.log('Adding Python requirements helper...');
+      }
 
       if (!get(this.serverless.service, 'package.patterns')) {
         set(this.serverless.service, ['package', 'patterns'], []);
@@ -72,15 +80,25 @@ function removeVendorHelper() {
         })
         .then((funcs) => uniqBy(funcs, (f) => f.module))
         .map((f) => {
-          this.serverless.cli.log(
-            `Removing Python requirements helper from ${f.module}...`
-          );
+          if (this.log) {
+            this.log.info(
+              `Removing Python requirements helper from ${f.module}`
+            );
+          } else {
+            this.serverless.cli.log(
+              `Removing Python requirements helper from ${f.module}...`
+            );
+          }
           return fse.removeAsync(
             path.join(this.servicePath, f.module, 'unzip_requirements.py')
           );
         });
     } else {
-      this.serverless.cli.log('Removing Python requirements helper...');
+      if (this.log) {
+        this.log.info('Removing Python requirements helper');
+      } else {
+        this.serverless.cli.log('Removing Python requirements helper...');
+      }
       return fse.removeAsync(
         path.join(this.servicePath, 'unzip_requirements.py')
       );
@@ -104,21 +122,46 @@ function packRequirements() {
         })
         .then((funcs) => uniqBy(funcs, (f) => f.module))
         .map((f) => {
-          this.serverless.cli.log(
-            `Zipping required Python packages for ${f.module}...`
-          );
+          let packProgress;
+          if (this.progress) {
+            packProgress = this.progress.get(
+              `python-pack-requirements-${f.module}`
+            );
+            packProgress.update(
+              `Zipping required Python packages for ${f.module}`,
+              { isMainEvent: true }
+            );
+          } else {
+            this.serverless.cli.log(
+              `Zipping required Python packages for ${f.module}...`
+            );
+          }
           f.package.patterns.push(`${f.module}/.requirements.zip`);
-          return addTree(
-            new JSZip(),
-            `.serverless/${f.module}/requirements`
-          ).then((zip) => writeZip(zip, `${f.module}/.requirements.zip`));
+          return addTree(new JSZip(), `.serverless/${f.module}/requirements`)
+            .then((zip) => writeZip(zip, `${f.module}/.requirements.zip`))
+            .then(() => packProgress && packProgress.remove())
+            .catch((e) => {
+              packProgress && packProgress.remove();
+              throw e;
+            });
         });
     } else {
-      this.serverless.cli.log('Zipping required Python packages...');
+      let packProgress;
+      if (this.progress) {
+        packProgress = this.progress.get(`python-pack-requirements`);
+      } else {
+        this.serverless.cli.log('Zipping required Python packages...');
+      }
       this.serverless.service.package.patterns.push('.requirements.zip');
-      return addTree(new JSZip(), '.serverless/requirements').then((zip) =>
-        writeZip(zip, path.join(this.servicePath, '.requirements.zip'))
-      );
+      return addTree(new JSZip(), '.serverless/requirements')
+        .then((zip) =>
+          writeZip(zip, path.join(this.servicePath, '.requirements.zip'))
+        )
+        .then(() => packProgress && packProgress.remove())
+        .catch((e) => {
+          packProgress && packProgress.remove();
+          throw e;
+        });
     }
   }
 }