shoryuken 3.0.6 → 4.0.0

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'pry-byebug'
 require 'shoryuken'
 require 'json'
 require 'dotenv'
+require 'securerandom'
 Dotenv.load
 
 if ENV['CODECLIMATE_REPO_TOKEN']
@@ -12,7 +13,7 @@ if ENV['CODECLIMATE_REPO_TOKEN']
   SimpleCov.start
 end
 
-config_file = File.join(File.expand_path('../..', __FILE__), 'spec', 'shoryuken.yml')
+config_file = File.join(File.expand_path('..', __dir__), 'spec', 'shoryuken.yml')
 
 Shoryuken::EnvironmentLoader.setup_options(config_file: config_file)
 
@@ -31,14 +32,15 @@ RSpec.configure do |config|
   # 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.filter_run_excluding slow: true if ENV['SPEC_ALL'] != 'true' || ENV['AWS_ACCESS_KEY_ID'].nil?
+  config.filter_run_excluding slow: true
 
   config.before do
     Shoryuken::Client.class_variable_set :@@queues, {}
 
     Shoryuken::Client.sqs = nil
 
-    Shoryuken.queues.clear
+    Shoryuken.groups.clear
 
     Shoryuken.options[:concurrency] = 1
     Shoryuken.options[:delay]       = 1
@@ -50,7 +52,16 @@ RSpec.configure do |config|
     TestWorker.get_shoryuken_options.clear
     TestWorker.get_shoryuken_options['queue'] = 'default'
 
+    Shoryuken.active_job_queue_name_prefixing = false
+
     Shoryuken.worker_registry.clear
     Shoryuken.register_worker('default', TestWorker)
+
+    Aws.config[:stub_responses] = true
+
+    Shoryuken.sqs_client_receive_message_opts.clear
+
+    allow(Concurrent).to receive(:global_io_executor).and_return(Concurrent::ImmediateExecutor.new)
+    allow(Shoryuken).to receive(:active_job?).and_return(false)
   end
 end

data/test_workers/endless_interruptive_worker.rb

@@ -12,7 +12,7 @@ class EndlessInterruptiveWorker
     end
 
     def max_execution_time
-      ENV["MAX_EXECUTION_TIME"] ? ENV["MAX_EXECUTION_TIME"].to_i : 100
+      ENV['MAX_EXECUTION_TIME'] ? ENV['MAX_EXECUTION_TIME'].to_i : 100
     end
 
     def rng
@@ -25,7 +25,7 @@ class EndlessInterruptiveWorker
     end
   end
 
-  def perform(sqs_msg, body)
+  def perform(_sqs_msg, body)
     Shoryuken.logger.info("Received message: '#{body}'")
 
     execution_ms = self.class.random_number(self.class.max_execution_time)

data/test_workers/endless_uninterruptive_worker.rb

@@ -12,7 +12,7 @@ class EndlessUninterruptiveWorker
     end
 
     def max_execution_time
-      ENV["MAX_EXECUTION_TIME"] ? ENV["MAX_EXECUTION_TIME"].to_i : 100
+      ENV['MAX_EXECUTION_TIME'] ? ENV['MAX_EXECUTION_TIME'].to_i : 100
     end
 
     def rng
@@ -25,13 +25,13 @@ class EndlessUninterruptiveWorker
     end
   end
 
-  def perform(sqs_msg, body)
-    Shoryuken.logger.info("Received message: '#{body}'")
+  def perform(_sqs_msg, body)
+    Shoryuken.logger.info("Received message: #{body}")
 
     execution_ms = self.class.random_number(self.class.max_execution_time)
     Shoryuken.logger.info("Going to burn metal for #{execution_ms}ms")
     end_time = Time.now + execution_ms.to_f / 1000
-    while Time.now < end_time do
+    while Time.now < end_time
       # burn metal
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,14 +84,14 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
@@ -137,6 +137,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.aws-sdk-core-v2
 - LICENSE
 - README.md
 - Rakefile
@@ -146,6 +147,7 @@ files:
 - examples/bootstrap_queues.rb
 - examples/default_worker.rb
 - lib/shoryuken.rb
+- lib/shoryuken/body_parser.rb
 - lib/shoryuken/client.rb
 - lib/shoryuken/core_ext.rb
 - lib/shoryuken/default_worker_registry.rb
@@ -162,22 +164,29 @@ files:
 - lib/shoryuken/middleware/server/auto_extend_visibility.rb
 - lib/shoryuken/middleware/server/exponential_backoff_retry.rb
 - lib/shoryuken/middleware/server/timing.rb
-- lib/shoryuken/polling.rb
+- lib/shoryuken/options.rb
+- lib/shoryuken/polling/base.rb
+- lib/shoryuken/polling/strict_priority.rb
+- lib/shoryuken/polling/weighted_round_robin.rb
 - lib/shoryuken/processor.rb
 - lib/shoryuken/queue.rb
 - lib/shoryuken/runner.rb
 - lib/shoryuken/util.rb
 - lib/shoryuken/version.rb
 - lib/shoryuken/worker.rb
+- lib/shoryuken/worker/default_executor.rb
+- lib/shoryuken/worker/inline_executor.rb
 - lib/shoryuken/worker_registry.rb
 - shoryuken.gemspec
 - shoryuken.jpg
 - spec/integration/launcher_spec.rb
 - spec/shoryuken.yml
+- spec/shoryuken/body_parser_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/extensions/active_job_adapter_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -185,11 +194,15 @@ files:
 - spec/shoryuken/middleware/server/auto_extend_visibility_spec.rb
 - spec/shoryuken/middleware/server/exponential_backoff_retry_spec.rb
 - spec/shoryuken/middleware/server/timing_spec.rb
-- spec/shoryuken/polling_spec.rb
+- spec/shoryuken/options_spec.rb
+- spec/shoryuken/polling/strict_priority_spec.rb
+- spec/shoryuken/polling/weighted_round_robin_spec.rb
 - spec/shoryuken/processor_spec.rb
 - spec/shoryuken/queue_spec.rb
 - spec/shoryuken/runner_spec.rb
 - spec/shoryuken/util_spec.rb
+- spec/shoryuken/worker/default_executor_spec.rb
+- spec/shoryuken/worker/inline_executor_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb
@@ -215,17 +228,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+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/body_parser_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/extensions/active_job_adapter_spec.rb
 - spec/shoryuken/fetcher_spec.rb
 - spec/shoryuken/manager_spec.rb
 - spec/shoryuken/middleware/chain_spec.rb
@@ -233,11 +248,15 @@ test_files:
 - spec/shoryuken/middleware/server/auto_extend_visibility_spec.rb
 - spec/shoryuken/middleware/server/exponential_backoff_retry_spec.rb
 - spec/shoryuken/middleware/server/timing_spec.rb
-- spec/shoryuken/polling_spec.rb
+- spec/shoryuken/options_spec.rb
+- spec/shoryuken/polling/strict_priority_spec.rb
+- spec/shoryuken/polling/weighted_round_robin_spec.rb
 - spec/shoryuken/processor_spec.rb
 - spec/shoryuken/queue_spec.rb
 - spec/shoryuken/runner_spec.rb
 - spec/shoryuken/util_spec.rb
+- spec/shoryuken/worker/default_executor_spec.rb
+- spec/shoryuken/worker/inline_executor_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/shoryuken_spec.rb
 - spec/spec_helper.rb

data/lib/shoryuken/polling.rb

@@ -1,204 +0,0 @@
-module Shoryuken
-  module Polling
-    QueueConfiguration = Struct.new(:name, :options) do
-      def hash
-        name.hash
-      end
-
-      def ==(other)
-        case other
-        when String
-          if options.empty?
-            name == other
-          else
-            false
-          end
-        else
-          super
-        end
-      end
-
-      alias_method :eql?, :==
-
-      def to_s
-        if options.empty?
-          name
-        else
-          "#<QueueConfiguration #{name} options=#{options.inspect}>"
-        end
-      end
-    end
-
-    class BaseStrategy
-      include Util
-
-      def next_queue
-        fail NotImplementedError
-      end
-
-      def messages_found(queue, messages_found)
-        fail NotImplementedError
-      end
-
-      def active_queues
-        fail NotImplementedError
-      end
-
-      def ==(other)
-        case other
-        when Array
-          @queues == other
-        else
-          if other.respond_to?(:active_queues)
-            active_queues == other.active_queues
-          else
-            false
-          end
-        end
-      end
-
-      private
-
-      def delay
-        Shoryuken.options[:delay].to_f
-      end
-    end
-
-    class WeightedRoundRobin < BaseStrategy
-      def initialize(queues)
-        @initial_queues = queues
-        @queues = queues.dup.uniq
-        @paused_queues = []
-      end
-
-      def next_queue
-        unpause_queues
-        queue = @queues.shift
-        return nil if queue.nil?
-
-        @queues << queue
-        QueueConfiguration.new(queue, {})
-      end
-
-      def messages_found(queue, messages_found)
-        if messages_found == 0
-          pause(queue)
-          return
-        end
-
-        maximum_weight = maximum_queue_weight(queue)
-        current_weight = current_queue_weight(queue)
-        if maximum_weight > current_weight
-          logger.info { "Increasing '#{queue}' weight to #{current_weight + 1}, max: #{maximum_weight}" }
-          @queues << queue
-        end
-      end
-
-      def active_queues
-        unparse_queues(@queues)
-      end
-
-      private
-
-      def pause(queue)
-        return unless @queues.delete(queue)
-        @paused_queues << [Time.now + delay, queue]
-        logger.debug "Paused '#{queue}'"
-      end
-
-      def unpause_queues
-        return if @paused_queues.empty?
-        return if Time.now < @paused_queues.first[0]
-        pause = @paused_queues.shift
-        @queues << pause[1]
-        logger.debug "Unpaused '#{pause[1]}'"
-      end
-
-      def current_queue_weight(queue)
-        queue_weight(@queues, queue)
-      end
-
-      def maximum_queue_weight(queue)
-        queue_weight(@initial_queues, queue)
-      end
-
-      def queue_weight(queues, queue)
-        queues.count { |q| q == queue }
-      end
-    end
-
-    class StrictPriority < BaseStrategy
-      def initialize(queues)
-        # Priority ordering of the queues, highest priority first
-        @queues = queues
-          .group_by { |q| q }
-          .sort_by { |_, qs| -qs.count }
-          .map(&:first)
-
-        # Pause status of the queues, default to past time (unpaused)
-        @paused_until = queues
-          .each_with_object(Hash.new) { |queue, h| h[queue] = Time.at(0) }
-
-        # Start queues at 0
-        reset_next_queue
-      end
-
-      def next_queue
-        next_queue = next_active_queue
-        next_queue.nil? ? nil : QueueConfiguration.new(next_queue, {})
-      end
-
-      def messages_found(queue, messages_found)
-        if messages_found == 0
-          pause(queue)
-        else
-          reset_next_queue
-        end
-      end
-
-      def active_queues
-        @queues
-          .reverse
-          .map.with_index(1)
-          .reject { |q, _| queue_paused?(q) }
-          .reverse
-      end
-
-      private
-
-      def next_active_queue
-        reset_next_queue if queues_unpaused_since?
-
-        size = @queues.length
-        size.times do
-          queue = @queues[@next_queue_index]
-          @next_queue_index = (@next_queue_index + 1) % size
-          return queue unless queue_paused?(queue)
-        end
-
-        nil
-      end
-
-      def queues_unpaused_since?
-        last = @last_unpause_check
-        now = @last_unpause_check = Time.now
-
-        last && @paused_until.values.any? { |t| t > last && t <= now }
-      end
-
-      def reset_next_queue
-        @next_queue_index = 0
-      end
-
-      def queue_paused?(queue)
-        @paused_until[queue] > Time.now
-      end
-
-      def pause(queue)
-        return unless delay > 0
-        @paused_until[queue] = Time.now + delay
-        logger.debug "Paused '#{queue}'"
-      end
-    end
-  end
-end