Merge pull request #43 from travis-ci/joshk-puma-and-ruby-2.5.1

Puma and Ruby 2.5.1

Author: joshk

.ruby-version

@@ -1 +1 @@
-2.3.6
+2.5.1

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 
-rvm: 2.3.6
+rvm: 2.5.1
 
 services:
   - redis
@@ -11,4 +11,6 @@ cache: bundler
 
 bundler_args: --without development --jobs 3 --retry 3 --deployment
 
+before_install: gem install bundler
+
 script: bundle exec rspec spec

Gemfile

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 
-ruby '2.3.6'
+ruby '2.5.1'
 
 gem 'travis-support',  git: 'https://github.com/travis-ci/travis-support', ref: '113cff17fe383bb72fcfae3a97a8ce98c228342f'
-gem 'travis-config',  '~> 1.0.0'
+gem 'travis-config',   '~> 1.0.0'
 
 gem 'sidekiq',         '~> 4.0.0'
 gem 'redis-namespace'
 
+gem 'puma'
 gem 'sinatra',         '~> 2.0.0'
 gem 'rake',            '~> 0.9.2.2'
 
@@ -18,12 +19,8 @@ gem 'activesupport',   '~> 4.1.11'
 gem 'metriks'
 gem 'metriks-librato_metrics'
 
-# structures
 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

Gemfile.lock

@@ -36,7 +36,6 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    kgio (2.11.2)
     method_source (0.9.0)
     metriks (0.9.9.8)
       atomic (~> 1.0)
@@ -50,12 +49,12 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    puma (3.11.4)
     rack (2.0.5)
     rack-protection (2.0.1)
       rack
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
-    raindrops (0.19.0)
     rake (0.9.2.2)
     redis (3.3.5)
     redis-namespace (1.6.0)
@@ -86,10 +85,6 @@ GEM
       hashr (~> 2.0.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicorn (4.6.3)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
     yajl-ruby (1.4.0)
 
 PLATFORMS
@@ -102,6 +97,7 @@ DEPENDENCIES
   metriks
   metriks-librato_metrics
   pry
+  puma
   rack-test
   rake (~> 0.9.2.2)
   redis-namespace
@@ -111,11 +107,10 @@ DEPENDENCIES
   sinatra (~> 2.0.0)
   travis-config (~> 1.0.0)
   travis-support!
-  unicorn (~> 4.6.2)
   yajl-ruby (~> 1.4.0)
 
 RUBY VERSION
-   ruby 2.3.6p384
+   ruby 2.5.1p57
 
 BUNDLED WITH
    1.16.1

Procfile

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

config/puma.rb

@@ -0,0 +1,16 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 3000
+environment ENV['RACK_ENV'] || 'development'
+
+on_worker_boot do
+  if reporter = Travis::Metrics.reporter
+    reporter.stop
+    reporter.start
+  end
+end