split timer loop from wait

Author: KazuCocoa

lib/appium_lib_core/common/wait.rb

@@ -1,4 +1,5 @@
-# rubocop:disable Lint/HandleExceptions
+require_relative 'wait/timer'
+
 module Appium
   module Core
     module Wait
@@ -30,19 +31,14 @@ class << self
         def until(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: nil, ignored: nil, object: nil)
           ignored = Array(ignored || ::Exception)
 
-          end_time   = Time.now + timeout
           last_error = nil
 
-          until Time.now > end_time
-            begin
-              return yield(object)
-            rescue ::Errno::ECONNREFUSED => e
-              raise e
-            rescue *ignored => last_error
-              # swallowed
-            end
-
-            sleep interval
+          begin
+            run_with_timer(timeout, interval) { return yield(object) }
+          rescue ::Errno::ECONNREFUSED => e
+            raise e
+          rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+            # swallowed
           end
 
           msg = message_for timeout, message
@@ -75,20 +71,17 @@ def until(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: nil, ig
         def until_true(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: nil, ignored: nil, object: nil)
           ignored = Array(ignored || ::Exception)
 
-          end_time   = Time.now + timeout
           last_error = nil
 
-          until Time.now > end_time
-            begin
+          begin
+            run_with_timer(timeout, interval) do
               result = yield(object)
               return result if result
-            rescue ::Errno::ECONNREFUSED => e
-              raise e
-            rescue *ignored => last_error
-              # swallowed
             end
-
-            sleep interval
+          rescue ::Errno::ECONNREFUSED => e
+            raise e
+          rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+            # swallowed
           end
 
           msg = message_for timeout, message
@@ -104,6 +97,17 @@ def message_for(timeout, message)
           msg << ", #{message}" if message
           msg
         end
+
+        def run_with_timer(timeout, interval, &block)
+          if timeout.zero?
+            block.call # rubocop:disable Performance/RedundantBlockCall
+          else
+            Timer.wait timeout do
+              block.call # rubocop:disable Performance/RedundantBlockCall
+              sleep interval
+            end
+          end
+        end
       end # self
     end # module Wait
 

lib/appium_lib_core/common/wait/timer.rb

@@ -0,0 +1,30 @@
+module Appium
+  module Core
+    module Wait
+      module Timer
+        class << self
+          # @private
+          def wait(timeout, &block)
+            end_time = current_time + timeout
+            loop do
+              yield(block)
+              break if current_time > end_time
+            end
+          end
+
+          private
+
+          if defined?(Process::CLOCK_MONOTONIC)
+            def current_time
+              Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            end
+          else
+            def current_time
+              ::Time.now.to_f
+            end
+          end
+        end
+      end # module Timer
+    end # module Wait
+  end # module Core
+end # module Appium