Adding back in queue names support in Rails 6

hlascelles · May 10, 2020 · c8d2a06 · c8d2a06
1 parent 0851411
commit c8d2a06
Show file tree

Hide file tree

Showing 25 changed files with 864 additions and 230 deletions.
diff --git a/Appraisals b/Appraisals
@@ -41,10 +41,16 @@ appraise 'activesupport-6-que-0-14' do
   gem 'que', '~> 0.14'
 end
 
-appraise 'activesupport-6-que-0-14-activejob' do
+appraise 'activesupport-6-without-queue-names-que-0-14-activejob' do
   gem 'activesupport', '~> 6.0'
   gem 'que', '~> 0.14'
-  gem 'activejob', '~> 6.0'
+  gem 'activejob', '6.0.2'
+end
+
+appraise 'activesupport-6-with-queue-names-que-0-14-activejob' do
+  gem 'activesupport', '~> 6.0'
+  gem 'que', '~> 0.14'
+  gem 'activejob', '~> 6.0', '>= 6.0.3'
 end
 
 appraise 'activesupport-4-que-1-x' do
@@ -68,8 +74,14 @@ appraise 'activesupport-6-que-1-x' do
   gem 'que', '1.0.0.beta4'
 end
 
-appraise 'activesupport-6-que-1-x-activejob' do
+appraise 'activesupport-6-without-queue-names-1-x-activejob' do
+  gem 'activesupport', '~> 6.0'
+  gem 'que', '1.0.0.beta4'
+  gem 'activejob', '6.0.2'
+end
+
+appraise 'activesupport-6-with-queue-names-que-1-x-activejob' do
   gem 'activesupport', '~> 6.0'
   gem 'que', '1.0.0.beta4'
-  gem 'activejob', '~> 6.0'
+  gem 'activejob', '~> 6.0', '>= 6.0.3'
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
-##
+## Unreleased
 
+- Include new support for queue names in Rails 6 [#180](https://github.com/hlascelles/que-scheduler/pull/180)
 - Remove backports gem  [#170](https://github.com/hlascelles/que-scheduler/pull/170)
 
 ## 3.3.0 (2020-04-04)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       thor (>= 0.14.0)
     ast (2.4.0)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     coderay (1.1.2)
     colorize (0.8.1)
     combustion (1.3.0)
@@ -93,7 +93,7 @@ GEM
       pry (~> 0.13.0)
     psych (3.1.0)
     que (0.14.3)
-    raabro (1.1.6)
+    raabro (1.3.1)
     rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -120,15 +120,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

diff --git a/gemfiles/activesupport_4_que_0_12.gemfile.lock b/gemfiles/activesupport_4_que_0_12.gemfile.lock
@@ -42,10 +42,10 @@ GEM
     arel (6.0.4)
     ast (2.4.0)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     coderay (1.1.2)
     colorize (0.8.1)
-    combustion (1.1.2)
+    combustion (1.3.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -57,7 +57,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    database_cleaner (1.8.4)
+    database_cleaner (1.8.5)
     diff-lcs (1.3)
     docile (1.3.2)
     erubis (2.7.0)
@@ -66,7 +66,7 @@ GEM
     fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    fugit (1.3.4)
+    fugit (1.3.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     hashie (4.1.0)
@@ -84,7 +84,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.1.0)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pg (0.21.0)
     pry (0.13.1)
@@ -95,7 +95,7 @@ GEM
       pry (~> 0.13.0)
     psych (3.1.0)
     que (0.12.3)
-    raabro (1.1.6)
+    raabro (1.3.1)
     rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -124,15 +124,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -141,7 +141,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby_parser (3.14.2)

diff --git a/gemfiles/activesupport_4_que_0_14.gemfile.lock b/gemfiles/activesupport_4_que_0_14.gemfile.lock
@@ -42,10 +42,10 @@ GEM
     arel (6.0.4)
     ast (2.4.0)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     coderay (1.1.2)
     colorize (0.8.1)
-    combustion (1.1.2)
+    combustion (1.3.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -57,7 +57,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    database_cleaner (1.8.4)
+    database_cleaner (1.8.5)
     diff-lcs (1.3)
     docile (1.3.2)
     erubis (2.7.0)
@@ -66,7 +66,7 @@ GEM
     fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    fugit (1.3.4)
+    fugit (1.3.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     hashie (4.1.0)
@@ -84,7 +84,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.1.0)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pg (0.21.0)
     pry (0.13.1)
@@ -95,7 +95,7 @@ GEM
       pry (~> 0.13.0)
     psych (3.1.0)
     que (0.14.3)
-    raabro (1.1.6)
+    raabro (1.3.1)
     rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -124,15 +124,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -141,7 +141,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby_parser (3.14.2)

diff --git a/gemfiles/activesupport_4_que_1_x.gemfile.lock b/gemfiles/activesupport_4_que_1_x.gemfile.lock
@@ -42,10 +42,10 @@ GEM
     arel (6.0.4)
     ast (2.4.0)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     coderay (1.1.2)
     colorize (0.8.1)
-    combustion (1.1.2)
+    combustion (1.3.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -57,7 +57,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    database_cleaner (1.8.4)
+    database_cleaner (1.8.5)
     diff-lcs (1.3)
     docile (1.3.2)
     erubis (2.7.0)
@@ -66,7 +66,7 @@ GEM
     fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    fugit (1.3.4)
+    fugit (1.3.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     hashie (4.1.0)
@@ -84,7 +84,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.1.0)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pg (0.21.0)
     pry (0.13.1)
@@ -95,7 +95,7 @@ GEM
       pry (~> 0.13.0)
     psych (3.1.0)
     que (1.0.0.beta4)
-    raabro (1.1.6)
+    raabro (1.3.1)
     rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -124,15 +124,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -141,7 +141,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby_parser (3.14.2)

diff --git a/gemfiles/activesupport_5_que_0_12.gemfile.lock b/gemfiles/activesupport_5_que_0_12.gemfile.lock
@@ -41,10 +41,10 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     coderay (1.1.2)
     colorize (0.8.1)
-    combustion (1.1.2)
+    combustion (1.3.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -56,7 +56,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    database_cleaner (1.8.4)
+    database_cleaner (1.8.5)
     diff-lcs (1.3)
     docile (1.3.2)
     erubi (1.9.0)
@@ -65,7 +65,7 @@ GEM
     fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    fugit (1.3.4)
+    fugit (1.3.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     hashie (4.1.0)
@@ -83,7 +83,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.1.0)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pg (0.21.0)
     pry (0.13.1)
@@ -94,7 +94,7 @@ GEM
       pry (~> 0.13.0)
     psych (3.1.0)
     que (0.12.3)
-    raabro (1.1.6)
+    raabro (1.3.1)
     rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -121,15 +121,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -138,7 +138,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby_parser (3.14.2)