shoryuken 2.1.3 → 3.0.0

data/spec/shoryuken/middleware/chain_spec.rb

@@ -44,28 +44,4 @@ describe Shoryuken::Middleware::Chain do
     expect(final_action).to eq nil
     expect(recorder).to eq []
   end
-
-  class DeprecatedMiddleware
-    def call(worker_instance, queue, sqs_msg)
-      @@success = true
-    end
-
-    def self.success?
-      !!@@success
-    end
-  end
-
-  it 'patches deprecated middleware' do
-    subject.clear
-
-    expect(Shoryuken.logger).to receive(:warn) do |&block|
-      expect(block.call).to eq('[DEPRECATION] DeprecatedMiddleware#call(worker_instance, queue, sqs_msg) is deprecated. Please use DeprecatedMiddleware#call(worker_instance, queue, sqs_msg, body)')
-    end
-
-    subject.add DeprecatedMiddleware
-
-    subject.invoke TestWorker, 'test', double('SQS msg', body: 'test'), 'test'
-
-    expect(DeprecatedMiddleware.success?).to eq true
-  end
 end

data/spec/shoryuken/middleware/server/auto_extend_visibility_spec.rb

@@ -12,8 +12,6 @@ RSpec.describe Shoryuken::Middleware::Server::AutoExtendVisibility do
 
   # We need to run our worker inside actor context.
   class Runner
-    include Celluloid
-
     def run_and_sleep(worker, queue, sqs_msg, interval)
       Shoryuken::Middleware::Server::AutoExtendVisibility.new.call(worker, queue, sqs_msg, sqs_msg.body) do
         sleep interval

data/spec/shoryuken/middleware/server/exponential_backoff_retry_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+# rubocop:disable Metrics/BlockLength, Metrics/BlockDelimiters
 RSpec.describe Shoryuken::Middleware::Server::ExponentialBackoffRetry do
   let(:queue)     { 'default' }
   let(:sqs_queue) { double Shoryuken::Queue }
@@ -16,8 +17,8 @@ RSpec.describe Shoryuken::Middleware::Server::ExponentialBackoffRetry do
     end
   end
 
-  context 'when a job succeeds' do
-    it 'does not retry the job' do
+  context 'when no exception' do
+    it 'does not retry' do
       TestWorker.get_shoryuken_options['retry_intervals'] = [300, 1800]
 
       expect(sqs_msg).not_to receive(:change_visibility)
@@ -26,60 +27,76 @@ RSpec.describe Shoryuken::Middleware::Server::ExponentialBackoffRetry do
     end
   end
 
-  context 'when a job throws an exception' do
+  context 'when an error' do
+    context "and retry_intervals isn't set" do
+      it 'does not retry' do
+        expect(sqs_msg).not_to receive(:change_visibility)
 
-    it 'does not retry the job by default' do
-      expect(sqs_msg).not_to receive(:change_visibility)
+        expect {
+          subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'Error' }
+        }.to raise_error(RuntimeError, 'Error')
+      end
+    end
+
+    context 'and retry_intervals is a lambda' do
+      it 'retries' do
+        TestWorker.get_shoryuken_options['retry_intervals'] = ->(_attempts) { 500 }
+
+        allow(sqs_msg).to receive(:queue) { sqs_queue }
+        expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 500)
 
-      expect {
-        subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'Error' }
-      }.to raise_error(RuntimeError, 'Error')
+        expect { subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'failed' } }.not_to raise_error
+      end
     end
 
-    it 'does not retry the job if :retry_intervals is empty' do
-      TestWorker.get_shoryuken_options['retry_intervals'] = []
+    context 'and retry_intervals is empty' do
+      it 'does not retry' do
+        TestWorker.get_shoryuken_options['retry_intervals'] = []
 
-      expect(sqs_msg).not_to receive(:change_visibility)
+        expect(sqs_msg).not_to receive(:change_visibility)
 
-      expect {
-        subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'Error' }
-      }.to raise_error(RuntimeError, 'Error')
+        expect {
+          subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'Error' }
+        }.to raise_error(RuntimeError, 'Error')
+      end
     end
 
-    it 'retries the job if :retry_intervals is non-empty' do
+    it 'uses first interval ' do
       TestWorker.get_shoryuken_options['retry_intervals'] = [300, 1800]
 
-      allow(sqs_msg).to receive(:queue){ sqs_queue }
+      allow(sqs_msg).to receive(:queue) { sqs_queue }
       expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 300)
 
       expect { subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'failed' } }.not_to raise_error
     end
 
-    it 'retries the job with exponential backoff' do
+    it 'uses matching interval' do
       TestWorker.get_shoryuken_options['retry_intervals'] = [300, 1800]
 
-      allow(sqs_msg).to receive(:attributes){ {'ApproximateReceiveCount' => 2 } }
-      allow(sqs_msg).to receive(:queue){ sqs_queue }
+      allow(sqs_msg).to receive(:attributes) { { 'ApproximateReceiveCount' => 2 } }
+      allow(sqs_msg).to receive(:queue) { sqs_queue }
       expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 1800)
 
       expect { subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'failed' } }.not_to raise_error
     end
 
-    it 'uses the last retry interval when :receive_count exceeds the size of :retry_intervals' do
-      TestWorker.get_shoryuken_options['retry_intervals'] = [300, 1800]
+    context 'when attempts exceeds retry_intervals' do
+      it 'uses last interval' do
+        TestWorker.get_shoryuken_options['retry_intervals'] = [300, 1800]
 
-      allow(sqs_msg).to receive(:attributes){ {'ApproximateReceiveCount' => 3 } }
-      allow(sqs_msg).to receive(:queue){ sqs_queue }
-      expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 1800)
+        allow(sqs_msg).to receive(:attributes) { { 'ApproximateReceiveCount' => 3 } }
+        allow(sqs_msg).to receive(:queue) { sqs_queue }
+        expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 1800)
 
-      expect { subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'failed' } }.not_to raise_error
+        expect { subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'failed' } }.not_to raise_error
+      end
     end
 
-    it 'limits the visibility timeout to 12 hours from receipt of message' do
-      TestWorker.get_shoryuken_options['retry_intervals'] = [86400]
+    it 'limits the visibility timeout to 12 hours' do
+      TestWorker.get_shoryuken_options['retry_intervals'] = [86_400]
 
-      allow(sqs_msg).to receive(:queue){ sqs_queue }
-      expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 43198)
+      allow(sqs_msg).to receive(:queue) { sqs_queue }
+      expect(sqs_msg).to receive(:change_visibility).with(visibility_timeout: 43_198)
 
       expect { subject.call(TestWorker.new, queue, sqs_msg, sqs_msg.body) { raise 'failed' } }.not_to raise_error
     end

data/spec/shoryuken/processor_spec.rb

@@ -169,7 +169,7 @@ RSpec.describe Shoryuken::Processor do
         end
 
         it 'invokes middleware' do
-          expect(manager).to receive(:processor_done).with(queue, subject)
+          expect(manager).to receive(:processor_done).with(queue)
 
           expect_any_instance_of(WorkerCalledMiddlewareWorker).to receive(:perform).with(sqs_msg, sqs_msg.body)
           expect_any_instance_of(WorkerCalledMiddlewareWorker).to receive(:called).with(sqs_msg, queue)
@@ -199,7 +199,7 @@ RSpec.describe Shoryuken::Processor do
         end
 
         it "doesn't invoke middleware" do
-          expect(manager).to receive(:processor_done).with(queue, subject)
+          expect(manager).to receive(:processor_done).with(queue)
 
           expect_any_instance_of(WorkerCalledMiddlewareWorker).to receive(:perform).with(sqs_msg, sqs_msg.body)
           expect_any_instance_of(WorkerCalledMiddlewareWorker).to_not receive(:called).with(sqs_msg, queue)
@@ -212,7 +212,7 @@ RSpec.describe Shoryuken::Processor do
     it 'performs with delete' do
       TestWorker.get_shoryuken_options['auto_delete'] = true
 
-      expect(manager).to receive(:processor_done).with(queue, subject)
+      expect(manager).to receive(:processor_done).with(queue)
 
       expect_any_instance_of(TestWorker).to receive(:perform).with(sqs_msg, sqs_msg.body)
 
@@ -224,7 +224,7 @@ RSpec.describe Shoryuken::Processor do
     it 'performs without delete' do
       TestWorker.get_shoryuken_options['auto_delete'] = false
 
-      expect(manager).to receive(:processor_done).with(queue, subject)
+      expect(manager).to receive(:processor_done).with(queue)
 
       expect_any_instance_of(TestWorker).to receive(:perform).with(sqs_msg, sqs_msg.body)
 
@@ -249,7 +249,7 @@ RSpec.describe Shoryuken::Processor do
       it 'performs without delete' do
         Shoryuken.worker_registry.clear # unregister TestWorker
 
-        expect(manager).to receive(:processor_done).with(queue, subject)
+        expect(manager).to receive(:processor_done).with(queue)
 
         expect_any_instance_of(TestWorker).to receive(:perform).with(sqs_msg, sqs_msg.body)
 

data/spec/shoryuken/{cli_spec.rb → runner_spec.rb}

@@ -1,9 +1,10 @@
 require 'spec_helper'
-require 'shoryuken/cli'
+require 'shoryuken/runner'
 require 'shoryuken/launcher'
 
-RSpec.describe Shoryuken::CLI do
-  let(:cli) { Shoryuken::CLI.instance }
+# rubocop:disable Metrics/BlockLength
+RSpec.describe Shoryuken::Runner do
+  let(:cli) { Shoryuken::Runner.instance }
 
   before do
     # make sure we do not bail
@@ -23,43 +24,28 @@ RSpec.describe Shoryuken::CLI do
     end
 
     it 'does not raise' do
-      expect { cli.run([]) }.to_not raise_error
+      expect { cli.run({}) }.to_not raise_error
     end
 
     it 'daemonizes with --daemon --logfile' do
-      expect(cli).to receive(:celluloid_loaded?).and_return(false)
       expect(Process).to receive(:daemon)
-      cli.run(['--daemon', '--logfile', '/dev/null'])
+      cli.run(daemon: true, logfile: '/dev/null')
     end
 
     it 'does NOT daemonize with --logfile' do
       expect(Process).to_not receive(:daemon)
-      cli.run(['--logfile', '/dev/null'])
+      cli.run(logfile: '/dev/null')
     end
 
     it 'writes PID file with --pidfile' do
       pidfile = instance_double('File')
       expect(File).to receive(:open).with('/dev/null', 'w').and_yield(pidfile)
       expect(pidfile).to receive(:puts).with(Process.pid)
-      cli.run(['--pidfile', '/dev/null'])
+      cli.run(pidfile: '/dev/null')
     end
   end
 
   describe '#daemonize' do
-    before(:each) do
-      allow(cli).to receive(:celluloid_loaded?).and_return(false)
-    end
-
-    it 'raises if logfile is not set' do
-      expect { cli.send(:daemonize, daemon: true) }.to raise_error(ArgumentError)
-    end
-
-    it 'raises if Celluloid is already loaded' do
-      expect(cli).to receive(:celluloid_loaded?).and_return(true)
-      args = { daemon: true, logfile: '/dev/null' }
-      expect { cli.send(:daemonize, args) }.to raise_error(RuntimeError)
-    end
-
     it 'calls Process.daemon' do
       args = { daemon: true, logfile: '/dev/null' }
       expect(Process).to receive(:daemon).with(true, true)

data/spec/shoryuken_spec.rb

@@ -1,6 +1,18 @@
 require 'spec_helper'
 
-describe Shoryuken do
+RSpec.describe Shoryuken do
+  describe '.add_queue' do
+    after { Shoryuken.queues.clear }
+
+    it 'adds queues' do
+      described_class.add_queue('default')
+      expect(described_class.queues).to eq(['default'])
+
+      described_class.add_queue('high', 2)
+      expect(described_class.queues).to eq(%w(default high high))
+    end
+  end
+
   describe '.register_worker' do
     it 'registers a worker' do
       described_class.worker_registry.clear

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'bundler/setup'
 Bundler.setup
 
 require 'pry-byebug'
-require 'celluloid/current'
 require 'shoryuken'
 require 'json'
 require 'dotenv'
@@ -18,7 +17,6 @@ config_file = File.join(File.expand_path('../..', __FILE__), 'spec', 'shoryuken.
 Shoryuken::EnvironmentLoader.setup_options(config_file: config_file)
 
 Shoryuken.logger.level = Logger::UNKNOWN
-Celluloid.logger.level = Logger::UNKNOWN
 
 class TestWorker
   include Shoryuken::Worker
@@ -30,17 +28,15 @@ end
 
 RSpec.configure do |config|
   # Only run slow tests if SPEC_ALL=true and AWS_ACCESS_KEY_ID is present
-  # The AWS_ACCESS_KEY_ID checker is because Travis CI does not expose ENV variables to pull requests from forked repositories
+  # The AWS_ACCESS_KEY_ID checker is because Travis CI
+  # does not expose ENV variables to pull requests from forked repositories
   # http://docs.travis-ci.com/user/pull-requests/
   config.filter_run_excluding slow: true if ENV['SPEC_ALL'] != 'true' || ENV['AWS_ACCESS_KEY_ID'].nil?
 
   config.before do
     Shoryuken::Client.class_variable_set :@@queues, {}
-    Shoryuken::Client.class_variable_set :@@visibility_timeouts, {}
 
     Shoryuken::Client.sqs = nil
-    Shoryuken::Client.sqs_resource = nil
-    Shoryuken::Client.sns = nil
 
     Shoryuken.queues.clear
 
@@ -49,8 +45,7 @@ RSpec.configure do |config|
     Shoryuken.options[:timeout]     = 1
     Shoryuken.options[:daemon]      = nil
     Shoryuken.options[:logfile]     = nil
-
-    Shoryuken.options[:aws].delete(:receive_message)
+    Shoryuken.options[:queues]      = nil
 
     TestWorker.get_shoryuken_options.clear
     TestWorker.get_shoryuken_options['queue'] = 'default'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Pablo Cantero
-- Mario Kostelac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,23 +95,36 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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: Shoryuken is a super efficient AWS SQS thread based message processor
 email:
 - pablo@pablocantero.com
-- mariokostelac@gmail.com
 executables:
 - shoryuken
 extensions: []
@@ -128,12 +140,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/cli/base.rb
+- bin/cli/sqs.rb
 - bin/shoryuken
 - examples/bootstrap_queues.rb
 - examples/default_worker.rb
 - lib/shoryuken.rb
-- lib/shoryuken/aws_config.rb
-- lib/shoryuken/cli.rb
 - lib/shoryuken/client.rb
 - lib/shoryuken/core_ext.rb
 - lib/shoryuken/default_worker_registry.rb
@@ -153,8 +165,7 @@ files:
 - lib/shoryuken/polling.rb
 - lib/shoryuken/processor.rb
 - lib/shoryuken/queue.rb
-- lib/shoryuken/sns_arn.rb
-- lib/shoryuken/topic.rb
+- lib/shoryuken/runner.rb
 - lib/shoryuken/util.rb
 - lib/shoryuken/version.rb
 - lib/shoryuken/worker.rb
@@ -163,10 +174,10 @@ files:
 - shoryuken.jpg
 - spec/integration/launcher_spec.rb
 - spec/shoryuken.yml
-- spec/shoryuken/cli_spec.rb
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
+- spec/shoryuken/environment_loader_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -177,11 +188,9 @@ files:
 - spec/shoryuken/polling_spec.rb
 - spec/shoryuken/processor_spec.rb
 - spec/shoryuken/queue_spec.rb
-- spec/shoryuken/sns_arn_spec.rb
-- spec/shoryuken/topic_spec.rb
+- spec/shoryuken/runner_spec.rb
 - spec/shoryuken/util_spec.rb
 - spec/shoryuken/worker_spec.rb
-- spec/shoryuken_endpoint.yml
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb
 - test_workers/endless_interruptive_worker.rb
@@ -206,17 +215,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Shoryuken is a super efficient AWS SQS thread based message processor
 test_files:
 - spec/integration/launcher_spec.rb
 - spec/shoryuken.yml
-- spec/shoryuken/cli_spec.rb
 - spec/shoryuken/client_spec.rb
 - spec/shoryuken/core_ext_spec.rb
 - spec/shoryuken/default_worker_registry_spec.rb
+- spec/shoryuken/environment_loader_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -227,10 +236,8 @@ test_files:
 - spec/shoryuken/polling_spec.rb
 - spec/shoryuken/processor_spec.rb
 - spec/shoryuken/queue_spec.rb
-- spec/shoryuken/sns_arn_spec.rb
-- spec/shoryuken/topic_spec.rb
+- spec/shoryuken/runner_spec.rb
 - spec/shoryuken/util_spec.rb
 - spec/shoryuken/worker_spec.rb
-- spec/shoryuken_endpoint.yml
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb