archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #582 from minibikini/master

Browse Source 
Small fixes
This commit is contained in:
Austen 2016-02-08 07:22:31 -08:00
commit e57a0dbb68
8 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/ServerlessFunction.js
View File

@ -11,7 +11,7 @@ const SError = require('./ServerlessError'),
BbPromise = require('bluebird'),
async = require('async'),
path = require('path'),
fs = require('fs'),
fs = BbPromise.promisifyAll(require('fs')),
_ = require('lodash');
class ServerlessFunction {
@ -337,24 +337,28 @@ class ServerlessFunction {
_create() {
let _this = this;
return fs.mkdirAsync(this._config.fullPath).then(() => {
let writeDeferred = [],
subFolderLevel = this._config.sPath.split('/').length - 1,
fnRootPath = _.repeat('../', subFolderLevel);
return BbPromise.try(function() {
writeDeferred.push(SUtils.writeFile(path.join(this._config.fullPath, 'event.json'), '{}'));
let writeDeferred = [];
// Runtime: nodejs
writeDeferred.push(
fs.mkdirSync(_this._config.fullPath),
SUtils.writeFile(path.join(_this._config.fullPath, 'event.json'), '{}')
);
if (_this.getRuntime() === 'nodejs') {
if (this.getRuntime() === 'nodejs') {
writeDeferred.push(
SUtils.writeFile(path.join(_this._config.fullPath, 'handler.js'), fs.readFileSync(path.join(_this._S.config.serverlessPath, 'templates', 'nodejs', 'handler.js')))
fs.readFileAsync(path.join(this._S.config.serverlessPath, 'templates', 'nodejs', 'handler.js'))
.then((template) => {
let handler = _.template(template)({fnRootPath: fnRootPath});
return SUtils.writeFile(path.join(this._config.fullPath, 'handler.js'), handler);
})
)
} else if (_this.getRuntime() === 'python2.7') {
} else if (this.getRuntime() === 'python2.7') {
writeDeferred.push(
SUtils.writeFile(path.join(_this._config.fullPath, 'handler.py'), fs.readFileSync(path.join(_this._S.config.serverlessPath, 'templates', 'python2.7', 'handler.py')))
fs.readFileAsync(path.join(this._S.config.serverlessPath, 'templates', 'python2.7', 'handler.py'))
.then((template) => {
let handler = _.template(template)({fnRootPath: fnRootPath});
return SUtils.writeFile(path.join(this._config.fullPath, 'handler.py'), handler);
})
)
}
return BbPromise.all(writeDeferred);

3
lib/actions/FunctionLogs.js
View File

@ -118,6 +118,9 @@ module.exports = function(SPlugin, serverlessPath) {
this.evt.options.path = [sPath];
}
// strip trailing slashes from path
this.evt.options.path = this.evt.options.path.replace(/\/$/, "");
this.spinner = SCli.spinner();
this.CWL = require('../utils/aws/CloudWatch')({

15
lib/actions/FunctionRun.js
View File

@ -7,14 +7,10 @@
module.exports = function(SPlugin, serverlessPath) {
const path = require('path'),
SUtils = require( path.join( serverlessPath, 'utils' ) ),
SError = require(path.join(serverlessPath, 'ServerlessError')),
BbPromise = require('bluebird'),
chalk = require('chalk'),
awsMisc = require(path.join(serverlessPath, 'utils/aws/Misc')),
fs = require('fs');
BbPromise.promisifyAll(fs);
SCli = require( path.join( serverlessPath, 'utils', 'cli'));
/**
* FunctionRun Class
@ -113,14 +109,17 @@ module.exports = function(SPlugin, serverlessPath) {
// Get all functions in CWD
let sPath = _this.getSPathFromCwd(_this.S.config.projectPath);
if (!sPath) {
throw new SError(`You must be in a function folder to run it`);
return BbPromise.reject(new SError(`You must be in a function folder to run it`));
}
_this.evt.options.path = [sPath];
}
// strip trailing slashes from path
_this.evt.options.path = _this.evt.options.path.replace(/\/$/, "");
let funcs = _this.S.state.getFunctions({ paths: [_this.evt.options.path] });
if (funcs.length > 1) {
throw new SError(`You must be in a function folder to run it`);
return BbPromise.reject(new SError(`You must be in a function folder to run it`));
}
_this.function = funcs[0];
@ -218,7 +217,7 @@ module.exports = function(SPlugin, serverlessPath) {
if (reply.LogResult) {
console.log(chalk.gray('--------------------------------------------------------------------'));
let logResult = new Buffer(reply.LogResult, 'base64').toString();
_.each(logResult.split('\n'), (line) => {
logResult.split('\n').forEach( line => {
console.log(SCli.formatLambdaLogEvent(line));
});
}

6
lib/actions/FunctionRunLambdaNodeJs.js
View File

@ -43,8 +43,8 @@ module.exports = function(SPlugin, serverlessPath) {
let _this = this;
_this.evt = evt;
if (!_this.evt.options.path || _this.evt.options.path.split('/').length != 3) {
return BbPromise.reject(new SError('Invalid function path. Function path should be in this format: component/module/function .'));
if (!_this.evt.options.path || _this.evt.options.path.split('/').length < 2) {
return BbPromise.reject(new SError('Invalid function path. Function path should be in this format: component/function .'));
}
// Instantiate Classes
@ -95,7 +95,7 @@ module.exports = function(SPlugin, serverlessPath) {
SCli.log(`-----------------`);
SCli.log(chalk.bold('Failed - This Error Was Thrown:'));
SCli.log(err);
SCli.log(err.stack || err);
_this.evt.data.result.status = 'error';
_this.evt.data.result.response = err.message;
return resolve();

4
lib/actions/FunctionRunLambdaPython2.js
View File

@ -43,8 +43,8 @@ module.exports = function(SPlugin, serverlessPath) {
let _this = this;
_this.evt = evt;
if (!_this.evt.options.path || _this.evt.options.path.split('/').length != 3) {
return BbPromise.reject(new SError('Invalid function path. Function path should be in this format: component/module/function .'));
if (!_this.evt.options.path || _this.evt.options.path.split('/').length < 2) {
return BbPromise.reject(new SError('Invalid function path. Function path should be in this format: component/function .'));
}
// Instantiate Classes

2
lib/templates/nodejs/handler.js
View File

@ -11,7 +11,7 @@
var ServerlessHelpers = require('serverless-helpers-js').loadEnv();
// Require Logic
var lib = require('../../lib');
var lib = require('<%= fnRootPath %>lib');
// Lambda Handler
module.exports.handler = function(event, context) {

4
lib/templates/python2.7/handler.py
View File

@ -10,8 +10,8 @@ log.setLevel(logging.DEBUG)
import sys, os
# get this file's directory independent of where it's run from
here = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(here, "../../"))
sys.path.append(os.path.join(here, "../../vendored"))
sys.path.append(os.path.join(here, "<%= fnRootPath %>"))
sys.path.append(os.path.join(here, "<%= fnRootPath %>vendored"))
# import the shared library, now anything in component/lib/__init__.py can be
# referenced as `lib.something`

2
package.json
View File

@ -49,9 +49,7 @@
"debug": "^2.2.0",
"dotenv": "^1.2.0",
"download": "^4.2.0",
"expand-home-dir": "0.0.2",
"fs-extra": "^0.26.4",
"insert-module-globals": "^6.5.2",
"keypress": "^0.2.1",
"lodash": "^3.9.0",
"minimist": "^1.2.0",