#15 将alipayobjects 改成 alipay

jackie19 · May 19, 2013 · 988ca00 · 988ca00
1 parent 83b1935
commit 988ca00
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 50 deletions.
diff --git a/bin/init.js b/bin/init.js
@@ -62,19 +62,25 @@ function initPeachesHome() {
 // windows 下，使用 process.env.HOMEPATH
     process.env.PEACHES_HOME = path.join(process.env.HOME || process.env.HOMEPATH, '.peaches');
     var defaultPkg = path.join(process.env.PEACHES_HOME, 'package.json');
-
+    var sysPkg = path.resolve(__dirname, './package.json');
     // 读取 系统默认package.json；
     if (!fs.existsSync(defaultPkg)) {
         try {
-            //TODO: 系统升级更新package.json时的处理。
             shelljs.mkdir('-p', path.join(process.env.PEACHES_HOME, 'images'));
             shelljs.mkdir('-p', path.join(process.env.PEACHES_HOME, 'tmp'));
-            shelljs.cp(path.resolve(__dirname, './package.json'), defaultPkg);
+            shelljs.cp(sysPkg, defaultPkg);
         }
         catch (e) {
             logger.error('无法创建系统目录：error:%s', e);
         }
     }
+    else {
+        var pkg = require(defaultPkg);
+        var pkg2 = require(sysPkg);
+        if (pkg.version !== pkg2.version) {
+            shelljs.cp('-f',sysPkg, defaultPkg);
+        }
+    }
     return defaultPkg;
 }
 init.initPeachesHome = initPeachesHome;

diff --git a/bin/main.js b/bin/main.js
@@ -19,7 +19,7 @@ function list(val) {
 program
     .version(version)
     .usage('[<a.css> [<b.css> ...]] [options]')
-    .option('-m, --model <local/alipayobjects/scp/upyun>', '配置图片托管模式，默认为local模式', 'local')
+    .option('-m, --model <local/alipay/scp/upyun>', '配置图片托管模式，默认为local模式', 'local')
     .option('-v, --verbose', '显示更多的日志信息')
     .option('-i, --input <file...>', '需要编译的css，以“,”分割,各文件将会被合并编译', list)
     .option('-o, --output <output>', '文件输出')
@@ -36,7 +36,7 @@ program
 
 program.on('--help', function () {
     'use strict';
-    console.log('  1.关于图片托管模式（-m, --model <local/alipayobjects/scp/upyun>），请查看http://peaches.io/doc/image-model');
+    console.log('  1.关于图片托管模式（-m, --model <local/alipay/scp/upyun>），请查看http://peaches.io/doc/image-model');
     console.log('');
     console.log('  一些例子:');
     console.log('');
@@ -49,7 +49,7 @@ program.on('--help', function () {
     console.log('    $ peaches -i a.css,b.css -o out.css');
     console.log('');
     console.log('    3. 合并a.css,b.css 并编译到到out.css,并将图片上传到alipaycnd');
-    console.log('    $ peaches a.css b.css -o out.css -m alipayobjects');
+    console.log('    $ peaches a.css b.css -o out.css -m alipay');
     console.log('');
     console.log('    4. 根据当前目录下的package.json 配置进行编译');
     console.log('    $ peaches');
@@ -137,7 +137,7 @@ function main() {
             });
         });
     }, function (next) {
-        var modelList = ['local', 'alipayobjects', 'scp', 'upyun'];
+        var modelList = ['local', 'alipay', 'scp', 'upyun'];
         if (typeof program.model !== 'undefined') {
             program.pkg.model = program.model;
         }
@@ -199,9 +199,9 @@ function main() {
                     process.exit(1);
                 }
                 break;
-            case 'alipayobjects':
+            case 'alipay':
                 if (server.username === '') {
-                    logger.error('alipayobjects 没有配置完整，请参考 http://peaches.io/doc/package#alipayobjects 配置');
+                    logger.error('alipay 没有配置完整，请参考 http://peaches.io/doc/package#alipay 配置');
                     process.exit(1);
                 }
                 break;

diff --git a/bin/package.json b/bin/package.json
@@ -1,40 +1,41 @@
 {
-    "sort":"h",
-    "format":"png8",
-    "autoReload":false,
-    "model":"local",
-    "servers":{
-        "local":{
-            "name":"local",
-            "port":8099,
-            "root":"./images",
-            "tmp":"./tmp",
-            "baseURI":"http://127.0.0.1:8099/"
+    "sort": "h",
+    "format": "png8",
+    "autoReload": false,
+    "model": "local",
+    "version": "0.5.0",
+    "servers": {
+        "local": {
+            "name": "local",
+            "port": 8099,
+            "root": "./images",
+            "tmp": "./tmp",
+            "baseURI": "http://127.0.0.1:8099/"
         },
-        "upyun":{
-            "name":"upyun",
-            "username":"",
-            "password":"",
-            "bucket":"",
-            "baseURI":"",
-            "root":"./images",
-            "tmp":"./tmp"
+        "upyun": {
+            "name": "upyun",
+            "username": "",
+            "password": "",
+            "bucket": "",
+            "baseURI": "",
+            "root": "./images",
+            "tmp": "./tmp"
         },
-        "scp":{
-            "name":"scp",
-            "root":"./images",
-            "tmp":"./tmp",
-            "server":"",
-            "dir":"",
-            "baseURI":""
+        "scp": {
+            "name": "scp",
+            "root": "./images",
+            "tmp": "./tmp",
+            "server": "",
+            "dir": "",
+            "baseURI": ""
         },
-        "alipayobjects":{
-            "name":"alipayobjects",
-            "root":"./images",
-            "username":"liuqin.sheng",
-            "tmp":"./tmp",
-            "baseURI":"https://i.alipayobjects.com",
-            "uploadUrl":"https://ecmng.alipay.com/home/uploadFile.json"
+        "alipay": {
+            "name": "alipay",
+            "root": "./images",
+            "username": "liuqin.sheng",
+            "tmp": "./tmp",
+            "baseURI": "https://i.alipay.com",
+            "uploadUrl": "https://ecmng.alipay.com/home/uploadFile.json"
         }
     }
 }
diff --git a/debug.js b/debug.js
@@ -36,8 +36,8 @@ var config = {
             "dir": "",
             "baseURI": ""
         },
-        "alipayobjects": {
-            "name": "alipayobjects",
+        "alipay": {
+            "name": "alipay",
             "root": "/Users/liuqin/.peaches/images",
             "username": "liuqin.sheng",
             "tmp": "/Users/liuqin/.peaches/tmp",

diff --git a/lib/cloud/index.js b/lib/cloud/index.js
@@ -116,8 +116,8 @@ Cloud.prototype = {
                             next();
                         });
                         break;
-                    case 'alipayobjects':
-                        var CDN = require('../plugin/alipayobjects');
+                    case 'alipay':
+                        var CDN = require('../plugin/alipay');
                         var cdn = new CDN('scp', self.options.server);
                         cdn.upload(file, function (err, url) {
                             data.styleText = data.styleText.replace(new RegExp(image, 'g'), url);

diff --git a/lib/combine.js b/lib/combine.js
@@ -114,8 +114,8 @@ Combine.prototype = {
                         'canvas 画图出现故障 \n \
 请尝试使用以下方式解决：\n \
 1. 重新处理图片：' + image.url + '\n ' + '\
-2. 如果使用alipayobjects，请使用原始图片而非压缩后的图片：\n \
-   在图片名称后，添加“_src”。比如：https://i.alipayobjects.com/e/201304/BUpbE2yzV_src.png \n \
+2. 如果使用alipay，请使用原始图片而非压缩后的图片：\n \
+   在图片名称后，添加“_src”。比如：https://i.alipay.com/e/201304/BUpbE2yzV_src.png \n \
 3. 使用云端模式：peaches --cloud=http://cloud.peaches.io/api ';
                     var err = new errors.CanNotDrawImage(msg);
                     return next(err);

diff --git a/lib/plugin/alipayobjects.js → lib/plugin/alipay.js b/lib/plugin/alipayobjects.js → lib/plugin/alipay.js
@@ -13,11 +13,11 @@ var md5 = require('./../tools').md5;
  */
 function Server(name, config) {
     'use strict';
-    this.serverName = 'alipayobjects';
+    this.serverName = 'alipay';
     this.options = {
         username: 'liuqin.sheng',
         // 访问图片的url
-        baseURI: 'https://i.alipayobjects.com/',
+        baseURI: 'https://i.alipay.com/',
         // 上传图片的URL
         uploadUrl: ''
     };