watership 0.8.2 → 0.9.0pre

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDRlOTVhZGM1OGI4ZDUwMWZhMzY1MWY0YmVhNmEwOGM1YmFmMGQ1OA==
-  data.tar.gz: !binary |-
-    YWY5OWE4ZmM2ZmYxMWFlZGYxOTQ4M2VhNWFhZmNiMmQzZmYxNzlkOQ==
+SHA1:
+  metadata.gz: af4e4c123875a9ec4bed6e1245ceb48024df628e
+  data.tar.gz: 8730ce20f09f1fe7ffdd4045af210e90622c9814
 SHA512:
-  metadata.gz: !binary |-
-    NjExN2FhNzhlMGQxOTZhZjNhYmExZTRlMzA0MWIzYWMxZTBiOGI1N2U2NDEz
-    Njk5MTQxMzYyM2I2YmRkNDI0Zjk5ZjBkODRlNjhjODBhM2NhY2I2ZTljMzA2
-    YzU1NWE5Nzc5N2E0NGM5NDQzZjYzZDNkMWNkOTU2YzMzY2IwMzI=
-  data.tar.gz: !binary |-
-    YzZlZDNjMTQ1NjNjOGQwZGIwNjZiZWE1MWI3ZGEyOTI3M2FmN2VlZjE2Njli
-    YTY0ZDk3OWMzYTlhMDM2YTMzZTRmMzczMWNlOGQ1N2U2ZTAzOTc1ZjBmZmI0
-    NzRkYWIxODIyNjQwMTFhNTIyY2VkY2I4NmU3Zjk0Y2FhNzJjYWE=
+  metadata.gz: cac3ffbf712948c61604af1bf4dd1d4941d9bc9e08fac2f59dd550a3a20f36f6aaf24accff0a749b14790468cb8c3bb30cbeea7e56314d023ee2d7d9b093d2d9
+  data.tar.gz: 0ed76325b78f98ac060695eefebf6720bd589f55990c738566390e2a42154a7b4fea060325f2e1322d08343aa616c7c2a7aeacc536a06a0e8562506060187984

data/bin/watership-consume

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+ENV["LIBRATO_AUTORUN"] = "1"
+concurrency = Integer(ENV.fetch("WORKER_CONCURRENCY", "2"))
+ENV["DB_POOL"] = (concurrency + 1).to_s
+require File.expand_path('config/environment',  Dir.pwd)
+require "watership/consumer"
+url = ENV.fetch("CONSUMER_AMQP_URI")
+
+require 'optparse'
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: watership-consume [options]"
+
+  opts.on("-c", "--class class", "Consumer class to use") do |v|
+    options[:class] = v
+  end
+
+  opts.on("-b", "--bind binding", "Bind to a queue (with routing key after /)") do |v|
+    if v =~ %r{/}
+      parts = v.split("/")
+      options[:bind] = parts[0]
+      options[:routing_key] = parts[1]
+    else
+      options[:bind] = v
+    end
+  end
+end.parse!
+
+puts options.inspect
+
+consumer = Watership::Consumer.new(options[:class].constantize, url, concurrency: concurrency)
+
+if options[:bind]
+  args = if options[:routing_key]
+    [options[:bind], routing_key: options[:routing_key]]
+  else
+    [options[:bind]]
+  end
+  consumer.bind(*args)
+end
+
+consumer.consume

data/lib/watership/consumer.rb

@@ -10,18 +10,16 @@ module Watership
       @prefetch = channel_options.delete(:prefetch) || Integer(ENV.fetch("RABBIT_CONSUMER_PREFETCH", 200))
       @concurrency = channel_options.delete(:concurrency) || 1
       @channel_opts = {durable: true}.merge(channel_options)
-      @queue_opts = {block: false, ack: true}.merge(queue_options)
+      @queue_opts = {block: false, manual_ack: true}.merge(queue_options)
     end
 
-    def consume(donotuse = :donotuse)
-      logger.error("Don't provide an argument to Consumer#consume") unless donotuse == :donotuse
-
+    def consume
       Thread.abort_on_exception = true
       @concurrency.times do
         queue.subscribe(@queue_opts) do |delivery_info, properties, payload|
           begin
             data = JSON.parse(payload)
-            @consumer.call(data)
+            @consumer.new.call(data)
             success = true
           rescue StandardError => exception
             logger.error "Error thrown in subscribe block"
@@ -34,7 +32,7 @@ module Watership
             Bugsnag.notify(exception, data: {payload: data, retries: retries}) if defined?(Bugsnag)
 
             new_data = data.merge({retries: retries+1})
-            Watership.enqueue!(name: @consumer.class::QUEUE, message: new_data)
+            Watership.enqueue!(name: @consumer::QUEUE, message: new_data)
             success = true
           rescue Interrupt => exception
             logger.error "Interrupt in subscribe block"
@@ -61,7 +59,10 @@ module Watership
       channel.close
     end
 
-    private
+    def bind(name, opts = {})
+      queue.bind(name, opts)
+    end
+
     def ack_message(tag)
       logger.info "Acking message"
       channel.acknowledge(tag, false)
@@ -73,7 +74,7 @@ module Watership
     end
 
     def queue
-      @queue ||= channel.queue(@consumer.class::QUEUE, @channel_opts)
+      @queue ||= channel.queue(@consumer::QUEUE, @channel_opts)
     end
 
     def connection

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = "0.8.2"
+  VERSION = '0.9.0pre'
 end

metadata

@@ -1,84 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0pre
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrapper around Bunny to better handle connection issues
 email:
 - git@turrean.com
-executables: []
+executables:
+- watership-consume
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/watership-consume
 - lib/watership.rb
 - lib/watership/consumer.rb
 - lib/watership/subscriber.rb
@@ -94,14 +96,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2