Skip to content
Browse files

update rails. replace unicorn with puma in gemfile, procfile

  • Loading branch information...
1 parent a7b3c93 commit 09e8447e19b79d6954f5f64aead6f3b1195b25dd @randx randx committed Apr 8, 2013
Showing with 41 additions and 53 deletions.
  1. +2 −3 Gemfile
  2. +38 −49 Gemfile.lock
  3. +1 −1 Procfile
View
5 Gemfile
@@ -8,7 +8,7 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as
end
-gem 'rails', '3.2.12'
+gem 'rails', '3.2.13'
# DB
gem 'mysql2', group: :mysql
@@ -21,8 +21,7 @@ gem 'settingslogic'
gem 'devise'
# Web server
-gem 'thin'
-gem "unicorn", "~> 4.4.0"
+gem "puma", "~> 2.0.0.b7"
# Haml
gem 'haml-rails'
View
87 Gemfile.lock
@@ -1,32 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.2)
annotate (2.4.0)
@@ -64,15 +64,13 @@ GEM
rest-client
simplecov (>= 0.7)
thor
- daemons (1.1.9)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.1.3)
erubis (2.7.0)
- eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
facter (1.6.17)
@@ -112,18 +110,17 @@ GEM
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- kgio (2.7.4)
libv8 (3.3.10.4)
libwebsocket (0.1.5)
addressable
listen (0.5.0)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
- mime-types (1.21)
- multi_json (1.6.0)
+ mime-types (1.22)
+ multi_json (1.7.2)
mysql2 (0.3.11)
nokogiri (1.5.5)
orm_adapter (0.4.0)
@@ -134,6 +131,8 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
+ puma (2.0.0.b7)
+ rack (>= 1.1, < 2.0)
quiet_assets (1.0.1)
railties (~> 3.1)
rack (1.4.5)
@@ -145,27 +144,26 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- raindrops (0.10.0)
- rake (10.0.3)
+ rake (10.0.4)
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
- rdoc (3.12.1)
+ rdoc (3.12.2)
json (~> 1.4)
redis (3.0.2)
redis-namespace (1.2.1)
@@ -227,24 +225,16 @@ GEM
temple (0.5.5)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
- thin (1.5.0)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
- thor (0.17.0)
- tilt (1.3.3)
+ thor (0.18.1)
+ tilt (1.3.6)
timers (1.0.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.4.0)
- kgio (~> 2.6)
- rack
- raindrops (~> 0.7)
warden (1.2.1)
rack (>= 1.0)
whenever (0.8.2)
@@ -278,8 +268,9 @@ DEPENDENCIES
mysql2
pg
pry
+ puma (~> 2.0.0.b7)
quiet_assets
- rails (= 3.2.12)
+ rails (= 3.2.13)
rake
rb-fsevent
rb-inotify
@@ -293,7 +284,5 @@ DEPENDENCIES
stamp
state_machine
therubyracer
- thin
uglifier (>= 1.0.3)
- unicorn (~> 4.4.0)
whenever
View
2 Procfile
@@ -1,2 +1,2 @@
-web: bundle exec rails s -p $PORT
+web: bundle exec puma -p $PORT
worker: bundle exec sidekiq -q runner,default

0 comments on commit 09e8447

Please sign in to comment.
Something went wrong with that request. Please try again.