run_loop 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a1ab6452d63edc6a2f13dba0fab7f401fda1e3
-  data.tar.gz: 9364026efd7089138f57c1660c4dd9d0402a9801
+  metadata.gz: 2de16f5cb3f91a4a5d0cf8f056a4a128d0cb906a
+  data.tar.gz: 58244f2475fa2ea431e18022545e02498d86dc4a
 SHA512:
-  metadata.gz: 73312b18f522ea556a06f8dc7f7257977629ca760ea5113ebab86666dd307586b86111742e514fddc59fef8acbb2380e4e92cf5400440f144bf41bac09aad130
-  data.tar.gz: 0d3aa340d0408d6875e6d39ed3182b4c8a22c8a3ff68108ae0c822a3214c66abe522598ed9a77204477b8ae41b653625ca60ddfa168423bf77361964451a9456
+  metadata.gz: 4bd98dcee58d56074c95ada808a4fe0b19a05bf8ece5f8c5fedfd9d55119bf8e5bdee8831b5f7b50471053aea2bc676af682cbabe18a653479b19677890a9f2f
+  data.tar.gz: da03c9b79b3435b11fc832268ddd8bb72e05e9e52f9b3a0bd3070b2470be53a32cb6ffa1fe41d32f59ab8ba48326054512f9a892475d4f9bc25fb16394b39a47

data/lib/run_loop/core.rb

@@ -4,6 +4,7 @@ require 'timeout'
 require 'json'
 require 'open3'
 require 'erb'
+require 'ap'
 
 module RunLoop
 
@@ -29,6 +30,23 @@ module RunLoop
       SCRIPTS_PATH
     end
 
+    def self.log_run_loop_options(options, xctools)
+      return unless ENV['DEBUG'] == '1'
+      # Ignore :sim_control b/c it is a ruby object; printing is not useful.
+      ignored_keys = [:sim_control]
+      options_to_log = {}
+      options.each_pair do |key, value|
+        next if ignored_keys.include?(key)
+        options_to_log[key] = value
+      end
+      # Objects that override '==' cannot be printed by awesome_print
+      # https://github.com/michaeldv/awesome_print/issues/154
+      # RunLoop::Version overrides '=='
+      options_to_log[:xcode] = xctools.xcode_version.to_s
+      options_to_log[:xcode_path] = xctools.xcode_developer_dir
+      ap(options_to_log, {:sort_keys => true})
+    end
+
     # @deprecated since 1.0.0
     # still used extensively in calabash-ios launcher
     def self.above_or_eql_version?(target_version, xcode_version)
@@ -127,39 +145,26 @@ module RunLoop
 
       log_file ||= File.join(results_dir, 'run_loop.out')
 
-      if ENV['DEBUG']=='1'
-        exclude = [:device_target, :udid, :sim_control, :args, :inject_dylib, :app]
-        options.each_pair { |key, value|
-          unless exclude.include? key
-            puts "#{key} => #{value}"
-          end
-        }
-        puts "device_target=#{device_target}"
-        puts "udid=#{udid}"
-        puts "bundle_dir_or_bundle_id=#{bundle_dir_or_bundle_id}"
-        puts "script=#{script}"
-        puts "log_file=#{log_file}"
-        puts "timeout=#{timeout}"
-        puts "uia_strategy=#{options[:uia_strategy]}"
-        puts "args=#{args}"
-        puts "inject_dylib=#{inject_dylib}"
-      end
-
       after = Time.now
-
       if ENV['DEBUG']=='1'
         puts "Preparation took #{after-before} seconds"
-
       end
 
-      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),
-                                xctools)
+      discovered_options =
+            {
+                  :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
+            }
+      merged_options = options.merge(discovered_options)
+
+      self.log_run_loop_options(merged_options, xctools)
+
+      cmd = instruments_command(merged_options, xctools)
 
       log_header("Starting on #{device_target} App: #{bundle_dir_or_bundle_id}")
       cmd_str = cmd.join(' ')
@@ -247,17 +252,11 @@ module RunLoop
         end
       rescue TimeoutError => e
         if ENV['DEBUG']
-          puts "Failed to launch\n"
-          puts "reason=#{e}: #{e && e.message} "
-          puts "device_target=#{device_target}"
-          puts "udid=#{udid}"
-          puts "bundle_dir_or_bundle_id=#{bundle_dir_or_bundle_id}"
-          puts "script=#{script}"
-          puts "log_file=#{log_file}"
-          puts "timeout=#{timeout}"
-          puts "uia_strategy=#{uia_strategy}"
-          puts "args=#{args}"
-          puts "lldb_output=#{raw_lldb_output}" if raw_lldb_output
+          puts "Failed to launch."
+          puts "#{e}: #{e && e.message}"
+          if raw_lldb_output
+            puts "LLDB OUTPUT: #{raw_lldb_output}"
+          end
         end
         raise TimeoutError, "Time out waiting for UIAutomation run-loop to Start. \n Logfile #{log_file} \n\n #{File.read(log_file)}\n"
       end

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   # A model of a software release version that can be used to compare two versions.
   #

data/lib/run_loop/xctools.rb

@@ -108,6 +108,14 @@ module RunLoop
       instruments = 'xcrun instruments'
       return instruments if cmd == nil
 
+      # Xcode 6 GM is spamming "WebKit Threading Violations"
+      stderr_filter = lambda { |stderr|
+        stderr.read.strip.split("\n").each do |line|
+          unless line[/WebKit Threading Violation/, 0]
+            $stderr.puts line
+          end
+        end
+      }
       case cmd
         when :version
           @instruments_version ||= lambda {
@@ -121,15 +129,24 @@ module RunLoop
           }.call
         when :sims
           @instruments_sims ||=  lambda {
-            devices = `#{instruments} -s devices`.chomp.split("\n")
-            devices.select { |device| device.downcase.include?('simulator') }
+            # Instruments 6 spams a lot of error messages.  I don't like to
+            # hide them, but they seem to be around to stay (Xcode 6 GM).
+            cmd = "#{instruments} -s devices"
+            Open3.popen3(cmd) do |_, stdout, stderr, _|
+              stderr_filter.call(stderr)
+              devices = stdout.read.chomp.split("\n")
+              devices.select { |device| device.downcase.include?('simulator') }
+            end
           }.call
 
         when :templates
           @instruments_templates ||= lambda {
             cmd = "#{instruments} -s templates"
             if self.xcode_version >= self.v60
-              `#{cmd}`.split("\n").map { |elm| elm.strip.tr('"', '') }
+              Open3.popen3(cmd) do |_, stdout, stderr, _|
+                stderr_filter.call(stderr)
+                stdout.read.chomp.split("\n").map { |elm| elm.strip.tr('"', '') }
+              end
             elsif self.xcode_version >= self.v51
               `#{cmd}`.split("\n").delete_if do |path|
                 not path =~ /tracetemplate/
@@ -146,13 +163,17 @@ module RunLoop
 
         when :devices
           @devices ||= lambda {
-            all = `#{instruments} -s devices`.chomp.split("\n")
-            valid = all.select { |device| device =~ /[a-f0-9]{40}/ }
-            valid.map do |device|
-              udid = device[/[a-f0-9]{40}/, 0]
-              version = device[/(\d\.\d(\.\d)?)/, 0]
-              name = device.split('(').first.strip
-              RunLoop::Device.new(name, version, udid)
+            cmd = "#{instruments} -s devices"
+            Open3.popen3(cmd) do |_, stdout, stderr, _|
+              stderr_filter.call(stderr)
+              all = stdout.read.chomp.split("\n")
+              valid = all.select { |device| device =~ /[a-f0-9]{40}/ }
+              valid.map do |device|
+                udid = device[/[a-f0-9]{40}/, 0]
+                version = device[/(\d\.\d(\.\d)?)/, 0]
+                name = device.split('(').first.strip
+                RunLoop::Device.new(name, version, udid)
+              end
             end
           }.call
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3.1
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement