Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency on older Sinatra version #81

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ source "http://rubygems.org"

# manually load the gem's dependencies for now until
# bundler version on Heroku is upgraded
gem "rack", ">= 1.0.1"
gem "rest-client", ">= 1.4.0", "< 1.7.0"
gem "sequel", "~> 3.20.0"
gem "sinatra", "~> 1.0.0"
gem "sqlite3-ruby" , "~> 1.2"
gem "rack"
gem "rest-client"
gem "sequel"
gem "sinatra"
gem "sqlite3-ruby"

group :development do
gem "bacon"
Expand Down
35 changes: 19 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.0.5)
activesupport (3.0.6)
bacon (1.1.0)
builder (3.0.0)
daemons (1.1.0)
daemons (1.1.2)
eventmachine (0.12.10)
extlib (0.9.15)
hoptoad_notifier (2.4.7)
hoptoad_notifier (2.4.9)
activesupport
builder
mime-types (1.16)
mocha (0.9.8)
rake
mocha (0.9.12)
mysql (2.8.1)
mysql2 (0.2.6)
pg (0.9.0)
rack (1.2.1)
rack (1.2.2)
rack-test (0.5.7)
rack (>= 1.0)
rake (0.8.7)
rcov (0.9.9)
rest-client (1.6.1)
mime-types (>= 1.16)
sequel (3.20.0)
sinatra (1.0)
rack (>= 1.0)
sqlite3-ruby (1.3.2)
thin (1.2.7)
sequel (3.22.0)
sinatra (1.2.3)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
sqlite3 (1.3.3)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.2.2)

PLATFORMS
ruby
Expand All @@ -43,12 +46,12 @@ DEPENDENCIES
mysql (= 2.8.1)
mysql2 (= 0.2.6)
pg (= 0.9.0)
rack (>= 1.0.1)
rack
rack-test
rake
rcov
rest-client (>= 1.4.0, < 1.7.0)
sequel (~> 3.20.0)
sinatra (~> 1.0.0)
sqlite3-ruby (~> 1.2)
rest-client
sequel
sinatra
sqlite3-ruby
thin (> 1.2.0)
2 changes: 1 addition & 1 deletion bin/schema
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby

require 'rubygems'
gem 'sequel', '~> 3.20.0'
gem 'sequel'

$:.unshift File.dirname(__FILE__) + '/../lib'

Expand Down
10 changes: 5 additions & 5 deletions taps.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Gem::Specification.new do |gem|

gem.files = Dir["**/*"].select { |d| d =~ %r{^(README|VERSION|bin/|data/|ext/|lib/|spec/|test/)} }

gem.add_dependency "rack", ">= 1.0.1"
gem.add_dependency "rest-client", ">= 1.4.0", "< 1.7.0"
gem.add_dependency "sequel", "~> 3.20.0"
gem.add_dependency "sinatra", "~> 1.0.0"
gem.add_dependency "sqlite3-ruby", "~> 1.2"
gem.add_dependency "rack"
gem.add_dependency "rest-client"
gem.add_dependency "sequel"
gem.add_dependency "sinatra"
gem.add_dependency "sqlite3-ruby"

gem.add_development_dependency "bacon"
gem.add_development_dependency "mocha"
Expand Down