merge ios-related files in devices

Gruntfile.js

@@ -30,7 +30,7 @@ module.exports = function(grunt) {
         , trailing: true
         , node: true
         , strict: true
-        , ignores: ['./submodules/**/*.js', './node_modules/**/*.js', './lib/hybrid/ios/webdriver-atoms/*.js', './sample-code/**/*.js', './test/harmony/**/*.js', './test/functional/_joined/*.js', './lib/server/static/**/*.js', './lib/hybrid/firefoxos/atoms/*.js', './lib/uiauto/**/*.js']
+        , ignores: ['./submodules/**/*.js', './node_modules/**/*.js', './lib/devices/ios/webdriver-atoms/*.js', './sample-code/**/*.js', './test/harmony/**/*.js', './test/functional/_joined/*.js', './lib/server/static/**/*.js', './lib/hybrid/firefoxos/atoms/*.js', './lib/uiauto/**/*.js']
       }
     }
     , mochaTest: {

lib/appium.js

@@ -15,7 +15,7 @@ var routing = require('./server/routing.js')
   , UUID = require('uuid-js')
   , _ = require('underscore')
   , fs = require('fs')
-  , ios = require('./devices/ios.js')
+  , ios = require('./devices/ios/ios.js')
   , android = require('./devices/android.js')
   , selendroid = require('./devices/selendroid.js')
   , chrome = require('./devices/chrome_android.js')

lib/devices/ios/ios.js

@@ -3,24 +3,24 @@ var path = require('path')
   , rimraf = require('rimraf')
   , fs = require('fs')
   , _ = require('underscore')
-  , logger = require('../server/logger.js').get('appium')
+  , logger = require('../../server/logger.js').get('appium')
   , sock = '/tmp/instruments_sock'
   , glob = require('glob')
   , exec = require('child_process').exec
   , bplistCreate = require('bplist-creator')
   , bplistParse = require('bplist-parser')
   , xmlplist = require('plist')
-  , instruments = require('../instruments.js')
+  , instruments = require('../../instruments.js')
   , uuid = require('uuid-js')
-  , helpers = require('../helpers.js')
+  , helpers = require('../../helpers.js')
   , escapeSpecialChars = helpers.escapeSpecialChars
   , parseWebCookies = helpers.parseWebCookies
   , rotateImage = helpers.rotateImage
-  , rd = require('../hybrid/ios/remote-debugger.js')
-  , wkrd = require('../hybrid/ios/webkit-remote-debugger.js')
-  , errors = require('../server/errors.js')
-  , deviceCommon = require('./common.js')
-  , status = require("../uiauto/lib/status.js")
+  , rd = require('./remote-debugger.js')
+  , wkrd = require('./webkit-remote-debugger.js')
+  , errors = require('../../server/errors.js')
+  , deviceCommon = require('../common.js')
+  , status = require("../../uiauto/lib/status.js")
   , IDevice = require('node-idevice')
   , async = require('async')
   , request = require('request')
@@ -180,7 +180,7 @@ IOS.prototype.start = function(cb, onDie) {
       this.app || this.bundleId
       , this.udid
       , this.isSafariLauncherApp
-      , path.resolve(__dirname, '..', 'uiauto', 'bootstrap.js')
+      , path.resolve(__dirname, '..', '..', 'uiauto', 'bootstrap.js')
       , this.automationTraceTemplatePath
       , sock
       , this.withoutDelay

lib/hybrid/ios/remote-test.js

@@ -1,40 +0,0 @@
-"use strict";
-var rd = require('./remote-debugger.js')
-  , _ = require("underscore");
-
-var remote = rd.init(function() {
-  console.log("Debugger said app disconnected");
-  process.exit(0);
-});
-
-remote.connect(function(appDict) {
-  console.log("App dict:");
-  console.log(appDict);
-  var appBundleId = null;
-  _.each(appDict, function(appName, appId) {
-    appBundleId = appId;
-  });
-  if (appBundleId) {
-    remote.selectApp(appBundleId, function(pageArray) {
-      console.log(pageArray);
-      var pageIdKey = null;
-      _.each(pageArray, function(page) {
-        pageIdKey = page.id;
-      });
-      if (pageIdKey) {
-        remote.selectPage(pageIdKey, function() {
-          remote.execute("alert('hi');", function(res) {
-            console.log(res);
-            process.exit(0);
-          });
-        });
-      } else {
-        console.log("No page is available");
-        process.exit(1);
-      }
-    });
-  } else {
-    console.log("No apps are available");
-    process.exit(1);
-  }
-});

test/unit/queue.js

@@ -7,7 +7,7 @@
 var should = require('should')
   , appium = require('../../lib/appium.js')
   , path = require('path')
-  , ios = require('../../lib/devices/ios.js');
+  , ios = require('../../lib/devices/ios/ios.js');
 
 describe('IOS', function() {
   // we'd like to test ios.proxy; mock instruments