sneakers 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sneakers (0.0.4)
+    sneakers (0.0.5)
       bunny (>= 0.10.0)
       serverengine
       thor
@@ -10,28 +10,30 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.14)
+    activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     amq-protocol (1.8.0)
     arrayfields (4.9.0)
-    awesome_print (1.1.0)
+    awesome_print (1.2.0)
     bluff (0.1.0)
     bunny (0.10.8)
       amq-protocol (>= 1.6.0)
     cane (2.6.0)
       parallel
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     chronic (0.10.2)
-    churn (0.0.33)
+    churn (0.0.34)
       chronic (>= 0.2.3)
       hirb
       json_pure
       main
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.1)
-    code_analyzer (0.4.2)
+    code_analyzer (0.4.3)
       sexp_processor
-    code_metrics (0.1.0)
+    code_metrics (0.1.1)
     coderay (1.0.9)
     colored (1.2)
     erubis (2.7.0)
@@ -44,22 +46,22 @@ GEM
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.0)
     formatador (0.2.4)
-    guard (1.8.2)
+    guard (2.1.0)
       formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-minitest (1.3.0)
-      guard (>= 1.8)
-      minitest (>= 2.1)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-minitest (2.0.0)
+      guard (~> 2.0)
+      minitest (>= 3.0)
     hirb (0.7.1)
     i18n (0.6.5)
     json_pure (1.8.0)
-    listen (1.3.1)
+    listen (2.1.1)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     lumberjack (1.0.4)
     main (5.2.0)
       arrayfields (>= 4.7.4)
@@ -68,7 +70,7 @@ GEM
       map (>= 5.1.0)
     map (6.5.1)
     method_source (0.8.2)
-    metric_fu (4.4.1)
+    metric_fu (4.4.4)
       bluff
       cane (~> 2.5, >= 2.5.2)
       churn (~> 0.0.28)
@@ -84,19 +86,19 @@ GEM
       roodi (~> 3.1)
     metric_fu-Saikuro (1.1.1.0)
     mini_portile (0.5.1)
-    minitest (5.0.7)
-    multi_json (1.8.0)
+    minitest (5.0.8)
+    multi_json (1.8.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    parallel (0.8.3)
+    parallel (0.9.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rails_best_practices (1.14.3)
+    rails_best_practices (1.14.4)
       activesupport
       awesome_print
-      code_analyzer (>= 0.4.2)
+      code_analyzer (>= 0.4.3)
       colored
       erubis
       i18n
@@ -106,17 +108,15 @@ GEM
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
     redcard (1.1.0)
-    reek (1.3.3)
+    reek (1.3.4)
       ruby2ruby (~> 2.0.2)
-      ruby_parser (~> 3.1, >= 3.1.1)
+      ruby_parser (~> 3.2)
       sexp_processor
     require_all (1.3.1)
     roodi (3.1.1)
       ruby_parser (~> 3.2, >= 3.2.2)
-    rr (1.1.1)
+    rr (1.1.2)
     ruby-prof (0.13.0)
     ruby-progressbar (1.2.0)
     ruby2ruby (2.0.6)
@@ -136,6 +136,7 @@ GEM
     slop (3.4.6)
     thor (0.18.1)
     thread (0.1.1)
+    timers (1.1.0)
 
 PLATFORMS
   ruby

data/examples/benchmark_worker.rb

@@ -11,7 +11,7 @@ class BenchmarkWorker
              :prefetch => 50,
              :timeout_job_after => 1,
              :exchange => 'dummy',
-             :heartbeat_interval => 5
+             :heartbeat => 5
   def work(msg)
     ack!
   end

data/examples/profiling_worker.rb

@@ -20,7 +20,7 @@ class ProfilingWorker
              :prefetch => 50,
              :timeout_job_after => 1,
              :exchange => 'dummy',
-             :heartbeat_interval => 5
+             :heartbeat => 5
   def work(msg)
     ack!
   end

data/examples/title_scraper.rb

@@ -1,8 +1,11 @@
-$: << File.expand_path('../lib', File.dirname(__FILE__))
-require 'sneakers'
+require "sneakers"
 require 'open-uri'
 require 'nokogiri'
 
+require 'logger'
+
+Sneakers.configure :log => STDOUT
+Sneakers.logger.level = Logger::INFO
 
 class TitleScraper
   include Sneakers::Worker

data/examples/workflow_worker.rb

@@ -11,7 +11,7 @@ class WorkflowWorker
              :prefetch => 50,
              :timeout_job_after => 1,
              :exchange => 'dummy',
-             :heartbeat_interval => 5
+             :heartbeat => 5
 
   def work(msg)
     logger.info("Seriously, i'm DONE.")

data/lib/sneakers.rb

@@ -1,6 +1,7 @@
 require "sneakers/version"
 require 'thread/pool'
 require 'bunny'
+require 'logger'
 
 
 module Sneakers
@@ -28,7 +29,6 @@ module Sneakers
     :workers => 4,
     :log  => 'sneakers.log',
     :pid_path => 'sneakers.pid',
-    :amqp => 'amqp://guest:guest@localhost:55672',
 
     #workers
     :timeout_job_after => 5,
@@ -37,8 +37,11 @@ module Sneakers
     :env => ENV['RACK_ENV'],
     :durable => true,
     :ack => true,
-    :heartbeat_interval => 2,
+    :heartbeat => 2,
+    :amqp => 'amqp://guest:guest@localhost:5672',
+    :vhost => '/',
     :exchange => 'sneakers',
+    :exchange_type => :direct,
     :hooks => {}
   }
 

data/lib/sneakers/cli.rb

@@ -26,10 +26,19 @@ module Sneakers
     method_option :debug
     method_option :front
     method_option :require
-    method_option :amqp
 
     desc "work FirstWorker,SecondWorker ... ,NthWorker", "Run workers"
     def work(workers)
+      opts = {
+        :daemonize => !options[:front]
+      }
+      unless opts[:daemonize]
+        opts[:log] = STDOUT
+      end
+
+      Sneakers.configure(opts)
+      puts Sneakers::Config
+
       require_boot File.expand_path(options[:require]) if options[:require]
 
       workers, missing_workers = Sneakers::Utils.parse_workers(workers)
@@ -52,13 +61,6 @@ module Sneakers
         return
       end
 
-      opts = {
-        :daemonize => !options[:front],
-        :log => options[:front] ? STDOUT : Sneakers::Config[:log],
-        :amqp => (options[:amqp] || Sneakers::Config[:amqp])
-      }
-
-      Sneakers.configure(opts)
       r = Sneakers::Runner.new(workers)
 
       pid = Sneakers::Config[:pid_path]

data/lib/sneakers/handlers/oneshot.rb

@@ -9,8 +9,8 @@ module Sneakers
         @channel.acknowledge(tag, false)
       end
 
-      def reject(tag)
-        @channel.reject(tag, false)
+      def reject(tag, requeue=false)
+        @channel.reject(tag, requeue)
       end
 
       def error(tag, err)
@@ -20,6 +20,10 @@ module Sneakers
       def timeout(tag)
         reject(tag)
       end
+
+      def noop(tag)
+
+      end
     end
   end
 end

data/lib/sneakers/publisher.rb

@@ -21,7 +21,7 @@ module Sneakers
   private
 
     def ensure_connection!
-      @bunny = Bunny.new(:heartbeat_interval => @opts[:heartbeat_interval])
+      @bunny = Bunny.new(:heartbeat => @opts[:heartbeat])
       @bunny.start
       @channel = @bunny.create_channel
       @exchange = @channel.exchange(@opts[:exchange], :type => :direct, :durable => @opts[:durable])

data/lib/sneakers/queue.rb

@@ -16,13 +16,16 @@ class Sneakers::Queue
   # :ack
   #
   def subscribe(worker)
-    @bunny = Bunny.new(@opts[:amqp], :heartbeat_interval => @opts[:heartbeat_interval])
+    @bunny = Bunny.new(@opts[:amqp], :vhost => @opts[:vhost], :heartbeat => @opts[:heartbeat])
     @bunny.start
 
     @channel = @bunny.create_channel
     @channel.prefetch(@opts[:prefetch])
 
-    @exchange = @channel.exchange(@opts[:exchange], :type => :direct, :durable => @opts[:durable])
+    @exchange = @channel.exchange(@opts[:exchange],
+                                  :type => @opts[:exchange_type],
+                                  :durable => @opts[:durable])
+
     handler = @handler_klass.new(@channel)
 
     queue = @channel.queue(@name, :durable => @opts[:durable])

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/sneakers/worker.rb

@@ -17,6 +17,7 @@ module Sneakers
       queue_name = self.class.queue_name
 
       opts = Sneakers::Config.merge(opts)
+
       queue_name = Support::QueueName.new(queue_name, opts).to_s
 
       @should_ack =  opts[:ack]
@@ -25,11 +26,7 @@ module Sneakers
 
       @queue = queue || Sneakers::Queue.new(
         queue_name,
-        :prefetch => opts[:prefetch],
-        :durable => opts[:durable],
-        :ack => @should_ack,
-        :heartbeat_interval => opts[:heartbeat_interval],
-        :exchange => opts[:exchange]
+        opts
       )
 
       @opts = opts
@@ -37,8 +34,8 @@ module Sneakers
     end
 
     def ack!; :ack end
-    def nack!; :nack end
     def reject!; :reject; end
+    def requeue!; :requeue; end
 
     def publish(msg, routing)
       return unless routing[:to_queue]
@@ -76,8 +73,12 @@ module Sneakers
             handler.timeout(hdr.delivery_tag)
           elsif res == :error
             handler.error(hdr.delivery_tag, error)
-          else
+          elsif res == :reject
             handler.reject(hdr.delivery_tag)
+          elsif res == :requeue
+            handler.reject(hdr.delivery_tag, true)
+          else
+            handler.noop(hdr.delivery_tag)
           end
           metrics.increment("work.#{self.class.name}.handled.#{res || 'reject'}")
         end

data/lib/sneakers/workergroup.rb

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

data/spec/sneakers/queue_spec.rb

@@ -14,8 +14,10 @@ describe Sneakers::Queue do
         :prefetch => 25,
         :durable => true,
         :ack => true,
-        :heartbeat_interval => 2,
-        :exchange => "sneakers"
+        :heartbeat => 2,
+        :vhost => '/',
+        :exchange => "sneakers",
+        :exchange_type => :direct
       )
       mkbunny = Object.new
       mkchan = Object.new
@@ -24,7 +26,7 @@ describe Sneakers::Queue do
 
       mock(mkbunny).start {}
       mock(mkbunny).create_channel{ mkchan }
-      mock(Bunny).new(anything, :heartbeat_interval => 2){ mkbunny }
+      mock(Bunny).new(anything, :vhost => '/', :heartbeat => 2){ mkbunny }
 
       mock(mkchan).prefetch(25)
       mock(mkchan).exchange("sneakers", :type => :direct, :durable => true){ mkex }

data/spec/sneakers/worker_spec.rb

@@ -13,7 +13,7 @@ class DummyWorker
              :prefetch => 40,
              :timeout_job_after => 1,
              :exchange => 'dummy',
-             :heartbeat_interval => 5
+             :heartbeat => 5
 
   def work(msg)
   end
@@ -127,7 +127,7 @@ describe Sneakers::Worker do
     stub(@queue).name { 'test-queue' }
     stub(@queue).opts { {} }
 
-    Sneakers.configure(:env => 'test')
+    Sneakers.configure(:env => 'test', :daemonize => true, :log => 'sneakers.log')
     Sneakers::Worker.configure_logger(Logger.new('/dev/null'))
     Sneakers::Worker.configure_metrics
   end
@@ -142,22 +142,14 @@ describe Sneakers::Worker do
       it "should build a queue with correct configuration given defaults" do
         @defaults_q.name.must_equal('defaults_test')
         @defaults_q.opts.must_equal(
-           :durable => true,
-           :ack => true,
-           :prefetch => 10,
-           :heartbeat_interval => 2,
-           :exchange => 'sneakers'
+          {: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, :env=>"test", :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_test')
         @dummy_q.opts.must_equal(
-           :durable => false,
-           :ack => false,
-           :prefetch => 40,
-           :heartbeat_interval => 5,
-           :exchange => 'dummy'
+          {: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, :env=>"test", :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
@@ -238,18 +230,18 @@ describe Sneakers::Worker do
         @worker.do_work(@header, nil, :ack, handler)
       end
 
-      it "should work and handle nacks" do
+      it "should work and handle rejects" do
         handler = Object.new
         mock(handler).reject("tag")
 
-        @worker.do_work(@header, nil, :nack, handler)
+        @worker.do_work(@header, nil, :reject, handler)
       end
 
-      it "should work and handle rejects" do
+      it "should work and handle requeues" do
         handler = Object.new
-        mock(handler).reject("tag")
+        mock(handler).reject("tag", true)
 
-        @worker.do_work(@header, nil, :reject, handler)
+        @worker.do_work(@header, nil, :requeue, handler)
       end
 
       it "should work and handle user-land timeouts" do
@@ -310,6 +302,7 @@ describe Sneakers::Worker do
       stub(@handler).reject("tag")
       stub(@handler).timeout("tag")
       stub(@handler).error("tag", anything)
+      stub(@handler).noop("tag")
 
       @header = Object.new
       stub(@header).delivery_tag { "tag" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine