run_loop 0.1.0.pre8 → 0.1.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 945e26c746021ba0f31cfcc092b20f279ce2d535
-  data.tar.gz: 3950184ea0e337f1c172a083886c04ae6e5b4783
+  metadata.gz: 4d07182bfd4a970c2acfe923ac8b5a94650149db
+  data.tar.gz: 4abbd2fdc27bcd848bcb02b8fc86989cca82e1e0
 SHA512:
-  metadata.gz: 43171f1961e4c498d63cf00a7acf150b15df5f9b59314c443224da22d9cd42e58cf072153834b530fc5aa52e11a930e288b836b2a13677d93b47207f1de0c824
-  data.tar.gz: 9ff4f9c9818dcfd64309c424c36de1f47a0b0c015b612a10d96e21cb1637f7a89319963f6fe68197c445344b255abd704da116dca60c3a09f1148e438c017f53
+  metadata.gz: f988014195fbc3525edc9b43539eb440d418186ef57be437a01fcbc60e410dc017703e7ff4045643fe495b312a49ebcf65445787b9e6f314a2f76825cd92fabf
+  data.tar.gz: 6518e52d8cd49c979042debf89f989e659343b96f413b1862cde461bdccc8954f59e1a0b29cb2ac459c2d292fa397ef108807763492b4df54b6058d58a5ea81b

data/lib/run_loop/core.rb

@@ -54,8 +54,8 @@ module RunLoop
       log_file = options[:log_path]
       timeout = options[:timeout] || 30
 
-      results_dir = options[:results_dir] || Dir.mktmpdir("run_loop")
-      results_dir_trace = File.join(results_dir, "trace")
+      results_dir = options[:results_dir] || Dir.mktmpdir('run_loop')
+      results_dir_trace = File.join(results_dir, 'trace')
       FileUtils.mkdir_p(results_dir_trace)
 
       dependencies = options[:dependencies] || []
@@ -64,17 +64,17 @@ module RunLoop
         FileUtils.cp(dep, results_dir)
       end
 
-      script = File.join(results_dir, "_run_loop.js")
+      script = File.join(results_dir, '_run_loop.js')
 
 
       code = File.read(options[:script])
       code = code.gsub(/\$PATH/, results_dir)
-      code = code.gsub(/\$MODE/, "FLUSH") unless options[:no_flush]
+      code = code.gsub(/\$MODE/, 'FLUSH') unless options[:no_flush]
 
-      repl_path = File.join(results_dir, "repl-cmd.txt")
-      File.open(repl_path, "w") { |file| file.puts "0:UIALogger.logMessage('Listening for run loop commands');" }
+      repl_path = File.join(results_dir, 'repl-cmd.txt')
+      File.open(repl_path, 'w') { |file| file.puts "0:UIALogger.logMessage('Listening for run loop commands');" }
 
-      File.open(script, "w") { |file| file.puts code }
+      File.open(script, 'w') { |file| file.puts code }
 
 
       bundle_dir_or_bundle_id = options[:app] || ENV['BUNDLE_ID']|| ENV['APP_BUNDLE_PATH'] || ENV['APP']
@@ -96,7 +96,7 @@ module RunLoop
         device = options[:device] || :iphone
         device = device && device.to_sym
 
-        plistbuddy="/usr/libexec/PlistBuddy"
+        plistbuddy='/usr/libexec/PlistBuddy'
         plistfile="#{bundle_dir_or_bundle_id}/Info.plist"
         if device == :iphone
           uidevicefamily=1
@@ -133,10 +133,16 @@ module RunLoop
 
       end
 
-      cmd = instruments_command(udid, results_dir_trace, bundle_dir_or_bundle_id, results_dir, script, log_file, args)
+      cmd = instruments_command(options.merge(:udid => udid,
+                                              :results_dir_trace => results_dir_trace,
+                                              :bundle_dir_or_bundle_id => bundle_dir_or_bundle_id,
+                                              :results_dir => results_dir,
+                                              :script => script,
+                                              :log_file => log_file,
+                                              :args => args))
 
       log_header("Starting on #{device_target} App: #{bundle_dir_or_bundle_id}")
-      cmd_str = cmd.join(" ")
+      cmd_str = cmd.join(' ')
       if ENV['DEBUG']
         log(cmd_str)
       end
@@ -150,7 +156,7 @@ module RunLoop
 
       Process.detach(pid)
 
-      File.open(File.join(results_dir, "run_loop.pid"), "w") do |f|
+      File.open(File.join(results_dir, 'run_loop.pid'), 'w') do |f|
         f.write pid
       end
 
@@ -203,7 +209,7 @@ module RunLoop
 
 
       tmp_cmd = File.join(File.dirname(repl_path), '__repl-cmd.txt')
-      File.open(tmp_cmd, "w") do |f|
+      File.open(tmp_cmd, 'w') do |f|
         f.write("#{index}:#{cmd}")
         if ENV['DEBUG']
           puts "Wrote: #{index}:#{cmd}"
@@ -235,7 +241,7 @@ module RunLoop
         end
         index_if_found = output.index(START_DELIMITER)
         if ENV['DEBUG_READ']=='1'
-          puts output.gsub("*", '')
+          puts output.gsub('*', '')
           puts "Size #{size}"
           puts "offset #{offset}"
           puts "index_of #{START_DELIMITER}: #{index_if_found}"
@@ -309,15 +315,23 @@ module RunLoop
     end
 
 
-    def self.instruments_command(udid, results_dir_trace, bundle_dir_or_bundle_id, results_dir, script, log_file, args=[])
+    def self.instruments_command(options)
+      udid = options[:udid]
+      results_dir_trace = options[:results_dir_trace]
+      bundle_dir_or_bundle_id = options[:bundle_dir_or_bundle_id]
+      results_dir = options[:results_dir]
+      script = options[:script]
+      log_file = options[:log_file]
+      args= options[:args] || []
+
       instruments_prefix = instruments_command_prefix(udid, results_dir_trace)
       cmd = [
           instruments_prefix,
-          "-t", automation_template,
+          '-t', automation_template,
           "\"#{bundle_dir_or_bundle_id}\"",
-          "-e", "UIARESULTSPATH", results_dir,
-          "-e", "UIASCRIPT", script,
-          args.join(" ")
+          '-e', 'UIARESULTSPATH', results_dir,
+          '-e', 'UIASCRIPT', script,
+          args.join(' ')
       ]
       if log_file
         cmd << "&> #{log_file}"
@@ -334,12 +348,12 @@ module RunLoop
 
     def self.default_tracetemplate
       xcode_path = `xcode-select -print-path`.chomp
-      automation_bundle = File.expand_path(File.join(xcode_path, "..", 'Applications', "Instruments.app", "Contents", "PlugIns", 'AutomationInstrument.bundle'))
+      automation_bundle = File.expand_path(File.join(xcode_path, '..', 'Applications', 'Instruments.app', 'Contents', 'PlugIns', 'AutomationInstrument.bundle'))
       if not File.exist? automation_bundle
-        automation_bundle= File.expand_path(File.join(xcode_path, "Platforms", "iPhoneOS.platform", "Developer", "Library", "Instruments", "PlugIns", "AutomationInstrument.bundle"))
-        raise "Unable to find AutomationInstrument.bundle" if not File.exist? automation_bundle
+        automation_bundle= File.expand_path(File.join(xcode_path, 'Platforms', 'iPhoneOS.platform', 'Developer', 'Library', 'Instruments', 'PlugIns', 'AutomationInstrument.bundle'))
+        raise 'Unable to find AutomationInstrument.bundle' if not File.exist? automation_bundle
       end
-      File.join(automation_bundle, "Contents", "Resources", "Automation.tracetemplate")
+      File.join(automation_bundle, 'Contents', 'Resources', 'Automation.tracetemplate')
     end
 
     def self.log(message)
@@ -371,7 +385,7 @@ module RunLoop
 
     def self.instruments_pids
       pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`.strip
-      pids_str.split(",").map { |pid| pid.to_i }
+      pids_str.split(',').map { |pid| pid.to_i }
     end
 
   end
@@ -420,7 +434,7 @@ module RunLoop
     FileUtils.mkdir_p(dest)
 
     if results_dir
-      pngs = Dir.glob(File.join(results_dir, "Run 1", "*.png"))
+      pngs = Dir.glob(File.join(results_dir, 'Run 1', '*.png'))
     else
       pngs = []
     end

data/lib/run_loop/version.rb

@@ -1,3 +1,3 @@
 module RunLoop
-  VERSION = '0.1.0.pre8'
+  VERSION = '0.1.0.pre9'
 end

data/scripts/run_loop_fast_uia.js

@@ -329,9 +329,8 @@ UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(null, __calabas
 UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(0, __calabashRequest);
 
 Log.result('success',true,true);
-
+target = UIATarget.localTarget();
 while (true) {
-    target = UIATarget.localTarget();
     try {
         preferences = target.frontMostApp().preferencesValueForKey(__calabashRequest);
     } catch (e) {
@@ -349,7 +348,7 @@ while (true) {
     if (!isNaN(_actualIndex) && _actualIndex >= _expectedIndex) {
         _exp = preferences['command'];
         UIALogger.logMessage("index " + _actualIndex + " is command: "+ _exp);
-        target.frontMostApp().setPreferencesValueForKey(0, __calabashRequest);
+        target.frontMostApp().setPreferencesValueForKey(null, __calabashRequest);
         try {
             _result = eval(_exp);
             UIALogger.logMessage("Success: "+ _result);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre8
+  version: 0.1.0.pre9
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor