crabatool 1.0.255 → 1.0.270

package/lib/utils.js

@@ -650,20 +650,34 @@ class Utils {
 
         var webPath = config.webPath || config.targetPath;
         console.log('cd ' + webPath);
-        execSync('cd ' + webPath); // 必须切换到web路径，有些是在node_modules路径下
+        //execSync('cd ' + webPath, { cwd: webPath }); // 必须切换到web路径，有些是在node_modules路径下
+
+        var branchName = config.branchName || config.version;
+        branchName = branchName.replace('origin/', '');
+
+        /*
+        var list = [];
+        list.push('cd ' + webPath);
+        list.push('git add --all');
+        list.push('git commit -m \"' + msg + '\"');
+        list.push('git pull --rebase origin ' + branchName);
+        list.push('git push origin ' + branchName);
+        var git = list.join(' && ');
+        console.log(git);
+        execSync(git, { cwd: webPath });
+        */
 
         console.log('git add --all');  // 暂存
-        execSync('git add --all'); // 暂存
+        execSync('git add --all', { cwd: webPath }); // 暂存
 
         console.log('git commit -m \"' + msg + '\"'); // 提交日志
-        execSync('git commit -m \"' + msg + '\"'); // 提交日志
+        execSync('git commit -m \"' + msg + '\"', { cwd: webPath }); // 提交日志
 
-        var branchName = config.branchName || config.version;
-        console.log('git pull --rebase origin ' + branchName); // 拉取分支
-        execSync('git pull --rebase origin ' + branchName); // 拉取分支
+        //console.log('git pull --rebase origin ' + branchName); // 拉取分支
+        //execSync('git pull --rebase origin ' + branchName, { cwd: webPath }); // 拉取分支
 
         console.log('git push origin ' + branchName); // 推送
-        execSync('git push origin ' + branchName); // 推送
+        execSync('git push origin ' + branchName, { cwd: webPath }); // 推送
     }
 
     addPackageVersion(packagePath, v1, v2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.255",
+  "version": "1.0.270",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -10,6 +10,7 @@
     "start": "node run.js",
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run",
+    "export": "node ./test/test.js -exportgspx -webPath F:\\Beefun\\srcs",
     "checkjs": "node ./test/test.js -checkjs",
     "beefun": "node ./test/beefun.js -checkjs",
     "checkUpdate": "node run.js -checkUpdate -version master -webPath F:\\crabaevery\\www",

package/tool/compress.js

@@ -28,6 +28,7 @@ module.exports.run = function() {
 
   utils.addPackageVersion(_pkgPath); // 版本号+1
 
+  // 版本号发生改变， 推送git仓库
   utils.gitpush('版本号+1');
 
   doCompress(); // 打包、压缩、合并js和css到临时目录下

package/tool/upgrade.js

@@ -136,6 +136,7 @@ class Upgrade {
 
     if (localData.version == newData.version) {
       console.log(':::本地已经是最新版本，不需要更新:::');
+      console.log('[crabaversion]没有更新，本地已经是最新版本:' + localData.version);
       if (this.hasLogs()) {
         this.clearLog();
       }
@@ -148,6 +149,7 @@ class Upgrade {
       return;
     }
 
+    console.log("[crabaversion]" + newData.version);
     this.done = this._updateDone;
     this.downloadCraba();
   }
@@ -192,6 +194,9 @@ class Upgrade {
     });
     var msg = logs.join(';\t');
 
+
+    console.log("[crabaupdatelog]" + msg);
+
     utils.gitpush(msg);
 
     this.clearLog(); // 每次更新后都要清除标记，避免下次又去更新；