Merge pull request #419 from isleofcode/fix/open-app-xcode

fix(open-app): drops android support, defaults to xcworkspace vs xcproj

Author: alexblom

lib/targets/cordova/tasks/open-app.js

@@ -2,55 +2,57 @@ const Task             = require('../../../tasks/-task');
 const Bash             = require('../../../tasks/bash');
 const Promise          = require('rsvp').Promise;
 const logger           = require('../../../utils/logger');
-const fs               = require('fs');
 
 const path             = require('path');
 const getOpenCommand   = require('../../../utils/open-app-command');
 const cordovaPath      = require('../utils/get-path');
+const getConfig        = require('../utils/get-config');
+const fsUtils          = require('../../../utils/fs-utils');
 
 module.exports = Task.extend({
   application: undefined,
   platform: undefined,
   project: undefined,
 
-  run() {
-    let projectPath, open, command;
-    let cdvPath = cordovaPath(this.project);
-
-    if (this.platform === 'ios') {
-      projectPath = path.join(cdvPath, 'platforms/ios/*.xcodeproj');
-    } else if (this.platform === 'android') {
-      let projectFile = path.join(cdvPath, 'platforms/android/.project');
+  getProjectPath(platform, project) {
+    let cdvPath = cordovaPath(project);
 
-      if (fs.existsSync(projectFile)) {
-        projectPath = projectFile;
-      } else {
-        let docLink = 'http://embercordova.com/pages/cli#open';
+    if (platform === 'ios') {
+      return getConfig(project).then((config) => {
+        let appName = config.widget.name[0];
 
-        logger.warn('Can\'t open IDE without a project being created. See ' +
-          docLink +
-          'for more info.'
+        let workspacePath = path.join(
+          cdvPath,
+          `platforms/ios/${appName}.xcworkspace`
         );
-
-        projectPath = path.join(cdvPath, 'platforms/android/');
-      }
+        if (fsUtils.existsSync(workspacePath)) {
+          return Promise.resolve(workspacePath);
+        } else {
+          return Promise.resolve(path.join(
+            cdvPath,
+            `platforms/ios/${appName}.xcodeproj`
+          ));
+        }
+      });
     } else {
-      return Promise.reject(
-        'The ' + this.platform +
-        ' platform is not supported. Please use \'ios\' or \'android\''
-      );
+      return Promise.reject(`Open is not supported for ${platform}`);
     }
+  },
 
-    logger.success('Opening app for ' + this.platform);
-
-    command = getOpenCommand(projectPath, this.application);
-    open = new Bash({
-      command: command,
-      options: {
-        cwd: this.project.root
-      }
-    });
-
-    return open.run();
+  run() {
+    let open, command;
+
+    return this.getProjectPath(this.platform, this.project)
+      .then((projectPath) => {
+        logger.success('Opening app for ' + this.platform);
+        command = getOpenCommand(projectPath, this.application);
+        open = new Bash({
+          command: command,
+          options: {
+            cwd: this.project.root
+          }
+        });
+        return open.run();
+      });
   }
 });

node-tests/unit/targets/cordova/tasks/open-app-test.js

@@ -1,52 +1,86 @@
 var td              = require('testdouble');
 var path            = require('path');
 var BashTask        = require('../../../../../lib/tasks/bash');
-var OpenAppTask     = require('../../../../../lib/targets/cordova/tasks/open-app');
+var fsUtils         = require('../../../../../lib/utils/fs-utils');
 var expect          = require('../../../../helpers/expect');
 var openCommand     = require('../../../../../lib/utils/open-app-command');
 var mockProject     = require('../../../../fixtures/corber-mock/project');
 var _merge          = require('lodash').merge;
 var isObject        = td.matchers.isA(Object);
 
+var setupOpenTask = function() {
+  var OpenAppTask = require('../../../../../lib/targets/cordova/tasks/open-app');
+  return new OpenAppTask(_merge(mockProject, { platform: 'ios' }));
+};
+
 describe('Cordova Open App Task', function() {
-  var bashDouble, openApp, cdvPath;
+  var cdvPath;
 
   beforeEach(function() {
-    bashDouble = td.replace(BashTask.prototype, 'runCommand');
     cdvPath = path.resolve(
       __dirname, '../../../../',
       'fixtures',
       'corber-mock/corber/cordova'
     );
-
-    openApp = new OpenAppTask(_merge(mockProject, { platform: 'ios' }));
   });
 
   afterEach(function() {
     td.reset();
   });
 
-  it('runs open command for ios', function() {
-    openApp.run();
-    var expectedPath = cdvPath + '/platforms/ios/*.xcodeproj';
-    var expectedCmd  = openCommand(expectedPath);
-    td.verify(bashDouble(expectedCmd, isObject));
+  it('runs openApp with the path from getProjectPath', function() {
+    var bashDouble = td.replace(BashTask.prototype, 'runCommand');
+
+    var openApp = setupOpenTask();
+    return openApp.run().then(function() {
+      var expectedPath = cdvPath + '/platforms/ios/emberCordovaDummyApp.xcodeproj';
+      var expectedCmd  = openCommand(expectedPath);
+      td.verify(bashDouble(expectedCmd, isObject));
+    });
   });
 
-  it('runs open command for Android', function() {
-    openApp.platform = 'android';
-    openApp.run();
 
-    var expectedPath = cdvPath + '/platforms/android/';
-    var expectedCmd  = openCommand(expectedPath);
-    td.verify(bashDouble(expectedCmd, isObject));
-  }),
+  context('getProjectPath', function() {
+    it('ios returns xcworkspace if it exists', function() {
+      td.replace(fsUtils, 'existsSync', function() {
+        return true;
+      });
 
-  it('outputs an error if no platform is specified', function() {
-    openApp.platform = 'invalidPlatform';
+      var openApp = setupOpenTask();
+      return openApp.getProjectPath('ios', mockProject.project).then(function(projectPath) {
+        var expectedPath = cdvPath + '/platforms/ios/emberCordovaDummyApp.xcworkspace';
+        expect(projectPath).to.equal(expectedPath);
+      });
+    });
 
-    return expect(openApp.run()).to.eventually.be.rejectedWith(
-      /platform is not supported/
-    );
+    it('ios returns xcodeproj if workspace does not exist', function() {
+      td.replace(fsUtils, 'existsSync', function() {
+        return false;
+      });
+
+      var openApp = setupOpenTask();
+      return openApp.getProjectPath('ios', mockProject.project).then(function(projectPath) {
+        var expectedPath = cdvPath + '/platforms/ios/emberCordovaDummyApp.xcodeproj';
+        expect(projectPath).to.equal(expectedPath);
+      });
+    });
+
+    it('rejects for android', function() {
+      var openApp = setupOpenTask();
+      openApp.platform = 'android';
+
+      return expect(openApp.run()).to.eventually.be.rejectedWith(
+        /is not supported for android/
+      );
+    });
+
+    it('rejects if an invalid platform is specified', function() {
+      var openApp = setupOpenTask();
+      openApp.platform = 'invalidPlatform';
+
+      return expect(openApp.run()).to.eventually.be.rejectedWith(
+        /is not supported/
+      );
+    });
   });
 });