redmine-bundler-20110618.diff - Redmine

.gitignore
23	23	/tmp/test/*
24	24	/vendor/rails
25	25	*.rbc
	26
	27	/.bundle
	28	/Gemfile.lock
	29

     tmp/test/*
     vendor/rails
     *.rbc
     .svn/
     .git/
     .bundle
     Gemfile.lock

     source :rubygems
     source :rubyforge
     source :gemcutter
     gem 'bundler', '~> 1.0.0'
     gem 'rails', '2.3.11'
     gem 'rack' , '~> 1.1.1'
     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
     group :production do
     end
     group :test do
       gem 'shoulda'
       gem 'mocha'
       gem 'edavis10-object_daddy', :require => 'object_daddy'
     end
     # Load plugins Gemfiles
     Dir.glob(File.join(File.dirname(__FILE__), %w(vendor plugins * Gemfile))) do |file|
       puts "Loading #{file} ..."
       instance_eval File.read(file)
     end

       class Boot
         def run
           load_initializer
           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
-...
       end
     end
     # TODO: Workaround for #7013 to be removed for 1.2.0
     # Loads i18n 0.4.2 before Rails loads any more recent gem
     # 0.5.0 is not compatible with the old interpolation syntax
     # Plugins will have to migrate to the new syntax for 1.2.0
     require 'rubygems'
     begin
       gem 'i18n', '0.4.2'
     rescue Gem::LoadError => load_error
       $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
       exit 1
     end
     # All that for this:
     Rails.boot!

       # Define your email configuration in configuration.yml instead.
       # 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).

     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.25")
       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

     source :rubyforge
     source :gemcutter
     gem "ruby-openid"
     gem 'bundler', '~> 1.0.0'
     gem 'rails', '2.3.11'
     gem 'rack' , '~> 1.1.1'
-...
     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
-...
     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} ..."

         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

config/environments/test.rb
23	23
24	24	# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application
25	25	config.action_controller.allow_forgery_protection = false
26
27		config.gem "shoulda", :version => "~> 2.10.3"
28		config.gem "edavis10-object_daddy", :lib => "object_daddy"
29		config.gem "mocha"

     source :rubyforge
     source :gemcutter
     gem "ruby-openid"
     gem 'bundler', '~> 1.0.0'
     gem 'rails', '2.3.11'
     gem 'rack' , '~> 1.1.1'
-...
       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

       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

       end
       group :mysql2 do
         gem "mysql2"
         gem "mysql2", "~> 0.2.7"
       end
       group :postgres do

Gemfile
74	74
75	75	# Load plugins Gemfiles
76	76	Dir.glob(File.join(File.dirname(__FILE__), %w(vendor plugins * Gemfile))) do \|file\|
77		puts "Loading #{file} ..."
	77	puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
78	78	instance_eval File.read(file)
79	79	end

Project

General

Profile

Redmine

Feature #5638 » redmine-bundler-20110618.diff