Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Switching to Thin

  • Loading branch information...
commit 8aae37e50df0f25027742c3e2c0509a0e181b785 1 parent 84f3efa
Travis Graham tgraham authored
Showing with 42 additions and 43 deletions.
  1. +1 −1  Gemfile
  2. +39 −40 Gemfile.lock
  3. +2 −2 script/setup_mac
2  Gemfile
View
@@ -19,7 +19,7 @@ gem 'jquery-rails', "~> 1.0.12"
gem 'airbrake', "~> 3.0.9"
gem 'bcrypt-ruby', "~> 3.0.0"
-gem 'unicorn', "~> 4.0.1"
+gem 'thin', "~> 1.5.0"
gem 'omniauth', "~> 1.1.0"
gem "omniauth-twitter", "~> 0.0.12"
79 Gemfile.lock
View
@@ -69,11 +69,11 @@ GEM
activesupport
builder
arel (3.0.2)
- bcrypt-ruby (3.0.0)
+ bcrypt-ruby (3.0.1)
bson (1.6.2)
bson_ext (1.6.2)
bson (~> 1.6.2)
- builder (3.0.0)
+ builder (3.0.3)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -81,9 +81,9 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.4)
+ childprocess (0.3.5)
ffi (~> 1.0, >= 1.0.6)
- chunky_png (1.2.5)
+ chunky_png (1.2.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -97,43 +97,43 @@ GEM
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
- crack (0.1.8)
+ crack (0.3.1)
daemons (1.1.9)
database_cleaner (0.6.7)
draper (0.11.1)
activesupport (>= 2.3.10)
erubis (2.7.0)
+ eventmachine (1.0.0)
exceptional (2.0.32)
rack
- execjs (1.2.4)
+ execjs (1.4.0)
multi_json (~> 1.0)
fabrication (1.2.0)
- faraday (0.8.2)
+ faraday (0.8.4)
multipart-post (~> 1.1)
- ffi (1.1.0)
+ ffi (1.1.5)
fssm (0.2.9)
haml (3.1.7)
- haml-rails (0.3.4)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- haml (~> 3.0)
- railties (~> 3.0)
+ haml-rails (0.3.5)
+ actionpack (>= 3.1, < 4.1)
+ activesupport (>= 3.1, < 4.1)
+ haml (~> 3.1)
+ railties (>= 3.1, < 4.1)
hashie (1.2.0)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (1.0.12)
+ jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- jquery-ui-rails (2.0.0)
+ jquery-ui-rails (2.0.1)
jquery-rails
railties (>= 3.1.0)
- json (1.7.4)
- kgio (2.6.0)
+ json (1.7.5)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.3.10.4)
- libwebsocket (0.1.4)
+ libwebsocket (0.1.5)
addressable
libxml-ruby (2.3.3)
mail (2.4.4)
@@ -143,7 +143,7 @@ GEM
metaclass (0.0.1)
mime-types (1.19)
minitest (2.12.1)
- mocha (0.11.1)
+ mocha (0.11.4)
metaclass (~> 0.0.1)
mongo (1.6.2)
bson (~> 1.6.2)
@@ -154,38 +154,38 @@ GEM
multi_json (1.3.6)
multipart-post (1.1.5)
mustache (0.99.4)
- newrelic_rpm (3.3.1)
+ newrelic_rpm (3.3.5)
nokogiri (1.5.5)
- oauth (0.4.6)
- omniauth (1.1.0)
+ oauth (0.4.7)
+ omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
- omniauth-twitter (0.0.12)
+ omniauth-twitter (0.0.13)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
opub (0.0.1)
- ostatus (0.0.11)
+ ostatus (0.0.12)
ratom (~> 0.7.0)
osub (0.0.7)
ostatus
ruby-hmac
- plucky (0.5.1)
+ plucky (0.5.2)
mongo (~> 1.5)
polyglot (0.3.3)
- pony (1.3)
+ pony (1.4)
mail (> 2.0)
pygmentize (0.0.3)
- quiet_assets (1.0.0)
- rails (~> 3.1)
+ quiet_assets (1.0.1)
+ railties (~> 3.1)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
@@ -202,7 +202,6 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- raindrops (0.7.0)
rake (0.9.2.2)
ratom (0.7.2)
libxml-ruby (~> 2.3.2)
@@ -225,7 +224,7 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- show_me_the_cookies (1.1.0)
+ show_me_the_cookies (1.1.3)
capybara (~> 1.0)
simple_oauth (0.1.9)
simplecov (0.4.2)
@@ -235,9 +234,13 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.9.9)
+ therubyracer (0.9.10)
libv8 (~> 3.3.10)
- thor (0.15.4)
+ thin (1.5.0)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
+ thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
@@ -247,13 +250,9 @@ GEM
multi_json (~> 1.3)
simple_oauth (~> 0.1.6)
tzinfo (0.3.33)
- uglifier (1.0.0)
+ uglifier (1.0.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.0.1)
- kgio (~> 2.4)
- rack
- raindrops (~> 0.6)
vcr (1.10.3)
webmock (1.6.4)
addressable (~> 2.2, > 2.2.5)
@@ -312,10 +311,10 @@ DEPENDENCIES
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
therubyracer (~> 0.9.9)
+ thin (~> 1.5.0)
twitter (~> 3.5.0)
tzinfo (~> 0.3.29)
uglifier (~> 1.0.0)
- unicorn (~> 4.0.1)
vcr (~> 1.10.3)
webmock (~> 1.6.4)
whenever (~> 0.6.8)
4 script/setup_mac
View
@@ -62,9 +62,9 @@ echo
# Start the server and open the site
echo "### Setup complete, starting the sever and opening localhost ###"
echo
-rails server -d
+thin start -d
open http://localhost:3000
-PID=$(ps aux | grep "rails server -d" | grep -v grep | awk '{print $2}')
+PID=$(ps aux | grep "thin server" | grep -v grep | awk '{print $2}')
echo "### To stop the server, run kill -9 $PID ###"
echo
Please sign in to comment.
Something went wrong with that request. Please try again.