Merge pull request #2 from travis-ci/joshk-yajl-projections

Checks and some updates

Author: joshk

Gemfile

@@ -2,15 +2,14 @@ source 'https://rubygems.org'
 
 ruby '2.3.6'
 
-gem 'travis-support',  git: 'https://github.com/travis-ci/travis-support'
+gem 'travis-support',  git: 'https://github.com/travis-ci/travis-support', ref: '113cff17fe383bb72fcfae3a97a8ce98c228342f'
 gem 'travis-config',  '~> 1.0.0'
 
 gem 'sidekiq',         '~> 4.0.0'
 gem 'redis-namespace'
 
-gem 'sinatra',         '~> 1.4.2'
+gem 'sinatra',         '~> 2.0.0'
 gem 'rake',            '~> 0.9.2.2'
-gem 'multi_json'
 
 gem 'sentry-raven'
 
@@ -19,15 +18,14 @@ gem 'activesupport',   '~> 4.1.11'
 gem 'metriks'
 gem 'metriks-librato_metrics'
 
-# backports 2.5.0 breaks rails routes
-gem 'backports',       '2.4.0'
-
 # structures
-gem 'yajl-ruby',       '~> 1.3.1'
+gem 'yajl-ruby',       '~> 1.4.0'
 
 # heroku
 gem 'unicorn',         '~> 4.6.2'
 
+gem 'jemalloc',        git: 'https://github.com/joshk/jemalloc-rb'
+
 group :development, :test do
   gem 'pry'
   gem 'rspec',         '~> 2.9'
@@ -39,5 +37,4 @@ end
 
 group :test do
   gem 'rack-test'
-  gem 'webmock'
 end

Gemfile.lock

@@ -1,6 +1,13 @@
+GIT
+  remote: https://github.com/joshk/jemalloc-rb
+  revision: 8c9dbef98f6bd4f96b371ec336b7e0c4fdc02d49
+  specs:
+    jemalloc (1.4.5)
+
 GIT
   remote: https://github.com/travis-ci/travis-support
   revision: 113cff17fe383bb72fcfae3a97a8ce98c228342f
+  ref: 113cff17fe383bb72fcfae3a97a8ce98c228342f
   specs:
     travis-support (0.0.1)
 
@@ -13,53 +20,46 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
     atomic (1.1.99)
     avl_tree (1.2.1)
       atomic (~> 1.1)
-    backports (2.4.0)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    faraday (0.12.1)
+    faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
     foreman (0.41.0)
       thor (>= 0.13.6)
-    hashdiff (0.3.4)
     hashr (2.0.1)
-    hitimes (1.2.5)
-    i18n (0.9.1)
+    hitimes (1.2.6)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    kgio (2.11.0)
+    kgio (2.11.2)
     method_source (0.9.0)
     metriks (0.9.9.8)
       atomic (~> 1.0)
       avl_tree (~> 1.2.0)
       hitimes (~> 1.1)
     metriks-librato_metrics (1.0.6)
       metriks (>= 0.9.9.6)
-    minitest (5.11.1)
-    multi_json (1.12.1)
+    minitest (5.11.3)
     multipart-post (2.0.0)
+    mustermann (1.0.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (2.0.5)
-    rack (1.6.9)
-    rack-protection (1.5.5)
+    rack (2.0.5)
+    rack-protection (2.0.1)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    raindrops (0.18.0)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    raindrops (0.19.0)
     rake (0.9.2.2)
-    redis (3.3.3)
-    redis-namespace (1.5.3)
-      redis (~> 3.0, >= 3.0.4)
+    redis (3.3.5)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -68,57 +68,51 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.4)
-    safe_yaml (1.0.4)
-    sentry-raven (2.5.3)
+    sentry-raven (2.7.3)
       faraday (>= 0.7.6, < 1.0)
     sidekiq (4.0.2)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       redis (~> 3.2, >= 3.2.1)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    thor (0.19.4)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     travis-config (1.0.13)
       hashr (~> 2.0.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    webmock (3.0.1)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    yajl-ruby (1.3.1)
+    yajl-ruby (1.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (~> 4.1.11)
-  backports (= 2.4.0)
   foreman (~> 0.41.0)
+  jemalloc!
   metriks
   metriks-librato_metrics
-  multi_json
   pry
   rack-test
   rake (~> 0.9.2.2)
   redis-namespace
   rspec (~> 2.9)
   sentry-raven
   sidekiq (~> 4.0.0)
-  sinatra (~> 1.4.2)
+  sinatra (~> 2.0.0)
   travis-config (~> 1.0.0)
   travis-support!
   unicorn (~> 4.6.2)
-  webmock
-  yajl-ruby (~> 1.3.1)
+  yajl-ruby (~> 1.4.0)
 
 RUBY VERSION
    ruby 2.3.6p384

Procfile

@@ -1,2 +1,2 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec je unicorn -p $PORT -c ./config/unicorn.rb
 console: bundle exec irb -I lib -r travis/listener