Permalink
Browse files

Update config

  • Loading branch information...
1 parent eee6dc2 commit 11af90ca7238678b82a8f510529794304ebd7bd3 @wrr committed Jan 24, 2013
Showing with 74 additions and 77 deletions.
  1. +0 −1 .gitignore
  2. +5 −23 Gemfile
  3. +67 −53 Gemfile.lock
  4. +2 −0 Procfile
View
@@ -20,7 +20,6 @@ tmp/*
/coverage/
nbproject
public/cache/*
-Gemfile.lock
.rbenv-version
bin/
.bundle/
View
28 Gemfile
@@ -1,27 +1,7 @@
-env = ENV["RAILS_ENV"] || 'development'
-dbfile = File.expand_path("../config/database.yml", __FILE__)
+source "https://rubygems.org"
+ruby "1.9.3"
-unless File.exists?(dbfile)
- raise "You need to configure config/database.yml first"
-else
- require 'erb'
- conf = YAML.load(ERB.new(File.read(dbfile)).result)
- environment = conf[env]
- adapter = environment['adapter'] if environment
- raise "You need define an adapter in your database.yml or set your RAILS_ENV variable" if adapter == '' || adapter.nil?
- case adapter
- when 'sqlite3'
- gem 'sqlite3'
- when 'postgresql'
- gem 'pg'
- when 'mysql2'
- gem 'mysql2'
- else
- raise "Don't know what gem to use for adapter #{adapter}"
- end
-end
-
-source :rubygems
+gem 'pg'
gem 'rails', '~> 3.2.11'
gem 'require_relative'
@@ -54,3 +34,5 @@ group :development, :test do
gem 'rspec-rails', '~> 2.12.0'
gem 'simplecov', :require => false
end
+
+gem 'thin'
View
@@ -5,120 +5,128 @@ GIT
prototype_legacy_helper (0.0.0)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
- mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ 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.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
- 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)
- acts_as_list (0.1.9)
+ acts_as_list (0.2.0)
+ activerecord (>= 3.0)
acts_as_tree_rails3 (0.1.0)
- addressable (2.3.2)
+ addressable (2.3.3)
arel (3.0.2)
bluecloth (2.2.0)
builder (3.0.4)
coderay (0.9.8)
+ daemons (1.1.9)
diff-lcs (1.1.3)
dynamic_form (1.1.4)
erubis (2.7.0)
- excon (0.16.10)
+ eventmachine (1.0.3)
+ excon (0.20.1)
factory_girl (3.6.2)
activesupport (>= 3.0.0)
flickraw (0.9.6)
flickraw-cached (20120701)
flickraw (>= 0.9)
- fog (1.9.0)
+ fog (1.10.1)
builder
- excon (~> 0.14)
+ excon (~> 0.20)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
- net-scp (~> 1.0.4)
+ net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.4)
- hike (1.2.1)
+ hike (1.2.2)
htmlentities (4.3.1)
i18n (0.6.1)
journey (1.0.4)
- json (1.7.6)
+ json (1.7.7)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
+ mime-types (1.22)
mini_magick (1.3.3)
subexec (~> 0.0.4)
- multi_json (1.5.0)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-ssh (2.6.3)
- nokogiri (1.5.6)
- pg (0.14.1)
+ multi_json (1.7.2)
+ net-http-persistent (2.8)
+ net-scp (1.1.0)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.6.7)
+ nokogiri (1.5.9)
+ pg (0.15.1)
polyglot (0.3.3)
prototype-rails (3.2.1)
rails (~> 3.2)
- rack (1.4.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rack-wwwhisper (1.1.6)
+ addressable (~> 2.0)
+ net-http-persistent
+ rack (~> 1.0)
+ 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.11)
+ railties (= 3.2.13)
rails_autolink (1.0.9)
rails (~> 3.1)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ 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)
- rake (10.0.3)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
- recaptcha (0.3.4)
+ recaptcha (0.3.5)
require_relative (1.0.3)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.1)
+ rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -138,12 +146,16 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
subexec (0.0.4)
- thor (0.16.0)
- tilt (1.3.3)
+ thin (1.5.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
+ thor (0.18.1)
+ tilt (1.3.7)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uuidtools (2.1.3)
webrat (0.7.3)
nokogiri (>= 1.2.0)
@@ -170,6 +182,7 @@ DEPENDENCIES
pg
prototype-rails (~> 3.2.1)
prototype_legacy_helper (= 0.0.0)!
+ rack-wwwhisper (~> 1.0)
rails (~> 3.2.11)
rails_autolink (~> 1.0.9)
rake (~> 10.0.2)
@@ -178,5 +191,6 @@ DEPENDENCIES
rspec-rails (~> 2.12.0)
rubypants (~> 0.2.0)
simplecov
+ thin
uuidtools (~> 2.1.1)
webrat
View
@@ -0,0 +1,2 @@
+web: bundle exec rails server thin -p $PORT
+# -e $RACK_ENV

0 comments on commit 11af90c

Please sign in to comment.