From 9cfa74a7f352e13eb7f4f90cb8270fe51f611be5 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Tue, 28 Sep 2010 18:49:15 +0200 Subject: [PATCH] Make gemspec conflict free and add anything that is needed to run the spec. The specs do not pass with haml 2.x, therefore depend on 3.0 or later. However, hanna depends on haml 2.2.14. Removed hanna to get tests passing. Add rake and rdoc as dependencies (which were dependencies of hanna, therefore not needed previously). Depend on rack-test >= 0.5.6 (0.5.5 was a bogus release that keeps the tests from passing). --- sinatra.gemspec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sinatra.gemspec b/sinatra.gemspec index 69f1ec17..e89baeed 100644 --- a/sinatra.gemspec +++ b/sinatra.gemspec @@ -102,9 +102,10 @@ Gem::Specification.new do |s| s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc LICENSE] s.add_dependency 'rack', '>= 1.0' s.add_dependency 'tilt', '~> 1.1' + s.add_development_dependency 'rake' s.add_development_dependency 'shotgun', '~> 0.6' - s.add_development_dependency 'rack-test', '>= 0.3.0' - s.add_development_dependency 'haml', '>= 2.2.11' + s.add_development_dependency 'rack-test', '>= 0.5.6' + s.add_development_dependency 'haml', '>= 3.0' s.add_development_dependency 'builder' s.add_development_dependency 'erubis' s.add_development_dependency 'less' @@ -114,7 +115,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'radius' s.add_development_dependency 'markaby' s.add_development_dependency 'coffee-script' - s.add_development_dependency 'hanna' + s.add_development_dependency 'rdoc' s.has_rdoc = true s.homepage = "http://sinatra.rubyforge.org"