Download as
Browse Code »

Commit e10fb64dd6092cc4d8f1d2feb24bbc64d5ed27de

Authored by Nihad Abbasov
1 parent a7734bba
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

update gems in order to make it work with ruby 1.9.3

Showing 3 changed files with 90 additions and 111 deletions   Show diff stats
1 source 'http://rubygems.org' 1 source 'http://rubygems.org'
2 2
3 -gem 'rails', '3.1.0' 3 +gem 'rails', '3.1.1'
4 4
5 gem 'sqlite3' 5 gem 'sqlite3'
6 -gem 'devise', "1.4.7" 6 +gem 'devise', "1.5.0"
7 gem 'stamp' 7 gem 'stamp'
8 gem 'kaminari' 8 gem 'kaminari'
9 gem 'haml-rails' 9 gem 'haml-rails'
@@ -13,25 +13,24 @@ gem "carrierwave" @@ -13,25 +13,24 @@ gem "carrierwave"
13 gem 'six' 13 gem 'six'
14 gem 'therubyracer' 14 gem 'therubyracer'
15 gem 'faker' 15 gem 'faker'
16 -gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' 16 +gem 'seed-fu', '~> 2.1.0'
17 gem "inifile" 17 gem "inifile"
18 gem "pygments.rb", "0.2.3" 18 gem "pygments.rb", "0.2.3"
19 gem "thin" 19 gem "thin"
20 gem "git" 20 gem "git"
21 gem "acts_as_list" 21 gem "acts_as_list"
22 gem 'rdiscount' 22 gem 'rdiscount'
23 -  
24 -gem 'acts-as-taggable-on', '~>2.1.0' 23 +gem 'acts-as-taggable-on', '~> 2.1.0'
25 24
26 group :assets do 25 group :assets do
27 - gem 'sass-rails', " ~> 3.1.0" 26 + gem 'sass-rails', "~> 3.1.0"
28 gem 'coffee-rails', "~> 3.1.0" 27 gem 'coffee-rails', "~> 3.1.0"
29 gem 'uglifier' 28 gem 'uglifier'
30 end 29 end
31 30
32 group :development do 31 group :development do
33 gem 'letter_opener' 32 gem 'letter_opener'
34 - gem 'rails-footnotes', '>= 3.7.5.rc4' 33 + gem 'rails-footnotes', '~> 3.7.5'
35 gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' 34 gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
36 end 35 end
37 36
@@ -40,13 +39,12 @@ group :development, :test do @@ -40,13 +39,12 @@ group :development, :test do
40 gem 'capybara' 39 gem 'capybara'
41 gem 'autotest' 40 gem 'autotest'
42 gem 'autotest-rails' 41 gem 'autotest-rails'
43 - gem 'ruby-debug19', :require => 'ruby-debug' 42 + # gem 'ruby-debug19', :require => 'ruby-debug'
44 gem 'awesome_print' 43 gem 'awesome_print'
45 gem 'database_cleaner' 44 gem 'database_cleaner'
46 gem 'launchy' 45 gem 'launchy'
47 end 46 end
48 47
49 -  
50 group :test do 48 group :test do
51 gem 'turn', :require => false 49 gem 'turn', :require => false
52 gem 'simplecov', :require => false 50 gem 'simplecov', :require => false
1 GIT 1 GIT
2 remote: git://github.com/ctran/annotate_models.git 2 remote: git://github.com/ctran/annotate_models.git
3 - revision: cfeec96c9ca0fa5035b10be3d73e798cc4fc52f7 3 + revision: fb73329243056a6d9a64878e5c543aba9b6417de
4 specs: 4 specs:
5 annotate (2.4.1.beta1) 5 annotate (2.4.1.beta1)
6 6
@@ -13,53 +13,43 @@ GIT @@ -13,53 +13,43 @@ GIT
13 mime-types (~> 1.15) 13 mime-types (~> 1.15)
14 posix-spawn (~> 0.3.6) 14 posix-spawn (~> 0.3.6)
15 15
16 -GIT  
17 - remote: git://github.com/mbleigh/seed-fu.git  
18 - revision: 77be06852b18fb01e272ab763ddb292da575586c  
19 - specs:  
20 - seed-fu (2.1.0)  
21 - activerecord (~> 3.1.0)  
22 - activesupport (~> 3.1.0)  
23 -  
24 GEM 16 GEM
25 remote: http://rubygems.org/ 17 remote: http://rubygems.org/
26 specs: 18 specs:
27 ZenTest (4.5.0) 19 ZenTest (4.5.0)
28 - actionmailer (3.1.0)  
29 - actionpack (= 3.1.0) 20 + actionmailer (3.1.1)
  21 + actionpack (= 3.1.1)
30 mail (~> 2.3.0) 22 mail (~> 2.3.0)
31 - actionpack (3.1.0)  
32 - activemodel (= 3.1.0)  
33 - activesupport (= 3.1.0) 23 + actionpack (3.1.1)
  24 + activemodel (= 3.1.1)
  25 + activesupport (= 3.1.1)
34 builder (~> 3.0.0) 26 builder (~> 3.0.0)
35 erubis (~> 2.7.0) 27 erubis (~> 2.7.0)
36 i18n (~> 0.6) 28 i18n (~> 0.6)
37 rack (~> 1.3.2) 29 rack (~> 1.3.2)
38 - rack-cache (~> 1.0.3) 30 + rack-cache (~> 1.1)
39 rack-mount (~> 0.8.2) 31 rack-mount (~> 0.8.2)
40 rack-test (~> 0.6.1) 32 rack-test (~> 0.6.1)
41 - sprockets (~> 2.0.0)  
42 - activemodel (3.1.0)  
43 - activesupport (= 3.1.0)  
44 - bcrypt-ruby (~> 3.0.0) 33 + sprockets (~> 2.0.2)
  34 + activemodel (3.1.1)
  35 + activesupport (= 3.1.1)
45 builder (~> 3.0.0) 36 builder (~> 3.0.0)
46 i18n (~> 0.6) 37 i18n (~> 0.6)
47 - activerecord (3.1.0)  
48 - activemodel (= 3.1.0)  
49 - activesupport (= 3.1.0) 38 + activerecord (3.1.1)
  39 + activemodel (= 3.1.1)
  40 + activesupport (= 3.1.1)
50 arel (~> 2.2.1) 41 arel (~> 2.2.1)
51 tzinfo (~> 0.3.29) 42 tzinfo (~> 0.3.29)
52 - activeresource (3.1.0)  
53 - activemodel (= 3.1.0)  
54 - activesupport (= 3.1.0)  
55 - activesupport (3.1.0) 43 + activeresource (3.1.1)
  44 + activemodel (= 3.1.1)
  45 + activesupport (= 3.1.1)
  46 + activesupport (3.1.1)
56 multi_json (~> 1.0) 47 multi_json (~> 1.0)
57 acts-as-taggable-on (2.1.1) 48 acts-as-taggable-on (2.1.1)
58 rails 49 rails
59 acts_as_list (0.1.4) 50 acts_as_list (0.1.4)
60 addressable (2.2.6) 51 addressable (2.2.6)
61 - ansi (1.3.0)  
62 - archive-tar-minitar (0.5.2) 52 + ansi (1.4.1)
63 arel (2.2.1) 53 arel (2.2.1)
64 autotest (4.4.6) 54 autotest (4.4.6)
65 ZenTest (>= 4.4.1) 55 ZenTest (>= 4.4.1)
@@ -69,14 +59,14 @@ GEM @@ -69,14 +59,14 @@ GEM
69 bcrypt-ruby (3.0.1) 59 bcrypt-ruby (3.0.1)
70 blankslate (2.1.2.4) 60 blankslate (2.1.2.4)
71 builder (3.0.0) 61 builder (3.0.0)
72 - capybara (1.0.1) 62 + capybara (1.1.2)
73 mime-types (>= 1.16) 63 mime-types (>= 1.16)
74 nokogiri (>= 1.3.3) 64 nokogiri (>= 1.3.3)
75 rack (>= 1.0.0) 65 rack (>= 1.0.0)
76 rack-test (>= 0.5.4) 66 rack-test (>= 0.5.4)
77 selenium-webdriver (~> 2.0) 67 selenium-webdriver (~> 2.0)
78 xpath (~> 0.1.4) 68 xpath (~> 0.1.4)
79 - carrierwave (0.5.7) 69 + carrierwave (0.5.8)
80 activesupport (~> 3.0) 70 activesupport (~> 3.0)
81 childprocess (0.2.2) 71 childprocess (0.2.2)
82 ffi (~> 1.0.6) 72 ffi (~> 1.0.6)
@@ -86,22 +76,21 @@ GEM @@ -86,22 +76,21 @@ GEM
86 coffee-script (2.2.0) 76 coffee-script (2.2.0)
87 coffee-script-source 77 coffee-script-source
88 execjs 78 execjs
89 - coffee-script-source (1.1.2)  
90 - columnize (0.3.4) 79 + coffee-script-source (1.1.3)
91 daemons (1.1.4) 80 daemons (1.1.4)
92 - database_cleaner (0.6.7)  
93 - devise (1.4.7) 81 + database_cleaner (0.7.0)
  82 + devise (1.5.0)
94 bcrypt-ruby (~> 3.0) 83 bcrypt-ruby (~> 3.0)
95 orm_adapter (~> 0.0.3) 84 orm_adapter (~> 0.0.3)
96 - warden (~> 1.0.3) 85 + warden (~> 1.1)
97 diff-lcs (1.1.3) 86 diff-lcs (1.1.3)
98 erubis (2.7.0) 87 erubis (2.7.0)
99 eventmachine (0.12.10) 88 eventmachine (0.12.10)
100 - execjs (1.2.6) 89 + execjs (1.2.9)
101 multi_json (~> 1.0) 90 multi_json (~> 1.0)
102 - faker (0.9.5) 91 + faker (1.0.1)
103 i18n (~> 0.4) 92 i18n (~> 0.4)
104 - ffi (1.0.9) 93 + ffi (1.0.11)
105 git (1.2.5) 94 git (1.2.5)
106 haml (3.1.3) 95 haml (3.1.3)
107 haml-rails (0.3.4) 96 haml-rails (0.3.4)
@@ -112,34 +101,32 @@ GEM @@ -112,34 +101,32 @@ GEM
112 hike (1.2.1) 101 hike (1.2.1)
113 i18n (0.6.0) 102 i18n (0.6.0)
114 inifile (0.4.1) 103 inifile (0.4.1)
115 - jquery-rails (1.0.14) 104 + jquery-rails (1.0.17)
116 railties (~> 3.0) 105 railties (~> 3.0)
117 thor (~> 0.14) 106 thor (~> 0.14)
118 - json_pure (1.5.4)  
119 - spruz (~> 0.2.8) 107 + json (1.6.1)
  108 + json_pure (1.6.1)
120 kaminari (0.12.4) 109 kaminari (0.12.4)
121 rails (>= 3.0.0) 110 rails (>= 3.0.0)
122 launchy (2.0.5) 111 launchy (2.0.5)
123 addressable (~> 2.2.6) 112 addressable (~> 2.2.6)
124 letter_opener (0.0.2) 113 letter_opener (0.0.2)
125 launchy 114 launchy
126 - libv8 (3.3.10.2)  
127 - linecache19 (0.5.12)  
128 - ruby_core_source (>= 0.1.4) 115 + libv8 (3.3.10.4)
129 mail (2.3.0) 116 mail (2.3.0)
130 i18n (>= 0.4.0) 117 i18n (>= 0.4.0)
131 mime-types (~> 1.16) 118 mime-types (~> 1.16)
132 treetop (~> 1.4.8) 119 treetop (~> 1.4.8)
133 - mime-types (1.16) 120 + mime-types (1.17.2)
134 multi_json (1.0.3) 121 multi_json (1.0.3)
135 nokogiri (1.5.0) 122 nokogiri (1.5.0)
136 orm_adapter (0.0.5) 123 orm_adapter (0.0.5)
137 - polyglot (0.3.2) 124 + polyglot (0.3.3)
138 posix-spawn (0.3.6) 125 posix-spawn (0.3.6)
139 pygments.rb (0.2.3) 126 pygments.rb (0.2.3)
140 rubypython (>= 0.5.1) 127 rubypython (>= 0.5.1)
141 - rack (1.3.2)  
142 - rack-cache (1.0.3) 128 + rack (1.3.5)
  129 + rack-cache (1.1)
143 rack (>= 0.4) 130 rack (>= 0.4)
144 rack-mount (0.8.3) 131 rack-mount (0.8.3)
145 rack (>= 1.0.0) 132 rack (>= 1.0.0)
@@ -147,84 +134,78 @@ GEM @@ -147,84 +134,78 @@ GEM
147 rack 134 rack
148 rack-test (0.6.1) 135 rack-test (0.6.1)
149 rack (>= 1.0) 136 rack (>= 1.0)
150 - rails (3.1.0)  
151 - actionmailer (= 3.1.0)  
152 - actionpack (= 3.1.0)  
153 - activerecord (= 3.1.0)  
154 - activeresource (= 3.1.0)  
155 - activesupport (= 3.1.0) 137 + rails (3.1.1)
  138 + actionmailer (= 3.1.1)
  139 + actionpack (= 3.1.1)
  140 + activerecord (= 3.1.1)
  141 + activeresource (= 3.1.1)
  142 + activesupport (= 3.1.1)
156 bundler (~> 1.0) 143 bundler (~> 1.0)
157 - railties (= 3.1.0)  
158 - rails-footnotes (3.7.5.rc4) 144 + railties (= 3.1.1)
  145 + rails-footnotes (3.7.5)
159 rails (>= 3.0.0) 146 rails (>= 3.0.0)
160 - railties (3.1.0)  
161 - actionpack (= 3.1.0)  
162 - activesupport (= 3.1.0) 147 + railties (3.1.1)
  148 + actionpack (= 3.1.1)
  149 + activesupport (= 3.1.1)
163 rack-ssl (~> 1.3.2) 150 rack-ssl (~> 1.3.2)
164 rake (>= 0.8.7) 151 rake (>= 0.8.7)
165 rdoc (~> 3.4) 152 rdoc (~> 3.4)
166 thor (~> 0.14.6) 153 thor (~> 0.14.6)
167 - rake (0.9.2) 154 + rake (0.9.2.2)
168 rdiscount (1.6.8) 155 rdiscount (1.6.8)
169 - rdoc (3.9.4)  
170 - rspec (2.6.0)  
171 - rspec-core (~> 2.6.0)  
172 - rspec-expectations (~> 2.6.0)  
173 - rspec-mocks (~> 2.6.0)  
174 - rspec-core (2.6.4)  
175 - rspec-expectations (2.6.0) 156 + rdoc (3.11)
  157 + json (~> 1.4)
  158 + rspec (2.7.0)
  159 + rspec-core (~> 2.7.0)
  160 + rspec-expectations (~> 2.7.0)
  161 + rspec-mocks (~> 2.7.0)
  162 + rspec-core (2.7.1)
  163 + rspec-expectations (2.7.0)
176 diff-lcs (~> 1.1.2) 164 diff-lcs (~> 1.1.2)
177 - rspec-mocks (2.6.0)  
178 - rspec-rails (2.6.1) 165 + rspec-mocks (2.7.0)
  166 + rspec-rails (2.7.0)
179 actionpack (~> 3.0) 167 actionpack (~> 3.0)
180 activesupport (~> 3.0) 168 activesupport (~> 3.0)
181 railties (~> 3.0) 169 railties (~> 3.0)
182 - rspec (~> 2.6.0)  
183 - ruby-debug-base19 (0.11.25)  
184 - columnize (>= 0.3.1)  
185 - linecache19 (>= 0.5.11)  
186 - ruby_core_source (>= 0.1.4)  
187 - ruby-debug19 (0.11.6)  
188 - columnize (>= 0.3.1)  
189 - linecache19 (>= 0.5.11)  
190 - ruby-debug-base19 (>= 0.11.19)  
191 - ruby_core_source (0.1.5)  
192 - archive-tar-minitar (>= 0.5.2)  
193 - rubypython (0.5.1) 170 + rspec (~> 2.7.0)
  171 + rubypython (0.5.3)
194 blankslate (>= 2.1.2.3) 172 blankslate (>= 2.1.2.3)
195 ffi (~> 1.0.7) 173 ffi (~> 1.0.7)
196 rubyzip (0.9.4) 174 rubyzip (0.9.4)
197 - sass (3.1.7)  
198 - sass-rails (3.1.1) 175 + sass (3.1.10)
  176 + sass-rails (3.1.4)
199 actionpack (~> 3.1.0) 177 actionpack (~> 3.1.0)
200 railties (~> 3.1.0) 178 railties (~> 3.1.0)
201 sass (>= 3.1.4) 179 sass (>= 3.1.4)
  180 + sprockets (~> 2.0.0)
202 tilt (~> 1.3.2) 181 tilt (~> 1.3.2)
203 - selenium-webdriver (2.5.0) 182 + seed-fu (2.1.0)
  183 + activerecord (~> 3.1.0)
  184 + activesupport (~> 3.1.0)
  185 + selenium-webdriver (2.12.2)
204 childprocess (>= 0.2.1) 186 childprocess (>= 0.2.1)
205 - ffi (>= 1.0.7) 187 + ffi (~> 1.0.9)
206 json_pure 188 json_pure
207 rubyzip 189 rubyzip
208 shoulda (3.0.0.beta2) 190 shoulda (3.0.0.beta2)
209 shoulda-context (~> 1.0.0.beta1) 191 shoulda-context (~> 1.0.0.beta1)
210 shoulda-matchers (~> 1.0.0.beta1) 192 shoulda-matchers (~> 1.0.0.beta1)
211 - shoulda-context (1.0.0.beta1)  
212 - shoulda-matchers (1.0.0.beta3)  
213 - simplecov (0.5.3) 193 + shoulda-context (1.0.0)
  194 + shoulda-matchers (1.0.0)
  195 + simplecov (0.5.4)
214 multi_json (~> 1.0.3) 196 multi_json (~> 1.0.3)
215 simplecov-html (~> 0.5.3) 197 simplecov-html (~> 0.5.3)
216 simplecov-html (0.5.3) 198 simplecov-html (0.5.3)
217 six (0.2.0) 199 six (0.2.0)
218 - sprockets (2.0.0) 200 + sprockets (2.0.3)
219 hike (~> 1.2) 201 hike (~> 1.2)
220 rack (~> 1.0) 202 rack (~> 1.0)
221 tilt (~> 1.1, != 1.3.0) 203 tilt (~> 1.1, != 1.3.0)
222 - spruz (0.2.13)  
223 sqlite3 (1.3.4) 204 sqlite3 (1.3.4)
224 stamp (0.1.6) 205 stamp (0.1.6)
225 - therubyracer (0.9.4) 206 + therubyracer (0.9.9)
226 libv8 (~> 3.3.10) 207 libv8 (~> 3.3.10)
227 - thin (1.2.11) 208 + thin (1.3.1)
228 daemons (>= 1.0.9) 209 daemons (>= 1.0.9)
229 eventmachine (>= 0.12.6) 210 eventmachine (>= 0.12.6)
230 rack (>= 1.0.0) 211 rack (>= 1.0.0)
@@ -233,13 +214,13 @@ GEM @@ -233,13 +214,13 @@ GEM
233 treetop (1.4.10) 214 treetop (1.4.10)
234 polyglot 215 polyglot
235 polyglot (>= 0.3.1) 216 polyglot (>= 0.3.1)
236 - turn (0.8.2)  
237 - ansi (>= 1.2.2)  
238 - tzinfo (0.3.29)  
239 - uglifier (1.0.3) 217 + turn (0.8.3)
  218 + ansi
  219 + tzinfo (0.3.31)
  220 + uglifier (1.1.0)
240 execjs (>= 0.3.0) 221 execjs (>= 0.3.0)
241 multi_json (>= 1.0.2) 222 multi_json (>= 1.0.2)
242 - warden (1.0.5) 223 + warden (1.1.0)
243 rack (>= 1.0) 224 rack (>= 1.0)
244 xpath (0.1.4) 225 xpath (0.1.4)
245 nokogiri (~> 1.3) 226 nokogiri (~> 1.3)
@@ -258,7 +239,7 @@ DEPENDENCIES @@ -258,7 +239,7 @@ DEPENDENCIES
258 carrierwave 239 carrierwave
259 coffee-rails (~> 3.1.0) 240 coffee-rails (~> 3.1.0)
260 database_cleaner 241 database_cleaner
261 - devise (= 1.4.7) 242 + devise (= 1.5.0)
262 faker 243 faker
263 git 244 git
264 grit! 245 grit!
@@ -269,13 +250,12 @@ DEPENDENCIES @@ -269,13 +250,12 @@ DEPENDENCIES
269 launchy 250 launchy
270 letter_opener 251 letter_opener
271 pygments.rb (= 0.2.3) 252 pygments.rb (= 0.2.3)
272 - rails (= 3.1.0)  
273 - rails-footnotes (>= 3.7.5.rc4) 253 + rails (= 3.1.1)
  254 + rails-footnotes (~> 3.7.5)
274 rdiscount 255 rdiscount
275 rspec-rails 256 rspec-rails
276 - ruby-debug19  
277 sass-rails (~> 3.1.0) 257 sass-rails (~> 3.1.0)
278 - seed-fu! 258 + seed-fu (~> 2.1.0)
279 shoulda (~> 3.0.0.beta2) 259 shoulda (~> 3.0.0.beta2)
280 simplecov 260 simplecov
281 six 261 six
spec/spec_helper.rb
  Diff comments   View file @e10fb64
@@ -42,6 +42,7 @@ RSpec.configure do |config| @@ -42,6 +42,7 @@ RSpec.configure do |config|
42 config.before do 42 config.before do
43 if example.metadata[:js] 43 if example.metadata[:js]
44 DatabaseCleaner.strategy = :truncation 44 DatabaseCleaner.strategy = :truncation
  45 + Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
45 else 46 else
46 DatabaseCleaner.strategy = :transaction 47 DatabaseCleaner.strategy = :transaction
47 end 48 end