watership 0.9.0pre2 → 0.9.0pre4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ab2aa84c3b1fc75f0d40c4dbc584a62f77d15dcd
-  data.tar.gz: e470d7772c919cb3e9cc66471e1508af63da9816
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjdhOGViYzhhYWQ3NWYzY2IxYjY4ZTVhZDM1MjNmZTAyODg1Mjk0MA==
+  data.tar.gz: !binary |-
+    YWFkNzk2Y2M1YTllZWE5N2Y3MTFiODkxMDYzMDZlMWQ1ZjIxZWVkYQ==
 SHA512:
-  metadata.gz: 4b312c70595fca078dd5d642be1f81dd4cd978ddedad51bf2627208939a2ae04f8964beb1f74201874925676ce1e3f63d1d98deaf6a2b0d08d2bcba18ab009c2
-  data.tar.gz: c4f84bac066267b2d55343e0500628825e557298ddf95f38717e57561027ae857e3478a9f214eef9e3330b8b0ce0a9294a5c50cc9008beeffe61c4e54dfad910
+  metadata.gz: !binary |-
+    Y2RhNmQwZWNjNjM2OTQ5MDZhYTQ2YmQwZjBjNzM0OWJlYzU3ODhlZDI2ZWYw
+    MzJmMDAwODNjNWYxMzk2NDU4YTg4MTMwOGRlNDE1NTAxOTU5MjU4MWIzMjBh
+    YzAxMzc2NmMyOTE4YmQ0Y2Q1ZThlNDcwNDY1YTdjNzc0MWZjMWI=
+  data.tar.gz: !binary |-
+    ZjExNGMxNWI0NDczZGQ5NTdhMThiM2U2NTEwOGU0YjI4OWFiZmI0OTFlMGEw
+    MzM0MDM4ZjJmZWM5Y2RiYWU5Y2JkZjcxY2NlNDgwOGY3Yjc2NTk1YjA2MGQ3
+    N2YzMmExNGYwODM1NTgzN2M3MDE4NjljMzUzYTY5ZWFiYWUwNGI=

data/bin/watership-consume

@@ -1,19 +1,16 @@
 #!/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'
+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
+  opts.on("-r", "--run class", "Camelcased name of the consumer class to run/use") do |v|
+    options[:run] = v
   end
 
   opts.on("-b", "--bind binding", "Bind to a queue (with routing key after /)") do |v|
@@ -25,11 +22,40 @@ OptionParser.new do |opts|
       options[:bind] = v
     end
   end
+
+  opts.on("-c", "--concurrency concurrency", "Amount of concurrent consumers/threads") do |v|
+    options[:concurrency] = v.to_i
+  end
+
+  opts.on("-u", "--amqp-uri uri", "URI string of the AMQP server to consume from") do |v|
+    options[:uri] = v
+  end
+
+  opts.on("-p", "--db-pool dbpool", "Amount of open database connections") do |v|
+    options[:pool] = v.to_i
+  end
 end.parse!
 
-puts options.inspect
+unless options[:concurrency].to_i > 0
+  options[:concurrency] = Integer(ENV.fetch("WORKER_CONCURRENCY", "2"))
+end
+
+ENV["DB_POOL"] = if options[:pool].to_i > 0
+  options[:pool].to_s
+else
+  (options[:concurrency] + 1).to_s
+end
+
+require File.expand_path("config/environment",  Dir.pwd)
+require "watership/consumer"
+
+unless options[:uri]
+  options[:uri] = ENV.fetch("CONSUMER_AMQP_URI")
+end
 
-consumer = Watership::Consumer.new(options[:class].constantize, url, concurrency: concurrency)
+consumer = Watership::Consumer.new(
+  options[:run].constantize, options[:uri], concurrency: options[:concurrency]
+)
 
 if options[:bind]
   args = if options[:routing_key]

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = '0.9.0pre2'
+  VERSION = "0.9.0pre4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.9.0pre2
+  version: 0.9.0pre4
 platform: ruby
 authors:
 - Ben Scofield
@@ -14,56 +14,56 @@ dependencies:
   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
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -96,12 +96,12 @@ 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: 1.3.1
 requirements: []