testautoi 0.9.146 → 0.9.147

data/bin/testautoi

@@ -76,6 +76,8 @@ def print_usage
       Start recording
     record stop
       Stop recording
+    uia <Script>
+      Run a UIA script
     version
       prints the gem version
 
@@ -500,14 +502,16 @@ def simulator_path
     "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\\ Simulator.app/Contents/MacOS/iPhone\\ Simulator"
 end
 
-def launch_app(app_url)
+def run_instruments(udid, app_path, script_path)
+    output = nil
     File.open("#{Dir.tmpdir}/testautoi.lock", 'w') { |f|
         f.flock(File::LOCK_EX)
-        launch_app_unsafe(app_url)
+        output = `instruments -w #{udid} -t #{tracetemplate} #{app_path} -e UIASCRIPT #{script_path}`
     }
+    output
 end
 
-def launch_app_unsafe(app_url)
+def launch_app(app_url)
     udid = @settings["device_udid"].to_s
     udids = Device.detect
     raise "No device is connected" if udids.length <= 0
@@ -521,17 +525,10 @@ def launch_app_unsafe(app_url)
     text = File.read(File.join(File.dirname(__FILE__), script))
     File.open(File.join(FileUtils.pwd, script), "w") {|file| file.puts text.gsub(/\[%app%\]/, app_url)}
     script = File.join(FileUtils.pwd, script)
-    cmd = `instruments -w #{udid} -t #{tracetemplate} #{launcher_path} -e UIASCRIPT #{script}`
+    run_instruments(udid, launcher_path, script)
 end
 
 def get_device_ip
-    File.open("#{Dir.tmpdir}/testautoi.lock", 'w') { |f|
-        f.flock(File::LOCK_EX)
-        get_device_ip_unsafe
-    }
-end
-
-def get_device_ip_unsafe
     app_url = app_bundle_url_schemes(app_bundle_path)
     udid = @settings["device_udid"].to_s
     udids = Device.detect
@@ -547,7 +544,7 @@ def get_device_ip_unsafe
     File.open(File.join(FileUtils.pwd, script), "w") {|file| file.puts text}
     script = File.join(FileUtils.pwd, script)
     File.open(File.join(FileUtils.pwd, "Device.cfg"), "w") {|file| file.puts "IPAddress="}
-    cmd = `instruments -w #{udid} -t #{tracetemplate} #{launcher_path} -e UIASCRIPT #{script}`
+    run_instruments(udid, launcher_path, script)
     puts File.read(File.join(FileUtils.pwd, "Device.cfg"))
 end
 
@@ -816,6 +813,11 @@ elsif cmd == 'gen'
 elsif cmd == 'go'
     go
     
+elsif cmd == 'uia'
+    read_settings
+    script_path = ARGV.shift
+    puts run_instruments(@settings["device_udid"].to_s, @settings["app_bundle"], script_path)
+
 elsif cmd == 'record'
     read_settings
     option = ARGV.shift

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.146'
-    FRAMEWORK_VERSION = '0.9.146'
+    VERSION = '0.9.147'
+    FRAMEWORK_VERSION = '0.9.147'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testautoi
 version: !ruby/object:Gem::Version
-  version: 0.9.146
+  version: 0.9.147
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber