shoryuken 5.0.1 → 5.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/FUNDING.yml +12 -0
- data/CHANGELOG.md +5 -0
- data/lib/shoryuken/environment_loader.rb +0 -12
- data/lib/shoryuken/options.rb +4 -2
- data/lib/shoryuken/version.rb +1 -1
- data/spec/shoryuken/environment_loader_spec.rb +24 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 177f42239f7942853a00ec1c527a63ef53662442e03c628f6b01f0a8a60f3c61
|
4
|
+
data.tar.gz: 6a6872a321ad6e300101905fbc08bc76dbcdc4a160d05eb8e061ae1972b2de67
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fcb645e36ec34051bcc588799dec40b3a7a0f69982c53ba8f9f309ebcf1db7c8b69d37f5c3765a9f7aa27ea710631fefa868241f253dc3a26400a77aa73a82fa
|
7
|
+
data.tar.gz: df7c1991c8e5370b4fe789ce2e0fa23c2270a12de6c40cf2ac5385e4587e5bc2259d90cb12c00a974bfc9bd7983ca7557927ad6c88e7bbd4fcf00481bc3b691d
|
data/.github/FUNDING.yml
ADDED
@@ -0,0 +1,12 @@
|
|
1
|
+
# These are supported funding model platforms
|
2
|
+
|
3
|
+
github: phstc
|
4
|
+
patreon: # Replace with a single Patreon username
|
5
|
+
open_collective: # Replace with a single Open Collective username
|
6
|
+
ko_fi: # Replace with a single Ko-fi username
|
7
|
+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
8
|
+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
9
|
+
liberapay: # Replace with a single Liberapay username
|
10
|
+
issuehunt: # Replace with a single IssueHunt username
|
11
|
+
otechie: # Replace with a single Otechie username
|
12
|
+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
data/CHANGELOG.md
CHANGED
@@ -20,7 +20,6 @@ module Shoryuken
|
|
20
20
|
def setup_options
|
21
21
|
initialize_options
|
22
22
|
initialize_logger
|
23
|
-
merge_cli_defined_queues
|
24
23
|
end
|
25
24
|
|
26
25
|
def load
|
@@ -76,17 +75,6 @@ module Shoryuken
|
|
76
75
|
end
|
77
76
|
end
|
78
77
|
|
79
|
-
def merge_cli_defined_queues
|
80
|
-
cli_defined_queues = options[:queues].to_a
|
81
|
-
|
82
|
-
cli_defined_queues.each do |cli_defined_queue|
|
83
|
-
# CLI defined queues override config_file defined queues
|
84
|
-
Shoryuken.options[:queues].delete_if { |config_file_queue| config_file_queue[0] == cli_defined_queue[0] }
|
85
|
-
|
86
|
-
Shoryuken.options[:queues] << cli_defined_queue
|
87
|
-
end
|
88
|
-
end
|
89
|
-
|
90
78
|
def prefix_active_job_queue_name(queue_name, weight)
|
91
79
|
queue_name_prefix = ::ActiveJob::Base.queue_name_prefix
|
92
80
|
queue_name_delimiter = ::ActiveJob::Base.queue_name_delimiter
|
data/lib/shoryuken/options.rb
CHANGED
@@ -14,9 +14,11 @@ module Shoryuken
|
|
14
14
|
}
|
15
15
|
}.freeze
|
16
16
|
|
17
|
-
attr_accessor :active_job_queue_name_prefixing, :cache_visibility_timeout, :
|
18
|
-
:launcher_executor,
|
17
|
+
attr_accessor :active_job_queue_name_prefixing, :cache_visibility_timeout, :groups,
|
18
|
+
:launcher_executor,
|
19
19
|
:start_callback, :stop_callback, :worker_executor, :worker_registry
|
20
|
+
attr_writer :default_worker_options, :sqs_client
|
21
|
+
attr_reader :sqs_client_receive_message_opts
|
20
22
|
|
21
23
|
def initialize
|
22
24
|
self.groups = {}
|
data/lib/shoryuken/version.rb
CHANGED
@@ -74,4 +74,28 @@ RSpec.describe Shoryuken::EnvironmentLoader do
|
|
74
74
|
expect(Shoryuken.groups['group1'][:queues]).to eq(%w[test_group1_queue1 test_group1_queue2])
|
75
75
|
end
|
76
76
|
end
|
77
|
+
describe "#setup_options" do
|
78
|
+
let (:cli_queues) { { "queue1"=> 10, "queue2" => 20 } }
|
79
|
+
let (:config_queues) { [["queue1", 8], ["queue2", 4]] }
|
80
|
+
context "when given queues through config and CLI" do
|
81
|
+
specify do
|
82
|
+
allow_any_instance_of(Shoryuken::EnvironmentLoader).to receive(:config_file_options).and_return({ queues: config_queues })
|
83
|
+
Shoryuken::EnvironmentLoader.setup_options(queues: cli_queues)
|
84
|
+
expect(Shoryuken.options[:queues]).to eq(cli_queues)
|
85
|
+
end
|
86
|
+
end
|
87
|
+
context "when given queues through config only" do
|
88
|
+
specify do
|
89
|
+
allow_any_instance_of(Shoryuken::EnvironmentLoader).to receive(:config_file_options).and_return({ queues: config_queues })
|
90
|
+
Shoryuken::EnvironmentLoader.setup_options({})
|
91
|
+
expect(Shoryuken.options[:queues]).to eq(config_queues)
|
92
|
+
end
|
93
|
+
end
|
94
|
+
context "when given queues through CLI only" do
|
95
|
+
specify do
|
96
|
+
Shoryuken::EnvironmentLoader.setup_options(queues: cli_queues)
|
97
|
+
expect(Shoryuken.options[:queues]).to eq(cli_queues)
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
77
101
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shoryuken
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.0.
|
4
|
+
version: 5.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pablo Cantero
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-11-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: dotenv
|
@@ -117,6 +117,7 @@ extensions: []
|
|
117
117
|
extra_rdoc_files: []
|
118
118
|
files:
|
119
119
|
- ".codeclimate.yml"
|
120
|
+
- ".github/FUNDING.yml"
|
120
121
|
- ".gitignore"
|
121
122
|
- ".rspec"
|
122
123
|
- ".rubocop.yml"
|