sneakers 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 744fa79ca6538fa2d298872ca0c3ba1e147836b7
-  data.tar.gz: f8ad9f24e1c5e48f5aa3a3f2cda8f012d339ace0
+  metadata.gz: 955c1e3e788a76c97ae9b89ee240a9a2d3f4aaf8
+  data.tar.gz: 28a4049a67567ba36e434a471e280ba0f5fe20b2
 SHA512:
-  metadata.gz: f26dac85d301da3434f8ecb547df39db7d1bfe757802a1d3dc3409dfd2c39182e2191463a599bc0cc3d54dbeb89e0504a2e9836f150abeb46cb107dab3318990
-  data.tar.gz: b0135a4c5e81f06f02477b4ae08d8c8f2724e82f966d73fd8c421f009196d14826f9ca40348131382eeccd5a7899bd7905a023efe412677861b360ae138cff2d
+  metadata.gz: 9405f6a0baf93ddf0211f7437138228e6bdeb76247d64675a8211775f540654bb89efe44497f5502d1582cf7855bae5d38c45986a167c3e39cd580ac2c98d24b
+  data.tar.gz: 11b4a380a5b3a3e596f294d7406c8afed06a7d9e5679dd12907bc543e00580e05f18cb71331ef16c24e6b1881cadb8df90d29317e4ed8573b0d8de946c877ab3

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+- 2.2.0
+- 2.1.0
+- 2.0.0
+- 1.9.3

data/README.md

@@ -20,6 +20,9 @@ Visit the [wiki](https://github.com/jondot/sneakers/wiki) for
 complete docs.
 
 
+[![Build Status](https://travis-ci.org/jondot/sneakers.svg?branch=master)](https://travis-ci.org/jondot/sneakers)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -153,17 +156,13 @@ Fork, implement, add tests, pull request, get my everlasting thanks and a respec
 
 ### Thanks:
 
-* Michael Klishin - @michaelklishin 
-* Ariel Zerahia - @arielze
-* @sergei-matheson
-* Sebastian Edwards - @SebastianEdwards
-* Tor Ivry - @torkale
+To all Sneakers [Contributors](https://github.com/jondot/sneakers/graphs/contributors) - you make this happen, thanks!
 
 
 
 # Copyright
 
-Copyright (c) 2013 [Dotan Nahum](http://gplus.to/dotan) [@jondot](http://twitter.com/jondot). See MIT-LICENSE for further details.
+Copyright (c) 2015 [Dotan Nahum](http://gplus.to/dotan) [@jondot](http://twitter.com/jondot). See MIT-LICENSE for further details.
 
 
 

data/lib/sneakers/handlers/maxretry.rb

@@ -141,6 +141,7 @@ module Sneakers
           }.tap do |hash|
             if reason.is_a?(Exception)
               hash[:error_class] = reason.class
+              hash[:error_message] = "#{reason}"
               if reason.backtrace
                 hash[:backtrace] = reason.backtrace.take(10).join(', ')
               end

data/lib/sneakers/queue.rb

@@ -46,7 +46,7 @@ class Sneakers::Queue
     handler_klass = worker.opts[:handler] || Sneakers::CONFIG[:handler]
     handler = handler_klass.new(@channel, queue, worker.opts)
 
-    @consumer = queue.subscribe(:block => false, :ack => @opts[:ack]) do | delivery_info, metadata, msg |
+    @consumer = queue.subscribe(:block => false, :manual_ack => @opts[:ack]) do | delivery_info, metadata, msg |
       worker.do_work(delivery_info, metadata, msg, handler)
     end
     nil

data/lib/sneakers/runner.rb

@@ -4,7 +4,7 @@ require 'sneakers/workergroup'
 module Sneakers
   class Runner
     def initialize(worker_classes, opts={})
-      @runnerconfig = RunnerConfig.new(worker_classes)
+      @runnerconfig = RunnerConfig.new(worker_classes, opts)
     end
 
     def run
@@ -29,9 +29,9 @@ module Sneakers
       end
     end
 
-    def initialize(worker_classes)
+    def initialize(worker_classes, opts)
       @worker_classes = worker_classes
-      @conf = {}
+      @conf = opts
     end
 
     def to_h

data/lib/sneakers/spawner.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+
+module Sneakers
+  class Spawner
+
+    def self.spawn
+      worker_group_config_file = ENV['WORKER_GROUP_CONFIG'] || "./config/sneaker_worker_groups.yml"
+      unless File.exists?(worker_group_config_file)
+        puts "No worker group file found."
+        puts "Specify via ENV 'WORKER_GROUP_CONFIG' or by convention ./config/sneaker_worker_groups.yml"
+      end
+      @pids = []
+      @exec_string = "bundle exec rake sneakers:run"
+      worker_config = YAML.load(File.read(worker_group_config_file))
+      worker_config.keys.each do |group_name|
+        @pids << fork do
+          @exec_hash = {"WORKERS"=> worker_config[group_name]['classes'], "WORKER_COUNT" => worker_config[group_name]["workers"].to_s}
+          Kernel.exec(@exec_hash, @exec_string)
+        end
+      end
+      ["TERM", "USR1", "HUP", "USR2"].each do |signal|
+        Signal.trap(signal){ @pids.each{|pid| Process.kill(signal, pid) } }
+      end
+      Process.waitall
+    end
+  end
+end

data/lib/sneakers/tasks.rb

@@ -26,8 +26,8 @@ Please set the classes of the workers you want to run like so:
 EOF
       exit(1)
     end
-
-    r = Sneakers::Runner.new(workers)
+    opts = (ENV['WORKER_COUNT'].present? ? {:workers => ENV['WORKER_COUNT'].to_i} : {})
+    r = Sneakers::Runner.new(workers, opts)
 
     r.run
   end

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/sneakers/workergroup.rb

@@ -28,7 +28,7 @@ module Sneakers
       # end per worker
       #
       until @stop_flag.wait_for_set(10.0)
-        Sneakers.logger.info("Heartbeat: running threads [#{Thread.list.count}]")
+        Sneakers.logger.debug("Heartbeat: running threads [#{Thread.list.count}]")
         # report aggregated stats?
       end
 

data/sneakers.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
   gem.add_dependency 'serverengine'
-  gem.add_dependency 'bunny', '~> 1.6.3'
+  gem.add_dependency 'bunny', '~> 1.7.0'
   gem.add_dependency 'thread'
   gem.add_dependency 'thor'
 
@@ -29,5 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'simplecov-rcov-text'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'minitest'
 end
 

data/spec/sneakers/publisher_spec.rb

@@ -3,6 +3,11 @@ require 'sneakers'
 
 describe Sneakers::Publisher do
   describe '#publish' do
+    before do
+      Sneakers.clear!
+      Sneakers.configure(:log => 'sneakers.log')
+    end
+
     it 'should publish a message to an exchange' do
       xchg = Object.new
       mock(xchg).publish('test msg', routing_key: 'downloads')

data/spec/sneakers/queue_spec.rb

@@ -44,7 +44,7 @@ describe Sneakers::Queue do
       q = Sneakers::Queue.new("downloads", queue_vars)
 
       mock(@mkqueue).bind(@mkex, :routing_key => "downloads")
-      mock(@mkqueue).subscribe(:block => false, :ack => true)
+      mock(@mkqueue).subscribe(:block => false, :manual_ack => true)
 
       q.subscribe(@mkworker)
     end
@@ -56,7 +56,7 @@ describe Sneakers::Queue do
 
       mock(@mkqueue).bind(@mkex, :routing_key => "alpha")
       mock(@mkqueue).bind(@mkex, :routing_key => "beta")
-      mock(@mkqueue).subscribe(:block => false, :ack => true)
+      mock(@mkqueue).subscribe(:block => false, :manual_ack => true)
 
       q.subscribe(@mkworker)
     end
@@ -80,7 +80,7 @@ describe Sneakers::Queue do
       q = Sneakers::Queue.new("test_nondurable", queue_vars)
 
       mock(@mkqueue_nondurable).bind(@mkex, :routing_key => "test_nondurable")
-      mock(@mkqueue_nondurable).subscribe(:block => false, :ack => true)
+      mock(@mkqueue_nondurable).subscribe(:block => false, :manual_ack => true)
 
       q.subscribe(@mkworker)
       myqueue = q.instance_variable_get(:@queue)

data/spec/sneakers/worker_spec.rb

@@ -131,6 +131,7 @@ describe Sneakers::Worker do
     stub(@queue).opts { {} }
     stub(@queue).exchange { @exchange }
 
+    Sneakers.clear!
     Sneakers.configure(:daemonize => true, :log => 'sneakers.log')
     Sneakers::Worker.configure_metrics
   end
@@ -160,14 +161,50 @@ describe Sneakers::Worker do
       it "should build a queue with correct configuration given defaults" do
         @defaults_q.name.must_equal('defaults')
         @defaults_q.opts.to_hash.must_equal(
-          {:runner_config_file=>nil, :metrics=>nil, :daemonize=>true, :start_worker_delay=>0.2, :workers=>4, :log=>"sneakers.log", :pid_path=>"sneakers.pid", :timeout_job_after=>5, :prefetch=>10, :threads=>10, :durable=>true, :ack=>true, :amqp=>"amqp://guest:guest@localhost:5672", :vhost=>"/", :exchange=>"sneakers", :exchange_type=>:direct, :hooks=>{}, :handler=>Sneakers::Handlers::Oneshot, :heartbeat => 2}
+          :runner_config_file => nil,
+          :metrics => nil,
+          :daemonize => true,
+          :start_worker_delay => 0.2,
+          :workers => 4,
+          :log => "sneakers.log",
+          :pid_path => "sneakers.pid",
+          :timeout_job_after => 5,
+          :prefetch => 10,
+          :threads => 10,
+          :durable => true,
+          :ack => true,
+          :amqp => "amqp://guest:guest@localhost:5672",
+          :vhost => "/",
+          :exchange => "sneakers",
+          :exchange_type => :direct,
+          :hooks => {},
+          :handler => Sneakers::Handlers::Oneshot,
+          :heartbeat  =>  2
         )
       end
 
       it "should build a queue with given configuration" do
         @dummy_q.name.must_equal('downloads')
         @dummy_q.opts.to_hash.must_equal(
-          {:runner_config_file=>nil, :metrics=>nil, :daemonize=>true, :start_worker_delay=>0.2, :workers=>4, :log=>"sneakers.log", :pid_path=>"sneakers.pid", :timeout_job_after=>1, :prefetch=>40, :threads=>50, :durable=>false, :ack=>false, :amqp=>"amqp://guest:guest@localhost:5672", :vhost=>"/", :exchange=>"dummy", :exchange_type=>:direct, :hooks=>{}, :handler=>Sneakers::Handlers::Oneshot, :heartbeat =>5}
+          :runner_config_file => nil,
+          :metrics => nil,
+          :daemonize => true,
+          :start_worker_delay => 0.2,
+          :workers => 4,
+          :log => "sneakers.log",
+          :pid_path => "sneakers.pid",
+          :timeout_job_after => 1,
+          :prefetch => 40,
+          :threads => 50,
+          :durable => false,
+          :ack => false,
+          :amqp => "amqp://guest:guest@localhost:5672",
+          :vhost => "/",
+          :exchange => "dummy",
+          :exchange_type => :direct,
+          :hooks => {},
+          :handler => Sneakers::Handlers::Oneshot,
+          :heartbeat => 5
         )
       end
     end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'simplecov'
 SimpleCov.start do
   add_filter "/spec/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dotan Nahum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " Fast background processing framework for Ruby and RabbitMQ "
 email:
 - jondotan@gmail.com
@@ -187,6 +201,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -217,6 +232,7 @@ files:
 - lib/sneakers/publisher.rb
 - lib/sneakers/queue.rb
 - lib/sneakers/runner.rb
+- lib/sneakers/spawner.rb
 - lib/sneakers/support/production_formatter.rb
 - lib/sneakers/support/utils.rb
 - lib/sneakers/tasks.rb
@@ -255,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fast background processing framework for Ruby and RabbitMQ