run_loop 2.1.9 → 2.1.10

data/lib/run_loop/device_agent/frameworks.rb

@@ -11,19 +11,15 @@ module RunLoop
       # @!visibility private
       def install
         if File.exist?(frameworks)
-          RunLoop.log_debug("#{frameworks} already exists; skipping install")
           return true
         end
 
-        RunLoop.log_debug("Installing Frameworks to #{rootdir}")
-
         options = { :log_cmd => true }
 
         Dir.chdir(rootdir) do
           RunLoop.log_unix_cmd("cd #{rootdir}")
           shell.run_shell_command(["ditto", "-xk", File.basename(zip), "."], options)
         end
-        RunLoop.log_debug("Installed frameworks to #{rootdir}")
       end
 
       private

data/lib/run_loop/device_agent/ios_device_manager.rb

@@ -76,6 +76,7 @@ but binary does not exist at that path.
       # @!visibility private
       def launch(options)
         code_sign_identity = options[:code_sign_identity]
+        install_timeout = options[:device_agent_install_timeout]
 
         RunLoop::DeviceAgent::Frameworks.instance.install
         cmd = RunLoop::DeviceAgent::IOSDeviceManager.ios_device_manager
@@ -84,12 +85,22 @@ but binary does not exist at that path.
         if device.simulator?
           cbxapp = RunLoop::App.new(runner.runner)
 
-          # quits the simulator
-          sim = CoreSimulator.new(device, cbxapp)
+          # Quits the simulator if CoreSimulator is not already in control of it.
+          sim = CoreSimulator.new(device, cbxapp, {:quit_sim_on_init => false})
           sim.install
           sim.launch_simulator
         else
 
+          if !install_timeout
+            raise ArgumentError, %Q[
+
+Expected :device_agent_install_timeout key in options:
+
+#{options}
+
+]
+          end
+
           if !code_sign_identity
             raise ArgumentError, %Q[
 Targeting a physical devices requires a code signing identity.
@@ -101,7 +112,7 @@ $ CODE_SIGN_IDENTITY="iPhone Developer: Your Name (ABCDEF1234)" cucumber
 ]
           end
 
-          options = {:log_cmd => true}
+          options = {:log_cmd => true, :timeout => install_timeout}
           args = [
             cmd, "install",
             "--device-id", device.udid,
@@ -112,7 +123,6 @@ $ CODE_SIGN_IDENTITY="iPhone Developer: Your Name (ABCDEF1234)" cucumber
           start = Time.now
           hash = run_shell_command(args, options)
 
-
           if hash[:exit_status] != 0
             raise RuntimeError, %Q[
 
@@ -120,14 +130,12 @@ Could not install #{runner.runner}.  iOSDeviceManager says:
 
 #{hash[:out]}
 
-            ]
+]
           end
         end
 
         RunLoop::log_debug("Took #{Time.now - start} seconds to install DeviceAgent");
 
-        cmd = RunLoop::DeviceAgent::IOSDeviceManager.ios_device_manager
-
         args = ["start_test", "--device-id", device.udid]
 
         log_file = IOSDeviceManager.log_file
@@ -146,11 +154,6 @@ Could not install #{runner.runner}.  iOSDeviceManager says:
         pid = Process.spawn(env, cmd, *args, options)
         Process.detach(pid)
 
-        if device.simulator?
-          # Give it a whirl.
-          # device.simulator_wait_for_stable_state
-        end
-
         pid.to_i
       end
 

data/lib/run_loop/device_agent/xcodebuild.rb

@@ -35,15 +35,11 @@ module RunLoop
 
         if device.simulator?
           # quits the simulator
-          sim = CoreSimulator.new(device, "")
-          sim.launch_simulator
+          # sim = CoreSimulator.new(device, "")
+          # sim.launch_simulator({:wait_for_stable => false})
         end
 
-        start = Time.now
-        RunLoop.log_debug("Waiting for CBX-Runner to build...")
-        pid = xcodebuild
-        RunLoop.log_debug("Took #{Time.now - start} seconds to build and launch CBX-Runner")
-        pid
+        xcodebuild
       end
 
       # @!visibility private
@@ -104,6 +100,11 @@ Use the CBXWS environment variable to override the default.
 
         pid = Process.spawn(env, *args, options)
         Process.detach(pid)
+
+        sleep_for = 15
+        RunLoop.log_debug("Waiting #{sleep_for} seconds for DeviceAgent to build...")
+        sleep(sleep_for)
+
         pid.to_i
       end
 

data/lib/run_loop/http/retriable_client.rb

@@ -5,7 +5,7 @@ module RunLoop
     # An HTTP client that retries its connection on errors and can time out.
     # @!visibility private
     class RetriableClient
-      attr_reader :client
+      attr_reader :client, :retries, :timeout, :interval
 
       # @!visibility private
        RETRY_ON =
@@ -49,22 +49,14 @@ module RunLoop
       # @option options [Number] :interval (0.5) How long to sleep between
       #  retries.
       def initialize(server, options = {})
-        @client = options[:client] || ::HTTPClient.new
         @server = server
         @retries = options.fetch(:retries, 5)
         @timeout = options.fetch(:timeout, 5)
         @interval = options.fetch(:interval, 0.5)
-        @on_error = {}
-      end
 
-      # @!visibility private
-      def on_error(type, &block)
-        @on_error[type] = block
-      end
-
-      # @!visibility private
-      def change_server(new_server)
-        @server = new_server
+        # Call after setting the attr.
+        # Yes, it is redundant to set @client, but it makes testing easier.
+        @client = new_client!
       end
 
       # Make an HTTP get request.
@@ -101,12 +93,37 @@ module RunLoop
         request(request, :post, options)
       end
 
+      # There is bug in HTTPClient so this method does work.
+      # https://xamarin.atlassian.net/browse/TCFW-255
+      # httpclient is unable to send a valid DELETE
       def delete(request, options={})
         request(request, :delete, options)
       end
 
+      # Call HTTPClient#reset_all
+      def reset_all!
+        if @client
+          @client.reset_all
+          @client = nil
+        end
+      end
+
       private
 
+      def new_client!
+        reset_all!
+
+        # Assumes ::HTTPClient has these defaults:
+        # send_timeout = 120
+        # There is an rspec test for this so we will know if they change.
+
+        new_client = HTTPClient.new
+        new_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        new_client.connect_timeout = 15
+        new_client.receive_timeout = timeout
+        @client = new_client
+      end
+
       def request(request, request_method, options={})
         retries = options.fetch(:retries, @retries)
         timeout = options.fetch(:timeout, @timeout)
@@ -121,14 +138,16 @@ module RunLoop
           RunLoop.log_debug("HTTP: #{request_method} #{@server.endpoint + request.route} #{http_options}")
         end
 
+        if !client
+          raise RuntimeError, "This RetriableClient is not attached to client"
+        end
+
         start_time = Time.now
         last_error = nil
 
-        client = @client.dup
         client.receive_timeout = timeout
 
-        retries.times do |i|
-          first_try = i == 0
+        retries.times do |_|
 
           # Subtract the aggregate time we've spent thus far to make sure we're
           # not exceeding the request timeout across retries.
@@ -141,17 +160,11 @@ module RunLoop
           client.receive_timeout = [time_diff, client.receive_timeout].min
 
           begin
-            return client.send(request_method, @server.endpoint + request.route,
-                               request.params, header)
+            return send_request(client, request_method,
+                                @server.endpoint + request.route,
+                                request.params, header)
           rescue *RETRY_ON => e
-            #RunLoop.log_debug("Rescued http error: #{e}")
-
-            if first_try
-              if @on_error[e.class]
-                @on_error[e.class].call(@server)
-              end
-            end
-
+            new_client!
             last_error = e
             sleep interval
           end
@@ -166,7 +179,10 @@ module RunLoop
 
         raise HTTP::Error, last_error
       end
+
+      def send_request(client, request_method, endpoint, parameters, header)
+        client.send(request_method, endpoint, parameters, header)
+      end
     end
   end
 end
-

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.1.9"
+  VERSION = "2.1.10"
 
   # 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.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json