Merge branch 'master' into master

Author: ubaniabalogun

CHANGELOG.md

@@ -17,3 +17,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 ### Removed
+
+
+## [0.2.4] - 2017-10-24
+### Added
+- Normalized path for building on windows courtesy @wsteimel77
+
+## [0.2.5] - 2017-11-11
+- Bug fix for #21 courtesy @JFox

README.md

@@ -83,10 +83,14 @@ When `serverless deploy` is run, the plugin will:
 The Serverless framework will then pickup each zip file and upload it to your provider.
 
 Here's a simple `serverless.yml` configuration for this plugin, assuming the project structure above
+one of the functions we add `-${opt:stage}` to the name in order to append the stage to the function name
 
 ```
 service: your-awesome-project
 
+package:
+    individually: true
+    
 plugins:
   - serverless-package-python-functions
 
@@ -102,7 +106,7 @@ custom:
 
 functions:
   function1:
-    name: function1
+    name: function1-${opt:stage}
     handler: lambda.handler
     package:
       include:
@@ -135,6 +139,9 @@ At the function level, you:
 - Use `include` to specify what function-level files you want to include in your artifact. Simply specifying the path to the function's folder will include every file in the folder in the function's zip artifact
 - Use `artifact` to tell Serverless where to find the zip artifact. The plugin creates the zip artifact for the function at `buildDir`/`name`.zip, so using `${self:custom.pkgPyFuncs.buildDir}/[function-name-here].zip` is advised.
 
+At the package level, you may need to:
+- Specify the `individually` parameter as `true` to ensure that zip artifacts are generated properly. You may need this if you are getting file not found errors about your zip artifact.
+
 Now, you may be wondering, doesn't the [Serverless documentation say](https://serverless.com/framework/docs/providers/aws/guide/packaging#artifact):
 > Serverless won't zip your service if [artifact] is configured and therefore exclude and include will be ignored. Either you use artifact or include / exclude.
 

index.js

@@ -6,6 +6,7 @@ const Fse = require('fs-extra');
 const Path = require('path');
 const ChildProcess = require('child_process');
 const zipper = require('zip-local');
+const upath = require('upath');
 
 BbPromise.promisifyAll(Fse);
 
@@ -23,15 +24,16 @@ class PkgPyFuncs {
     if ( !config ) {
       this.error("No serverless-package-python-functions configuration detected. Please see documentation")
     }
-    config.requirementsFile ? this.requirementsFile = config.requirementsFile  : this.requirementsFile = 'requirements.txt'
+    this.requirementsFile = config.requirementsFile || 'requirements.txt'
     config.buildDir ? this.buildDir = config.buildDir : this.error("No buildDir configuration specified")
-    config.globalRequirements ? this.globalRequirements = config.globalRequirements : this.globalRequirements = null
-    config.globalIncludes ? this.globalIncludes = config.globalIncludes : this.globalIncludes = null
+    this.globalRequirements = config.globalRequirements || []
+    this.globalIncludes = config.globalIncludes || []
     config.cleanup === undefined ? this.cleanup = true : this.cleanup = config.cleanup
     this.useDocker = config.useDocker || false
     this.dockerImage = config.dockerImage || `lambci/lambda:build-${this.serverless.service.provider.runtime}`
     this.containerName = config.containerName || 'serverless-package-python-functions'
     this.mountSSH = config.mountSSH || false
+    this.dockerServicePath = '/var/task'
   }
 
   clean(){
@@ -78,13 +80,15 @@ class PkgPyFuncs {
     }
 
     let cmd = 'pip'
-    let args = ['install','--upgrade','-t', buildPath, '-r', requirementsPath]
+    let args = ['install','--upgrade','-t', upath.normalize(buildPath), '-r']
     if ( this.useDocker === true ){
       cmd = 'docker'
-      args = ['exec',this.containerName, 'pip', ...args]
+      args = ['exec', this.containerName, 'pip', ...args]
+      requirementsPath = `${this.dockerServicePath}/${requirementsPath}`
     }
 
-    return this.runProcess(cmd,args)
+    args = [...args, upath.normalize(requirementsPath)]
+    return this.runProcess(cmd, args)
   }
 
   checkDocker(){
@@ -99,7 +103,7 @@ class PkgPyFuncs {
     }
 
     if (ret.stderr.length != 0){
-      throw new this.serverless.classes.Error(`[serverless-package-python-functions] ${ret.stderr.toString()}`)
+      this.log(ret.stderr.toString())
     }
 
     const out = ret.stdout.toString()
@@ -113,14 +117,13 @@ class PkgPyFuncs {
     if ( out === this.containerName ){
       this.log('Container already exists. Reusing.')
     } else {
-      let args = ['run', '--rm', '-dt', '-v', `${process.cwd()}:/var/task`]
-
+      let args = ['run', '--rm', '-dt', '-v', `${process.cwd()}:${this.dockerServicePath}`]
+      
       if (this.mountSSH) {
         args = args.concat(['-v', `${process.env.HOME}/.ssh:/root/.ssh`])
       }
-
+      
       args = args.concat(['--name',this.containerName, this.dockerImage, 'bash'])
-
       this.runProcess('docker', args)
       this.log('Container created')
     }
@@ -153,7 +156,7 @@ class PkgPyFuncs {
     // Create package directory and package files
     Fse.ensureDirSync(buildPath)
     // Copy includes
-    let includes = target.includes
+    let includes = target.includes || []
     if (this.globalIncludes){
       includes = _.concat(includes, this.globalIncludes)
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-package-python-functions",
-  "version": "0.2.0",
+  "version": "0.2.5",
   "description": "Serverless Framework plugin to package python functions and their requirements",
   "main": "index.js",
   "scripts": {},
@@ -9,7 +9,8 @@
   "dependencies": {
     "bluebird": "^3.5.0",
     "fs-extra": "^3.0.0",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.11",
+    "upath": "^1.1.0",
     "zip-local": "^0.3.4"
   },
   "repository": {