Permalink
Browse files

Merge pull request #107 from technomancy/optional-sqlite

Optional sqlite
  • Loading branch information...
2 parents a533f45 + 0b4b66b commit e7a7266a9a2079ca85225f7a2301d4e6a241aab7 @technomancy technomancy committed Apr 27, 2012
Showing with 18 additions and 27 deletions.
  1. +1 −0 .gitignore
  2. +1 −17 Gemfile
  3. +14 −8 Gemfile.lock
  4. +1 −0 lib/taps/cli.rb
  5. +0 −1 lib/taps/config.rb
  6. +1 −1 taps.gemspec
View
@@ -2,3 +2,4 @@
*.db
.bundle
pkg
+taps-*.gem
View
@@ -1,23 +1,7 @@
source "http://rubygems.org"
# load the gem's dependencies
-# gemspec
-
-# 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"
-
-group :development do
- gem "bacon"
- gem "mocha"
- gem "rack-test"
- gem "rake"
- gem "rcov"
-end
+gemspec
# server-specific dependencies
group :server do
View
@@ -1,3 +1,12 @@
+PATH
+ remote: .
+ specs:
+ taps (0.3.23)
+ rack (>= 1.0.1)
+ rest-client (>= 1.4.0, < 1.7.0)
+ sequel (~> 3.20.0)
+ sinatra (~> 1.0.0)
+
GEM
remote: http://rubygems.org/
specs:
@@ -10,7 +19,7 @@ GEM
hoptoad_notifier (2.4.7)
activesupport
builder
- mime-types (1.16)
+ mime-types (1.18)
mocha (0.9.8)
rake
mysql (2.8.1)
@@ -21,12 +30,12 @@ GEM
rack (>= 1.0)
rake (0.8.7)
rcov (0.9.9)
- rest-client (1.6.1)
+ rest-client (1.6.7)
mime-types (>= 1.16)
sequel (3.20.0)
sinatra (1.0)
rack (>= 1.0)
- sqlite3-ruby (1.3.2)
+ sqlite3 (1.3.6)
thin (1.2.7)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -43,12 +52,9 @@ DEPENDENCIES
mysql (= 2.8.1)
mysql2 (= 0.2.6)
pg (= 0.9.0)
- rack (>= 1.0.1)
rack-test
rake
rcov
- rest-client (>= 1.4.0, < 1.7.0)
- sequel (~> 3.20.0)
- sinatra (~> 1.0.0)
- sqlite3-ruby (~> 1.2)
+ sqlite3 (~> 1.2)
+ taps!
thin (> 1.2.0)
View
@@ -7,6 +7,7 @@
Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || begin
# this is dirty but it solves a weird problem where the tempfile disappears mid-process
+ require 'sqlite3'
$__taps_database = Tempfile.new('taps.db')
$__taps_database.open()
"sqlite://#{$__taps_database.path}"
View
@@ -1,5 +1,4 @@
require 'sequel'
-require 'sqlite3'
require 'taps/version'
Sequel.datetime_class = DateTime
View
@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
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_development_dependency "sqlite3", "~> 1.2"
gem.add_development_dependency "bacon"
gem.add_development_dependency "mocha"
gem.add_development_dependency "rack-test"

0 comments on commit e7a7266

Please sign in to comment.