From f41417b4ca714409af23f02ddcf92ed9fd4ecb6d Mon Sep 17 00:00:00 2001 From: qen Date: Wed, 24 Jun 2015 07:42:35 +0800 Subject: [PATCH 1/2] lambda_package fix copy zipfile to distribution folder --- tasks/lambda_package.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tasks/lambda_package.js b/tasks/lambda_package.js index 8c691a5..9481a82 100644 --- a/tasks/lambda_package.js +++ b/tasks/lambda_package.js @@ -71,18 +71,24 @@ module.exports = function (grunt) { output.on('close', function () { mkdirp('./' + options.dist_folder, function (err) { - fs.createReadStream(install_location + '/' + archive_name + '.zip').pipe( - fs.createWriteStream('./' + options.dist_folder + '/' + archive_name + '.zip') - ); - rimraf(install_location, function () { + var dist_zip = fs.createWriteStream('./' + options.dist_folder + '/' + archive_name + '.zip'); - grunt.config.set('lambda_deploy.' + task.target + '.package', - './' + options.dist_folder + '/' + archive_name + '.zip'); + fs.createReadStream(install_location + '/' + archive_name + '.zip').pipe(dist_zip); + + dist_zip.on('close', function () { + + rimraf(install_location, function () { + + grunt.config.set('lambda_deploy.' + task.target + '.package', + './' + options.dist_folder + '/' + archive_name + '.zip'); + + grunt.log.writeln('Created package at ' + options.dist_folder + '/' + archive_name + '.zip'); + done(true); + }); - grunt.log.writeln('Created package at ' + options.dist_folder + '/' + archive_name + '.zip'); - done(true); }); + }); }); }); From be8478740ce885c544bbad0720d916ce76d53a6e Mon Sep 17 00:00:00 2001 From: qen Date: Wed, 24 Jun 2015 11:54:03 +0800 Subject: [PATCH 2/2] using current directory ./.tmp for temporary folder --- tasks/lambda_package.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tasks/lambda_package.js b/tasks/lambda_package.js index 9481a82..8e95c9c 100644 --- a/tasks/lambda_package.js +++ b/tasks/lambda_package.js @@ -12,7 +12,6 @@ module.exports = function (grunt) { var path = require('path'); var npm = require("npm"); - var tmp = require('temporary'); var archive = require('archiver'); var fs = require('fs'); var mkdirp = require('mkdirp'); @@ -33,7 +32,6 @@ module.exports = function (grunt) { var pkg = grunt.file.readJSON(path.resolve(options.package_folder + '/package.json')); - var dir = new tmp.Dir(); var done = this.async(); var now = new Date(); @@ -51,7 +49,7 @@ module.exports = function (grunt) { npm.config.set('loglevel', 'silent'); - var install_location = dir.path; + var install_location = './.tmp'; npm.commands.install(install_location, options.package_folder, function () {