shoryuken 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ba8bef505d23849a92954c00b8e8e60682c884d44e0c23ca3fabbc9a4d5349a
-  data.tar.gz: 7171d68f58db484f59b50eb53cb3a674801e690e9f6c394da9a2d7d79d82976a
+  metadata.gz: 177f42239f7942853a00ec1c527a63ef53662442e03c628f6b01f0a8a60f3c61
+  data.tar.gz: 6a6872a321ad6e300101905fbc08bc76dbcdc4a160d05eb8e061ae1972b2de67
 SHA512:
-  metadata.gz: 865b059815b1e1462f4df2fb652bce2950b325a40366dc53b4a8c01c5492bfcf5687116ac4bf9e193d8235202117e8a8e7b99c0795ad7ae3c8637622bcd073a2
-  data.tar.gz: 40c011460dc37ec522d5924010c1ab4c80f9db646fa835206aae726fc4d9ba05f86c72c98d661166262c63e1fe18ab9d02c4f945594d776fd5498ced1cf36fcc
+  metadata.gz: fcb645e36ec34051bcc588799dec40b3a7a0f69982c53ba8f9f309ebcf1db7c8b69d37f5c3765a9f7aa27ea710631fefa868241f253dc3a26400a77aa73a82fa
+  data.tar.gz: df7c1991c8e5370b4fe789ce2e0fa23c2270a12de6c40cf2ac5385e4587e5bc2259d90cb12c00a974bfc9bd7983ca7557927ad6c88e7bbd4fcf00481bc3b691d

data/.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: phstc
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v5.0.2] - 2019-11-02
+
+- Fix Queue order is reversed if passed through CLI
+  - [#571](https://github.com/phstc/shoryuken/pull/583)
+
 ## [v5.0.1] - 2019-06-19
 
 - Add back attr_accessor for `stop_callback`

data/lib/shoryuken/environment_loader.rb

@@ -20,7 +20,6 @@ module Shoryuken
     def setup_options
       initialize_options
       initialize_logger
-      merge_cli_defined_queues
     end
 
     def load
@@ -76,17 +75,6 @@ module Shoryuken
       end
     end
 
-    def merge_cli_defined_queues
-      cli_defined_queues = options[:queues].to_a
-
-      cli_defined_queues.each do |cli_defined_queue|
-        # CLI defined queues override config_file defined queues
-        Shoryuken.options[:queues].delete_if { |config_file_queue| config_file_queue[0] == cli_defined_queue[0] }
-
-        Shoryuken.options[:queues] << cli_defined_queue
-      end
-    end
-
     def prefix_active_job_queue_name(queue_name, weight)
       queue_name_prefix = ::ActiveJob::Base.queue_name_prefix
       queue_name_delimiter = ::ActiveJob::Base.queue_name_delimiter

data/lib/shoryuken/options.rb

@@ -14,9 +14,11 @@ module Shoryuken
       }
     }.freeze
 
-    attr_accessor :active_job_queue_name_prefixing, :cache_visibility_timeout, :default_worker_options, :groups,
-                  :launcher_executor, :sqs_client, :sqs_client_receive_message_opts,
+    attr_accessor :active_job_queue_name_prefixing, :cache_visibility_timeout, :groups,
+                  :launcher_executor,
                   :start_callback, :stop_callback, :worker_executor, :worker_registry
+    attr_writer :default_worker_options, :sqs_client
+    attr_reader :sqs_client_receive_message_opts
 
     def initialize
       self.groups = {}

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '5.0.1'.freeze
+  VERSION = '5.0.2'.freeze
 end

data/spec/shoryuken/environment_loader_spec.rb

@@ -74,4 +74,28 @@ RSpec.describe Shoryuken::EnvironmentLoader do
       expect(Shoryuken.groups['group1'][:queues]).to eq(%w[test_group1_queue1 test_group1_queue2])
     end
   end
+  describe "#setup_options" do
+    let (:cli_queues) { { "queue1"=> 10, "queue2" => 20 } }
+    let (:config_queues) { [["queue1", 8], ["queue2", 4]] }
+    context "when given queues through config and CLI" do
+      specify do
+        allow_any_instance_of(Shoryuken::EnvironmentLoader).to receive(:config_file_options).and_return({ queues: config_queues })
+        Shoryuken::EnvironmentLoader.setup_options(queues: cli_queues)
+        expect(Shoryuken.options[:queues]).to eq(cli_queues)
+      end
+    end
+    context "when given queues through config only" do
+      specify do
+        allow_any_instance_of(Shoryuken::EnvironmentLoader).to receive(:config_file_options).and_return({ queues: config_queues })
+        Shoryuken::EnvironmentLoader.setup_options({})
+        expect(Shoryuken.options[:queues]).to eq(config_queues)
+      end
+    end
+    context "when given queues through CLI only" do
+      specify do
+        Shoryuken::EnvironmentLoader.setup_options(queues: cli_queues)
+        expect(Shoryuken.options[:queues]).to eq(cli_queues)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"