Permalink
Browse files

updated .gems manifest

  • Loading branch information...
1 parent 1237bfc commit 50f3478afe2fdf0ffb46ec3c192fcc881d95fcdf @cyx cyx committed Mar 13, 2010
Showing with 14 additions and 6 deletions.
  1. +3 −2 .gems
  2. +4 −3 Rakefile
  3. +7 −1 init.rb
View
5 .gems
@@ -24,15 +24,16 @@ hashie --version 0.1.8
hoe --version 2.5.0
httparty --version 0.5.2
httparty --version 0.4.5
-image_science --version 1.2.1
+json --version 1.2.3
mime-types --version 1.16
oauth --version 0.3.6
+rake --version 0.8.7
rmagick --version 2.12.2
ruby-hmac --version 0.4.0
ruby_core_source --version 0.1.4
rubyforge --version 2.0.4
-RubyInline --version 3.8.4
sinatra --version 1.0.b
twitter --version 0.8.4
twitter-login --version 0.2.0
xml-simple --version 1.0.12
+pg
View
@@ -37,6 +37,7 @@ task :create_heroku_gems_manifest do
gems.each do |name, version|
f.write "#{name} --version #{version}\n"
end
+ f.write "pg"
end
puts " => Created .gems"
@@ -45,8 +46,8 @@ end
desc "Deploy to heroku"
task :deploy => :create_heroku_gems_manifest do
- `cp .git/config .gitgithub`
- `cp .githeroku .git/config`
+ # `cp .git/config .gitgithub`
+ # `cp .githeroku .git/config`
- `git add . && git commit -m "updated .gems manifest" && git push origin master`
+ `git add . && git commit -m "updated .gems manifest" && git push heroku-staging master`
end
View
@@ -12,7 +12,13 @@
require 'active_record'
require 'carrierwave'
require 'carrierwave/orm/activerecord'
-require 'mysql'
+begin
+ require 'mysql'
+rescue LoadError
+ require 'pg'
+rescue LoadError
+ require 'sqlite3-ruby'
+end
Dir[ root_path('config', 'initializers', '*.rb') ].each { |f| require f }

0 comments on commit 50f3478

Please sign in to comment.