Sinatra prefers Thin by default

francois · Nov 8, 2016 · 2174039 · 2174039
1 parent a4a356d
commit 2174039
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ gem "sinatra", ">= 1.4.7", "< 2.0"
 gem "sinatra-contrib"
 gem "tzinfo", "= 0.3.51", github: "tzinfo/tzinfo", tag: "v0.3.51"
 
-gem "puma"
+gem "thin"
 
 group :development, :test do
   gem "rspec"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,11 +9,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     backports (3.6.8)
+    daemons (1.2.4)
     diff-lcs (1.2.5)
+    eventmachine (1.2.0.1)
+    eventmachine (1.2.0.1-java)
     multi_json (1.12.1)
     pg (0.17.1)
-    puma (3.6.0)
-    puma (3.6.0-java)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -49,6 +50,10 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
+    thin (1.7.0)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     tilt (2.0.5)
 
 PLATFORMS
@@ -57,13 +62,13 @@ PLATFORMS
 
 DEPENDENCIES
   pg (= 0.17.1)
-  puma
   rollbar
   rspec
   sequel
   sequel_pg
   sinatra (>= 1.4.7, < 2.0)
   sinatra-contrib
+  thin
   tzinfo (= 0.3.51)!
 
 BUNDLED WITH