run_loop 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f70f23c16823815e9b01ca4e967dcd8f065d4ff
-  data.tar.gz: 2d2b303201f7d2961dbb4a9f8947a2ab0638de3b
+  metadata.gz: c125e357c95d69d1ef1e4b74ce1bfbf4faddb920
+  data.tar.gz: f27d253bba7d6f3faeb4ee37d9f4d0e209d1393b
 SHA512:
-  metadata.gz: 2343195435e906556bfe720b75f66637a42b29e4f8aea669584793ad4a668002151210c75ac96d2856afd1b1aee3800afa255d1ec2a5cd0e79ce3e5709683adc
-  data.tar.gz: eea4a57f853d15eedfad0c710f889e5896dfa046ac45e7d4114df1c889f98a6d78cfc32948ebda371e48a26a726f756fbae4275812a13f48aa6b93a1815e2b16
+  metadata.gz: 009bddf011cdb692c5ee738b0b9a2e4a3c033e4b01fb29e0db6b548cadea44be2d068b3190af2a34db4b7c38cf7ed880b03c23943a7769f974da0d106ad98742
+  data.tar.gz: e26d021e69d642bdc9c115e47a235c993b837ac5b88ceaab43570bd86a3f0756de7d37ffea55418cf6818628eeb2cf8af6579decc4ca69924c450dba3a8db6fd

data/lib/run_loop/device.rb

@@ -110,8 +110,8 @@ removed (1.5.0).  It has been replaced by an options hash with two keys:
 
       instruments = merged_options[:instruments]
       simctl = merged_options[:simctl]
+      xcode = merged_options[:xcode]
 
-      xcode = RunLoop::Xcode.new
       simulator = simctl.simulators.detect do |sim|
         sim.instruments_identifier(xcode) == udid_or_name ||
               sim.udid == udid_or_name
@@ -376,7 +376,10 @@ version: #{version}
       # iOS 9 simulators have an additional boot screen.
       is_gte_ios9 = version >= RunLoop::Version.new('9.0')
 
-      # iOS 9 iPad simulators need additional time to stabilize, especially
+      # Xcode 8 simulators do not need to wait for log file
+      is_xcode8 = RunLoop::Xcode.new.version_gte_8?
+
+      # iOS > 9 iPad simulators need additional time to stabilize, especially
       # to ensure that `simctl install` notifies SpringBoard that a new app
       # has been installed.
       is_ipad = simulator_is_ipad?
@@ -388,7 +391,12 @@ version: #{version}
       RunLoop.log_debug("Waiting for simulator to stabilize with timeout: #{timeout} seconds")
 
       current_dir_sha = simulator_data_directory_sha
-      current_log_sha = simulator_log_file_sha
+      if is_xcode8
+        current_log_sha = true
+      else
+        current_log_sha = simulator_log_file_sha
+      end
+
       is_stable = false
       waited_for_boot = false
       waited_for_ipad = false
@@ -396,7 +404,11 @@ version: #{version}
 
       while Time.now < poll_until do
         latest_dir_sha = simulator_data_directory_sha
-        latest_log_sha = simulator_log_file_sha
+        if is_xcode8
+          latest_log_sha = true
+        else
+          latest_log_sha = simulator_log_file_sha
+        end
 
         is_stable = [current_dir_sha == latest_dir_sha,
                      current_log_sha == latest_log_sha].all?

data/lib/run_loop/device_agent/bin/CLI.json

@@ -18,7 +18,7 @@
             "optionName" : "session_id",
             "info" : "Session ID for the XCUITest",
             "required" : false,
-            "default" : "BEEFBABE-FEED-BABE-BEEF-CAFEBEEFFACE"
+            "default" : "AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE"
         },
         "-k" : {
             "longFlag" : "--keep-alive",

data/lib/run_loop/device_agent/client.rb

@@ -84,8 +84,13 @@ module RunLoop
                                                                      options,
                                                                      app_details)
 
+        default_options = {
+            :xcode => xcode
+        }
+        merged_options = default_options.merge(options)
+
         if device.simulator? && app
-          core_sim = RunLoop::CoreSimulator.new(device, app, :xcode => xcode)
+          core_sim = RunLoop::CoreSimulator.new(device, app, merged_options)
           if reset_options
             core_sim.reset_app_sandbox
           end
@@ -317,7 +322,7 @@ INSTANCE METHODS
 
       # @!visibility private
       def tree
-        options = http_options
+        options = tree_http_options
         request = request("tree")
         client = http_client(options)
         response = client.get(request)
@@ -336,12 +341,44 @@ INSTANCE METHODS
         result.count != 0
       end
 
+      # @!visibility private
+      def clear_text
+        options = enter_text_http_options
+        parameters = {
+          :gesture => "clear_text"
+        }
+        request = request("gesture", parameters)
+        client = http_client(options)
+        response = client.post(request)
+        expect_300_response(response)
+      end
+
       # @!visibility private
       def enter_text(string)
         if !keyboard_visible?
           raise RuntimeError, "Keyboard must be visible"
         end
-        options = http_options
+        options = enter_text_http_options
+        parameters = {
+          :gesture => "enter_text",
+          :options => {
+            :string => string
+          }
+        }
+        request = request("gesture", parameters)
+        client = http_client(options)
+        response = client.post(request)
+        expect_300_response(response)
+      end
+
+      # @!visibility private
+      #
+      # Some clients are performing keyboard checks _before_ calling #enter_text.
+      #
+      # 1. Removes duplicate check.
+      # 2. It turns out DeviceAgent query can be very slow.
+      def enter_text_without_keyboard_check(string)
+        options = enter_text_http_options
         parameters = {
           :gesture => "enter_text",
           :options => {
@@ -377,6 +414,12 @@ INSTANCE METHODS
       #  query({text: "\"To know is not enough.\""})
       #  query({text: %Q["To know is not enough."]})
       #
+      #  # Equivalent to Calabash query("*")
+      #  query({})
+      #
+      #  # Equivalent to Calabash query("all *")
+      #  query({all: true})
+      #
       # Querying for text with newlines is not supported yet.
       #
       # The query language supports the following keys:
@@ -449,45 +492,40 @@ INSTANCE METHODS
           raise ArgumentError, %Q[
 Unsupported key or keys found: '#{unknown_keys}'.
 
-Allowed keys for a query are: #{keys}
-
-]
-        end
-
-        has_any_key = (allowed_keys & uiquery.keys).any?
-        if !has_any_key
-          keys = allowed_keys.map { |key| ":#{key}" }.join(", ")
-          raise ArgumentError, %Q[
-Query does not contain any keysUnsupported key or keys found: '#{unknown_keys}'.
+Allowed keys for a query are:
 
-Allowed keys for a query are: #{keys}
+#{keys}
 
 ]
         end
 
-        parameters = merged_options.dup.tap { |hs| hs.delete(:all) }
-        if parameters.empty?
-          keys = allowed_keys.map { |key| ":#{key}" }.join(", ")
-          raise ArgumentError, %Q[
+        if _wildcard_query?(uiquery)
+          elements = _flatten_tree
+        else
+          parameters = merged_options.dup.tap { |hs| hs.delete(:all) }
+          if parameters.empty?
+            keys = allowed_keys.map { |key| ":#{key}" }.join(", ")
+            raise ArgumentError, %Q[
 Query must contain at least one of these keys:
 
 #{keys}
 
 ]
-        end
+          end
 
-        request = request("query", parameters)
-        client = http_client(http_options)
+          request = request("query", parameters)
+          client = http_client(http_options)
 
-        RunLoop.log_debug %Q[Sending query with parameters:
+          RunLoop.log_debug %Q[Sending query with parameters:
 
 #{JSON.pretty_generate(parameters)}
 
 ]
 
-        response = client.post(request)
-        hash = expect_300_response(response)
-        elements = hash["result"]
+          response = client.post(request)
+          hash = expect_300_response(response)
+          elements = hash["result"]
+        end
 
         if merged_options[:all]
           elements
@@ -1030,6 +1068,30 @@ PRIVATE
         end
       end
 
+      # @!visibility private
+      #
+      # Tree can take a very long time.
+      def tree_http_options
+        timeout = DEFAULTS[:http_timeout] * 6
+        {
+          :timeout => timeout,
+          :interval => 0.1,
+          :retries => (timeout/0.1).to_i
+        }
+      end
+
+      # @!visibility private
+      #
+      # A patch while we are trying to figure out what is wrong with text entry.
+      def enter_text_http_options
+        timeout = DEFAULTS[:http_timeout] * 6
+        {
+          :timeout => timeout,
+          :interval => 0.1,
+          :retries => (timeout/0.1).to_i
+        }
+      end
+
       # @!visibility private
       def server_pid
         options = http_options
@@ -1394,6 +1456,16 @@ Valid values are: :down, :up, :right, :left, :bottom, :top
         response = client.post(request)
         expect_300_response(response)
       end
+
+      # @!visibility private
+      # Private method.  Do not call.
+      def _wildcard_query?(uiquery)
+        return true if uiquery.empty?
+        return false if uiquery.count != 1
+
+        uiquery.has_key?(:all)
+      end
+
     end
   end
 end

data/lib/run_loop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -301,6 +301,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - karl.krukow@xamarin.com
@@ -412,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments