# HG changeset patch
# User edogawaconan <me@myconan.net>
# Date 1409928676 -32400
# Node ID a4deb8a43cc382d6ec507802ad86bb7b937e338e
# Parent  70d70736faeed5349b5dfb772bd3d26bc41fd56f
Add standalone servers.

diff -r 70d70736faee -r a4deb8a43cc3 Gemfile
--- a/Gemfile	Fri Sep 05 23:38:57 2014 +0900
+++ b/Gemfile	Fri Sep 05 23:51:16 2014 +0900
@@ -14,7 +14,8 @@
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use unicorn as the app server
-# gem 'unicorn'
+gem "unicorn", :platforms => :mri, :require => false
+gem "puma", :platforms => [:jruby, :rbx, :mswin], :require => false
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
diff -r 70d70736faee -r a4deb8a43cc3 Gemfile.lock
--- a/Gemfile.lock	Fri Sep 05 23:38:57 2014 +0900
+++ b/Gemfile.lock	Fri Sep 05 23:51:16 2014 +0900
@@ -39,8 +39,11 @@
     http (0.6.2)
       http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
+    http_parser.rb (0.6.0-java)
     i18n (0.6.11)
     json (1.8.1)
+    json (1.8.1-java)
+    kgio (2.9.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -52,6 +55,10 @@
     multipart-post (2.0.0)
     naught (1.0.0)
     polyglot (0.3.5)
+    puma (2.9.0)
+      rack (>= 1.1, < 2.0)
+    puma (2.9.0-java)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -70,6 +77,7 @@
       activesupport (= 4.1.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    raindrops (0.13.0)
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
@@ -89,6 +97,7 @@
       sprockets (~> 2.8)
     thor (0.19.1)
     thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -110,14 +119,23 @@
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
+    unf (0.1.4-java)
     unf_ext (0.0.6)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
 
 PLATFORMS
+  java
   ruby
+  x86-mingw32
 
 DEPENDENCIES
+  puma
   rails (~> 4.1.4)
   sdoc (~> 0.4.0)
   spring
   twitter
   twitter-text
+  unicorn