appium_lib_core 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e972900301fbf194438a65c383c0456337b2aa13
-  data.tar.gz: 2ce95031c23912360f8542d88749ff6cef7db15d
+  metadata.gz: e9bb0e41715b40a247cce0ca6c129aa782269d21
+  data.tar.gz: 88cf6d66bdc6ad88e83971ab6234279e703a2203
 SHA512:
-  metadata.gz: e1c6ac5e752578f5012a269eb7656457bb5c4939b94cd473502266c28ba9c1e701cc696efb02aeac38637992b8013c29463f0b4a00146005410dc90b9400f94c
-  data.tar.gz: 997526c2682ead602ec3b6f95b578237d2ff81f7cd34fac500fa20e7cf45bf95b4eafd6fd1ba9796428a641b902ba48e582233753dbabd635ef432b46b1949e8
+  metadata.gz: 2df417c53c2e9001002bd23f00ccd3938d436a4736914fb372b3978f968e1d87f247fd1b4d6706bbd67b3bf50b77abefdcdeb7ab3838bee9b257e8f1f74cec34
+  data.tar.gz: 88eb0ca4828ea2bbf052012557b204a0346d0a205485804e4e6c68bea7f70d960ada2e91835d262f4dc594a1e463738c3e55868e612012e7152ed890d332a6ae

data/CHANGELOG.md

@@ -8,6 +8,14 @@ All notable changes to this project will be documented in this file.
 
 ### Deprecations
 
+## [1.5.1] - 2018-04-25
+### Enhancements
+
+### Bug fixes
+- Revert timeout logic in `1.4.1`
+
+### Deprecations
+
 ## [1.5.0] - 2018-04-25
 ### Enhancements
 - [internal] Remove hot fix for XCUITest action

data/lib/appium_lib_core/common/wait.rb

@@ -32,13 +32,17 @@ module Appium
           ignored = Array(ignored || ::Exception)
 
           last_error = nil
-
-          begin
-            run_with_timer(timeout, interval) { return yield(object) }
-          rescue ::Errno::ECONNREFUSED => e
-            raise e
-          rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
-            # swallowed
+          timer = Wait::Timer.new(timeout)
+
+          until timer.timeout?
+            begin
+              return yield(object)
+            rescue ::Errno::ECONNREFUSED => e
+              raise e
+            rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+              # swallowed
+            end
+            sleep interval
           end
 
           msg = message_for timeout, message
@@ -72,16 +76,18 @@ module Appium
           ignored = Array(ignored || ::Exception)
 
           last_error = nil
+          timer = Wait::Timer.new(timeout)
 
-          begin
-            run_with_timer(timeout, interval) do
+          until timer.timeout?
+            begin
               result = yield(object)
               return result if result
+            rescue ::Errno::ECONNREFUSED => e
+              raise e
+            rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+              # swallowed
             end
-          rescue ::Errno::ECONNREFUSED => e
-            raise e
-          rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
-            # swallowed
+            sleep interval
           end
 
           msg = message_for timeout, message
@@ -97,17 +103,6 @@ module Appium
           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
 

data/lib/appium_lib_core/common/wait/timer.rb

@@ -1,30 +1,25 @@
 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
+      class Timer
+        def initialize(timeout)
+          @end_time = current_time + timeout
+        end
 
-          private
+        def timeout?
+          current_time > @end_time
+        end
 
-          if defined?(Process::CLOCK_MONOTONIC)
-            def current_time
-              Process.clock_gettime(Process::CLOCK_MONOTONIC)
-            end
-          else
-            def current_time
-              ::Time.now.to_f
-            end
+        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 # module Timer
+      end # class Timer
     end # module Wait
   end # module Core
 end # module Appium

data/lib/appium_lib_core/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Core
-    VERSION = '1.5.0'.freeze unless defined? ::Appium::Core::VERSION
+    VERSION = '1.5.1'.freeze unless defined? ::Appium::Core::VERSION
     DATE    = '2018-04-25'.freeze unless defined? ::Appium::Core::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v1.5.1 2018-04-25
+
+- [27f6149](https://github.com/appium/ruby_lib_core/commit/27f6149f330137bc1d6350271c246ebe0346122b) Release 1.5.1
+- [ddd8624](https://github.com/appium/ruby_lib_core/commit/ddd8624d2c3b9295af086eaf75774f94dbb17b39) Km/fix timeout error (#82)
+
+
 #### v1.5.0 2018-04-25
 
 - [b37ab24](https://github.com/appium/ruby_lib_core/commit/b37ab249c01a9d9f22a35e8d08e79a6d6b53e3f2) Release 1.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib_core
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver