[#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
This commit is contained in:
parent
13de4cc4b0
commit
87d8634b04
|
@ -24,3 +24,5 @@
|
|||
/vendor/rails
|
||||
*.rbc
|
||||
doc/app
|
||||
/.bundle
|
||||
/Gemfile.lock
|
||||
|
|
|
@ -27,3 +27,6 @@ vendor/rails
|
|||
*.rbc
|
||||
.svn/
|
||||
.git/
|
||||
doc/app
|
||||
/.bundle
|
||||
/Gemfile.lock
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
source :rubygems
|
||||
|
||||
gem "rails", "2.3.11"
|
||||
|
||||
gem "coderay", "~> 0.9.7"
|
||||
gem "i18n", "< 0.5" # explicit version 0.4.2 is used in config!
|
||||
gem "ruby-openid"
|
||||
gem "rubytree", "~> 0.5.2", :require => 'tree'
|
||||
|
||||
group :development, :test do
|
||||
gem 'edavis10-object_daddy', :require => 'object_daddy'
|
||||
gem 'mocha'
|
||||
gem 'shoulda', '~> 2.10.3'
|
||||
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.expand_path("../vendor/plugins/*/Gemfile", __FILE__) do |file|
|
||||
puts "Loading #{file} ..."
|
||||
instance_eval File.read(file)
|
||||
end
|
|
@ -36,6 +36,15 @@ module Rails
|
|||
class Boot
|
||||
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
|
||||
end
|
||||
end
|
||||
|
||||
Rails::Initializer.run(:set_load_path)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -50,11 +50,8 @@ Rails::Initializer.run do |config|
|
|||
# It will automatically turn deliveries on
|
||||
config.action_mailer.perform_deliveries = false
|
||||
|
||||
config.gem 'rubytree', :lib => 'tree'
|
||||
config.gem 'coderay', :version => '~>0.9.7'
|
||||
|
||||
# Load any local configuration that is kept out of source control
|
||||
# (e.g. gems, patches).
|
||||
# (e.g. patches).
|
||||
if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
|
||||
instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
|
||||
end
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
begin
|
||||
require "rubygems"
|
||||
require "bundler"
|
||||
rescue LoadError
|
||||
raise "Could not load the bundler gem. Install it with `gem install bundler`."
|
||||
end
|
||||
|
||||
if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
|
||||
raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
|
||||
"Run `gem install bundler` to upgrade."
|
||||
end
|
||||
|
||||
begin
|
||||
# Set up load paths for all bundled gems
|
||||
ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
|
||||
Bundler.setup
|
||||
rescue Bundler::GemNotFound
|
||||
raise RuntimeError, "Bundler couldn't find some gems." +
|
||||
"Did you run `bundle install`?"
|
||||
end
|
Loading…
Reference in New Issue