Allow dynamic adding queues

.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.3.3
 
 notifications:
   email:

lib/shoryuken.rb

@@ -41,19 +41,23 @@ module Shoryuken
     polling_strategy: Polling::WeightedRoundRobin
   }.freeze
 
-  @@queues = []
-  @@worker_registry = DefaultWorkerRegistry.new
+  @@queues                          = []
+  @@worker_registry                 = DefaultWorkerRegistry.new
   @@active_job_queue_name_prefixing = false
-  @@sqs_client = nil
+  @@sqs_client                      = nil
   @@sqs_client_receive_message_opts = {}
-  @@start_callback = nil
-  @@stop_callback = nil
+  @@start_callback                  = nil
+  @@stop_callback                   = nil
 
   class << self
     def queues
       @@queues
     end
 
+    def add_queue(queue, priority = 1)
+      priority.times { queues << queue }
+    end
+
     def worker_registry
       @@worker_registry
     end
@@ -87,7 +91,7 @@ def active_job_queue_name_prefixing=(active_job_queue_name_prefixing)
     end
 
     def sqs_client
-      @@sqs_client
+      @@sqs_client ||= Aws::SQS::Client.new
     end
 
     def sqs_client=(sqs_client)
@@ -157,10 +161,6 @@ def on_stop(&block)
       @@stop_callback = block
     end
 
-    def sqs_client
-      @@sqs_client ||= Aws::SQS::Client.new
-    end
-
     # Register a block to run at a point in the Shoryuken lifecycle.
     # :startup, :quiet or :shutdown are valid events.
     #

lib/shoryuken/environment_loader.rb

@@ -99,7 +99,7 @@ def prefix_active_job_queue_names
     end
 
     def parse_queue(queue, weight = nil)
-      [weight.to_i, 1].max.times { Shoryuken.queues << queue }
+      Shoryuken.add_queue(queue, [weight.to_i, 1])
     end
 
     def parse_queues
@@ -145,7 +145,7 @@ def validate_queues
 
       Shoryuken.queues.uniq.each do |queue|
         begin
-          Shoryuken::Client.queues queue
+          Shoryuken::Client.queues(queue)
         rescue Aws::SQS::Errors::NonExistentQueue
           non_existent_queues << queue
         end
@@ -155,13 +155,13 @@ def validate_queues
     end
 
     def validate_workers
+      return if defined?(::ActiveJob)
+
       all_queues = Shoryuken.queues
       queues_with_workers = Shoryuken.worker_registry.queues
 
-      unless defined?(::ActiveJob)
-        (all_queues - queues_with_workers).each do |queue|
-          Shoryuken.logger.warn { "No worker supplied for '#{queue}'" }
-        end
+      (all_queues - queues_with_workers).each do |queue|
+        Shoryuken.logger.warn { "No worker supplied for '#{queue}'" }
       end
     end
   end

lib/shoryuken/queue.rb

@@ -35,9 +35,7 @@ def send_messages(options)
     end
 
     def receive_messages(options)
-      client.receive_message(options.merge(queue_url: url)).
-        messages.
-        map { |m| Message.new(client, self, m) }
+      client.receive_message(options.merge(queue_url: url)).messages.map { |m| Message.new(client, self, m) }
     end
 
     def fifo?

spec/integration/launcher_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'shoryuken/manager'
 require 'shoryuken/launcher'
+require 'securerandom'
 
 RSpec.describe Shoryuken::Launcher do
   describe 'Consuming messages', slow: :true do
@@ -19,7 +20,9 @@
     end
 
     after do
-      queue_url = Shoryuken::Client.sqs.get_queue_url(queue_name: StandardWorker.get_shoryuken_options['queue']).queue_url
+      queue_url = Shoryuken::Client.sqs.get_queue_url(
+        queue_name: StandardWorker.get_shoryuken_options['queue']
+      ).queue_url
 
       Shoryuken::Client.sqs.delete_queue queue_url: queue_url
     end

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