uiauto 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed1dc6ce64fc2949895916755c61d112f34cf5c0
-  data.tar.gz: 020fca7e5018461aa99f95f24447ffefb6db9dfe
+  metadata.gz: b13ad5de892dd0145639a2f46bfc12a3d6555535
+  data.tar.gz: 0b3a7d825433f830e6bb0ced19bce989d033a28b
 SHA512:
-  metadata.gz: 805e4f7309178911232396a1ff6c01c318a3754b1adfaac1886828b203161be761406295d5d932062d20dce61fc7946cbe615a7193a36cf168a844e5bc27cd3d
-  data.tar.gz: 013447062aa6df1bffc1502a15ef42bbf42dcddf0f5e76e2d42fa9c09df0c7774c0c5379f05ed3b4dc67a45db2d71926866dee9a8538edee4bdd437d23178147
+  metadata.gz: 8334839a2bf68692b91729130c0951d4d97837020709a23b32acf21d70ad2ee809c5d1c9644332e38f3fad2ed438983787c7071ed281043cfe17ec8957f845fc
+  data.tar.gz: eacf0342d04567d12ee38caf0402567631f9ad46a31ca0a6d77aa4307cf685cc24121363d6d37483d3ddf4db54de742a2d79b080b55f93014828e562c815fa8d

data/README.md

@@ -4,8 +4,6 @@ UIAuto is a command line tool for running UI Automation scripts. It improves App
 
 UIAuto also facilitates the setup of simulator data for running scripts in a repeatable and known state.
 
-Note: UIAuto only works with the simulator for now.
-
 ## Prerequisites
 
 * Xcode command line tools
@@ -24,7 +22,7 @@ UIAuto does not build your app. You can use Xcode or `xcodebuild`.
 
 #### With Xcode
 
-The easiest way to build your app for UIAuto is to use Xcode. Open your app in Xcode, select the simulator, then build your project (command+b). This builds your app and places the resulting bundle in derived data.
+The easiest way to build your app for UIAuto is to use Xcode. Open your app in Xcode then build your project (command+b). This builds your app and places the resulting bundle in derived data.
 
 #### With xcodebuild
 
@@ -36,7 +34,7 @@ You can build from the command line using `xcodebuild`. The following examples s
     # Example using xcodebuild to build a project
     $ xcodebuild -project MyApp.xcodeproj -sdk iphonesimulator6.1
 
-By building with the commands above, the resulting bundle is placed in derived data.
+By building with the commands above, the resulting bundle is placed in derived data. Replace `iphonesimulator6.1` with `iphoneos6.1` if you want to build for the device.
 
 ### Run UI Automation scripts
 
@@ -64,10 +62,20 @@ Running `uiauto help exec` prints the following message.
 
       [--app=APP]
 
+      [--device=DEVICE]
+
 If you build your app outside of derived data, then you can specify the `--app` flag to tell uiauto where to find the `*.app`. You can also override the default locations for the trace file and results. For example, if your build your app in a build directory you can run the following
 
     uiauto exec uiauto/scripts/script_to_run.js --app=build/MyApp.app
 
+Pass the `--device` flag to run on the device.
+
+    # Run on a connected device
+    $ uiauto exec uiauto/scripts/script_to_run.js --device
+
+    # Run on a connected device with a specific udid
+    $ uiauto exec uiauto/scripts/script_to_run.js --device=UDID
+
 ### Simulator data
 
 UIAuto's `simulator` subcommand allows you to setup the simulator's applications, settings, and data. This is done by taking a "snapshot" of the simulator's current data by saving the `~/Library/Application Support/iPhone Simulator/(SDK VERSION)/` directory somewhere, then loading it back in when needed.

data/lib/uiauto/cli.rb

@@ -43,6 +43,7 @@ module UIAuto
     method_option :results, :default => File.expand_path("./uiauto/results")
     method_option :trace,   :default => File.expand_path("./uiauto/results/trace")
     method_option :app
+    method_option :device
     def exec(file_or_dir = "./uiauto/scripts/")
       Runner.run(file_or_dir, options)
     end

data/lib/uiauto/instruments.rb

@@ -4,12 +4,13 @@ require 'cfpropertylist'
 
 module UIAuto
   class Instruments
-    attr_accessor :trace, :app, :results, :script
+    attr_accessor :trace, :app, :results, :script, :device
 
     def initialize(script, opts = {})
       @script  = script
       @trace   = opts[:trace]
       @results = opts[:results]
+      @device  = opts[:device]
       @app     = opts[:app] || default_application
 
       FileUtils.mkdir_p(@results) unless File.exists?(@results)
@@ -17,6 +18,7 @@ module UIAuto
 
     def command
       command = ["xcrun instruments"]
+      command << "-w #{device_id}" if device_id
       command << "-D #{@trace}"
       command << "-t #{automation_template_location}"
       command << @app
@@ -67,9 +69,9 @@ module UIAuto
         end
       end
 
-      # TODO: Add support for running on a device
       sorted_matches = matching_directories.sort_by { |dir| File.mtime(dir) }
-      Dir.glob(File.join(sorted_matches.last, "Build/Products/*-iphonesimulator/*.app")).sort_by { |dir| File.mtime(dir) }.last
+      build_products_directory = device_id ? "Build/Products/*-iphoneos/*.app" : "Build/Products/*-iphonesimulator/*.app"
+      Dir.glob(File.join(sorted_matches.last, build_products_directory)).sort_by { |dir| File.mtime(dir) }.last
     end
 
     def automation_template_location
@@ -87,5 +89,16 @@ module UIAuto
       File.expand_path("~/Library/Developer/Xcode/DerivedData/")
     end
 
+    def device_id
+      @device_id ||= begin
+        if @device == 'device'
+          ioreg = `ioreg -w 0 -rc IOUSBDevice -k SupportsIPhoneOS`
+          ioreg[/"USB Serial Number" = "([0-9a-z]+)"/] && $1
+        else
+          @device
+        end
+      end
+    end
+
   end
 end

data/lib/uiauto/version.rb

@@ -1,3 +1,3 @@
 module UIAuto
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uiauto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mike Enriquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler