trinidad_resque_extension 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trinidad_resque_extension (0.1.0)
+    trinidad_resque_extension (0.1.1)
       rake
       resque
       trinidad
@@ -10,17 +10,19 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    jruby-rack (1.0.7)
-    json (1.4.6-java)
+    jruby-rack (1.1.3)
     mocha (0.9.12)
-    rack (1.2.2)
-    rake (0.8.7)
-    redis (2.1.1)
-    redis-namespace (0.10.0)
+    multi_json (1.0.4)
+    rack (1.4.0)
+    rack-protection (1.2.0)
+      rack
+    rake (0.9.2.2)
+    redis (2.2.2)
+    redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.15.0)
-      json (~> 1.4.6)
-      redis-namespace (>= 0.10.0)
+    resque (1.19.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     rspec (2.5.0)
@@ -31,14 +33,15 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sinatra (1.2.0)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.2.2)
-    trinidad (1.1.0)
-      jruby-rack (>= 1.0.6)
-      trinidad_jars (>= 1.0.0)
-    trinidad_jars (1.0.1)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    trinidad (1.3.2)
+      jruby-rack (>= 1.1.1)
+      trinidad_jars (>= 1.0.1)
+    trinidad_jars (1.0.2)
     vegas (0.1.8)
       rack (>= 1.0.0)
 

data/History.txt

@@ -0,0 +1,7 @@
+== 0.1.1
+
+* Fix rake task initialization error
+
+== 0.1.0
+
+* Initial release

data/lib/resque_lifecycle_listener.rb

@@ -53,7 +53,9 @@ module Trinidad
         end
 
         def invoke_workers(task)
-          Rake::Task[task].invoke
+          t = Rake::Task[task]
+          t.application.options[:trace] = true
+          t.invoke
         rescue Errno::ECONNREFUSED
           puts "WARN: Cannot connect with Redis. Please restart the server when Redis is up again."
           @redis_econnref = true

data/lib/trinidad_resque_extension.rb

@@ -2,7 +2,7 @@ module Trinidad
   module Extensions
     require File.expand_path('../resque_lifecycle_listener', __FILE__)
     module Resque
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
 
     class ResqueApp < Trinidad::RackupWebApp
@@ -67,8 +67,14 @@ module Trinidad
 
       def trap_signals(tomcat)
         # trap signals and stop tomcat properly to make sure resque is also stopped properly
-        trap('INT') { tomcat.stop }
-        trap('TERM') { tomcat.stop }
+        trap('INT') do
+          ::Resque.workers.each { |w| w.shutdown! }
+          tomcat.stop
+        end
+        trap('TERM') do
+          ::Resque.workers.each { |w| w.shutdown! }
+          tomcat.stop
+        end
       end
     end
 

data/trinidad_resque_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_resque_extension'
-  s.version           = '0.1.0'
-  s.date              = '2011-04-01'
+  s.version           = '0.1.1'
+  s.date              = '2012-01-15'
   s.rubyforge_project = 'trinidad_resque_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
   s.files = %w[
     Gemfile
     Gemfile.lock
+    History.txt
     LICENSE
     README.md
     Rakefile

metadata

@@ -2,7 +2,7 @@
 name: trinidad_resque_extension
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
   - David Calavera
@@ -10,64 +10,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -07:00
-default_executable: 
+date: 2012-01-15 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: trinidad
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id002
+    prerelease: false
     type: :runtime
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: resque
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id003
+    prerelease: false
     type: :runtime
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rspec
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: mocha
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
+    requirement: *id005
+    prerelease: false
     type: :development
-    version_requirements: *id005
 description: Trinidad extension to autoconfigure and launch Resque
 email: calavera@apache.org
 executables: []
@@ -80,6 +79,7 @@ extra_rdoc_files:
 files: 
   - Gemfile
   - Gemfile.lock
+  - History.txt
   - LICENSE
   - README.md
   - Rakefile
@@ -92,7 +92,6 @@ files:
   - spec/spec_helper.rb
   - spec/trinidad_resque_extension_spec.rb
   - trinidad_resque_extension.gemspec
-has_rdoc: true
 homepage: http://github.com/trinidad/trinidad_resque_extension
 licenses: []
 
@@ -106,6 +105,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: trinidad_resque_extension
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 2
 summary: Trinidad resque extension