polling 0.0.2 → 0.0.3

data/README.md

@@ -1,6 +1,6 @@
 # Polling
 
-fluent-plugin-snmp用pollingライブラリ
+ruby polling library
 
 ## Installation
 
@@ -8,22 +8,36 @@ Add this line to your application's Gemfile:
 
     gem 'polling'
 
+Or install it yourself as:
+
+    $ gem install polling
+
 ## Usage
 
-必ず0秒からスタートします
+It starts at per minute 0 second. 
 
     time = [0,10,20,30,40,50]
     Polling::run(time,debug=false) do
-      p "hoge"
+      puts "test"
+      sleep 2
     end
     
-もし60以上の値を設定する場合には60で割り切れる値を設定
+The multiple of 60 is set up. 
 
     time = [300]
-    Polling::run(time,debug=false) do
-      p "hoge"
+    Polling::run(time) do
+      puts "hoge"
+      sleep 2
+    end
+
+Please set a vlue that is divisible by 60.
+
+    time = ["5s"]
+    Polling::run(time) do
+      puts "test"
+      sleep 2
     end
 
 ## Copyright
 
-Copyright:: Copyright (c) 2012, Internet Initiative Japan Inc. All rights reserved.
+Copyright (c) 2012, hiro-su All rights reserved.

data/lib/polling/confirm.rb

@@ -3,8 +3,44 @@ module Polling
     module_function
     def check_value(value)
       value = value.to_i
-      raise TypeError, "Please set as a multiple of 60" if (value % 60 != 0) && value > 60
+      raise TypeError, "Please set a value that is multiple of 60." if (value % 60 != 0) && value > 60
       return value
     end
+
+    def check_arr(arr)
+      if arr.count == 1
+        time = convert(arr[0])
+        arr = time < 60 ? create_arr(time) : [time]
+        raise TypeError, "Please set a value that is divisible by 60." if (60 % time != 0) && time < 60
+      end
+      return arr
+    end
+
+    def convert(value)
+      case value
+      when /(\d+)s/
+        value = $1.to_i
+      when /(\d+)m/
+        value = $1.to_i*60
+      when /(\d+)h/
+        value = $1.to_i*60*60
+      when /(\d+)d/
+        value = $1.to_i*60*60*24
+      when String
+        value = value.to_i
+      end
+      return value
+    end
+
+    def create_arr(time)
+      arr = Array.new
+      arr << 0 if time != 0
+      result = time
+      while time < 60
+        arr << time
+        time += result
+      end
+      return arr
+    end
   end
 end

data/lib/polling/target.rb

@@ -4,12 +4,7 @@ module Polling
   module Target
     module_function
 
-    class << self
-      #TODO imple delay
-      attr_accessor :delay
-    end
-
-    def create_time(interval,debug=false)
+    def interval(interval,debug=false)
       init = 60
       now_to_f = Time.now.to_f
 
@@ -23,5 +18,6 @@ module Polling
 
       return stime
     end
+
   end
 end

data/lib/polling/version.rb

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

data/lib/polling.rb

@@ -7,12 +7,12 @@ module Polling
   module_function
   def run(arr, debug=false)
     start = true
-
+    arr = Confirm::check_arr(arr)
     loop do 
       arr.each do |time|
         time = Confirm::check_value(time)
-        Sleep::exec Target::create_time(0, debug) if start
-        Sleep::exec Target::create_time(time, debug) unless start
+        Sleep::exec Target::interval(0, debug) if start
+        Sleep::exec Target::interval(time, debug) unless start
         start = false
         yield
       end

data/polling.gemspec

@@ -6,11 +6,11 @@ require 'polling/version'
 Gem::Specification.new do |gem|
   gem.name          = "polling"
   gem.version       = Polling::VERSION
-  gem.authors       = ["hiroshi sugimoto"]
-  gem.email         = ["h-sugimoto@iij.ad.jp"]
+  gem.authors       = ["hiro-su"]
+  gem.email         = ["h.sugipon@gmail.com"]
   gem.description   = %q{polling}
   gem.summary       = %q{polling}
-  gem.homepage      = "https://github.com/iij/polling"
+  gem.homepage      = "https://github.com/hiro-su/polling"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/helper.rb

@@ -2,5 +2,5 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'polling'

data/test/test_confirm.rb

@@ -5,7 +5,21 @@ class PollingTest < Test::Unit::TestCase
     assert_equal 0, Polling::Confirm::check_value(0)
     assert_equal 0, Polling::Confirm::check_value("0")
     assert_equal 60, Polling::Confirm::check_value(60)
-    assert_equal 60, Polling::Confirm::check_value("60")
-    assert_equal RuntimeError, Polling::Confirm::check_value(61)
+    assert_equal 5, Polling::Confirm::check_value("5")
+
+    assert_equal 5, Polling::Confirm::convert(5)
+    assert_equal 5, Polling::Confirm::convert("5")
+    assert_equal 5, Polling::Confirm::convert("5s")
+    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(["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])
+    assert_equal [0,30], Polling::Confirm::check_arr([30])
+    assert_equal [60], Polling::Confirm::check_arr([60])
+    assert_equal [60], Polling::Confirm::check_arr(["60"])
+    assert_equal [60], Polling::Confirm::check_arr(["60s"])
+    assert_equal [120], Polling::Confirm::check_arr(["120s"])
   end
 end

data/test/test_run.rb

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

data/test/test_target.rb

@@ -5,22 +5,22 @@ class PollingTest < Test::Unit::TestCase
 
   def test_target_time
     Time.stubs(:now).returns(Time.parse "2012/12/31 23:59:59")
-    assert_equal 1, Polling::Target::create_time(0)
-    assert_equal 6, Polling::Target::create_time(5)
-    assert_equal 0, Polling::Target::create_time(59)
-    assert_equal 1, Polling::Target::create_time(60)
-    assert_equal 2, Polling::Target::create_time(61)
+    assert_equal 1, Polling::Target::interval(0)
+    assert_equal 6, Polling::Target::interval(5)
+    assert_equal 0, Polling::Target::interval(59)
+    assert_equal 1, Polling::Target::interval(60)
+    assert_equal 2, Polling::Target::interval(61)
 
     arr = [0,1,5,10,20,30,40,50,58]
     arr.each do |time|
-      assert_equal time+1, Polling::Target::create_time(time)
+      assert_equal time+1, Polling::Target::interval(time)
     end
 
     Time.stubs(:now).returns(Time.parse "2012/01/01 00:00:00")
-    assert_equal 180, Polling::Target::create_time(180,true)
-    assert_equal 300, Polling::Target::create_time(300,true)
-    assert_equal 300, Polling::Target::create_time(300,true)
-    assert_equal 3600, Polling::Target::create_time(3600,true)
+    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)
 
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: polling
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
-- hiroshi sugimoto
+- hiro-su
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies: []
 description: polling
 email:
-- h-sugimoto@iij.ad.jp
+- h.sugipon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -34,7 +34,7 @@ files:
 - test/test_run.rb
 - test/test_sleep.rb
 - test/test_target.rb
-homepage: https://github.com/iij/polling
+homepage: https://github.com/hiro-su/polling
 licenses: []
 post_install_message: 
 rdoc_options: []