polling 0.0.3 → 0.0.5

data/README.md

@@ -17,10 +17,29 @@ Or install it yourself as:
 It starts at per minute 0 second. 
 
     time = [0,10,20,30,40,50]
-    Polling::run(time,debug=false) do
+    Polling::run(time,debug=true) do
       puts "test"
       sleep 2
     end
+
+result
+
+    start: 2012-11-16 19:47:36 +0900
+    sleep 23.980872869491577seconds (until 2012-11-16 19:48:00 +0900)
+    test
+    sleep 7.999034881591797seconds (until 2012-11-16 19:48:10 +0900)
+    test
+    sleep 7.999000072479248seconds (until 2012-11-16 19:48:20 +0900)
+    test
+    sleep 7.998318195343018seconds (until 2012-11-16 19:48:30 +0900)
+    test
+    sleep 7.998938083648682seconds (until 2012-11-16 19:48:40 +0900)
+    test
+    sleep 7.999677896499634seconds (until 2012-11-16 19:48:50 +0900)
+    test
+    sleep 7.998055934906006seconds (until 2012-11-16 19:49:00 +0900)
+    test
+    sleep 7.998072147369385seconds (until 2012-11-16 19:49:10 +0900)
     
 The multiple of 60 is set up. 
 
@@ -32,7 +51,7 @@ The multiple of 60 is set up.
 
 Please set a vlue that is divisible by 60.
 
-    time = ["5s"]
+    time = ["5s"] #or 5. support string is s,m,h,d.
     Polling::run(time) do
       puts "test"
       sleep 2

data/lib/polling/target.rb

@@ -4,18 +4,22 @@ module Polling
   module Target
     module_function
 
-    def interval(interval,debug=false)
+    def interval(interval,*args)
       init = 60
       now_to_f = Time.now.to_f
-
       stime = interval - (now_to_f % init)
-      if stime < 0
+
+      args.each do |arg|
+        @start = arg[:start]
+        @debug = arg[:debug]
+      end
+
+      if !@start && stime < 0
         stime = init - stime.abs
       end
 
       ### debug
-      print "sleep #{stime}seconds (until #{Time.at(now_to_f + stime)})\n" if debug
-
+      print "sleep #{stime}seconds (until #{Time.at(now_to_f + stime)})\n" if @debug && stime > 0
       return stime
     end
 

data/lib/polling/version.rb

@@ -1,3 +1,3 @@
 module Polling
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/polling.rb

@@ -6,14 +6,15 @@ require 'polling/target'
 module Polling
   module_function
   def run(arr, debug=false)
-    start = true
     arr = Confirm::check_arr(arr)
+    args = {:start => false, :debug => debug}
+    Sleep::exec Target::interval(0,args)
+    args[:start] = true
     loop do 
       arr.each do |time|
         time = Confirm::check_value(time)
-        Sleep::exec Target::interval(0, debug) if start
-        Sleep::exec Target::interval(time, debug) unless start
-        start = false
+        Sleep::exec Target::interval(time,args)
+        args[:start] = false
         yield
       end
     end

data/test/test_confirm.rb

@@ -13,6 +13,8 @@ class PollingTest < Test::Unit::TestCase
     assert_equal 300, Polling::Confirm::convert("5m")
     assert_equal 18000, Polling::Confirm::convert("5h")
 
+    assert_equal ["0","10","20","30","40","50"], Polling::Confirm::check_arr(["0","10","20","30","40","50"])
+    assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr([0,10,20,30,40,50])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr(["10s"])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr(["10"])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr([10])

data/test/test_run.rb

@@ -1,11 +1,14 @@
 require File.expand_path(File.dirname(__FILE__)) + "/helper.rb"
 
 class PollingTest < Test::Unit::TestCase
-  def test_run
-    arr = [0,10,20,30,40,50]
-    Polling::run(arr,true) do
-      puts "test"
-      sleep 2
-    end
-  end
+  #def test_run
+  #  puts "start: #{Time.now}"
+  #  #arr = [5,15,25,35,45,55]
+  #  #arr = ["0","10","20","30","40","50"]
+  #  arr = ["10s"]
+  #  Polling::run(arr,true) do
+  #    puts Time.now
+  #    sleep 2
+  #  end
+  #end
 end

data/test/test_target.rb

@@ -16,11 +16,13 @@ class PollingTest < Test::Unit::TestCase
       assert_equal time+1, Polling::Target::interval(time)
     end
 
+    debug = {:debug => true}
+    
     Time.stubs(:now).returns(Time.parse "2012/01/01 00:00:00")
-    assert_equal 180, Polling::Target::interval(180,true)
-    assert_equal 300, Polling::Target::interval(300,true)
-    assert_equal 300, Polling::Target::interval(300,true)
-    assert_equal 3600, Polling::Target::interval(3600,true)
-
+    assert_equal 180, Polling::Target::interval(180,debug)
+    assert_equal 300, Polling::Target::interval(300,debug)
+    assert_equal 300, Polling::Target::interval(300,debug)
+    assert_equal 3600, Polling::Target::interval(3600,debug)
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polling
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies: []
 description: polling
 email: