redmine_with_bundler_1.0.001.patch

Toshi MARUYAMA, 2011-06-13 16:03

Download (6.8 KB)

View differences:

.gitignore
23 23
/tmp/test/*
24 24
/vendor/rails
25 25
*.rbc
26

  
27
/.bundle
28
/Gemfile.lock
29

  
.hgignore
25 25
tmp/test/*
26 26
vendor/rails
27 27
*.rbc
28

  
28 29
.svn/
29 30
.git/
31

  
32
.bundle
33
Gemfile.lock
34

  
Gemfile
2 2
source :rubyforge
3 3
source :gemcutter
4 4

  
5
gem "ruby-openid"
5 6
gem 'bundler', '~> 1.0.0'
6 7
gem 'rails', '2.3.11'
7 8
gem 'rack' , '~> 1.1.1'
......
9 10
gem 'rubytree', '0.5.2', :require => 'tree'
10 11
gem 'coderay', '~> 0.9.7'
11 12

  
12
# Please uncomment lines for your databases.
13
# Alternatively you may want to add these lines to specific groups below.
14
# gem 'sqlite3-ruby', :require => 'sqlite3'  # for SQLite 3
15
# gem 'mysql'                                #     MySQL
16
# gem 'pg'                                   #     PostgreSQL
17
gem 'pg'
18

  
19 13
group :development do
20 14
end
21 15

  
......
23 17
end
24 18

  
25 19
group :test do
26
  gem 'shoulda'
20
  gem 'shoulda', '~> 2.10.3'
27 21
  gem 'mocha'
28 22
  gem 'edavis10-object_daddy', :require => 'object_daddy'
29 23
end
30 24

  
25

  
26
# Use the commented pure ruby gems, if you have not the needed prerequisites on
27
# board to compile the native ones.  Note, that their use is discouraged, since
28
# their integration is propbably not that well tested and their are slower in
29
# orders of magnitude compared to their native counterparts. You have been
30
# warned.
31
#
32
platforms :mri do
33
  group :mysql do
34
    gem "mysql"
35
    #   gem "ruby-mysql"
36
  end
37

  
38
  group :mysql2 do
39
    gem "mysql2"
40
  end
41

  
42
  group :postgres do
43
    gem "pg", "~> 0.9.0"
44
    #   gem "postgres-pr"
45
  end
46

  
47
  group :sqlite do
48
    gem "sqlite3-ruby", "< 1.3", :require => "sqlite3"
49
    #   please tell me, if you are fond of a pure ruby sqlite3 binding
50
  end
51
end
52

  
53
platforms :jruby do
54
  gem "jruby-openssl"
55

  
56
  group :mysql do
57
    gem "activerecord-jdbcmysql-adapter"
58
  end
59

  
60
  group :postgres do
61
    gem "activerecord-jdbcpostgresql-adapter"
62
  end
63

  
64
  group :sqlite do
65
    gem "activerecord-jdbcsqlite3-adapter"
66
  end
67
end
68

  
31 69
# Load plugins Gemfiles
32 70
Dir.glob(File.join(File.dirname(__FILE__), %w(vendor plugins * Gemfile))) do |file|
33 71
  puts "Loading #{file} ..."
config/boot.rb
37 37
    def run
38 38
      load_initializer
39 39

  
40
      # This block was added for bundler support while following setup
41
      # instructions from http://gembundler.com/rails23.html
40 42
      Rails::Initializer.class_eval do
41 43
        def load_gems
42 44
          @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"
.gitignore
26 26

  
27 27
/.bundle
28 28
/Gemfile.lock
29
/.rvmrc*
29 30

  
.hgignore
31 31

  
32 32
.bundle
33 33
Gemfile.lock
34
.rvmrc*
34 35

  
Gemfile
2 2
source :rubyforge
3 3
source :gemcutter
4 4

  
5
gem "ruby-openid"
6 5
gem 'bundler', '~> 1.0.0'
7 6
gem 'rails', '2.3.11'
8 7
gem 'rack' , '~> 1.1.1'
......
22 21
  gem 'edavis10-object_daddy', :require => 'object_daddy'
23 22
end
24 23

  
24
group :openid do
25
  gem "ruby-openid", '~> 2.1.4', :require => 'openid'
26
end
25 27

  
26 28
# Use the commented pure ruby gems, if you have not the needed prerequisites on
27 29
# board to compile the native ones.  Note, that their use is discouraged, since
Gemfile
25 25
  gem "ruby-openid", '~> 2.1.4', :require => 'openid'
26 26
end
27 27

  
28
group :rmagick do
29
  gem "rmagick", "~> 1.15.17"
30
end
31

  
28 32
# Use the commented pure ruby gems, if you have not the needed prerequisites on
29 33
# board to compile the native ones.  Note, that their use is discouraged, since
30 34
# their integration is propbably not that well tested and their are slower in
Gemfile
42 42
  end
43 43

  
44 44
  group :mysql2 do
45
    gem "mysql2"
45
    gem "mysql2", "~> 0.2.7"
46 46
  end
47 47

  
48 48
  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