girl_friday 0.11.1 → 0.11.2

data/.gitignore

@@ -1,8 +1,8 @@
 *.gem
+*.rdb
 .bundle
+.idea/*
 Gemfile.lock
+coverage/*
 pkg/*
 rbxdb/
-*.rdb
-.idea/*
-

data/.travis.yml

@@ -1,11 +1,9 @@
+bundler_args: --without development
+language: ruby
 rvm:
   - 1.9.3
-  - jruby
+  - jruby-19mode
   - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
 branches:
   only:
     - master
-env: JRUBY_OPTS='--1.9'

data/Gemfile

@@ -1,10 +1,11 @@
-source "http://rubygems.org"
+source :rubygems
 
-# Specify your gem's dependencies in girl_friday.gemspec
-gemspec
+gem 'rake'
+
+group :test do
+  gem 'minitest'
+  gem 'redis'
+  gem 'flexmock-minitest'
+end
 
-# Needed for testing only!
-gem 'minitest'
-gem 'redis'
-gem 'connection_pool'
-gem 'flexmock-minitest'
+gemspec

data/History.md

@@ -4,6 +4,12 @@ Changes
 HEAD
 ---------
 
+0.11.2
+---------
+
+* Update connectio\_pool to latest (sferik)
+* Clean up gemspec, Gemfile & add bundler install tasks (sferik)
+
 0.11.1
 ---------
 
@@ -20,7 +26,7 @@ HEAD
 0.10.0
 ---------
 
-* Update connection_pool to latest
+* Update connection\_pool to latest
 * Handle shutdown more gracefully, wait for work to be finished
 
 0.9.7

data/Rakefile

@@ -1,3 +1,6 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'

data/girl_friday.gemspec

@@ -1,23 +1,21 @@
 # -*- encoding: utf-8 -*-
 require "./lib/girl_friday/version"
 
-Gem::Specification.new do |s|
-  s.name        = "girl_friday"
-  s.version     = GirlFriday::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Mike Perham"]
-  s.email       = ["mperham@gmail.com"]
-  s.homepage    = "http://github.com/mperham/girl_friday"
-  s.summary     = s.description = %q{Background processing, simplified}
-
-  s.rubyforge_project = "girl_friday"
-
-  s.files         = `git ls-files`.split("\n").reject { |path| path =~ /rails_app/}
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.add_dependency              'connection_pool', '~> 0.9.0'
-  s.add_dependency              'rubinius-actor'
-  s.add_development_dependency  'sinatra', '~> 1.3'
-  s.add_development_dependency  'rake'
+Gem::Specification.new do |spec|
+  spec.add_dependency             'connection_pool', '~> 1.0'
+  spec.add_dependency             'rubinius-actor'
+  spec.add_development_dependency 'sinatra', '~> 1.3'
+  spec.add_development_dependency 'simplecov'
+  spec.authors       = ["Mike Perham"]
+  spec.email         = ["mperham@gmail.com"]
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.files         = `git ls-files`.split("\n").reject { |path| path =~ /rails_app/}
+  spec.homepage      = "https://github.com/mperham/girl_friday"
+  spec.licenses      = ['MIT']
+  spec.name          = "girl_friday"
+  spec.platform      = Gem::Platform::RUBY
+  spec.require_paths = ["lib"]
+  spec.summary       = spec.description = %q{Background processing, simplified}
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.version       = GirlFriday::VERSION
 end

data/lib/girl_friday/version.rb

@@ -1,3 +1,3 @@
 module GirlFriday
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/test/helper.rb

@@ -15,10 +15,12 @@ at_exit do
   end
 end
 
-# require 'simplecov'
-# SimpleCov.start do
-#   add_filter "/actor.rb"
-# end
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/actor.rb"
+  end
+end
 
 require 'rubygems'
 require 'minitest/spec'
@@ -30,9 +32,9 @@ require 'flexmock/minitest'
 class MiniTest::Unit::TestCase
 
   def async_test(time=0.5)
-    q = TimedQueue.new
+    q = ConnectionPool::TimedStack.new
     yield Proc.new { q << nil }
-    q.timed_pop(time)
+    q.pop(time)
   ensure
     count = GirlFriday.shutdown!(1)
     puts "Unable to shutdown queue (#{count})" if count != 0

data/test/test_girl_friday.rb

@@ -9,8 +9,8 @@ class TestGirlFriday < MiniTest::Unit::TestCase
 
     describe '.status' do
       before do
-        q1 = GirlFriday::Queue.new(:q1) do; end
-        q2 = GirlFriday::Queue.new(:q2) do; end
+        GirlFriday::Queue.new(:q1) do; end
+        GirlFriday::Queue.new(:q2) do; end
       end
       it 'provides a status structure for each live queue' do
         hash = GirlFriday.status
@@ -22,8 +22,8 @@ class TestGirlFriday < MiniTest::Unit::TestCase
 
     describe '.shutdown!' do
       before do
-        q1 = GirlFriday::Queue.new(:q1) do; end
-        q2 = GirlFriday::Queue.new(:q2) do; end
+        GirlFriday::Queue.new(:q1) do; end
+        GirlFriday::Queue.new(:q2) do; end
       end
       it 'provides a status structure for each live queue' do
         a = Time.now

data/test/test_girl_friday_queue.rb

@@ -125,7 +125,7 @@ class TestGirlFridayQueue < MiniTest::Unit::TestCase
       require 'redis'
       require 'connection_pool'
       pool = ConnectionPool.new(:size => 5, :timeout => 2){ Redis.new }
-      pool.with_connection {|redis| redis.flushdb }
+      pool.with {|redis| redis.flushdb }
     rescue LoadError
       return puts "Skipping redis test, 'redis' gem not found: #{$!.message}"
     rescue Errno::ECONNREFUSED

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl_friday
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubinius-actor
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -114,8 +114,9 @@ files:
 - test/test_girl_friday.rb
 - test/test_girl_friday_immediately.rb
 - test/test_girl_friday_queue.rb
-homepage: http://github.com/mperham/girl_friday
-licenses: []
+homepage: https://github.com/mperham/girl_friday
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -133,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: girl_friday
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Background processing, simplified