servolux 0.10.0 → 0.11.0

data/spec/servolux_spec.rb

@@ -1,19 +1,15 @@
-
 require File.expand_path('../spec_helper', __FILE__)
 
 describe Servolux do
-
   before :all do
     @root_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end
 
   it "finds things releative to 'lib'" do
-    Servolux.libpath(%w[servolux threaded]).should == File.join(@root_dir, %w[lib servolux threaded])
+    expect(Servolux.libpath(%w[servolux threaded])).to eq(File.join(@root_dir, %w[lib servolux threaded]))
   end
 
   it "finds things releative to 'root'" do
-    Servolux.path('Rakefile').should == File.join(@root_dir, 'Rakefile')
+    expect(Servolux.path('Rakefile')).to eq(File.join(@root_dir, 'Rakefile'))
   end
-
 end
-

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-
 unless defined? SERVOLUX_SPEC_HELPER
 SERVOLUX_SPEC_HELPER = true
 
@@ -15,6 +14,4 @@ RSpec.configure do |config|
   include RSpec::LoggingHelper
   config.capture_log_messages
 end
-
 end  # unless defined?
-

data/spec/threaded_spec.rb

@@ -1,8 +1,6 @@
-
 require File.expand_path('../spec_helper', __FILE__)
 
 describe Servolux::Threaded do
-
   base = Class.new do
     include Servolux::Threaded
     def initialize
@@ -33,14 +31,14 @@ describe Servolux::Threaded do
 
     obj = klass.new
     obj.interval = 0
-    obj.running?.should be_nil
+    expect(obj.running?).to be_nil
 
     obj.start
-    obj.running?.should be_true
+    expect(obj).to be_running
     obj.pass
 
     obj.stop.join(2)
-    obj.running?.should be_false
+    expect(obj).to_not be_running
   end
 
   it "stops even when sleeping in the run method" do
@@ -53,14 +51,14 @@ describe Servolux::Threaded do
 
     obj = klass.new
     obj.interval = 0
-    obj.stopped.should be_nil
+    expect(obj.stopped).to be_nil
 
     obj.start
-    obj.stopped.should be_false
+    expect(obj.stopped).to be false
     obj.pass
 
     obj.stop.join(2)
-    obj.stopped.should be_true
+    expect(obj.stopped).to be true
   end
 
   it "calls all the before and after hooks" do
@@ -78,11 +76,11 @@ describe Servolux::Threaded do
     obj.ary = []
 
     obj.start
-    obj.ary.should be == [1,2]
+    expect(obj.ary).to eq([1,2])
     obj.pass
 
     obj.stop.join(2)
-    obj.ary.should be == [1,2,3,4]
+    expect(obj.ary).to eq([1,2,3,4])
   end
 
   it "dies when an exception is thrown" do
@@ -95,11 +93,11 @@ describe Servolux::Threaded do
     obj.start
     obj.pass nil
 
-    obj.running?.should be_false
+    expect(obj).to_not be_running
     @log_output.readline
-    @log_output.readline.chomp.should be == "FATAL  Object : <RuntimeError> ni"
+    expect(@log_output.readline.chomp).to eq("FATAL  Object : <RuntimeError> ni")
 
-    lambda { obj.join }.should raise_error(RuntimeError, 'ni')
+    expect { obj.join }.to raise_error(RuntimeError, 'ni')
   end
 
   it "lives if told to continue on error" do
@@ -122,12 +120,12 @@ describe Servolux::Threaded do
     obj.start
     obj.wait_signal
 
-    obj.running?.should be_true
+    expect(obj).to be_running
     @log_output.readline
-    @log_output.readline.chomp.should be == "ERROR  Object : <RuntimeError> ni"
+    expect(@log_output.readline.chomp).to eq("ERROR  Object : <RuntimeError> ni")
 
     obj.stop.join(2)
-    obj.running?.should be_false
+    expect(obj).to_not be_running
   end
 
   it "complains loudly if you don't have a run method" do
@@ -136,9 +134,9 @@ describe Servolux::Threaded do
     obj.pass nil
 
     @log_output.readline
-    @log_output.readline.chomp.should be == "FATAL  Object : <NotImplementedError> The run method must be defined by the threaded object."
+    expect(@log_output.readline.chomp).to eq("FATAL  Object : <NotImplementedError> The run method must be defined by the threaded object.")
 
-    lambda { obj.join }.should raise_error(NotImplementedError, 'The run method must be defined by the threaded object.')
+    expect { obj.join }.to raise_error(NotImplementedError, 'The run method must be defined by the threaded object.')
   end
 
   # --------------------------------------------------------------------------
@@ -151,11 +149,11 @@ describe Servolux::Threaded do
 
       obj = klass.new
       obj.maximum_iterations = 5
-      obj.iterations.should be == 0
+      expect(obj.iterations).to eq(0)
 
       obj.start
       obj.wait
-      obj.iterations.should be == 5
+      expect(obj.iterations).to eq(5)
     end
 
     it "runs the 'after_stopping' method" do
@@ -171,7 +169,7 @@ describe Servolux::Threaded do
 
       obj.start
       obj.wait
-      obj.ary.should be == [4]
+      expect(obj.ary).to eq([4])
     end
 
     it "should not increment iterations if maximum iterations has not been set" do
@@ -180,19 +178,55 @@ describe Servolux::Threaded do
       end
 
       obj = klass.new
-      obj.iterations.should be == 0
+      expect(obj.iterations).to eq(0)
 
       obj.start
       sleep 0.1
       obj.stop.join(2)
-      obj.iterations.should be == 0
+      expect(obj.iterations).to eq(0)
     end
 
     it "complains loudly if you attempt to set a maximum number of iterations < 1" do
       obj = base.new
-      lambda { obj.maximum_iterations = -1 }.should raise_error( ArgumentError, "maximum iterations must be >= 1" )
+      expect { obj.maximum_iterations = -1 }.to raise_error( ArgumentError, "maximum iterations must be >= 1" )
     end
+  end
+
+  # --------------------------------------------------------------------------
+  context 'when running with a strict interval' do
+
+    it "logs a warning if the strict interval is exceeded" do
+      klass = Class.new( base ) do
+        def run() sleep 0.5; end
+      end
+
+      obj = klass.new
+      obj.interval = 0.250
+      obj.use_strict_interval = true
+      obj.maximum_iterations = 2
+
+      obj.start
+      obj.wait
 
+      @log_output.readline
+      expect(@log_output.readline.chomp).to match(%r/ WARN  Servolux::Threaded::ThreadContainer : Run time \[\d+\.\d+ s\] exceeded strict interval \[0\.25 s\]/)
+    end
+
+    it "ignores the strict flag if the interval is zero" do
+      klass = Class.new( base ) do
+        def run() sleep 0.250; end
+      end
+
+      obj = klass.new
+      obj.interval = 0
+      obj.use_strict_interval = true
+      obj.maximum_iterations = 2
+
+      obj.start
+      obj.wait
+
+      @log_output.readline
+      expect(@log_output.readline).to be_nil
+    end
   end
 end
-

metadata

@@ -1,79 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: servolux
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Tim Pease
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bones-rspec
-  requirement: &2160654620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2160654620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bones-git
-  requirement: &2160654100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2160654100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2160653660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2160653660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &2160653220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.8.3
   type: :development
   prerelease: false
-  version_requirements: *2160653220
-description: ! 'Serv-O-Lux is a collection of Ruby classes that are useful for daemon
-  and
-
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
+description: |-
+  Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
   process management, and for writing your own Ruby services. The code is well
-
   documented and tested. It works with Ruby and JRuby supporting both 1.8 and 1.9
-
-  interpreters.'
+  interpreters.
 email: tim.pease@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - History.txt
-- README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - History.txt
-- README.rdoc
+- README.md
 - Rakefile
 - examples/beanstalk.rb
 - examples/echo.rb
@@ -86,6 +93,8 @@ files:
 - lib/servolux/prefork.rb
 - lib/servolux/server.rb
 - lib/servolux/threaded.rb
+- lib/servolux/version.rb
+- script/bootstrap
 - spec/child_spec.rb
 - spec/daemon_spec.rb
 - spec/piper_spec.rb
@@ -94,31 +103,29 @@ files:
 - spec/servolux_spec.rb
 - spec/spec_helper.rb
 - spec/threaded_spec.rb
-- version.txt
-homepage: http://gemcutter.org/gems/servolux
+homepage: http://rubygems.org/gems/servolux
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
-- README.rdoc
+- "--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: servolux
-rubygems_version: 1.8.11
+rubygems_version: 2.2.3
 signing_key: 
-specification_version: 3
-summary: ! '* {Homepage}[http://rubygems.'
+specification_version: 4
+summary: A collection of tools for working with processes
 test_files: []

data/README.rdoc

@@ -1,68 +0,0 @@
-= Serv-O-Lux
-by Tim Pease {<img src="https://secure.travis-ci.org/TwP/servolux.png">}[http://travis-ci.org/TwP/servolux]
-
-* {Homepage}[http://rubygems.org/gems/servolux]
-* {Github Project}[http://github.com/TwP/servolux]
-
-=== DESCRIPTION
-
-Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
-process management, and for writing your own Ruby services. The code is well
-documented and tested. It works with Ruby and JRuby supporting both 1.8 and 1.9
-interpreters.
-
-=== FEATURES
-
-Servolux::Threaded -- when included into your own class, it gives you an
-activity thread that will run some code at a regular interval. Provides methods
-to start and stop the thread, report on the running state, and join the thread
-to wait for it to complete.
-
-Servolux::Server -- a template server class that handles the mundane work of
-creating / deleting a PID file, reporting running state, logging errors,
-starting the service, and gracefully shutting down the service.
-
-Servolux::Piper -- an extension of the standard Ruby fork method that opens a
-pipe for communication between parent and child processes. Ruby objects are
-passed between parent and child allowing, for example, exceptions in the child
-process to be passed to the parent and raised there.
-
-Servolux::Daemon -- a robust class for starting and stopping daemon processes.
-
-Servolux::Child -- adds some much needed functionality to child processes
-created via Ruby's IO#popen method. Specifically, a timeout thread is used to
-signal the child process to die if it does not exit in a given amount of time.
-
-Servolux::Prefork -- provides a pre-forking worker pool for executing tasks in
-parallel using multiple processes.
-
-All the documentation is available online at http://rdoc.info/projects/TwP/servolux
-
-=== INSTALL
-
-  gem install servolux
-
-=== LICENSE
-
-(The MIT License)
-
-Copyright (c) 2009
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.