flapjack 0.6.59 → 0.6.60

data/lib/flapjack/gateways/email.rb

@@ -18,6 +18,8 @@ module Flapjack
       class << self
 
         def start
+          @logger.info("starting")
+          @logger.debug("new email gateway pikelet with the following options: #{@config.inspect}")
           @smtp_config = @config.delete('smtp_config')
           @sent = 0
         end

data/lib/flapjack/pikelet.rb

@@ -147,6 +147,11 @@ module Flapjack
         pikelet_klass.instance_variable_set('@redis_config', @redis_config)
         pikelet_klass.instance_variable_set('@logger', @logger)
 
+        unless defined?(@@resque_pool) && !@@resque_pool.nil?
+          @@resque_pool = Flapjack::RedisPool.new(:config => @redis_config)
+          ::Resque.redis = @@resque_pool
+        end
+
         # TODO error if config['queue'].nil?
 
         @worker = EM::Resque::Worker.new(@config['queue'])

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.59"
+  VERSION = "0.6.60"
 end

data/spec/lib/flapjack/pikelet_spec.rb

@@ -10,6 +10,10 @@ describe Flapjack::Pikelet do
 
   let(:fiber) { mock(Fiber) }
 
+  before do
+    Flapjack::Pikelet::Resque.class_variable_set(:@@resque_pool, nil)
+  end
+
   it "creates and starts an executive pikelet" do
     Flapjack::Logger.should_receive(:new).and_return(logger)
 
@@ -56,6 +60,10 @@ describe Flapjack::Pikelet do
     config.should_receive(:[]).with('logger').and_return(nil)
     config.should_receive(:[]).with('queue').and_return('email_notif')
 
+    redis = mock('redis')
+    Flapjack::RedisPool.should_receive(:new).and_return(redis)
+    Resque.should_receive(:redis=).with( redis )
+
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
       with('@config', config)
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
@@ -77,13 +85,19 @@ describe Flapjack::Pikelet do
     pik.start
   end
 
+
   it "handles an exception raised by a resque worker gateway" do
+
     Flapjack::Logger.should_receive(:new).and_return(logger)
     logger.should_receive(:fatal)
 
     config.should_receive(:[]).with('logger').and_return(nil)
     config.should_receive(:[]).with('queue').and_return('email_notif')
 
+    redis = mock('redis')
+    Flapjack::RedisPool.should_receive(:new).and_return(redis)
+    Resque.should_receive(:redis=).with( redis )
+
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
       with('@config', config)
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
@@ -134,4 +148,4 @@ describe Flapjack::Pikelet do
     pik.start
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.59
+  version: 0.6.60
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -481,7 +481,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4498964249235778602
+      hash: 3922844473422717495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -490,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4498964249235778602
+      hash: 3922844473422717495
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23