# HG changeset patch # User Gregor Schmidt # Date 1300479945 -3600 # Node ID 9d5f729ad03112f5dbdf1a8c801a11e43c15aa79 # Parent 8a038ca933a058f94d5655456d5e5c35347af390 [#290] using bundler * following setup instructions from http://gembundler.com/rails23.html * adding generated files to .gitignore and .hgignore * removing config.gem calls * adding Gemfile that should work with all supported dbs and interpreters * removing work-around for rubygems 1.5 deprecation. this seems to be fixed since now bundler handles the gem loading diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,7 @@ /tmp/test/* /vendor/rails *.rbc + +/.bundle +/Gemfile.lock + diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -25,5 +25,10 @@ tmp/sockets/* tmp/test/* vendor/rails *.rbc + .svn/ .git/ + +.bundle +Gemfile.lock + diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source :rubygems source :rubyforge source :gemcutter +gem "ruby-openid" gem 'bundler', '~> 1.0.0' gem 'rails', '2.3.11' gem 'rack' , '~> 1.1.1' @@ -9,13 +10,6 @@ gem 'i18n', '>= 0.4.2' gem 'rubytree', '0.5.2', :require => 'tree' gem 'coderay', '~> 0.9.7' -# Please uncomment lines for your databases. -# Alternatively you may want to add these lines to specific groups below. -# gem 'sqlite3-ruby', :require => 'sqlite3' # for SQLite 3 -# gem 'mysql' # MySQL -# gem 'pg' # PostgreSQL -gem 'pg' - group :development do end @@ -23,11 +17,55 @@ group :production do end group :test do - gem 'shoulda' + gem 'shoulda', '~> 2.10.3' gem 'mocha' gem 'edavis10-object_daddy', :require => 'object_daddy' end + +# Use the commented pure ruby gems, if you have not the needed prerequisites on +# board to compile the native ones. Note, that their use is discouraged, since +# their integration is propbably not that well tested and their are slower in +# orders of magnitude compared to their native counterparts. You have been +# warned. +# +platforms :mri do + group :mysql do + gem "mysql" + # gem "ruby-mysql" + end + + group :mysql2 do + gem "mysql2" + end + + group :postgres do + gem "pg", "~> 0.9.0" + # gem "postgres-pr" + end + + group :sqlite do + gem "sqlite3-ruby", "< 1.3", :require => "sqlite3" + # please tell me, if you are fond of a pure ruby sqlite3 binding + end +end + +platforms :jruby do + gem "jruby-openssl" + + group :mysql do + gem "activerecord-jdbcmysql-adapter" + end + + group :postgres do + gem "activerecord-jdbcpostgresql-adapter" + end + + group :sqlite do + gem "activerecord-jdbcsqlite3-adapter" + end +end + # Load plugins Gemfiles Dir.glob(File.join(File.dirname(__FILE__), %w(vendor plugins * Gemfile))) do |file| puts "Loading #{file} ..." diff --git a/config/boot.rb b/config/boot.rb --- a/config/boot.rb +++ b/config/boot.rb @@ -37,6 +37,8 @@ module Rails def run load_initializer + # This block was added for bundler support while following setup + # instructions from http://gembundler.com/rails23.html Rails::Initializer.class_eval do def load_gems @bundler_loaded ||= Bundler.require :default, Rails.env diff --git a/config/environments/test.rb b/config/environments/test.rb --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -23,7 +23,3 @@ config.action_controller.session = { # Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application config.action_controller.allow_forgery_protection = false - -config.gem "shoulda", :version => "~> 2.10.3" -config.gem "edavis10-object_daddy", :lib => "object_daddy" -config.gem "mocha" # HG changeset patch # User Gregor Schmidt # Date 1300479989 -3600 # Node ID 00945dc6c883917d5c8b47ba61b07d5b5fa89651 # Parent 6d8973cae664ab4142f705704e1c88cbc0bcddf6 [#290] ignoring .rvmrc files diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ /.bundle /Gemfile.lock +/.rvmrc* diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -31,4 +31,5 @@ vendor/rails .bundle Gemfile.lock +.rvmrc* # HG changeset patch # User Gregor Schmidt # Date 1300550638 -3600 # Node ID f33564aa321f485ac40941d1652ab6b077f95ff6 # Parent 00945dc6c883917d5c8b47ba61b07d5b5fa89651 [#290] making openid opt-out by adding it to a group diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,6 @@ source :rubygems source :rubyforge source :gemcutter -gem "ruby-openid" gem 'bundler', '~> 1.0.0' gem 'rails', '2.3.11' gem 'rack' , '~> 1.1.1' @@ -22,6 +21,9 @@ group :test do gem 'edavis10-object_daddy', :require => 'object_daddy' end +group :openid do + gem "ruby-openid", '~> 2.1.4', :require => 'openid' +end # Use the commented pure ruby gems, if you have not the needed prerequisites on # board to compile the native ones. Note, that their use is discouraged, since # HG changeset patch # User Gregor Schmidt # Date 1300551149 -3600 # Node ID e3f981ce9315a7242b7602afb02cee2092862982 # Parent f33564aa321f485ac40941d1652ab6b077f95ff6 [#290] Adding rmagick, making it opt-out using version < 2.0 since later versions do not work w/o backports on Debian Lenny diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,10 @@ group :openid do gem "ruby-openid", '~> 2.1.4', :require => 'openid' end +group :rmagick do + gem "rmagick", "~> 1.15.17" +end + # Use the commented pure ruby gems, if you have not the needed prerequisites on # board to compile the native ones. Note, that their use is discouraged, since # their integration is propbably not that well tested and their are slower in # HG changeset patch # User Gregor Schmidt # Date 1305009757 -7200 # Node ID fd4de12f23dfef885f70d1cfc566ae8b6fa47f1a # Parent e3f981ce9315a7242b7602afb02cee2092862982 Pinning mysql2 gem to 0.2 branch, since 0.3 and the following are Rails 3 only diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ platforms :mri do end group :mysql2 do - gem "mysql2" + gem "mysql2", "~> 0.2.7" end group :postgres do # HG changeset patch # User Eric Davis # Date 1305303449 25200 # Node ID 8e0b237e3e642abb08c995625174c983aedbe7d5 # Parent fd4de12f23dfef885f70d1cfc566ae8b6fa47f1a [#290] Only print the plugin Gemfile messages when $DEBUG is set diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -74,6 +74,6 @@ end # Load plugins Gemfiles Dir.glob(File.join(File.dirname(__FILE__), %w(vendor plugins * Gemfile))) do |file| - puts "Loading #{file} ..." + puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v` instance_eval File.read(file) end