Rack 0.4 (remove vendor submodule)

Use Rack gem instead of freezing.
sinatra · Aug 31, 2008 · 7be3682 · 7be3682
1 parent cb0165f
commit 7be3682
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "vendor/rack"]
-	path = vendor/rack
-	url = git://github.com/chneukirchen/rack-mirror.git

diff --git a/lib/sinatra.rb b/lib/sinatra.rb
@@ -1,13 +1,7 @@
-Dir[File.dirname(__FILE__) + "/../vendor/*"].each do |l|
-  $:.unshift "#{File.expand_path(l)}/lib"
-end
-
-require 'rack'
-
-require 'rubygems'
 require 'time'
 require 'ostruct'
-require "uri"
+require 'uri'
+require 'rack'
 
 if ENV['SWIFT']
  require 'swiftcore/swiftiplied_mongrel'

diff --git a/test/events_test.rb b/test/events_test.rb
@@ -1,7 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/sinatra'
-
-require 'rubygems'
-require 'test/spec'
+require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
 

diff --git a/test/helper.rb b/test/helper.rb
@@ -1,4 +1,7 @@
-require File.dirname(__FILE__) + "/../lib/sinatra"
-require File.dirname(__FILE__) + "/../lib/sinatra/test/spec"
+require 'rubygems'
+require 'mocha'
 
-require "mocha"
+$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
+
+require 'sinatra'
+require 'sinatra/test/spec'