Permalink
Browse files

updated Gemfile

  • Loading branch information...
1 parent 059f8ff commit 7d8f1c3cfd2b33294c616057f9cef81ae74043b4 @4poc 4poc committed Oct 26, 2012
Showing with 45 additions and 33 deletions.
  1. +16 −10 Gemfile
  2. +29 −23 Gemfile.lock
View
26 Gemfile
@@ -1,20 +1,21 @@
source :rubygems
-gem "sinatra"
-gem "shotgun"
-gem "haml"
-gem "sass"
gem "dm-core"
gem "dm-pager"
gem "dm-validations"
gem "dm-timestamps"
gem "dm-migrations"
gem "dm-serializer"
-gem "dm-sqlite-adapter"
+
+gem "sinatra"
+gem "shotgun"
+gem "haml"
+gem "sass"
gem "rack"
gem "rack-flash3", :require => "rack-flash"
gem "rack-pagespeed", :git => 'git://github.com/jessor/rack-pagespeed.git'
gem "sinatra-authentication"
+
gem "builder", ">= 2.1.2"
gem "ruby-filemagic", :require => "filemagic"
gem "mini_magick"
@@ -32,11 +33,16 @@ group :qrencoder do
end
group :phashion do
- # The original gem does include a custom pHash and cImg tarball that is
- # built and then linked during install, this fork gets rid of it and
- # requires both phash and cimg to be installed in the system.
- # NOTE: phashion violates the GPL by linking with GPL code (phash) and
- # using the MIT
gem "phashion", :git => 'git://github.com/4poc/phashion.git'
end
+# dependent on your database configuration:
+
+group :sqlite do
+ gem "dm-sqlite-adapter"
+end
+
+group :mysql do
+ gem "dm-mysql-adapter"
+end
+
View
@@ -17,10 +17,10 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.8)
- builder (3.0.0)
- chunky_png (1.2.5)
- dalli (2.0.5)
- data_objects (0.10.8)
+ builder (3.1.4)
+ chunky_png (1.2.6)
+ dalli (2.3.0)
+ data_objects (0.10.10)
addressable (~> 2.1)
dm-aggregates (1.2.0)
dm-core (~> 1.2.0)
@@ -31,31 +31,36 @@ GEM
dm-core (~> 1.2.0)
dm-migrations (1.2.0)
dm-core (~> 1.2.0)
+ dm-mysql-adapter (1.2.0)
+ dm-do-adapter (~> 1.2.0)
+ do_mysql (~> 0.10.6)
dm-pager (1.1.0)
dm-aggregates (>= 0.10.1)
dm-core (>= 0.10.1)
- dm-serializer (1.2.1)
+ dm-serializer (1.2.2)
dm-core (~> 1.2.0)
- fastercsv (~> 1.5.4)
- json (~> 1.6.1)
- json_pure (~> 1.6.1)
- multi_json (~> 1.0.3)
+ fastercsv (~> 1.5)
+ json (~> 1.6)
+ json_pure (~> 1.6)
+ multi_json (~> 1.0)
dm-sqlite-adapter (1.2.0)
dm-do-adapter (~> 1.2.0)
do_sqlite3 (~> 0.10.6)
dm-timestamps (1.2.0)
dm-core (~> 1.2.0)
dm-validations (1.2.0)
dm-core (~> 1.2.0)
- do_sqlite3 (0.10.8)
- data_objects (= 0.10.8)
- domain_name (0.5.3)
+ do_mysql (0.10.10)
+ data_objects (= 0.10.10)
+ do_sqlite3 (0.10.10)
+ data_objects (= 0.10.10)
+ domain_name (0.5.4)
unf (~> 0.0.3)
fastercsv (1.5.5)
- haml (3.1.6)
+ haml (3.1.7)
jsmin (1.0.1)
- json (1.6.7)
- json_pure (1.6.7)
+ json (1.7.5)
+ json_pure (1.7.5)
mechanize (2.5.1)
domain_name (~> 0.5, >= 0.5.1)
mime-types (~> 1.17, >= 1.17.2)
@@ -64,13 +69,13 @@ GEM
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (~> 0.0, >= 0.0.9)
- mime-types (1.18)
+ mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
- multi_json (1.0.4)
+ multi_json (1.3.6)
net-http-digest_auth (1.2.1)
- net-http-persistent (2.6)
- nokogiri (1.5.3)
+ net-http-persistent (2.8)
+ nokogiri (1.5.5)
ntlm-http (0.1.1)
qrencoder (1.4.1)
chunky_png (~> 1.1)
@@ -85,13 +90,13 @@ GEM
ruby-filemagic (0.4.2)
ruby-oembed (0.8.7)
rufus-tokyo (1.0.7)
- sass (3.1.19)
+ sass (3.2.1)
shotgun (0.9)
rack (>= 1.0)
- sinatra (1.3.2)
- rack (>= 1.3.6, ~> 1.3)
+ sinatra (1.3.3)
+ rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
- tilt (>= 1.3.3, ~> 1.3)
+ tilt (~> 1.3, >= 1.3.3)
sinatra-authentication (0.4.1)
dm-core
dm-migrations
@@ -118,6 +123,7 @@ DEPENDENCIES
builder (>= 2.1.2)
dm-core
dm-migrations
+ dm-mysql-adapter
dm-pager
dm-serializer
dm-sqlite-adapter

0 comments on commit 7d8f1c3

Please sign in to comment.