timeouter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f10b6b4a402f7a2eda65f18f71e14bcf5745616a81f7793b9051a1dd3b09501
-  data.tar.gz: 916cb40b55973b7343abdb134ce16f2068828f5dee28a4c9205290b767046ea9
+  metadata.gz: 4eebc16a3cd094d67214eba8d29e32c94b9e3c8c553d063fe6df190dac55f75b
+  data.tar.gz: 9ac2cf769c9345afcf99bda5dbe2f2a5d299d1ac1eaa05bfa43643dffb18df8c
 SHA512:
-  metadata.gz: 716982b408f28ff28d656917e6085c4731a9b57ac3238673997399285315311e96d3ddc2f48c6077f7a61de08808a561a0dc2b264ed184cbe28f48be30e42873
-  data.tar.gz: b89ee00299bf83fb6a7bfb269eff51727e24288346acae5f22dfb9630ad3c3a16576b71c2159e80acfbff8f13696741b206088007192998a40004886aa113de9
+  metadata.gz: b1dcb98874efc98cc29cff7a8c3cd04a2746c7e74cbd00f42cc29b638b908bdd57e4e8967858083dcb86b57a09b1cfce67042776f425a66393f7ed4bf07df440
+  data.tar.gz: ccb5256cadaac18f390441fa5a8bee9223b628f77646774300ebc3e251d298978e148b8660f28a9c0a98dbf6ce30863654c511b3f413be17884f0fdc1cdff71c

data/lib/timeouter/timer.rb

@@ -3,18 +3,17 @@ require 'timeout'
 module Timeouter
   class Timer
 
-    attr_reader :started_at, :exhausted_at
+    attr_reader :timeout, :started_at#, :exhausted_at
 
-    def initialize(timeout = 0, eclass: Timeouter::TimeoutError, emessage: 'execution expired')
+    def initialize(timeout = 0, eclass: nil, message: nil)
       # ensure only positive timeouts
       timeout ||= 0
-      timeout = [timeout, 0].max
+      @timeout = [timeout, 0].max
 
-      @eclass = eclass
-      @emessage = emessage
+      @eclass = eclass || Timeouter::TimeoutError
+      @message = message || 'execution expired'
 
       @started_at = Time.now
-      @exhausted_at = timeout > 0 ? @started_at + timeout : nil
     end
 
     # elapsed time from creation
@@ -24,12 +23,12 @@ module Timeouter
 
     # time left to be exhausted or nil if timeout was 0
     def left
-      @exhausted_at && [@exhausted_at - Time.now, 0].max
+      (@timeout > 0) ? [@timeout - elapsed, 0].max : nil
     end
 
     # is timeout exhausted? or nil when timeout was 0
     def exhausted?
-      @exhausted_at && (@exhausted_at < Time.now)
+      (@timeout > 0) ? elapsed > @timeout : nil
     end
 
     # is timeout NOT exhausted? or true when timeout was 0
@@ -38,7 +37,7 @@ module Timeouter
     end
 
     # ensure timeout NOT exhausted raise exception otherwise
-    def running!(eclass = @eclass, message: @emessage)
+    def running!(eclass = @eclass, message: @message)
       !exhausted? || (raise eclass.new(message))
     end
 
@@ -47,7 +46,7 @@ module Timeouter
       yield(self) while self.running?
     end
 
-    def loop!(eclass = @eclass, message: @emessage)
+    def loop!(eclass = @eclass, message: @message)
       yield(self) while self.running!(eclass, message: message)
     end
 

data/lib/timeouter/version.rb

@@ -1,6 +1,6 @@
 module Timeouter
 
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 
 end
 

data/lib/timeouter.rb

@@ -1,4 +1,4 @@
-require_relative 'timeouter/timer'
+require 'timeouter/timer'
 
 
 module Timeouter
@@ -7,16 +7,16 @@ module Timeouter
 
   class << self
 
-    def run(timeout = 0, eclass: Timeouter::TimeoutError, emessage: 'execution expired')
-      yield(Timeouter::Timer.new(timeout, eclass: eclass, emessage: emessage))
+    def run(timeout = 0, eclass: Timeouter::TimeoutError, message: 'execution expired')
+      yield(Timeouter::Timer.new(timeout, eclass: eclass, message: message))
     end
 
-    def loop(timeout = 0, eclass: Timeouter::TimeoutError, emessage: 'execution expired', &block)
-      Timeouter::Timer.new(timeout, eclass: eclass, emessage: emessage).loop(&block)
+    def loop(timeout = 0, eclass: Timeouter::TimeoutError, message: 'execution expired', &block)
+      Timeouter::Timer.new(timeout, eclass: eclass, message: message).loop(&block)
     end
 
-    def loop!(timeout = 0, eclass: Timeouter::TimeoutError, emessage: 'execution expired', &block)
-      Timeouter::Timer.new(timeout, eclass: eclass, emessage: emessage).loop!(&block)
+    def loop!(timeout = 0, eclass: Timeouter::TimeoutError, message: 'execution expired', &block)
+      Timeouter::Timer.new(timeout, eclass: eclass, message: message).loop!(&block)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timeouter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samoilenko Yuri
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,7 +86,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Timeouter is advisory timeout helper
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  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: Timeouter is advisory timeout helper without any background threads.
 email:
 - kinnalru@gmail.com
 executables: []
@@ -116,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Timeouter is advisory timeout helper
+summary: Timeouter is advisory timeout helper without any background threads.
 test_files: []