stillwater 0.0.2 → 0.0.3

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.sw*

data/.rvmrc

@@ -1 +1,52 @@
-rvm 1.8.7@balancer --create
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.8.7" > .rvmrc
+environment_id="ruby-1.8.7-p370@stillwater"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.14.10 (latest)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+  if [[ $- == *i* ]] # check for interactive shells
+  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+if [[ -s Gemfile ]] && {
+  ! builtin command -v bundle >/dev/null ||
+  builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+}
+then
+  printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+  gem install bundler
+fi
+if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+then
+  bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+fi

data/lib/stillwater/connection_pool.rb

@@ -8,6 +8,7 @@ module Stillwater
       @pool = []
       @reactivate_timeout = 5 * 60 # 5 minutes
       @retry_count = 3
+      @polling = false
     end
 
     def add(&builder)
@@ -15,11 +16,8 @@ module Stillwater
     end
 
     def reactivate_timeout=(seconds)
-      running = !!@thread
-      @thread.kill if running
-      @thread = nil
       @reactivate_timeout = seconds
-      start_polling if running
+      start_polling
     end
 
     def with_connection(&block)
@@ -32,18 +30,21 @@ module Stillwater
 
     def retry_connection_from(exception_class, &block)
       count = 0
-      conn  = checkout
-      yield conn
-    rescue exception_class
-      deactivate conn
-      count += 1
-      raise if count >= @retry_count
-      retry
-    ensure
-      checkin conn
+      begin
+        conn  = checkout
+        yield conn
+      rescue exception_class
+        raise if count >= @retry_count
+        deactivate conn
+        count += 1
+        retry
+      ensure
+        checkin conn
+      end
     end
 
     def checkout
+      reactivate_all if poll_timeout_exceeded?
       connection_info = available.respond_to?(:sample) ? available.sample : available.choice
       raise ConnectionNotAvailable if connection_info.nil?
       connection_info[:state] = :in_use
@@ -90,13 +91,20 @@ module Stillwater
 
     private
 
-    def start_polling
-      @thread ||= Thread.new do
-        sleep @reactivate_timeout
-        reactivate_all
+    def poll_timeout_exceeded?
+      return false unless @polling
+      now = Time.now
+      if (now - @last_poll_time) >= @reactivate_timeout
+        @last_poll_time = now
+        true
       end
     end
 
+    def start_polling
+      @polling = true
+      @last_poll_time = Time.now
+    end
+
     def available
       find_by_state :available
     end

data/lib/stillwater/version.rb

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

data/spec/connection_pool_spec.rb

@@ -72,18 +72,22 @@ module Stillwater
       describe "#retry_connection_from" do
         before(:each) do
           subject.add { TestConnection.new("two") }
+          subject.add { TestConnection.new("three") }
         end
 
         it "should retry a connection when receiving specific exception type" do
           client_obj = mock("ClientObject")
-          client_obj.stubs(:do_something).raises(TestException).then.returns("client result")
+          client_obj.stubs(:do_something).
+            raises(TestException).then.
+            raises(TestException).then.
+            returns("client result")
 
           result = subject.retry_connection_from(TestException) do |conn|
             client_obj.do_something
           end
 
           subject.available_count.should == 1
-          subject.inactive_count.should == 1
+          subject.inactive_count.should == 2
           result.should == "client result"
         end
 
@@ -96,7 +100,7 @@ module Stillwater
             end
           }.should raise_error(TestException)
 
-          subject.available_count.should == 1
+          subject.available_count.should == 2
           subject.inactive_count.should == 1
         end
 
@@ -164,6 +168,8 @@ module Stillwater
 
           sleep 2
 
+          conn = subject.checkout
+          subject.checkin conn
           subject.available_count.should == 3
           subject.inactive_count.should == 0
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stillwater
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Trae Robrock
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 Z
+date: 2012-08-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -28,9 +28,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
-  type: :development
   prerelease: false
+  type: :development
+  name: rake
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -42,9 +42,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
-  type: :development
   prerelease: false
+  type: :development
+  name: rspec
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -56,9 +56,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mocha
-  type: :development
   prerelease: false
+  type: :development
+  name: mocha
   requirement: *id003
 description: A simple connection pool, that allows connections to different servers (or anything else)
 email: 
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple connection pool, that allows connections to different servers (or anything else)