Permalink
Browse files

Thin -> Puma

  • Loading branch information...
1 parent 509a0eb commit 3cd0f04ed29a25df6d6dfeeffccd2e12548c05cf @steveklabnik committed Feb 24, 2013
Showing with 21 additions and 7 deletions.
  1. +3 −1 Gemfile
  2. +7 −6 Gemfile.lock
  3. +1 −0 Procfile
  4. +10 −0 README.md
View
4 Gemfile
@@ -5,8 +5,10 @@ gem 'rack', "1.3.10"
gem 'sinatra_warden'
gem 'sinatra-subdomain'
-gem 'thin'
gem 'rake'
gem 'haml'
gem 'redcarpet'
gem 'sinatra-contrib'
+
+gem 'puma'
+gem 'foreman'
View
13 Gemfile.lock
@@ -2,9 +2,12 @@ GEM
remote: https://rubygems.org/
specs:
backports (2.6.3)
- daemons (1.1.5)
eventmachine (0.12.10)
+ foreman (0.61.0)
+ thor (>= 0.13.6)
haml (3.1.4)
+ puma (1.6.3)
+ rack (~> 1.2)
rack (1.3.10)
rack-protection (1.1.4)
rack
@@ -28,10 +31,7 @@ GEM
sinatra_warden (0.3.2)
sinatra (>= 1.0.0)
warden (~> 1.0)
- thin (1.3.1)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
+ thor (0.17.0)
tilt (1.3.3)
warden (1.1.0)
rack (>= 1.0)
@@ -40,12 +40,13 @@ PLATFORMS
ruby
DEPENDENCIES
+ foreman
haml
+ puma
rack (= 1.3.10)
rake
redcarpet
sinatra
sinatra-contrib
sinatra-subdomain
sinatra_warden
- thin
View
1 Procfile
@@ -0,0 +1 @@
+web: rackup -s puma -p $PORT
View
10 README.md
@@ -1,5 +1,15 @@
+## Blog
+
This is my blog.
The code is terrible, but I just don't care. Pull requests welcome, if you feel
like hacking at it. Articles are all in the posts directory, if you want to fix
a typo.
+
+## Usage
+
+```
+$ bundle
+$ bundle exec foreman start
+```
+

0 comments on commit 3cd0f04

Please sign in to comment.