howler 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    howler (1.0.0)
+    howler (1.1.0)
       celluloid
       connection_pool
       multi_json

data/lib/howler.rb

@@ -9,11 +9,11 @@ module Howler
     args.to_s.gsub(/^\[|\]$/, '')
   end
   def self.redis
-    @connection ||= ConnectionPool.new(:timeout => 1, :size => 5) { _redis }
+    @connection ||= ConnectionPool.new(:timeout => 1, :size => 30) { _redis }
   end
   private
-  def self._redis
-    @redis ||= ::Redis.connect(:url => 'redis://localhost:6379/0')
+  def self._redis(url = 'redis://localhost:6379/0')
+    @redis ||= ::Redis.connect(:url => url, :thread_safe => true)
   end
 end
 

data/lib/howler/manager.rb

@@ -51,7 +51,7 @@ module Howler
         end
 
         @logger.log do |log|
-          log.info("Processing #{messages.size} Messages")
+          log.info("Processing #{messages.size} Messages") if messages.size > 0
 
           sleep(1) unless messages.any?
 

data/lib/howler/runner.rb

@@ -1,10 +1,20 @@
-Howler::Config[:concurrency] = 1
-Howler::Config[:shutdown_timeout] = 5
-
 module Howler
   class Runner
+    attr_reader :options
+
+    def initialize
+      @options = {
+        :concurrency => 30,
+        :path => './config/environment.rb',
+        :shutdown_timeout => 5
+      }
+
+      parse_options
+      set_options
+    end
+
     def run
-      require "./config/environment.rb"
+      require Howler::Config[:path]
       @manager = Howler::Manager.current
 
       begin
@@ -30,5 +40,42 @@ module Howler
         logger.info("INT - All workers have shut down - Exiting")
       end
     end
+
+    private
+
+    def set_options
+      Howler._redis @options[:redis_url]
+
+      @options.each_pair do |option, value|
+        Howler::Config[option] = value
+      end
+    end
+
+    def parse_options
+      OptionParser.new do |opts|
+        opts.on('-k', '--key_value OPTIONS', 'Arbitrary key - values into Howler::Config [key:value,another:value]') do |kvs|
+          kvs.split(',').each do |kv|
+            kv = kv.split(':')
+            @options[kv.first] = kv.last
+          end
+        end
+
+        opts.on('-r', '--redis_url URL', 'The url of the Redis Server [redis://localhost:6379/0]') do |url|
+          @options[:redis_url] = url
+        end
+
+        opts.on('-c', '--concurrency COUNT', 'The number of Workers [30]') do |c|
+          @options[:concurrency] = c
+        end
+
+        opts.on('-p', '--path PATH', 'The path to the file to load [./config/environment.rb]') do |path|
+          @options[:path] = path
+        end
+
+        opts.on('-s', '--shutdown_timeout SECONDS', 'The number of seconds to wait for workers to finish [5]') do |seconds|
+          @options[:shutdown_timeout] = seconds
+        end
+      end.parse!
+    end
   end
 end

data/lib/howler/support/version.rb

@@ -1,3 +1,3 @@
 module Howler
-  VERSION = %W(1 1 0) .join(".")
+  VERSION = %W(1 1 1) .join(".")
 end

data/spec/models/howler_spec.rb

@@ -46,7 +46,7 @@ describe Howler do
     let(:pool) { mock("ConnectionPool2") }
 
     xit "should be a ConnectionPool" do
-      ConnectionPool.should_receive(:new).with(:timeout => 1, :size => 5)
+      ConnectionPool.should_receive(:new).with(:timeout => 1, :size => 30)
 
       Howler.redis
     end

data/spec/models/manager_spec.rb

@@ -206,34 +206,46 @@ describe Howler::Manager do
       subject.wrapped_object.stub(:done?).and_return(false, true)
       subject.wrapped_object.instance_variable_set(:@logger, logger)
       logger.stub(:log).and_yield(log)
+    end
+
+    describe "when there are no messages" do
+      it "should not log" do
+        log.should_not_receive(:info)
 
-      [:send_notification, :enforce_avgs].each_with_index do |method, i|
-        subject.push(Array, method, [i, ((i+1)*100).to_s(36)])
+        subject.run
       end
     end
 
-    describe "information" do
+    describe "when there are messages" do
       before do
-        Howler::Config[:log] = 'info'
+        [:send_notification, :enforce_avgs].each_with_index do |method, i|
+          subject.push(Array, method, [i, ((i+1)*100).to_s(36)])
+        end
       end
 
-      it "should log the number of messages to be processed" do
-        log.should_receive(:info).with("Processing 2 Messages")
+      describe "information" do
+        before do
+          Howler::Config[:log] = 'info'
+        end
 
-        subject.run
-      end
-    end
+        it "should log the number of messages to be processed" do
+          log.should_receive(:info).with("Processing 2 Messages")
 
-    describe "debug" do
-      before do
-        Howler::Config[:log] = 'debug'
+          subject.run
+        end
       end
 
-      it "should show a digest of the messages" do
-        log.should_receive(:debug).with('MESG - 123 Array.new.send_notification(0, "2s")')
-        log.should_receive(:debug).with('MESG - 123 Array.new.enforce_avgs(1, "5k")')
+      describe "debug" do
+        before do
+          Howler::Config[:log] = 'debug'
+        end
 
-        subject.run
+        it "should show a digest of the messages" do
+          log.should_receive(:debug).with('MESG - 123 Array.new.send_notification(0, "2s")')
+          log.should_receive(:debug).with('MESG - 123 Array.new.enforce_avgs(1, "5k")')
+
+          subject.run
+        end
       end
     end
   end

data/spec/models/runner_spec.rb

@@ -6,6 +6,138 @@ describe Howler::Runner do
     subject.stub(:sleep)
   end
 
+  describe ".new" do
+    let!(:opts) { mock(OptionParser, :on => nil, :parse! => nil) }
+
+    describe "parsing options" do
+      before do
+        OptionParser.stub(:new).and_yield(opts).and_return(opts)
+      end
+
+      it "should set up an options parser" do
+        OptionParser.should_receive(:new)
+
+        Howler::Runner.new
+      end
+
+      it "should parse the options" do
+        opts.should_receive(:parse!)
+
+        Howler::Runner.new
+      end
+    end
+
+    describe "for the redis url" do
+      before do
+        ARGV.replace(['-r', 'anything'])
+      end
+
+      it "should setup the matcher" do
+        OptionParser.stub(:new).and_yield(opts).and_return(opts)
+        opts.should_receive(:on).with("-r", "--redis_url URL", "The url of the Redis Server [redis://localhost:6379/0]")
+
+        Howler::Runner.new
+      end
+
+      it "should set the argument" do
+        Howler::Runner.new.options[:redis_url].should == 'anything'
+      end
+    end
+
+    describe "for custom key - values" do
+      before do
+        ARGV.replace(['-k', 'key:value,k:5'])
+      end
+
+      it "should setup the matcher" do
+        OptionParser.stub(:new).and_yield(opts).and_return(opts)
+        opts.should_receive(:on).with("-k", "--key_value OPTIONS", "Arbitrary key - values into Howler::Config [key:value,another:value]")
+
+        Howler::Runner.new
+      end
+
+      it "should set the argument" do
+        runner = Howler::Runner.new
+
+        runner.options['key'].should == 'value'
+        runner.options['k'].should == '5'
+      end
+    end
+
+    describe "for concurrency" do
+      before do
+        ARGV.replace(['-c', '50'])
+      end
+
+      it "should setup the matcher" do
+        OptionParser.stub(:new).and_yield(opts).and_return(opts)
+        opts.should_receive(:on).with("-c", "--concurrency COUNT", "The number of Workers [30]")
+
+        Howler::Runner.new
+      end
+
+      it "should set the argument" do
+        Howler::Runner.new.options[:concurrency].should == '50'
+      end
+    end
+
+    describe "for the path" do
+      before do
+        ARGV.replace(['-p', 'a/path/to/env.rb'])
+      end
+
+      it "should setup the matcher" do
+        OptionParser.stub(:new).and_yield(opts).and_return(opts)
+        opts.should_receive(:on).with("-p", "--path PATH", "The path to the file to load [./config/environment.rb]")
+
+        Howler::Runner.new
+      end
+
+      it "should set the argument" do
+        Howler::Runner.new.options[:path].should == 'a/path/to/env.rb'
+      end
+    end
+
+    describe "for the shutdown timeout" do
+      before do
+        ARGV.replace(['-s', '9'])
+      end
+
+      it "should setup the matcher" do
+        OptionParser.stub(:new).and_yield(opts).and_return(opts)
+        opts.should_receive(:on).with("-s", "--shutdown_timeout SECONDS", "The number of seconds to wait for workers to finish [5]")
+
+        Howler::Runner.new
+      end
+
+      it "should set the argument" do
+        Howler::Runner.new.options[:shutdown_timeout].should == '9'
+      end
+    end
+
+
+    it "should start the redis connection" do
+      redis = mock(Redis, :with => nil)
+      ARGV.replace(['-r', 'some/url:port'])
+
+      Howler.should_receive(:_redis).ordered.with('some/url:port')
+      Howler.should_receive(:redis).ordered.at_least(1).and_return(redis)
+
+      Howler::Runner.new
+    end
+
+    it "should store the config in Howler::Config" do
+      ARGV.replace(['-r', 'anything', '-c', '50'])
+
+      Howler::Config.stub(:[]=)
+
+      Howler::Config.should_receive(:[]=).with(:concurrency, '50')
+      Howler::Config.should_receive(:[]=).with(:redis_url, 'anything')
+
+      Howler::Runner.new
+    end
+  end
+
   describe "#run" do
     let!(:manager) { Howler::Manager.current }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis