From fc41d1229981733c71734680858c71e823974294 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman+foo@gmail.com>
Date: Wed, 27 Jun 2018 16:40:55 -0500
Subject: [PATCH] Try `ci-queue`

---
 Gemfile                          | 3 ++-
 Gemfile.lock                     | 9 ++++++---
 Rakefile                         | 3 ---
 app.json                         | 5 ++++-
 spec/helpers/rake_runner_spec.rb | 4 ++--
 spec/spec_helper.rb              | 3 ---
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1a6921ff4..329f52a45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 group :development, :test do
   gem "heroku_hatchet"
-  gem "knapsack"
   gem "rspec-core"
   gem "rspec-expectations"
   gem "excon"
@@ -12,4 +11,6 @@ group :development, :test do
   gem "netrc"
   gem "git", github: "hone/ruby-git", branch: "master"
   gem 'json', '~> 2.0.2'
+  gem 'ci-queue'
+  gem 'redis'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cb3d8b94..df86c60e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,6 +13,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    ansi (1.5.0)
+    ci-queue (0.13.4)
+      ansi
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     erubis (2.7.0)
@@ -33,8 +36,6 @@ GEM
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     json (2.0.4)
-    knapsack (1.16.0)
-      rake
     minitest (5.11.3)
     minitest-retry (0.1.9)
       minitest (>= 5.0)
@@ -48,6 +49,7 @@ GEM
       heroics (~> 0.0.23)
       moneta (~> 0.8.1)
     rake (12.0.0)
+    redis (4.0.1)
     repl_runner (0.0.3)
       activesupport
     rrrretry (1.0.0)
@@ -69,14 +71,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ci-queue
   excon
   git!
   heroku_hatchet
   json (~> 2.0.2)
-  knapsack
   netrc
   parallel_tests
   rake
+  redis
   rspec-core
   rspec-expectations
   rspec-retry
diff --git a/Rakefile b/Rakefile
index 41c9a0011..5e13030a3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,6 @@
 require "fileutils"
 require "tmpdir"
 require 'hatchet/tasks'
-require 'knapsack'
 ENV["BUILDPACK_LOG_FILE"] ||= "tmp/buildpack.log"
 
 S3_BUCKET_NAME  = "heroku-buildpack-ruby"
@@ -309,5 +308,3 @@ begin
   task :default => :spec
 rescue LoadError => e
 end
-
-Knapsack.load_tasks if defined?(Knapsack)
diff --git a/app.json b/app.json
index a26eece2c..0d9fe6f4c 100644
--- a/app.json
+++ b/app.json
@@ -3,6 +3,9 @@
   "description":"The buildpack for Ruby",
   "environments": {
     "test": {
+      "addons":[
+        "heroku-redis:hobby-dev"
+      ],
       "env": {
           "HATCHET_RETRIES":    "3",
           "IS_RUNNING_ON_CI":   "true",
@@ -17,7 +20,7 @@
       },
       "scripts": {
         "test-setup": "bundle exec rake hatchet:setup_ci",
-        "test":       "HATCHET_BUILDPACK_BRANCH=$HEROKU_TEST_RUN_BRANCH bundle exec rake knapsack:rspec"
+        "test":       "HATCHET_BUILDPACK_BRANCH=$HEROKU_TEST_RUN_BRANCH bundle exec rspec-queue --max-requeues=3 --timeout 180 --build $HEROKU_TEST_RUN_ID --worker $CI_NODE_INDEX --queue $REDIS_URL"
       },
       "buildpacks": [
         { "url": "https://github.com/heroku/heroku-buildpack-apt" },
diff --git a/spec/helpers/rake_runner_spec.rb b/spec/helpers/rake_runner_spec.rb
index 89ba78a1e..5fdcc7c14 100644
--- a/spec/helpers/rake_runner_spec.rb
+++ b/spec/helpers/rake_runner_spec.rb
@@ -7,8 +7,8 @@
       task = rake.task("assets:precompile")
       task.invoke
 
-      expect(task.status).to   eq(:pass)
       expect(task.output).to   match("success!")
+      expect(task.status).to   eq(:pass)
       expect(task.time).not_to be_nil
     end
   end
@@ -19,8 +19,8 @@
       task = rake.task("assets:precompile")
       task.invoke
 
-      expect(task.status).to   eq(:fail)
       expect(task.output).to   match("assets:precompile fails")
+      expect(task.status).to   eq(:fail)
       expect(task.time).not_to be_nil
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 58467922e..e801b929b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,9 +6,6 @@
 require 'language_pack'
 require 'language_pack/shell_helpers'
 
-require 'knapsack'
-
-Knapsack::Adapters::RSpecAdapter.bind
 
 ENV['RACK_ENV'] = 'test'