Permalink
Browse files

target Sinatra 1.3

  • Loading branch information...
rkh committed Aug 17, 2011
1 parent c68d567 commit 6d8e69cc6a00ef3ec6475420d16c48cc47b51166
Showing with 24 additions and 10 deletions.
  1. +6 −0 Gemfile
  2. +16 −8 Gemfile.lock
  3. +2 −2 sinatra-contrib.gemspec
View
@@ -1,8 +1,14 @@
source "http://rubygems.org" unless ENV['QUICK']
gemspec
+gem 'sinatra', :git => 'git://github.com/sinatra/sinatra'
+
group :development, :test do
platform :ruby_18, :jruby do
gem 'json'
end
+
+ platform :ruby do
+ gem 'yajl-ruby'
+ end
end
View
@@ -1,23 +1,31 @@
+GIT
+ remote: git://github.com/sinatra/sinatra
+ revision: af6b4c5367f0e05c047186787fe961d3c195c5c8
+ specs:
+ sinatra (1.3.0)
+ rack (~> 1.3)
+ tilt (~> 1.3)
+
PATH
remote: .
specs:
- sinatra-contrib (1.2.0)
+ sinatra-contrib (1.3.0)
backports (>= 2.0)
rack-test
- sinatra (~> 1.2.3)
+ sinatra (~> 1.3.0)
tilt (~> 1.3)
GEM
remote: http://rubygems.org/
specs:
- backports (2.2.1)
+ backports (2.3.0)
diff-lcs (1.1.2)
erubis (2.7.0)
haml (3.1.2)
json (1.5.1)
json (1.5.1-java)
- rack (1.3.0)
- rack-test (0.6.0)
+ rack (1.3.2)
+ rack-test (0.6.1)
rack (>= 1.0)
rake (0.9.2)
rspec (2.6.0)
@@ -28,14 +36,12 @@ GEM
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
- sinatra (1.2.6)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
slim (0.9.4)
temple (~> 0.3.0)
tilt (~> 1.2)
temple (0.3.1)
tilt (1.3.2)
+ yajl-ruby (0.8.3)
PLATFORMS
java
@@ -47,5 +53,7 @@ DEPENDENCIES
json
rake
rspec (~> 2.3)
+ sinatra!
sinatra-contrib!
slim
+ yajl-ruby
View
@@ -1,7 +1,7 @@
# Run `rake sinatra-contrib.gemspec` to update the gemspec.
Gem::Specification.new do |s|
s.name = "sinatra-contrib"
- s.version = "1.2.0"
+ s.version = "1.3.0"
s.description = "Collection of useful Sinatra extensions"
s.homepage = "http://github.com/sinatra/sinatra-contrib"
s.summary = s.description
@@ -102,7 +102,7 @@ Gem::Specification.new do |s|
"spec/spec_helper.rb"
]
- s.add_dependency "sinatra", "~> 1.2.3"
+ s.add_dependency "sinatra", "~> 1.3.0"
s.add_dependency "backports", ">= 2.0"
s.add_dependency "tilt", "~> 1.3"
s.add_dependency "rack-test"

0 comments on commit 6d8e69c

Please sign in to comment.