Minimal changes to deploy on Heroku

harlantwood · harlantwood · commit 8d513b4acdfd · 2012-04-30T02:31:31.000-07:00
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,7 @@ gem "sass"
 gem "json"
 gem "thin"
 gem "RubyInline"
+gem "ZenTest", '<= 4.6.0'   # dependency of RubyInline, newer versions break Heroku deploy
 gem "png"
 gem "rest-client"
 gem "ruby-openid"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     RubyInline (3.11.0)
       ZenTest (~> 4.3)
-    ZenTest (4.6.2)
+    ZenTest (4.6.0)
     archive-tar-minitar (0.5.2)
     capybara (1.1.1)
       mime-types (>= 1.16)
@@ -96,6 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   RubyInline
+  ZenTest (<= 4.6.0)
   capybara
   couchrest
   haml
diff --git a/config.ru b/config.ru
@@ -0,0 +1,2 @@
+require File.expand_path('server/sinatra/server', File.dirname(__FILE__))
+run Controller

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+require File.expand_path('server/sinatra/server', File.dirname(__FILE__))`
	`2`	`+run Controller`