Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Freezing Rack into package to take care of upload issue

  • Loading branch information...
commit a0f5849ded7a1edcb678685928f676402f5df320 1 parent ca9ac7b
Blake Mizerany authored
Showing with 12 additions and 9 deletions.
  1. +3 −0  .gitmodules
  2. +1 −6 Rakefile
  3. +7 −3 lib/sinatra.rb
  4. +1 −0  vendor/rack
View
3  .gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/rack"]
+ path = vendor/rack
+ url = git://github.com/chneukirchen/rack-mirror.git
View
7 Rakefile
@@ -12,17 +12,12 @@ Rake::RDocTask.new do |rd|
rd.rdoc_dir = 'doc'
end
-Rake::TestTask.new do |t|
- ENV['SINATRA_ENV'] = 'test'
- t.pattern = File.dirname(__FILE__) + "/test/*_test.rb"
-end
-
Echoe.new("sinatra") do |p|
p.author = "Blake Mizerany"
p.summary = "Classy web-development dressed in a DSL"
p.url = "http://www.sinatrarb.com"
p.docs_host = "sinatrarb.com:/var/www/blakemizerany.com/public/docs/"
- p.dependencies = ["mongrel >=1.0.1", "rack >= 0.3.0"]
+ p.dependencies = ["mongrel >=1.0.1"]
p.install_message = "*** Be sure to checkout the site for helpful tips! sinatrarb.com ***"
p.include_rakefile = true
end
View
10 lib/sinatra.rb
@@ -1,6 +1,13 @@
+Dir[File.dirname(__FILE__) + "/../vendor/*"].each do |l|
+ $:.unshift "#{File.expand_path(l)}/lib"
+end
+
+require 'rack'
+
require 'rubygems'
require 'uri'
require 'time'
+require 'ostruct'
if ENV['SWIFT']
require 'swiftcore/swiftiplied_mongrel'
@@ -10,9 +17,6 @@
puts "Using Evented Mongrel"
end
-require 'rack'
-require 'ostruct'
-
class Class
def dslify_writer(*syms)
syms.each do |sym|
1  vendor/rack
@@ -0,0 +1 @@
+Subproject commit 67a7507fb07c9d49bf4be4fc6c4fc4578f1673ac

0 comments on commit a0f5849

Please sign in to comment.
Something went wrong with that request. Please try again.