Merge pull request #120 from weexteam/bugfix-alisource

fixbug-support alisource for ios platform

Author: zhangquan

.travis.yml

@@ -9,5 +9,5 @@ node_js:
 script: ./node_modules/mocha/bin/mocha tests/*.test.js
 before_install:
   - brew install nvm;
-  - brew install android-platform-tools;
+#  - brew install android-platform-tools;
   - gem install -n /usr/local/bin cocoapods

README.md

@@ -367,6 +367,9 @@ weexpack 所提供的命令大致可分为三组，分别是：
 
 ## changelog
 
+0.3.13
+* 修复创建ali内部源问题
+
 
 0.3.12
 * 修复merge问题

lib/src/platforms/PlatformApiPoly.js

@@ -93,31 +93,15 @@ PlatformApiPoly.createPlatform = function (destinationDir, projectConfig, option
 
     var templatePath = path.join(options.platformDetails.libDir, 'bin', 'templates');
     return Q().then(function(){
-            copyPlatform(templatePath, destinationDir)
-            //修改source
-            if(options.ali&&options.platformDetails.platform == "ios"){
-                var weexPluginRootDir = path.join(destinationDir, 'Weexplugin');
-                var xcodeProjDir;
-                var xcodeCordovaProj;
-
-                try {
-                    xcodeProjDir = fs.readdirSync(weexPluginRootDir).filter( function(e) { return e.match(/\.xcodeproj$/i); })[0];
-                    if (!xcodeProjDir) {
-                        throw new CordovaError('The provided path "' + weexPluginRootDir + '" is not a Weex iOS project.');
-                    }
-
-                    var cordovaProjName = xcodeProjDir.substring(xcodeProjDir.lastIndexOf(path.sep)+1, xcodeProjDir.indexOf('.xcodeproj'));
-                    xcodeCordovaProj = path.join(weexPluginRootDir, cordovaProjName);
-                } catch(e) {
-                    throw new CordovaError('The provided path "'+weexPluginRootDir+'" is not a weexpack iOS project.');
-                }
-                var Podfile = require('./ios_pack/lib/Podfile').Podfile;
-                var project_name = xcodeCordovaProj.split('/').pop();
-                var podfileFile = new Podfile(path.join(weexPluginRootDir, Podfile.FILENAME), project_name)
-                podfileFile.writeUseAliSource()
-            }
-            return PlatformApiPoly;
-        })
+        copyPlatform(templatePath, destinationDir)
+        //修改source
+        if(options.ali&&options.platformDetails.platform == "ios"){
+            var weexPluginRootDir = path.join(destinationDir, 'Weexplugin');
+            changeSource(destinationDir)
+            changeSource(weexPluginRootDir)
+        }
+        return PlatformApiPoly;
+    })
 
     // WEEX_HOOK
     // var command = path.join(options.platformDetails.libDir, 'bin', 'create');
@@ -133,6 +117,33 @@ PlatformApiPoly.createPlatform = function (destinationDir, projectConfig, option
     // });
 };
 
+function changeSource (destinationDir){
+
+    var weexPluginRootDir = path.join(destinationDir);
+    var xcodeProjDir;
+    var xcodeCordovaProj;
+
+    try {
+        xcodeProjDir = fs.readdirSync(weexPluginRootDir).filter( function(e) { return e.match(/\.xcodeproj$/i); })[0];
+        if (!xcodeProjDir) {
+            throw new CordovaError('The provided path "' + weexPluginRootDir + '" is not a Weex iOS project.');
+        }
+
+        var cordovaProjName = xcodeProjDir.substring(xcodeProjDir.lastIndexOf(path.sep)+1, xcodeProjDir.indexOf('.xcodeproj'));
+        xcodeCordovaProj = path.join(weexPluginRootDir, cordovaProjName);
+    } catch(e) {
+        throw new CordovaError('The provided path "'+weexPluginRootDir+'" is not a weexpack iOS project.');
+    }
+    var Podfile = require('./ios_pack/lib/Podfile').Podfile;
+    var project_name = xcodeCordovaProj.split('/').pop();
+    var podfileFile = new Podfile(path.join(weexPluginRootDir, Podfile.FILENAME), project_name)
+    podfileFile.writeUseAliSource()
+
+
+}
+
+
+
 /**
  * Updates already installed platform.
  *

package.json

@@ -1,6 +1,6 @@
 {
   "name": "weexpack",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "Weex pack tool",
   "main": "index.js",
   "scripts": {