zoidberg 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231615060c80d5ca9662a95eb70688e1b11208e9
-  data.tar.gz: 83b5a508225ce56f2dbe124a54b77941b99677fd
+  metadata.gz: 3632fd491e21d5b71dca06d2670227b281b27865
+  data.tar.gz: 360be229f5e280316a28b6505b80e08fba50220b
 SHA512:
-  metadata.gz: 8b50938806d8da937ff0778a1772a2fe458503c34936295c5ed87a16cdee2ab101b00bef94c29eb046ffd4022de077647bd4568ec5d9ded5e3c476f18e27a4b6
-  data.tar.gz: 9188f12d3184e78ba89c84a93e72d6540ac4e9d801fd411e3df383d74a1d15edf454ca2de2f57a3f2d7e9b2f196f777ce4e0608199dcd7e938fce90acc871852
+  metadata.gz: f3d3c32e84acbd7b470f16166b070b8bf219d3db1d548eeb25bb758e9675c1b8b864ec45cbe5b4536b402147ce6b0513cefbb5af2008855eea4af48a21c29366
+  data.tar.gz: 3bd1a5562bdab8f04ac8f0e1381b1db7aa10c33cb0e1f83e334802cf348b329dae5e6091052b875efab3b3c740371620147c679dcbdb72962f5cb690321fa15c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.1.4
+* Timer updates and fix spec
+
 # v0.1.2
 * Use select + pipe for timer interactions
 

data/lib/zoidberg/timer.rb

@@ -15,8 +15,6 @@ module Zoidberg
       attr_reader :interval
       # @return [Float]
       attr_reader :last_run
-      # @return [IO]
-      attr_reader :waker
 
       # Create a new action
       #
@@ -33,7 +31,6 @@ module Zoidberg
         @interval = args.fetch(:interval, 5)
         @last_run = Time.now.to_f
         @cancel = false
-        @waker = IO.pipe.last
       end
 
       # Cancel the action
@@ -59,6 +56,15 @@ module Zoidberg
         self
       end
 
+      # @return [TrueClass, FalseClass]
+      def ready?
+        !cancelled? && (
+          Time.now.to_f > (
+            last_run + interval
+          )
+        )
+      end
+
     end
 
     include Zoidberg::SoftShell
@@ -66,10 +72,17 @@ module Zoidberg
     # Custom exception used to wakeup timer
     class Wakeup < StandardError; end
 
+    # Wakeup string
+    WAKEUP = "WAKEUP\n"
+
     # @return [Array<Action>] items to run
     attr_reader :to_run
     # @return [TrueClass, FalseClass] timer is paused
     attr_reader :paused
+    # @return [IO]
+    attr_reader :waker
+    # @return [IO]
+    attr_reader :alerter
 
     # Create a new timer
     #
@@ -77,6 +90,7 @@ module Zoidberg
     def initialize
       @to_run = []
       @paused = false
+      @alerter, @waker = IO.pipe
       @thread = Thread.new{ run! }
     end
 
@@ -152,7 +166,7 @@ module Zoidberg
         (item.interval + item.last_run) - Time.now.to_f
       end
       if(wakeup)
-        waker.write '-'
+        waker.write WAKEUP
       end
       current_self
     end
@@ -170,9 +184,7 @@ module Zoidberg
     #
     # @return [self]
     def run_ready
-      items = to_run.find_all do |item|
-        ((item.interval + item.last_run) - Time.now.to_f) <= 0
-      end
+      items = to_run.find_all(&:ready?)
       to_run.delete_if do |item|
         items.include?(item)
       end
@@ -197,13 +209,14 @@ module Zoidberg
     def run!
       loop do
         begin
-          interval = current_self.next_interval
-          io = IO.select([waker], [], [], interval).flatten.compact.first
-          io.read if io
-          current_self.run_ready
-          current_self.reset(false)
-        rescue Wakeup
-          Zoidberg.logger.debug "<#{self}> Received wakeup notification. Rechecking sleep interval!"
+          alerter.read_nonblock(WAKEUP.length)
+        rescue IO::WaitReadable
+          interval = current_self.next_interval if current_self
+          IO.select([alerter], [], [], interval)
+        end
+        begin
+          run_ready
+          reset(false)
         rescue DeadException
           raise
         rescue => e

data/lib/zoidberg/version.rb

@@ -1,4 +1,4 @@
 module Zoidberg
   # Current library version
-  VERSION = Gem::Version.new('0.1.2')
+  VERSION = Gem::Version.new('0.1.4')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoidberg
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo