grunt-contrib-lefdupload
Advanced tools
Comparing version 0.0.7 to 0.0.8
{ | ||
"name": "grunt-contrib-lefdupload", | ||
"version": "0.0.7", | ||
"description": "upload file to server", | ||
"homepage": "http://git.letv.cn/uc-ued/grunt-contrib-lefdupload", | ||
"repository": "http://git.letv.cn/uc-ued/grunt-contrib-lefdupload.git", | ||
"author": { | ||
"name": "liuluying@le.com", | ||
"email": "liuluying@le.com", | ||
"url": "https://github.com/liulyliu" | ||
}, | ||
"keywords": [ | ||
"gruntplugin" | ||
], | ||
"main": "Gruntfile.js", | ||
"engines": { | ||
"node": ">= 0.8.0" | ||
}, | ||
"license": "MIT", | ||
"dependencies": { | ||
"needle": "^1.0.0" | ||
}, | ||
"devDependencies": { | ||
"grunt": "~0.4.2", | ||
"grunt-contrib-nodeunit": "~0.3.0", | ||
"load-grunt-tasks": "~0.3.0" | ||
}, | ||
"scripts": { | ||
"test": "grunt test" | ||
} | ||
"name": "grunt-contrib-lefdupload", | ||
"version": "0.0.8", | ||
"description": "upload file to server", | ||
"homepage": "http://git.letv.cn/uc-ued/grunt-contrib-lefdupload", | ||
"repository": "http://git.letv.cn/uc-ued/grunt-contrib-lefdupload.git", | ||
"author": { | ||
"name": "liuluying@le.com", | ||
"email": "liuluying@le.com", | ||
"url": "https://github.com/liulyliu" | ||
}, | ||
"keywords": [ | ||
"gruntplugin" | ||
], | ||
"main": "Gruntfile.js", | ||
"engines": { | ||
"node": ">= 0.8.0" | ||
}, | ||
"license": "MIT", | ||
"dependencies": { | ||
"needle": "^1.0.0" | ||
}, | ||
"devDependencies": { | ||
"grunt": "~0.4.2", | ||
"grunt-contrib-nodeunit": "~0.3.0", | ||
"load-grunt-tasks": "~0.3.0" | ||
}, | ||
"scripts": { | ||
"test": "grunt test" | ||
} | ||
} |
@@ -27,10 +27,11 @@ /* | ||
//http request setting | ||
request:{}, | ||
request: {}, | ||
}); | ||
var route = []; | ||
var route = []; | ||
var done = this.async(); | ||
// Iterate over all specified file groups. | ||
var src = [],i = 0; | ||
var src = [], | ||
i = 0; | ||
this.files.forEach(function(file) { | ||
@@ -55,18 +56,18 @@ // Concat specified files. | ||
var router = function(opts,callback){ | ||
var content,newContent,reg = new RegExp(opts.startTag + "[\\w\\W]+" + opts.endTag,'mg'); | ||
var router = function(opts, callback) { | ||
if(!grunt.file.exists(opts.file)) { | ||
var content, newContent, reg = new RegExp(opts.startTag + "[\\w\\W]+" + opts.endTag, 'mg'); | ||
if (!grunt.file.exists(opts.file)) { | ||
grunt.fail.fatal('router failed:' + opts.file + 'is not found'); | ||
callback(true); | ||
return ; | ||
callback(true); | ||
return; | ||
} | ||
content = grunt.file.read(opts.file).split(reg); | ||
if(content.length > 1) { | ||
content[0] += opts.startTag +'\n'+route.join(',') + '\n' + opts.endTag; | ||
if (content.length > 1) { | ||
content[0] += opts.startTag + '\n' + route.join(',') + '\n' + opts.endTag; | ||
} | ||
content = content.join(''); | ||
grunt.file.write(opts.file,content); | ||
content = content.join(''); | ||
grunt.file.write(opts.file, content); | ||
grunt.task.run(opts.tasks) | ||
@@ -76,8 +77,8 @@ callback(false); | ||
var go = function(i){ | ||
if(!src[i]) { | ||
if(options.router) { | ||
router(options.router,function(err,res){ | ||
var go = function(i) { | ||
if (!src[i]) { | ||
if (options.router) { | ||
router(options.router, function(err, res) { | ||
done(!err); | ||
}); | ||
}); | ||
} else { | ||
@@ -88,9 +89,7 @@ done(true); | ||
} | ||
uploadMoudle.uploadOneFile(options.remote.folder,src[i],function(err,url,file){ | ||
if(!err) { | ||
uploadMoudle.uploadOneFile(options.remote.folder, src[i], function(err, url, file) { | ||
if (!err) { | ||
grunt.log.writeln('upload success:' + url); | ||
if(options.protocol === 'https') { | ||
url = url.replace('http:','https:'); | ||
} | ||
route[route.length] = '"' + file + '":"' + url + '"'; | ||
url = url.replace('http:', ''); | ||
route[route.length] = '"' + file + '":"' + url + '"'; | ||
} else { | ||
@@ -102,3 +101,3 @@ grunt.fail.fatal('upload failed:' + err); | ||
} | ||
go(i); | ||
@@ -105,0 +104,0 @@ }); |
10543
241