Download as
Browse Code »

Commit cf313c57b6715a640ed69fadab67e5ab2864f853

Authored by Nick Recobra
1 parent 63842378
Exists in master and in 1 other branch production

Massive dependencies update.

Showing 4 changed files with 81 additions and 88 deletions   Show diff stats
.gitignore
  Diff comments   View file @cf313c5
... ... @@ -6,3 +6,4 @@ config/config.yml
6 6 config/deploy.rb
7 7 config/mongoid.yml
8 8 .rvmrc
  9 +*~
... ...
Gemfile
  Diff comments   View file @cf313c5
1 1 source 'http://rubygems.org'
2 2  
3   -gem 'rails', '3.0.0.rc'
  3 +gem 'rails', '3.0.3'
4 4 gem 'libxml-ruby'
5 5 gem 'bson_ext', :require => nil
6   -gem 'mongoid', '2.0.0.beta.15'
  6 +gem 'mongoid', '~> 2.0.0.beta.20'
7 7 gem 'haml'
8 8 gem 'will_paginate'
9   -gem 'devise', '1.1.1'
  9 +gem 'devise', '~> 1.1.3'
10 10  
11 11 group :development, :test do
12   - gem 'rspec-rails', '>= 2.0.0.beta.19'
  12 + gem 'rspec-rails', '~> 2.1'
13 13 end
14 14  
15 15 group :test do
16   - gem 'rspec', '>= 2.0.0.beta.19'
17   - gem 'database_cleaner', '0.5.2'
  16 + gem 'rspec', '~> 2.1'
  17 + gem 'database_cleaner', '~> 0.6.0'
18 18 gem 'factory_girl_rails'
19 19 end
... ...
Gemfile.lock
  Diff comments   View file @cf313c5
... ... @@ -2,40 +2,39 @@ GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4 4 abstract (1.0.0)
5   - actionmailer (3.0.0.rc)
6   - actionpack (= 3.0.0.rc)
7   - mail (~> 2.2.5)
8   - actionpack (3.0.0.rc)
9   - activemodel (= 3.0.0.rc)
10   - activesupport (= 3.0.0.rc)
  5 + actionmailer (3.0.3)
  6 + actionpack (= 3.0.3)
  7 + mail (~> 2.2.9)
  8 + actionpack (3.0.3)
  9 + activemodel (= 3.0.3)
  10 + activesupport (= 3.0.3)
11 11 builder (~> 2.1.2)
12 12 erubis (~> 2.6.6)
13   - i18n (~> 0.4.1)
  13 + i18n (~> 0.4)
14 14 rack (~> 1.2.1)
15   - rack-mount (~> 0.6.9)
16   - rack-test (~> 0.5.4)
17   - tzinfo (~> 0.3.22)
18   - activemodel (3.0.0.rc)
19   - activesupport (= 3.0.0.rc)
  15 + rack-mount (~> 0.6.13)
  16 + rack-test (~> 0.5.6)
  17 + tzinfo (~> 0.3.23)
  18 + activemodel (3.0.3)
  19 + activesupport (= 3.0.3)
20 20 builder (~> 2.1.2)
21   - i18n (~> 0.4.1)
22   - activerecord (3.0.0.rc)
23   - activemodel (= 3.0.0.rc)
24   - activesupport (= 3.0.0.rc)
25   - arel (~> 0.4.0)
26   - tzinfo (~> 0.3.22)
27   - activeresource (3.0.0.rc)
28   - activemodel (= 3.0.0.rc)
29   - activesupport (= 3.0.0.rc)
30   - activesupport (3.0.0.rc)
31   - arel (0.4.0)
32   - activesupport (>= 3.0.0.beta)
  21 + i18n (~> 0.4)
  22 + activerecord (3.0.3)
  23 + activemodel (= 3.0.3)
  24 + activesupport (= 3.0.3)
  25 + arel (~> 2.0.2)
  26 + tzinfo (~> 0.3.23)
  27 + activeresource (3.0.3)
  28 + activemodel (= 3.0.3)
  29 + activesupport (= 3.0.3)
  30 + activesupport (3.0.3)
  31 + arel (2.0.4)
33 32 bcrypt-ruby (2.1.2)
34   - bson (1.0.4)
35   - bson_ext (1.0.4)
  33 + bson (1.1.2)
  34 + bson_ext (1.1.2)
36 35 builder (2.1.2)
37   - database_cleaner (0.5.2)
38   - devise (1.1.1)
  36 + database_cleaner (0.6.0)
  37 + devise (1.1.3)
39 38 bcrypt-ruby (~> 2.1.2)
40 39 warden (~> 0.10.7)
41 40 diff-lcs (1.1.2)
... ... @@ -45,64 +44,58 @@ GEM
45 44 factory_girl_rails (1.0)
46 45 factory_girl (~> 1.3)
47 46 rails (>= 3.0.0.beta4)
48   - haml (3.0.16)
49   - i18n (0.4.1)
  47 + haml (3.0.24)
  48 + i18n (0.4.2)
50 49 libxml-ruby (1.1.4)
51   - mail (2.2.5)
  50 + mail (2.2.10)
52 51 activesupport (>= 2.3.6)
53   - mime-types
54   - treetop (>= 1.4.5)
  52 + i18n (~> 0.4.1)
  53 + mime-types (~> 1.16)
  54 + treetop (~> 1.4.8)
55 55 mime-types (1.16)
56   - mongo (1.0.6)
57   - bson (>= 1.0.4)
58   - mongoid (2.0.0.beta.15)
59   - activemodel (= 3.0.0.rc)
60   - bson (= 1.0.4)
61   - mongo (= 1.0.6)
62   - tzinfo (= 0.3.22)
  56 + mongo (1.1.2)
  57 + bson (>= 1.1.1)
  58 + mongoid (2.0.0.beta.20)
  59 + activemodel (~> 3.0)
  60 + mongo (~> 1.1)
  61 + tzinfo (~> 0.3.22)
63 62 will_paginate (~> 3.0.pre)
64   - nokogiri (1.4.3.1)
65 63 polyglot (0.3.1)
66 64 rack (1.2.1)
67   - rack-mount (0.6.9)
  65 + rack-mount (0.6.13)
68 66 rack (>= 1.0.0)
69   - rack-test (0.5.4)
  67 + rack-test (0.5.6)
70 68 rack (>= 1.0)
71   - rails (3.0.0.rc)
72   - actionmailer (= 3.0.0.rc)
73   - actionpack (= 3.0.0.rc)
74   - activerecord (= 3.0.0.rc)
75   - activeresource (= 3.0.0.rc)
76   - activesupport (= 3.0.0.rc)
77   - bundler (>= 1.0.0.rc.1)
78   - railties (= 3.0.0.rc)
79   - railties (3.0.0.rc)
80   - actionpack (= 3.0.0.rc)
81   - activesupport (= 3.0.0.rc)
82   - rake (>= 0.8.3)
83   - thor (~> 0.14.0)
  69 + rails (3.0.3)
  70 + actionmailer (= 3.0.3)
  71 + actionpack (= 3.0.3)
  72 + activerecord (= 3.0.3)
  73 + activeresource (= 3.0.3)
  74 + activesupport (= 3.0.3)
  75 + bundler (~> 1.0)
  76 + railties (= 3.0.3)
  77 + railties (3.0.3)
  78 + actionpack (= 3.0.3)
  79 + activesupport (= 3.0.3)
  80 + rake (>= 0.8.7)
  81 + thor (~> 0.14.4)
84 82 rake (0.8.7)
85   - rspec (2.0.0.beta.19)
86   - rspec-core (= 2.0.0.beta.19)
87   - rspec-expectations (= 2.0.0.beta.19)
88   - rspec-mocks (= 2.0.0.beta.19)
89   - rspec-core (2.0.0.beta.19)
90   - rspec-expectations (2.0.0.beta.19)
91   - diff-lcs (>= 1.1.2)
92   - rspec-mocks (2.0.0.beta.19)
93   - rspec-rails (2.0.0.beta.19)
94   - rspec (= 2.0.0.beta.19)
95   - webrat (>= 0.7.2.beta.1)
96   - thor (0.14.0)
97   - treetop (1.4.8)
  83 + rspec (2.1.0)
  84 + rspec-core (~> 2.1.0)
  85 + rspec-expectations (~> 2.1.0)
  86 + rspec-mocks (~> 2.1.0)
  87 + rspec-core (2.1.0)
  88 + rspec-expectations (2.1.0)
  89 + diff-lcs (~> 1.1.2)
  90 + rspec-mocks (2.1.0)
  91 + rspec-rails (2.1.0)
  92 + rspec (~> 2.1.0)
  93 + thor (0.14.6)
  94 + treetop (1.4.9)
98 95 polyglot (>= 0.3.1)
99   - tzinfo (0.3.22)
  96 + tzinfo (0.3.23)
100 97 warden (0.10.7)
101 98 rack (>= 1.0.0)
102   - webrat (0.7.2.beta.1)
103   - nokogiri (>= 1.2.0)
104   - rack (>= 1.0)
105   - rack-test (>= 0.5.3)
106 99 will_paginate (3.0.pre2)
107 100  
108 101 PLATFORMS
... ... @@ -110,13 +103,13 @@ PLATFORMS
110 103  
111 104 DEPENDENCIES
112 105 bson_ext
113   - database_cleaner (= 0.5.2)
114   - devise (= 1.1.1)
  106 + database_cleaner (~> 0.6.0)
  107 + devise (~> 1.1.3)
115 108 factory_girl_rails
116 109 haml
117 110 libxml-ruby
118   - mongoid (= 2.0.0.beta.15)
119   - rails (= 3.0.0.rc)
120   - rspec (>= 2.0.0.beta.19)
121   - rspec-rails (>= 2.0.0.beta.19)
  111 + mongoid (~> 2.0.0.beta.20)
  112 + rails (= 3.0.3)
  113 + rspec (~> 2.1)
  114 + rspec-rails (~> 2.1)
122 115 will_paginate
... ...
spec/spec_helper.rb
  Diff comments   View file @cf313c5
... ... @@ -18,8 +18,7 @@ RSpec.configure do |config|
18 18 config.alias_example_to :fit, :focused => true
19 19  
20 20 config.before(:each) do
21   - DatabaseCleaner.orm = "mongoid"
22   - DatabaseCleaner.strategy = :truncation
  21 + DatabaseCleaner[:mongoid].strategy = :truncation
23 22 DatabaseCleaner.clean
24 23 end
25 24 end
26 25 \ No newline at end of file
... ...