eventmachinealignedperiodic 2.1.1 → 2.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0f1502dd5d02b96ce82393ba287206d5e5b90e52
+  data.tar.gz: 32b94631815197cf3b1e557a011a2c46ebfca613
+SHA512:
+  metadata.gz: d272223531926975d338b480406c307004c8626c23c6c337f3932954f9ffa9dd390f02fdbf470e8190740723a3e5c07b9fad95a357717c19199122adb5aeaaee
+  data.tar.gz: 8ee2335aa06748d38f2a63c660f7286c6ddc4174addcb02b006331b52c3fa9cfa9b159880dc6e96c69a2eb16234656bdf8ac203455b8c5a150f0028a071c89ff

data/Manifest.txt

@@ -1,6 +1,6 @@
 History.txt
 Manifest.txt
-README.txt
+README.md
 LICENSE.txt
 Rakefile
 lib/eventmachine_alignedperiodic.rb

data/Rakefile

@@ -6,6 +6,7 @@ Hoe.plugin :bundler
 
 Hoe.spec 'eventmachinealignedperiodic' do
     developer("James FitzGibbon", "james@nadt.net")
+    developer("Gregory Hill", "gregoryhilluk@gmail.com")
     license "MIT"
     dependency 'eventmachine', '~> 1.0.3'
     dependency 'hoe', '~> 3.7.1', :dev

data/eventmachinealignedperiodic.gemspec

@@ -1,27 +1,28 @@
 # -*- encoding: utf-8 -*-
+# stub: eventmachinealignedperiodic 2.1.2.20151204094310 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "eventmachinealignedperiodic"
-  s.version = "2.1.1.20131112160551"
+  s.version = "2.1.2.20151204094310"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["James FitzGibbon"]
-  s.date = "2013-11-13"
+  s.require_paths = ["lib"]
+  s.authors = ["James FitzGibbon", "Gregory Hill"]
+  s.date = "2015-12-04"
   s.description = "EventMachineAlignedPeriodic helps to kick off a block of code on a periodic\nschedule aligned with a time period.  Rather than have something starting at\n2 seconds, 17 seconds, 32 seconds and so on you can have it consistently\nlaunch at 0, 15, 30."
-  s.email = ["james@nadt.net"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt", "Rakefile", "lib/eventmachine_alignedperiodic.rb", "eventmachinealignedperiodic.gemspec", "test/test_eventmachine_alignedperiodic.rb", ".gemtest"]
+  s.email = ["james@nadt.net", "gregoryhilluk@gmail.com"]
+  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.md"]
+  s.files = [".gemtest", "History.txt", "LICENSE.txt", "Manifest.txt", "README.md", "Rakefile", "eventmachinealignedperiodic.gemspec", "lib/eventmachine_alignedperiodic.rb", "test/test_eventmachine_alignedperiodic.rb"]
   s.homepage = "https://github.com/jf647/EventMachineAlignedPeriodic"
   s.licenses = ["MIT"]
-  s.rdoc_options = ["--main", "README.txt"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = ["--main", "README.md"]
   s.rubyforge_project = "eventmachinealignedperiodic"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.4.6"
   s.summary = "EventMachineAlignedPeriodic helps to kick off a block of code on a periodic schedule aligned with a time period"
   s.test_files = ["test/test_eventmachine_alignedperiodic.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, ["~> 1.0.3"])

data/lib/eventmachine_alignedperiodic.rb

@@ -6,8 +6,8 @@ module EventMachine
 
     class AlignedPeriodic
 
-        VERSION = '2.1.1'
-    
+        VERSION = '2.1.2'
+
         attr_reader :nextevent
 
         def initialize(interval, p, offset = 0, logger = nil)
@@ -40,17 +40,21 @@ module EventMachine
                 schedule_next_event
             }
         end
-        
+
         def stop
-            @mutex.synchronize {
-                EventMachine.cancel_timer(@timer)
-                @running = false
-                @p.call(true)
-            }
+            #Changed as per https://github.com/eventmachine/eventmachine/issues/418
+            if EM.reactor_running?
+              EM.add_timer(0) {
+                  EventMachine.cancel_timer(@timer) if !@timer.nil?
+              }
+            end
+            @running = false
+            @timer = nil
+            @p.call(true)
         end
-        
+
         private
-        
+
         def do_periodic
             @mutex.synchronize {
                 # we can't remove shutdown hooks, so if we aren't running, do nothing
@@ -67,7 +71,7 @@ module EventMachine
                 schedule_next_event
             }
         end
-        
+
         def schedule_first_event
             now = Time.now
             if @lastevent.nil?
@@ -79,12 +83,12 @@ module EventMachine
             @nextevent = @lastevent + @interval
             schedule
         end
-        
+
         def schedule_next_event
             @nextevent = @lastevent + @interval
             schedule
         end
-        
+
         def schedule
             if ! @logger.nil?
                 @logger.debug("next event is at #{@nextevent}")
@@ -92,7 +96,7 @@ module EventMachine
             nextevent_in = @nextevent - Time.now
             @timer = EventMachine.add_timer(nextevent_in) { do_periodic() }
         end
-    
+
     end
 
 end

data/test/test_eventmachine_alignedperiodic.rb

@@ -1,8 +1,71 @@
 require 'minitest_helper'
+require 'logger'
 
 class TestEVMAAlignedPeriodic < Minitest::Test
-    def test_constructor
-        aligned = EventMachine::AlignedPeriodic.new(900, proc { puts "foo" })
-        assert_instance_of EventMachine::AlignedPeriodic, aligned, "constructor works"
+  def test_constructor
+    aligned = EventMachine::AlignedPeriodic.new(900, proc { puts "foo" })
+    assert_instance_of EventMachine::AlignedPeriodic, aligned, "constructor works"
+  end
+  def test_destructor_trap_context
+    aligned = EventMachine::AlignedPeriodic.new(900, proc { puts "foo" })
+    assert_instance_of EventMachine::AlignedPeriodic, aligned, "constructor works"
+
+    #This specifically tests stopping in a trap context.
+    #Issue #418
+    shutdownproc = Proc.new {
+        aligned.stop
+    }
+    Signal.trap("TERM", shutdownproc)
+    Process.kill("TERM", $$)
+  end
+
+  def test_destructor_reactor_not_running
+    aligned = EventMachine::AlignedPeriodic.new(900, proc { puts "foo" })
+    assert_instance_of EventMachine::AlignedPeriodic, aligned, "constructor works"
+    out, err = capture_io do
+      aligned.stop
+    end
+    assert_match "foo", out
+  end
+
+  def test_poke_not_running
+    aligned = EventMachine::AlignedPeriodic.new(900, proc { puts "foo" })
+    e = assert_raises(RuntimeError) { aligned.poke }
+    assert_equal e.message, "periodic schedulder not running; can't be poked"
+  end
+
+  def test_poke_running
+    aligned = nil
+    t = nil
+    out, err = capture_io {
+      log = Logger.new($stdout)
+      aligned = EventMachine::AlignedPeriodic.new(900, proc { puts "foo" },0,log)
+      t = Thread.new() do
+        EM.run
+      end
+      sleep 1  #pause to give eventmachine time to initialise
+      aligned.start
+    }
+    assert_match %r{next event is at}, out
+    out, err = capture_io { aligned.poke }
+    assert_equal "foo\n", out
+    aligned.stop
+    EM.stop
+    t.join
+  end
+
+  def test_periodic_output #no assertions yet but does run lines of code! :)
+    log = Logger.new(STDOUT)
+    aligned = EventMachine::AlignedPeriodic.new(5, proc { puts "foo" },0,log)
+    t = Thread.new() do
+      EM.run
     end
+    sleep 1  #pause to give eventmachine time to initialise
+    aligned.start
+    sleep 5
+    #assert_match "foo", out
+    aligned.stop
+    EM.stop
+    t.join
+  end
 end

metadata

@@ -1,213 +1,192 @@
 --- !ruby/object:Gem::Specification
 name: eventmachinealignedperiodic
 version: !ruby/object:Gem::Version
-  version: 2.1.1
-  prerelease: 
+  version: 2.1.2
 platform: ruby
 authors:
 - James FitzGibbon
+- Gregory Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.8
 - !ruby/object:Gem::Dependency
   name: minitest-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
-description: ! 'EventMachineAlignedPeriodic helps to kick off a block of code on a
-  periodic
-
+description: |-
+  EventMachineAlignedPeriodic helps to kick off a block of code on a periodic
   schedule aligned with a time period.  Rather than have something starting at
-
   2 seconds, 17 seconds, 32 seconds and so on you can have it consistently
-
-  launch at 0, 15, 30.'
+  launch at 0, 15, 30.
 email:
 - james@nadt.net
+- gregoryhilluk@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - History.txt
-- Manifest.txt
-- README.txt
 - LICENSE.txt
+- Manifest.txt
+- README.md
 files:
+- ".gemtest"
 - History.txt
-- Manifest.txt
-- README.txt
 - LICENSE.txt
+- Manifest.txt
+- README.md
 - Rakefile
-- lib/eventmachine_alignedperiodic.rb
 - eventmachinealignedperiodic.gemspec
+- lib/eventmachine_alignedperiodic.rb
 - test/test_eventmachine_alignedperiodic.rb
-- .gemtest
 homepage: https://github.com/jf647/EventMachineAlignedPeriodic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
-- README.txt
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: eventmachinealignedperiodic
-rubygems_version: 1.8.23
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EventMachineAlignedPeriodic helps to kick off a block of code on a periodic
   schedule aligned with a time period
 test_files: