lifeguard 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e58ec1398c4d3ed7295eddc101b7e0782b7e410
-  data.tar.gz: a50f5bf81baf9c7b9f61756408dd9ce47affc12b
+  metadata.gz: 8c0e136e3ea9cf546ef269e33ebd6b5e1f84fa7f
+  data.tar.gz: af7f496ae700677de545303d763bca5eb285d648
 SHA512:
-  metadata.gz: e2c8b4660b69d933c3edfb118963e08ae94525a01755f134811e669feff118c84ad4549de81759d155a34f64b635df8361ef752fd0781432644f3b138fa5c599
-  data.tar.gz: 6b47b9c2b0c397c80819f96b550e79b8938c087293b05f50bf33aa8300ab206cd47bab224b8a34a5771c3c8fea7411c9c56a3bd8e20bdb1749afcc9d4d9b9a09
+  metadata.gz: b0d4d7ef4c2f6fa8a18e8dba4ce01ea25f1ae72c838c30833e6316120ee8582fdacafde991d87f02e96dfac7708ae8f68858fe6684572bda33704993702bdfb6
+  data.tar.gz: 333d49ff95dd267e49e0e38a3f151729c21b2fee459f5bbb6616c2b6aa8abe24428c870c5bcb9ce871efc5191ed8dbae79358a2347fbb42fe338b9afef430b10

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+before_install:
+  - gem install bundler
+rvm:
+  - 1.9
+  - 2.0
+  - 2.1
+  - jruby

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/moneydesktop/lifeguard.svg?branch=master)](https://travis-ci.org/moneydesktop/lifeguard)
+
+[![Code Climate](https://codeclimate.com/github/moneydesktop/lifeguard/badges/gpa.svg)](https://codeclimate.com/github/moneydesktop/lifeguard)
+
 lifeguard
 =========
 

data/lib/lifeguard/infinite_threadpool.rb

@@ -13,6 +13,7 @@ module Lifeguard
     def async(*args, &block)
       return false if @shutdown
 
+      check_queued_jobs
       job_started = super
 
       unless job_started
@@ -23,10 +24,12 @@ module Lifeguard
     end
 
     def check_queued_jobs
-      if @queued_jobs.size > 0
-        queued_job = @queued_jobs.pop
-        async(*queued_job[:args], &queued_job[:block])
-      end
+      return if busy?
+      return if @queued_jobs.size <= 0
+
+      queued_job = @queued_jobs.pop
+      async(*queued_job[:args], &queued_job[:block])
+      check_queued_jobs
     end
 
     def kill!(*args)
@@ -40,6 +43,12 @@ module Lifeguard
       return_value
     end
 
+    def prune_busy_threads
+      response = super
+      check_queued_jobs
+      response
+    end
+
     def shutdown(*args)
       @shutdown = true
       super

data/lib/lifeguard/reaper.rb

@@ -7,6 +7,7 @@ module Lifeguard
       @threadpool = threadpool
       @reaping_interval = reaping_interval
       @thread = ::Thread.new { self.run! }
+      ::Thread.pass until alive?
     end
 
     ##
@@ -16,30 +17,14 @@ module Lifeguard
       @thread.alive?
     end
 
-    def reap!
-      @threadpool.prune_busy_threads
-    end
-
     def run!
       loop do
         sleep(@reaping_interval)
-        reap!
-        timeout!
-        ready_thread_count = @threadpool.pool_size - @threadpool.busy_size
-        
-        if ready_thread_count > 0 && @threadpool.respond_to?(:check_queued_jobs)
-          ready_thread_count.times do
-            @threadpool.check_queued_jobs
-          end
-        end
+        @threadpool.prune_busy_threads if @threadpool
+        @threadpool.timeout! if @threadpool
       end
     rescue
       retry
     end
-
-    def timeout!
-      @threadpool.timeout!
-    end
-
   end
 end

data/lib/lifeguard/threadpool.rb

@@ -1,16 +1,19 @@
 require 'thread'
+require 'securerandom'
 
 module Lifeguard
   class Threadpool
     DEFAULT_REAPING_INTERVAL = 5 # in seconds
     DEFAULT_POOL_SIZE = 2
 
-    attr_accessor :pool_size
+    attr_accessor :name, :options, :pool_size
 
     ##
     # Constructor
     #
     def initialize(opts = {})
+      @options = opts
+      @name = opts[:name] || ::SecureRandom.uuid
       @pool_size = opts[:pool_size] || DEFAULT_POOL_SIZE
 
       # Important info about "timeout", it is controlled by the reaper
@@ -23,12 +26,16 @@ module Lifeguard
       @mutex = ::Mutex.new
       @busy_threads = []
 
-      @reaper = ::Lifeguard::Reaper.new(self, opts[:reaping_interval] || DEFAULT_REAPING_INTERVAL)
+      restart_reaper_unless_alive
     end
 
     ##
     # Public Instance Methods
     #
+    def busy?
+      busy_size >= pool_size
+    end
+
     def busy_size
       @busy_threads.size
     end
@@ -49,6 +56,7 @@ module Lifeguard
 
     def async(*args, &block)
       queued_the_work = false
+      restart_reaper_unless_alive
 
       unless block
         raise "Threadpool#async must be passed a block"
@@ -129,5 +137,11 @@ module Lifeguard
       @busy_threads.select!(&:alive?)
     end
 
+    def restart_reaper_unless_alive
+      return if @reaper && @reaper.alive?
+
+      @reaper = ::Lifeguard::Reaper.new(self, options[:reaping_interval] || DEFAULT_REAPING_INTERVAL)
+    end
+
   end
 end

data/lib/lifeguard/version.rb

@@ -1,3 +1,3 @@
 module Lifeguard
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lifeguard.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["brianastien@gmail.com", "brandonsdewitt@gmail.com"]
   spec.summary       = %q{A Supervised threadpool implementation in ruby.}
   spec.description   = %q{Do you have a threadpool? Do you need someone to watch it? Look no further!}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/moneydesktop/lifeguard"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/lifeguard/reaper_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe ::Lifeguard::Reaper do
-  pending
+  skip
 end

data/spec/lifeguard/threadpool_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe ::Lifeguard::Threadpool do
-
   subject { described_class.new(:pool_size => 5) }
 
   after(:each) do
@@ -9,15 +8,40 @@ describe ::Lifeguard::Threadpool do
     sleep(0.1)
   end
 
+  describe "#busy?" do
+    it "reports false when the busy_size < pool_size" do
+      threadpool = described_class.new(:pool_size => 1, :reaping_interval => 1)
+      expect(threadpool.busy?).to be false
+    end
+
+    it "reports true when the busy_size >= pool_size" do
+      threadpool = described_class.new(:pool_size => 1, :reaping_interval => 1)
+      threadpool.async do
+        sleep(1)
+      end
+
+      expect(threadpool.busy?).to be true
+    end
+  end
+
+  describe "#name" do
+    let(:name) { "AWESOME_NAME" }
+
+    it "allows a name to be set via an option" do
+      threadpool = described_class.new(:name => name, :pool_size => 1, :reaping_interval => 1)
+      expect(threadpool.name).to eq(name)
+    end
+  end
+
   describe "#timeout!" do
     it "doesn't timeout when no timeout set" do
       threadpool = described_class.new()
-      threadpool.timeout?.should be_false
+      threadpool.timeout?.should be false
     end
 
     it "does timeout when timeout set" do
       threadpool = described_class.new(:timeout => 30)
-      threadpool.timeout?.should be_true
+      threadpool.timeout?.should be true
     end
 
     it "uses the reaper to timeout threads that are all wiley" do
@@ -39,7 +63,7 @@ describe ::Lifeguard::Threadpool do
       sleep(0.1)
       subject.kill!
       sleep(1)
-      @expected.should be_false
+      @expected.should be false
     end
 
     it 'rejects all pending tasks' do
@@ -49,17 +73,18 @@ describe ::Lifeguard::Threadpool do
       sleep(0.1)
       subject.kill!
       sleep(1)
-      @expected.should be_false
+      @expected.should be false
     end
 
     it 'kills all threads' do
+      subject
       before_thread_count = Thread.list.size
       100.times { subject.async{ sleep(1) } }
       sleep(0.1)
       Thread.list.size.should > before_thread_count
       subject.kill!
       sleep(0.1)
-      Thread.list.size.should eq(before_thread_count + 1) # +1 for the reaper
+      Thread.list.size.should eq(before_thread_count)
     end
   end
 
@@ -69,7 +94,7 @@ describe ::Lifeguard::Threadpool do
     end
 
     it 'returns true when the block is added to the queue' do
-      subject.async{ sleep }.should be_true
+      subject.async{ sleep }.should be true
     end
 
     it 'calls the block with the given arguments' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lifeguard
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian Stien
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_receive
@@ -119,6 +119,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -133,7 +134,7 @@ files:
 - spec/lifeguard/threadpool_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
-homepage: ''
+homepage: https://github.com/moneydesktop/lifeguard
 licenses:
 - MIT
 metadata: {}
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Supervised threadpool implementation in ruby.