add .gemspec; remove echoe

.gitignore

@@ -1,6 +1,4 @@
 doc
-pkg
 *.log
 .DS_Store
-Manifest
+/dist
-x.rb

Manifest

@@ -1,122 +0,0 @@
-CHANGELOG
-images/404.png
-images/500.png
-lib/sinatra/test/methods.rb
-lib/sinatra/test/spec.rb
-lib/sinatra/test/unit.rb
-lib/sinatra.rb
-LICENSE
-Manifest
-Rakefile
-README.rdoc
-test/app_test.rb
-test/application_test.rb
-test/builder_test.rb
-test/custom_error_test.rb
-test/diddy_test.rb
-test/erb_test.rb
-test/event_context_test.rb
-test/events_test.rb
-test/haml_test.rb
-test/helper.rb
-test/mapped_error_test.rb
-test/public/foo.xml
-test/rest_test.rb
-test/sass_test.rb
-test/sessions_test.rb
-test/streaming_test.rb
-test/sym_params_test.rb
-test/template_test.rb
-test/use_in_file_templates_test.rb
-test/views/foo.builder
-test/views/foo.erb
-test/views/foo.haml
-test/views/foo.sass
-test/views/foo_layout.erb
-test/views/foo_layout.haml
-test/views/layout_test/foo.builder
-test/views/layout_test/foo.erb
-test/views/layout_test/foo.haml
-test/views/layout_test/foo.sass
-test/views/layout_test/layout.builder
-test/views/layout_test/layout.erb
-test/views/layout_test/layout.haml
-test/views/layout_test/layout.sass
-test/views/no_layout/no_layout.builder
-test/views/no_layout/no_layout.haml
-vendor/rack/AUTHORS
-vendor/rack/bin/rackup
-vendor/rack/contrib/rack_logo.svg
-vendor/rack/COPYING
-vendor/rack/example/lobster.ru
-vendor/rack/example/protectedlobster.rb
-vendor/rack/example/protectedlobster.ru
-vendor/rack/KNOWN-ISSUES
-vendor/rack/lib/rack/adapter/camping.rb
-vendor/rack/lib/rack/auth/abstract/handler.rb
-vendor/rack/lib/rack/auth/abstract/request.rb
-vendor/rack/lib/rack/auth/basic.rb
-vendor/rack/lib/rack/auth/digest/md5.rb
-vendor/rack/lib/rack/auth/digest/nonce.rb
-vendor/rack/lib/rack/auth/digest/params.rb
-vendor/rack/lib/rack/auth/digest/request.rb
-vendor/rack/lib/rack/auth/openid.rb
-vendor/rack/lib/rack/builder.rb
-vendor/rack/lib/rack/cascade.rb
-vendor/rack/lib/rack/commonlogger.rb
-vendor/rack/lib/rack/file.rb
-vendor/rack/lib/rack/handler/cgi.rb
-vendor/rack/lib/rack/handler/fastcgi.rb
-vendor/rack/lib/rack/handler/lsws.rb
-vendor/rack/lib/rack/handler/mongrel.rb
-vendor/rack/lib/rack/handler/scgi.rb
-vendor/rack/lib/rack/handler/webrick.rb
-vendor/rack/lib/rack/lint.rb
-vendor/rack/lib/rack/lobster.rb
-vendor/rack/lib/rack/mock.rb
-vendor/rack/lib/rack/recursive.rb
-vendor/rack/lib/rack/reloader.rb
-vendor/rack/lib/rack/request.rb
-vendor/rack/lib/rack/response.rb
-vendor/rack/lib/rack/session/abstract/id.rb
-vendor/rack/lib/rack/session/cookie.rb
-vendor/rack/lib/rack/session/memcache.rb
-vendor/rack/lib/rack/session/pool.rb
-vendor/rack/lib/rack/showexceptions.rb
-vendor/rack/lib/rack/showstatus.rb
-vendor/rack/lib/rack/static.rb
-vendor/rack/lib/rack/urlmap.rb
-vendor/rack/lib/rack/utils.rb
-vendor/rack/lib/rack.rb
-vendor/rack/Rakefile
-vendor/rack/README
-vendor/rack/test/cgi/lighttpd.conf
-vendor/rack/test/cgi/test
-vendor/rack/test/cgi/test.fcgi
-vendor/rack/test/cgi/test.ru
-vendor/rack/test/spec_rack_auth_basic.rb
-vendor/rack/test/spec_rack_auth_digest.rb
-vendor/rack/test/spec_rack_builder.rb
-vendor/rack/test/spec_rack_camping.rb
-vendor/rack/test/spec_rack_cascade.rb
-vendor/rack/test/spec_rack_cgi.rb
-vendor/rack/test/spec_rack_commonlogger.rb
-vendor/rack/test/spec_rack_fastcgi.rb
-vendor/rack/test/spec_rack_file.rb
-vendor/rack/test/spec_rack_lint.rb
-vendor/rack/test/spec_rack_lobster.rb
-vendor/rack/test/spec_rack_mock.rb
-vendor/rack/test/spec_rack_mongrel.rb
-vendor/rack/test/spec_rack_recursive.rb
-vendor/rack/test/spec_rack_request.rb
-vendor/rack/test/spec_rack_response.rb
-vendor/rack/test/spec_rack_session_cookie.rb
-vendor/rack/test/spec_rack_session_memcache.rb
-vendor/rack/test/spec_rack_session_pool.rb
-vendor/rack/test/spec_rack_showexceptions.rb
-vendor/rack/test/spec_rack_showstatus.rb
-vendor/rack/test/spec_rack_static.rb
-vendor/rack/test/spec_rack_urlmap.rb
-vendor/rack/test/spec_rack_utils.rb
-vendor/rack/test/spec_rack_webrick.rb
-vendor/rack/test/testrequest.rb

Rakefile

@@ -1,14 +1,46 @@
-require 'rubygems'
+require 'rake/clean'
-require 'echoe'
 
 task :default => :test
 
-Echoe.new("sinatra") do |p|
+# SPECS ===============================================================
-  p.author = "Blake Mizerany"
+
-  p.summary = "Classy web-development dressed in a DSL"
+desc 'Run specs with story style output'
-  p.url = "http://www.sinatrarb.com"
+task :spec do
-  p.docs_host = "sinatrarb.com:/var/www/blakemizerany.com/public/docs/"
+  sh 'specrb --specdox -Ilib:test test/*_test.rb'
-  p.dependencies = ["mongrel >=1.0.1"]
+end
-  p.install_message = "*** Be sure to checkout the site for helpful tips!  sinatrarb.com ***"
+
-  p.include_rakefile = true
+desc 'Run specs with unit test style output'
+task :test => FileList['test/*_test.rb'] do |t|
+  suite = t.prerequisites.map{|f| "-r#{f.chomp('.rb')}"}.join(' ')
+  sh "ruby -Ilib:test #{suite} -e ''", :verbose => false
+end
+
+# PACKAGING ============================================================
+
+def spec
+  @spec ||=
+    eval(File.read('sinatra.gemspec'))
+end
+
+def package(ext='')
+  "dist/sinatra-#{spec.version}" + ext
+end
+
+desc 'Build packages'
+task :package => %w[.gem .tar.gz].map {|e| package(e)}
+
+desc 'Build and install as local gem'
+task :install => package('.gem') do
+  sh "gem install #{package('.gem')}"
+end
+
+directory 'dist/'
+
+file package('.gem') => %w[dist/ sinatra.gemspec] + spec.files do |f|
+  sh "gem build sinatra.gemspec"
+  mv File.basename(f.name), f.name
+end
+
+file package('.tar.gz') => %w[dist/] + spec.files do |f|
+  sh "git archive --format=tar HEAD | gzip > #{f.name}"
 end

sinatra.gemspec

@@ -0,0 +1,73 @@
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+
+  s.name = 'sinatra'
+  s.version = '0.3.0'
+  s.date = "2008-08-31"
+
+  s.description = "Classy web-development dressed in a DSL"
+  s.summary     = "Classy web-development dressed in a DSL"
+
+  s.authors = ["Blake Mizerany"]
+
+  # git ls-files | grep -v '^\.'
+  s.files = %w[
+    images/404.png
+    images/500.png
+    lib/sinatra/test/methods.rb
+    lib/sinatra/test/spec.rb
+    lib/sinatra/test/unit.rb
+    lib/sinatra.rb
+    LICENSE
+    Rakefile
+    README.rdoc
+    test/app_test.rb
+    test/application_test.rb
+    test/builder_test.rb
+    test/custom_error_test.rb
+    test/diddy_test.rb
+    test/erb_test.rb
+    test/event_context_test.rb
+    test/events_test.rb
+    test/haml_test.rb
+    test/helper.rb
+    test/mapped_error_test.rb
+    test/public/foo.xml
+    test/rest_test.rb
+    test/sass_test.rb
+    test/sessions_test.rb
+    test/streaming_test.rb
+    test/sym_params_test.rb
+    test/template_test.rb
+    test/use_in_file_templates_test.rb
+    test/views/foo.builder
+    test/views/foo.erb
+    test/views/foo.haml
+    test/views/foo.sass
+    test/views/foo_layout.erb
+    test/views/foo_layout.haml
+    test/views/layout_test/foo.builder
+    test/views/layout_test/foo.erb
+    test/views/layout_test/foo.haml
+    test/views/layout_test/foo.sass
+    test/views/layout_test/layout.builder
+    test/views/layout_test/layout.erb
+    test/views/layout_test/layout.haml
+    test/views/layout_test/layout.sass
+    test/views/no_layout/no_layout.builder
+    test/views/no_layout/no_layout.haml
+  ]
+
+  s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
+
+  s.extra_rdoc_files = %w[README.rdoc LICENSE]
+  s.add_dependency 'rack', '>= 0.4.0'
+
+  s.has_rdoc = true
+  s.homepage = "http://www.sinatrarb.com"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rack::Cache", "--main", "Rack::Cache"]
+  s.require_paths = %w[lib]
+  s.rubyforge_project = 'sinatra'
+  s.rubygems_version = '1.1.1'
+end