graylog2-resque 0.5.0 → 0.5.1

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  # - rbx-19mode
+script: bundle exec rspec spec

data/CHANGELOG

@@ -1,3 +1,12 @@
+0.5.1
+-----
+
+Merge pull request #1 from mogotest/master <bf17b32> [Matt Conway]
+Properly scope the reference to the Stat class. <b0d007e> [Kevin Menard]
+only auto start redis if not on CI <0010bd5> [Matt Conway]
+disable rbx19 <d66ae57> [Matt Conway]
+setup travis CI <a553e2b> [Matt Conway]
+
 0.5.0
 -----
 

data/lib/graylog2-resque/failure_handler.rb

@@ -63,7 +63,7 @@ module Graylog2
       def self.count
         # We can't get the total # of errors from graylog so we fake it
         # by asking Resque how many errors it has seen.
-        Stat[:failed]
+        ::Resque::Stat[:failed]
       end
 
     end

data/lib/graylog2-resque/version.rb

@@ -1,5 +1,5 @@
 module Graylog2
   module Resque
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/redis-test.conf

@@ -21,7 +21,7 @@ daemonize yes
 pidfile ./redis.pid
 
 # Accept connections on the specified port, default is 6379
-port 9736
+port 6379
 
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for incoming connections.

data/spec/spec_helper.rb

@@ -1,17 +1,29 @@
 require 'rspec'
 require 'graylog2-resque'
 
-spec_dir = File.dirname(File.expand_path(__FILE__))
-REDIS_CMD = "redis-server #{spec_dir}/redis-test.conf"
+# No need to start redis when running in Travis
+unless ENV['CI']
 
-puts "Starting redis for testing at localhost:9736..."
-puts `cd #{spec_dir}; #{REDIS_CMD}`
-Resque.redis = 'localhost:9736'
-
-# Schedule the redis server for shutdown when tests are all finished.
-at_exit do
-  pid = File.read("#{spec_dir}/redis.pid").to_i rescue nil
-  system ("kill #{pid}") if pid != 0
+  begin
+    Resque.queues
+  rescue Errno::ECONNREFUSED
+    spec_dir = File.dirname(File.expand_path(__FILE__))
+    REDIS_CMD = "redis-server #{spec_dir}/redis-test.conf"
+    
+    puts "Starting redis for testing at localhost..."
+    puts `cd #{spec_dir}; #{REDIS_CMD}`
+    
+    # Schedule the redis server for shutdown when tests are all finished.
+    at_exit do
+      puts 'Stopping redis'
+      pid = File.read("#{spec_dir}/redis.pid").to_i rescue nil
+      system ("kill -9 #{pid}") if pid.to_i != 0
+      File.delete("#{spec_dir}/redis.pid") rescue nil
+      File.delete("#{spec_dir}/redis-server.log") rescue nil
+      File.delete("#{spec_dir}/dump.rdb") rescue nil
+    end
+  end
+  
 end
 
 ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graylog2-resque
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2240396860 !ruby/object:Gem::Requirement
+  requirement: &70360966781160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2240396860
+  version_requirements: *70360966781160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2240396400 !ruby/object:Gem::Requirement
+  requirement: &70360966780480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2240396400
+  version_requirements: *70360966780480
 - !ruby/object:Gem::Dependency
   name: gelf
-  requirement: &2240395960 !ruby/object:Gem::Requirement
+  requirement: &70360966779800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2240395960
+  version_requirements: *70360966779800
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2240395480 !ruby/object:Gem::Requirement
+  requirement: &70360966778940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2240395480
+  version_requirements: *70360966778940
 description: ! 'A resque failure handler that sends failures to the graylog2 log management
   facility '
 email:
@@ -64,6 +64,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -88,15 +89,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3532665088592803414
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3532665088592803414
 requirements: []
 rubyforge_project: graylog2-resque
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A resque failure handler that sends failures to the graylog2 log management
@@ -105,4 +112,3 @@ test_files:
 - spec/redis-test.conf
 - spec/resque_failure_spec.rb
 - spec/spec_helper.rb
-has_rdoc: