From 9588f816b0ab4b7acbccb711b61328cedc972a64 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Fri, 8 Jan 2016 14:31:49 +0100 Subject: [PATCH 1/8] do not require all of rack/contrib, it now assumes a git repository --- lib/travis/api/app.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb index a2763fdd..71d7ab9c 100644 --- a/lib/travis/api/app.rb +++ b/lib/travis/api/app.rb @@ -9,7 +9,9 @@ require 'travis/support/amqp' require 'travis/states_cache' require 'rack' require 'rack/protection' -require 'rack/contrib' +require 'rack/contrib/config' +require 'rack/contrib/jsonp' +require 'rack/contrib/post_body_content_type_parser' require 'dalli' require 'memcachier' require 'rack/cache' From 7a5f477a0a0fd1794bf00abba4468f334c319173 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 12 Jan 2016 13:52:01 +0100 Subject: [PATCH 2/8] require raven/integrations/rack --- lib/travis/api/app.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb index 71d7ab9c..7216bcbe 100644 --- a/lib/travis/api/app.rb +++ b/lib/travis/api/app.rb @@ -20,6 +20,7 @@ require 'active_record' require 'redis' require 'gh' require 'raven' +require 'raven/integrations/rack' require 'sidekiq' require 'metriks/reporter/logger' require 'metriks/librato_metrics_reporter' From 3637061b762bdc2c0da0db0f2fbee4502f93c20a Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 12 Jan 2016 13:58:21 +0100 Subject: [PATCH 3/8] bump sentry-raven --- Gemfile | 2 +- Gemfile.lock | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 9334227c..c8eaf7f6 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: gem 'active_model_serializers' gem 'unicorn' -gem 'sentry-raven', github: 'getsentry/raven-ruby' +gem 'sentry-raven' gem 'yard-sinatra', github: 'rkh/yard-sinatra' gem 'rack-contrib', github: 'rack/rack-contrib' gem 'rack-cache', github: 'rtomayko/rack-cache' diff --git a/Gemfile.lock b/Gemfile.lock index 64aeb7c3..e456f646 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,14 +5,6 @@ GIT metriks-librato_metrics (1.0.2) metriks (>= 0.9.9.6) -GIT - remote: git://github.com/getsentry/raven-ruby.git - revision: 84392e5db701f0b5c66802aab9cc82ef9a5ad830 - specs: - sentry-raven (0.10.1) - faraday (>= 0.7.6) - uuidtools - GIT remote: git://github.com/rack/rack-contrib.git revision: 1b11346d729efd88b274cd7f704e0bca9eb3de7a @@ -171,7 +163,7 @@ GEM erubis (2.7.0) factory_girl (2.4.2) activesupport - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.6) foreman (0.64.0) @@ -269,6 +261,8 @@ GEM rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.99.2) + sentry-raven (0.15.3) + faraday (>= 0.7.6) sidekiq (3.3.0) celluloid (>= 0.16.0) connection_pool (>= 2.0.0) @@ -321,7 +315,6 @@ GEM rack raindrops (~> 0.7) useragent (0.13.3) - uuidtools (2.1.5) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -355,7 +348,7 @@ DEPENDENCIES rerun rspec (~> 2.13) s3! - sentry-raven! + sentry-raven simplecov sinatra sinatra-contrib From 67d1d0956956868260b76b8aec16af6d0764e2b1 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 24 Jan 2016 23:55:38 +0100 Subject: [PATCH 4/8] use travis-amqp --- Gemfile | 1 + Gemfile.lock | 7 +++++++ lib/travis/api/app.rb | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c8eaf7f6..2074c33b 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,7 @@ gem 's3', github: 'travis-ci/s3' gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-support', github: 'travis-ci/travis-support' +gem 'travis-amqp', github: 'travis-ci/travis-amqp' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil gem 'travis-yaml', github: 'travis-ci/travis-yaml' diff --git a/Gemfile.lock b/Gemfile.lock index e456f646..0ef58701 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,12 @@ GIT s3 (0.3.21) proxies (~> 0.2.0) +GIT + remote: git://github.com/travis-ci/travis-amqp.git + revision: c388299757b7eda2cc0e33cdc7d90113cf283e6a + specs: + travis-amqp (0.0.1) + GIT remote: git://github.com/travis-ci/travis-core.git revision: 21793fc8b01f965b93cf98b7ab1458ee359a5a62 @@ -354,6 +360,7 @@ DEPENDENCIES sinatra-contrib skylight (~> 0.6.0.beta.1) stackprof + travis-amqp! travis-api! travis-config (~> 0.1.0) travis-core! diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb index 7216bcbe..bb34c61a 100644 --- a/lib/travis/api/app.rb +++ b/lib/travis/api/app.rb @@ -4,8 +4,8 @@ require 'active_record_postgres_variables' # now actually load travis require 'travis' +require 'travis/amqp' require 'travis/model' -require 'travis/support/amqp' require 'travis/states_cache' require 'rack' require 'rack/protection' @@ -179,7 +179,7 @@ module Travis::Api def self.setup_travis Travis::Async.enabled = true - Travis::Amqp.config = Travis.config.amqp + Travis::Amqp.setup(Travis.config.amqp) setup_database_connections From 197120a9eb68c8a629f05979a7f1d44050bc7b3c Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Mar 2016 12:09:33 +0100 Subject: [PATCH 5/8] add buildpack url --- .buildpacks | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildpacks b/.buildpacks index 36201cad..08c5a04b 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,3 +1,4 @@ +https://github.com/ddollar/heroku-buildpack-multi https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/drogus/last-commit-sha-buildpack.git https://github.com/ryandotsmith/nginx-buildpack.git From 48880ad1843fc5ab37e36fd2dbbf187d1b9720d4 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Tue, 22 Mar 2016 12:27:10 +0100 Subject: [PATCH 6/8] Revert "add buildpack url" This reverts commit 197120a9eb68c8a629f05979a7f1d44050bc7b3c. --- .buildpacks | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildpacks b/.buildpacks index 08c5a04b..36201cad 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,4 +1,3 @@ -https://github.com/ddollar/heroku-buildpack-multi https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/drogus/last-commit-sha-buildpack.git https://github.com/ryandotsmith/nginx-buildpack.git From b552544d190d49fa1f985a9d16cd9a58915f6d3e Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Mar 2016 12:27:34 +0100 Subject: [PATCH 7/8] revert --- .buildpacks | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildpacks b/.buildpacks index 08c5a04b..36201cad 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,4 +1,3 @@ -https://github.com/ddollar/heroku-buildpack-multi https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/drogus/last-commit-sha-buildpack.git https://github.com/ryandotsmith/nginx-buildpack.git From 71813bf92a67dd43a141a4f327a80e2ff6ed6692 Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Mar 2016 12:35:28 +0100 Subject: [PATCH 8/8] move travis-migrations into main group --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index bf2e564b..9c08569e 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil gem 'travis-yaml', github: 'travis-ci/travis-yaml' +gem 'travis-migrations', github: 'travis-ci/travis-migrations' gem 'mustermann', github: 'rkh/mustermann' gem 'sinatra' gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil @@ -41,7 +42,6 @@ group :test do gem 'factory_girl', '~> 2.4.0' gem 'mocha', '~> 0.12' gem 'database_cleaner', '~> 0.8.0' - gem 'travis-migrations', github: 'travis-ci/travis-migrations' end group :development do