Merge pull request #135 from monaca/dev_fix_build_path_monaca_import_…

…clone

Fix monaca import and build path

CHANGELOG.md

@@ -2,6 +2,11 @@
 CHANGELOG
 ====
 
+v2.7.9
+----
+* Modified `monaca remote build` to ask users providing the build directory if it is not specified. In addition, the default build directory is changed to `Desktop` directory.
+* Fixed `monaca import` to NOT set `project_id` to `local_properties.json` (with `monaca-lib@2.7.9`)
+
 v2.7.8
 ----
 * Always append `webpack-dev-server/client` to webpack configuration to fix `Angular`'s `live reloading` with `monaca-lib@2.7.8`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaca",
-  "version": "2.7.8",
+  "version": "2.7.9",
   "description": "Monaca Command Line Tool",
   "bin": {
     "monaca": "bin/monaca"
@@ -39,13 +39,12 @@
     "ip": "^1.1.5",
     "live-server": "1.2.0",
     "monaca-inquirer": "^1.0.4",
-    "monaca-lib": "^2.7.8",
+    "monaca-lib": "^2.7.9",
     "open": "0.0.5",
     "optimist": "^0.6.1",
     "portfinder": "^1.0.7",
     "q": "^1.1.2",
     "shelljs": "^0.3.0",
     "xmldom": "^0.1.19"
-  },
-  "devDependencies": {}
+  }
 }

src/remote.js

@@ -165,12 +165,28 @@ RemoteTask.remote = function(task) {
         return result.binary_url ? monaca.getSessionUrl(result.binary_url) : Q.reject(result.error_message);
       }
     )
-    // Getting session URL.
+    // Getting session URL && Preparing the file path
     .then(
       function(sessionUrl) {
+        // return the filepath if it is specified
+        if (params.output) {
+          return Q.resolve({
+            sessionUrl: sessionUrl,
+            buildDir: params.output
+          });
+        } else {
+          return specifyBuildDirectory(sessionUrl);
+        }
+      }
+    )
+    // Download file
+    .then(
+      function(result) {
+        let sessionUrl = result.sessionUrl;
+        let buildDir = result.buildDir;
         return monaca.download(sessionUrl, {}, function(response) {
           if (params.output) {
-            return path.resolve(params.output);
+            return path.resolve(params.output); //filepath specified by --path
           }
 
           var filename = 'output.bin';
@@ -181,16 +197,8 @@ RemoteTask.remote = function(task) {
             }
           }
 
-          let build_path = '';
-          try {
-            build_path = path.join( process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'], 'Desktop');
-          } catch (e) {
-            build_path = '/tmp/build';
-            console.log('could not get the desktop directory', e);
-            console.log('save to ', build_path);
-            shell.mkdir('-p', build_path);
-          }
-          return path.join(build_path, filename);
+          shell.mkdir('-p', buildDir);
+          return path.join(buildDir, filename);
         });
       }
     )
@@ -206,6 +214,32 @@ RemoteTask.remote = function(task) {
       util.fail
     );
 
+  var specifyBuildDirectory = function(sessionUrl) {
+    let deferred = Q.defer();
+
+    // get the build directory from user
+    let default_path = path.join( process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'], 'Desktop');
+    util.print(''); //insert an empty line
+    inquirer.prompt({
+      type: 'input',
+      name: 'build_path',
+      message: 'Please enter the directory to save the file or press Enter to accept the default:',
+      default: default_path
+    })
+    .then(
+      function(response) {
+        if (response && response.build_path) {
+          return deferred.resolve({
+            sessionUrl: sessionUrl,
+            buildDir: response.build_path
+          });
+        }
+      }
+    );
+
+    return deferred.promise;
+  };
+
   var requestBuildSelection = function(validBuilds) {
     var deferred = Q.defer();
 

src/sync.js

@@ -137,7 +137,7 @@ SyncTask.clone = function(saveCloudProjectID) {
     .then(
       function() {
         util.print((saveCloudProjectID ? 'Cloning' : 'Importing') + ' \'' + project.name + '\' to ' + project.absolutePath);
-        return monaca.cloneProject(project.projectId, project.destPath)
+        return monaca.cloneProject(project.projectId, project.destPath, saveCloudProjectID)
           .progress(util.displayProgress);
       }
     )