require curlys to avoid the types of bugs @abetomo keeps finding

Author: dschep

.eslintrc.yml

@@ -4,3 +4,4 @@ parserOptions:
 rules:
   no-console: 2
   max-len: [1, 100, 2, {ignoreComments: true}]
+  curly: error

index.js

@@ -42,8 +42,9 @@ class ServerlessPythonRequirements {
         'setuptools',
       ],
     }, this.serverless.service.custom && this.serverless.service.custom.pythonRequirements || {});
-    if (options.dockerizePip === 'non-linux')
+    if (options.dockerizePip === 'non-linux') {
       options.dockerizePip = process.platform !== 'linux';
+    }
     return options;
   }
 

lib/link.js

@@ -12,23 +12,27 @@ const rimraf = require('rimraf');
  */
 function linkRequirements() {
   const requirementsDir = path.join(this.servicePath, '.serverless/requirements');
-  if (fse.existsSync('__pycache__'))
+  if (fse.existsSync('__pycache__')) {
     rimraf.sync('__pycache__');
-  if (!get(this.serverless.service, 'package.include'))
+  }
+  if (!get(this.serverless.service, 'package.include')) {
     set(this.serverless.service, ['package', 'include'], []);
+  }
   if (!this.options.zip && fse.existsSync(requirementsDir)) {
     this.serverless.cli.log('Linking required Python packages...');
     const noDeploy = new Set(this.options.noDeploy || []);
     fse.readdirSync(requirementsDir).map((file) => {
-      if (noDeploy.has(file))
+      if (noDeploy.has(file)) {
         return;
+      }
       if (this.serverless.service.package.individually) {
         // don't include python deps in non-python functions
         values(this.serverless.service.functions)
           .filter((f) => (f.runtime || this.serverless.service.provider.runtime).match(/^python.*/))
           .forEach((f) => {
-            if (!get(f, 'package.include'))
+            if (!get(f, 'package.include')) {
               set(f, ['package', 'include'], []);
+            }
             f.package.include.push(file);
             f.package.include.push(`${file}/**`);
           });
@@ -47,8 +51,9 @@ function linkRequirements() {
             linkDest = fse.readlinkSync(`./${file}`);
           } catch (e) {
           }
-          if (linkDest !== `${requirementsDir}/${file}`)
+          if (linkDest !== `${requirementsDir}/${file}`) {
             throw exception;
+          }
         }
       }
     });
@@ -65,8 +70,9 @@ function unlinkRequirements() {
     this.serverless.cli.log('Unlinking required Python packages...');
     const noDeploy = new Set(this.options.noDeploy || []);
     fse.readdirSync(requirementsDir).map((file) => {
-      if (noDeploy.has(file))
+      if (noDeploy.has(file)) {
         return;
+      }
       fse.unlinkSync(file);
     });
   }

lib/pip.js

@@ -14,8 +14,9 @@ function installRequirements() {
     fileName = dotSlsReqs;
   }
 
-  if (!fse.existsSync(path.join(this.servicePath, fileName)))
+  if (!fse.existsSync(path.join(this.servicePath, fileName))) {
     return;
+  }
 
   this.serverless.cli.log(`Installing required Python packages with ${this.options.pythonBin}...`);
 
@@ -39,13 +40,15 @@ function installRequirements() {
     const pipTestRes = spawnSync(
       this.options.pythonBin, ['-m', 'pip', 'help', 'install']);
     if (pipTestRes.error) {
-      if (pipTestRes.error.code === 'ENOENT')
+      if (pipTestRes.error.code === 'ENOENT') {
         throw new Error(`${this.options.pythonBin} not found! ` +
                       'Try the pythonBin option.');
+      }
       throw new Error(pipTestRes.error);
     }
-    if (pipTestRes.stdout.toString().indexOf('--system') >= 0)
+    if (pipTestRes.stdout.toString().indexOf('--system') >= 0) {
       pipCmd.push('--system');
+    }
   }
   if (this.options.dockerizePip) {
     cmd = 'docker';
@@ -114,8 +117,9 @@ function installRequirements() {
     }
     throw new Error(res.error);
   }
-  if (res.status !== 0)
+  if (res.status !== 0) {
     throw new Error(res.stderr);
+  }
 };
 
 module.exports = {installRequirements};

lib/pipenv.js

@@ -6,19 +6,22 @@ const {spawnSync} = require('child_process');
   * pipenv install
   */
 function pipfileToRequirements() {
-  if (!this.options.usePipenv || !fse.existsSync(path.join(this.servicePath, 'Pipfile')))
+  if (!this.options.usePipenv || !fse.existsSync(path.join(this.servicePath, 'Pipfile'))) {
     return;
+  }
 
   this.serverless.cli.log('Generating requirements.txt from Pipfile...');
 
   const res = spawnSync('pipenv', ['lock', '--requirements'], {cwd: this.servicePath});
   if (res.error) {
-    if (res.error.code === 'ENOENT')
+    if (res.error.code === 'ENOENT') {
       throw new Error(`pipenv not found! Install it with 'pip install pipenv'.`);
+    }
     throw new Error(res.error);
   }
-  if (res.status !== 0)
+  if (res.status !== 0) {
     throw new Error(res.stderr);
+  }
   fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
   fse.writeFileSync(path.join(this.servicePath, '.serverless/requirements.txt'), res.stdout);
 };

lib/zip.js

@@ -15,8 +15,9 @@ function addVendorHelper() {
   if (this.options.zip) {
     this.serverless.cli.log('Adding Python requirements helper...');
 
-    if (!get(this.serverless.service, 'package.include'))
+    if (!get(this.serverless.service, 'package.include')) {
       set(this.serverless.service, ['package', 'include'], []);
+    }
 
     this.serverless.service.package.include.push('unzip_requirements.py');