Merge pull request #221 from tijmenb/pessimistic-gemfile

Upgrade Rails and use pessimistic versioning

Andrew Cantino 10 years ago
parent
commit
d1ccba969a
2 changed files with 166 additions and 174 deletions
  1. 36 37
      Gemfile
  2. 130 137
      Gemfile.lock

+ 36 - 37
Gemfile

@@ -1,53 +1,51 @@
1 1
 source 'https://rubygems.org'
2 2
 
3
-gem 'rails'
4
-gem 'rake'
5
-gem 'mysql2'
6
-gem 'devise'
7
-gem 'kaminari'
8
-gem 'bootstrap-kaminari-views'
9
-gem "rufus-scheduler", :require => false
3
+gem 'rails', '3.2.17'
4
+gem 'mysql2', '~> 0.3.13'
5
+gem 'devise', '~> 3.0.0'
6
+gem 'kaminari', '~> 0.14.1'
7
+gem 'bootstrap-kaminari-views', '~> 0.0.2'
8
+gem 'rufus-scheduler', '~> 3.0.7', require: false
10 9
 gem 'json', '>= 1.7.7'
11
-gem 'jsonpath'
12
-gem 'twilio-ruby'
13
-gem 'ruby-growl'
10
+gem 'jsonpath', '~> 0.5.3'
11
+gem 'twilio-ruby', '~> 3.10.0'
12
+gem 'ruby-growl', '~> 4.1.0'
14 13
 
15
-gem 'delayed_job'
16
-gem 'delayed_job_active_record'#, "~> 0.3.3" # newer was giving a strange MySQL error
17
-gem "daemons"
14
+gem 'delayed_job', '~> 4.0.0'
15
+gem 'delayed_job_active_record', '~> 4.0.0'
16
+gem 'daemons', '~> 1.1.9'
18 17
 
19 18
 # To enable DelayedJobWeb, see the 'Enable DelayedJobWeb' section of the README.
20
-# gem "delayed_job_web"
19
+# gem 'delayed_job_web'
21 20
 
22
-gem 'foreman'
23
-gem 'dotenv-rails', :groups => [:development, :test]
21
+gem 'foreman', '~> 0.63.0'
24 22
 
25 23
 gem 'sass-rails',   '~> 3.2.3'
26 24
 gem 'coffee-rails', '~> 3.2.1'
27 25
 gem 'uglifier', '>= 1.0.3'
28
-gem 'select2-rails'
29
-gem 'jquery-rails'
30
-gem 'ace-rails-ap'
26
+gem 'select2-rails', '~> 3.4.3'
27
+gem 'jquery-rails', '~> 3.0.4'
28
+gem 'ace-rails-ap', '~> 2.0.1'
31 29
 
32
-gem 'geokit-rails3'
33
-gem 'kramdown'
34
-gem "typhoeus"
35
-gem 'nokogiri'
36
-gem 'wunderground'
37
-gem 'forecast_io'
38
-gem 'rturk'
30
+# geokit-rails doesn't work with geokit 1.8.X but it specifies ~> 1.5
31
+# in its own Gemfile.
32
+gem 'geokit', '~> 1.6.7'
33
+gem 'geokit-rails3', '~> 0.1.5'
39 34
 
40
-gem "twitter", '~> 5.7.1'
41
-gem 'twitter-stream', :git => 'https://github.com/cantino/twitter-stream', :branch => 'master'
42
-gem 'em-http-request'
43
-gem 'weibo_2'
35
+gem 'kramdown', '~> 1.1.0'
36
+gem 'typhoeus', '~> 0.6.3'
37
+gem 'nokogiri', '~> 1.6.0'
44 38
 
45
-gem 'therubyracer'
39
+gem 'wunderground', '~> 1.1.0'
40
+gem 'forecast_io', '~> 2.0.0'
41
+gem 'rturk', '~> 2.11.0'
46 42
 
47
-platforms :ruby_18 do
48
-  gem 'system_timer'
49
-  gem 'fastercsv'
50
-end
43
+gem 'twitter', '~> 5.7.1'
44
+gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'master'
45
+gem 'em-http-request', '~> 1.1.2'
46
+gem 'weibo_2', '~> 0.1.4'
47
+
48
+gem 'therubyracer', '~> 0.12.1'
51 49
 
52 50
 group :development do
53 51
   gem 'binding_of_caller'
@@ -55,11 +53,12 @@ group :development do
55 53
 end
56 54
 
57 55
 group :development, :test do
56
+  gem 'dotenv-rails'
58 57
   gem 'pry'
59 58
   gem 'rspec-rails'
60 59
   gem 'rspec'
61 60
   gem 'shoulda-matchers'
62 61
   gem 'rr'
63
-  gem 'webmock', :require => false
64
-  gem 'coveralls', :require => false
62
+  gem 'webmock', require: false
63
+  gem 'coveralls', require: false
65 64
 end

+ 130 - 137
Gemfile.lock

@@ -1,5 +1,5 @@
1 1
 GIT
2
-  remote: https://github.com/cantino/twitter-stream
2
+  remote: git://github.com/cantino/twitter-stream.git
3 3
   revision: fde6bed2b62ca487d49e4a57381bbfca6e33361b
4 4
   branch: master
5 5
   specs:
@@ -12,12 +12,12 @@ GEM
12 12
   remote: https://rubygems.org/
13 13
   specs:
14 14
     ace-rails-ap (2.0.1)
15
-    actionmailer (3.2.13)
16
-      actionpack (= 3.2.13)
17
-      mail (~> 2.5.3)
18
-    actionpack (3.2.13)
19
-      activemodel (= 3.2.13)
20
-      activesupport (= 3.2.13)
15
+    actionmailer (3.2.17)
16
+      actionpack (= 3.2.17)
17
+      mail (~> 2.5.4)
18
+    actionpack (3.2.17)
19
+      activemodel (= 3.2.17)
20
+      activesupport (= 3.2.17)
21 21
       builder (~> 3.0.0)
22 22
       erubis (~> 2.7.0)
23 23
       journey (~> 1.0.4)
@@ -25,68 +25,69 @@ GEM
25 25
       rack-cache (~> 1.2)
26 26
       rack-test (~> 0.6.1)
27 27
       sprockets (~> 2.2.1)
28
-    activemodel (3.2.13)
29
-      activesupport (= 3.2.13)
28
+    activemodel (3.2.17)
29
+      activesupport (= 3.2.17)
30 30
       builder (~> 3.0.0)
31
-    activerecord (3.2.13)
32
-      activemodel (= 3.2.13)
33
-      activesupport (= 3.2.13)
31
+    activerecord (3.2.17)
32
+      activemodel (= 3.2.17)
33
+      activesupport (= 3.2.17)
34 34
       arel (~> 3.0.2)
35 35
       tzinfo (~> 0.3.29)
36
-    activeresource (3.2.13)
37
-      activemodel (= 3.2.13)
38
-      activesupport (= 3.2.13)
39
-    activesupport (3.2.13)
40
-      i18n (= 0.6.1)
36
+    activeresource (3.2.17)
37
+      activemodel (= 3.2.17)
38
+      activesupport (= 3.2.17)
39
+    activesupport (3.2.17)
40
+      i18n (~> 0.6, >= 0.6.4)
41 41
       multi_json (~> 1.0)
42
-    addressable (2.3.5)
42
+    addressable (2.3.6)
43 43
     arel (3.0.3)
44
-    atomic (1.1.14)
45
-    bcrypt-ruby (3.1.1)
44
+    bcrypt (3.1.7)
45
+    bcrypt-ruby (3.1.5)
46
+      bcrypt (>= 3.1.3)
46 47
     better_errors (1.1.0)
47 48
       coderay (>= 1.0.0)
48 49
       erubis (>= 2.6.6)
49 50
     binding_of_caller (0.7.2)
50 51
       debug_inspector (>= 0.0.1)
51
-    bootstrap-kaminari-views (0.0.2)
52
+    bootstrap-kaminari-views (0.0.3)
52 53
       kaminari (>= 0.13)
53 54
       rails (>= 3.1)
54 55
     buftok (0.2.0)
55 56
     builder (3.0.4)
56
-    coderay (1.0.9)
57
+    coderay (1.1.0)
57 58
     coffee-rails (3.2.2)
58 59
       coffee-script (>= 2.2.0)
59 60
       railties (~> 3.2.0)
60 61
     coffee-script (2.2.0)
61 62
       coffee-script-source
62 63
       execjs
63
-    coffee-script-source (1.6.3)
64
-    cookiejar (0.3.1)
64
+    coffee-script-source (1.7.0)
65
+    cookiejar (0.3.2)
65 66
     coveralls (0.7.0)
66 67
       multi_json (~> 1.3)
67 68
       rest-client
68 69
       simplecov (>= 0.7)
69 70
       term-ansicolor
70 71
       thor
71
-    crack (0.4.1)
72
-      safe_yaml (~> 0.9.0)
72
+    crack (0.4.2)
73
+      safe_yaml (~> 1.0.0)
73 74
     daemons (1.1.9)
74 75
     debug_inspector (0.0.2)
75
-    delayed_job (4.0.0)
76
-      activesupport (>= 3.0, < 4.1)
77
-    delayed_job_active_record (4.0.0)
78
-      activerecord (>= 3.0, < 4.1)
76
+    delayed_job (4.0.1)
77
+      activesupport (>= 3.0, < 4.2)
78
+    delayed_job_active_record (4.0.1)
79
+      activerecord (>= 3.0, < 4.2)
79 80
       delayed_job (>= 3.0, < 4.1)
80
-    devise (3.0.0)
81
+    devise (3.0.4)
81 82
       bcrypt-ruby (~> 3.0)
82 83
       orm_adapter (~> 0.1)
83 84
       railties (>= 3.2.6, < 5)
84 85
       warden (~> 1.2.3)
85
-    diff-lcs (1.2.4)
86
-    docile (1.1.1)
87
-    dotenv (0.9.0)
88
-    dotenv-rails (0.9.0)
89
-      dotenv (= 0.9.0)
86
+    diff-lcs (1.2.5)
87
+    docile (1.1.3)
88
+    dotenv (0.10.0)
89
+    dotenv-rails (0.10.0)
90
+      dotenv (= 0.10.0)
90 91
     em-http-request (1.1.2)
91 92
       addressable (>= 2.3.4)
92 93
       cookiejar
@@ -96,19 +97,16 @@ GEM
96 97
     em-socksify (0.3.0)
97 98
       eventmachine (>= 1.0.0.beta.4)
98 99
     equalizer (0.0.9)
99
-    erector (0.9.0)
100
+    erector (0.10.0)
100 101
       treetop (>= 1.2.3)
101 102
     erubis (2.7.0)
102
-    ethon (0.5.12)
103
+    ethon (0.7.0)
103 104
       ffi (>= 1.3.0)
104
-      mime-types (~> 1.18)
105 105
     eventmachine (1.0.3)
106
-    execjs (1.4.0)
107
-      multi_json (~> 1.0)
106
+    execjs (2.0.2)
108 107
     faraday (0.9.0)
109 108
       multipart-post (>= 1.2, < 3)
110
-    fastercsv (1.5.5)
111
-    ffi (1.9.0)
109
+    ffi (1.9.3)
112 110
     forecast_io (2.0.0)
113 111
       faraday
114 112
       hashie
@@ -116,8 +114,8 @@ GEM
116 114
     foreman (0.63.0)
117 115
       dotenv (>= 0.7)
118 116
       thor (>= 0.13.6)
119
-    geokit (1.6.5)
120
-      multi_json
117
+    geokit (1.6.7)
118
+      multi_json (>= 1.3.2)
121 119
     geokit-rails3 (0.1.5)
122 120
       geokit (~> 1.5)
123 121
       rails (~> 3.0)
@@ -126,78 +124,76 @@ GEM
126 124
     http (0.5.0)
127 125
       http_parser.rb
128 126
     http_parser.rb (0.6.0)
129
-    httparty (0.11.0)
130
-      multi_json (~> 1.0)
127
+    httparty (0.13.1)
128
+      json (~> 1.8)
131 129
       multi_xml (>= 0.5.2)
132
-    httpauth (0.2.0)
133
-    i18n (0.6.1)
130
+    i18n (0.6.9)
134 131
     journey (1.0.4)
135 132
     jquery-rails (3.0.4)
136 133
       railties (>= 3.0, < 5.0)
137 134
       thor (>= 0.14, < 2.0)
138 135
     json (1.8.1)
139
-    jsonpath (0.5.3)
136
+    jsonpath (0.5.6)
140 137
       multi_json
141
-    jwt (0.1.8)
138
+    jwt (0.1.11)
142 139
       multi_json (>= 1.5)
143 140
     kaminari (0.14.1)
144 141
       actionpack (>= 3.0.0)
145 142
       activesupport (>= 3.0.0)
146 143
     kramdown (1.1.0)
147 144
     libv8 (3.16.14.3)
148
-    macaddr (1.6.7)
145
+    macaddr (1.7.1)
149 146
       systemu (~> 2.6.2)
150 147
     mail (2.5.4)
151 148
       mime-types (~> 1.16)
152 149
       treetop (~> 1.4.8)
153
-    memoizable (0.4.0)
154
-      thread_safe (~> 0.1.3)
155
-    method_source (0.8.1)
156
-    mime-types (1.24)
157
-    mini_portile (0.5.1)
158
-    multi_json (1.7.9)
150
+    memoizable (0.4.2)
151
+      thread_safe (~> 0.3, >= 0.3.1)
152
+    method_source (0.8.2)
153
+    mime-types (1.25.1)
154
+    mini_portile (0.5.3)
155
+    multi_json (1.9.2)
159 156
     multi_xml (0.5.5)
160 157
     multipart-post (2.0.0)
161
-    mysql2 (0.3.13)
158
+    mysql2 (0.3.15)
162 159
     naught (1.0.0)
163
-    nokogiri (1.6.0)
160
+    nokogiri (1.6.1)
164 161
       mini_portile (~> 0.5.0)
165
-    oauth2 (0.9.2)
166
-      faraday (~> 0.8)
167
-      httpauth (~> 0.2)
168
-      jwt (~> 0.1.4)
169
-      multi_json (~> 1.0)
162
+    oauth2 (0.9.3)
163
+      faraday (>= 0.8, < 0.10)
164
+      jwt (~> 0.1.8)
165
+      multi_json (~> 1.3)
170 166
       multi_xml (~> 0.5)
171 167
       rack (~> 1.2)
172
-    orm_adapter (0.4.0)
173
-    polyglot (0.3.3)
174
-    pry (0.9.12.2)
175
-      coderay (~> 1.0.5)
168
+    orm_adapter (0.5.0)
169
+    polyglot (0.3.4)
170
+    pry (0.9.12.6)
171
+      coderay (~> 1.0)
176 172
       method_source (~> 0.8)
177 173
       slop (~> 3.4)
178 174
     rack (1.4.5)
179 175
     rack-cache (1.2)
180 176
       rack (>= 0.4)
181
-    rack-ssl (1.3.3)
177
+    rack-ssl (1.3.4)
182 178
       rack
183 179
     rack-test (0.6.2)
184 180
       rack (>= 1.0)
185
-    rails (3.2.13)
186
-      actionmailer (= 3.2.13)
187
-      actionpack (= 3.2.13)
188
-      activerecord (= 3.2.13)
189
-      activeresource (= 3.2.13)
190
-      activesupport (= 3.2.13)
181
+    rails (3.2.17)
182
+      actionmailer (= 3.2.17)
183
+      actionpack (= 3.2.17)
184
+      activerecord (= 3.2.17)
185
+      activeresource (= 3.2.17)
186
+      activesupport (= 3.2.17)
191 187
       bundler (~> 1.0)
192
-      railties (= 3.2.13)
193
-    railties (3.2.13)
194
-      actionpack (= 3.2.13)
195
-      activesupport (= 3.2.13)
188
+      railties (= 3.2.17)
189
+    railties (3.2.17)
190
+      actionpack (= 3.2.17)
191
+      activesupport (= 3.2.17)
196 192
       rack-ssl (~> 1.3.2)
197 193
       rake (>= 0.8.7)
198 194
       rdoc (~> 3.4)
199 195
       thor (>= 0.14.6, < 2.0)
200
-    rake (10.1.0)
196
+    rake (10.2.2)
201 197
     rdoc (3.12.2)
202 198
       json (~> 1.4)
203 199
     ref (1.0.5)
@@ -208,35 +204,36 @@ GEM
208 204
       rspec-core (~> 2.14.0)
209 205
       rspec-expectations (~> 2.14.0)
210 206
       rspec-mocks (~> 2.14.0)
211
-    rspec-core (2.14.5)
212
-    rspec-expectations (2.14.2)
207
+    rspec-core (2.14.8)
208
+    rspec-expectations (2.14.5)
213 209
       diff-lcs (>= 1.1.3, < 2.0)
214
-    rspec-mocks (2.14.3)
215
-    rspec-rails (2.14.0)
210
+    rspec-mocks (2.14.6)
211
+    rspec-rails (2.14.2)
216 212
       actionpack (>= 3.0)
213
+      activemodel (>= 3.0)
217 214
       activesupport (>= 3.0)
218 215
       railties (>= 3.0)
219 216
       rspec-core (~> 2.14.0)
220 217
       rspec-expectations (~> 2.14.0)
221 218
       rspec-mocks (~> 2.14.0)
222
-    rturk (2.11.0)
219
+    rturk (2.11.3)
223 220
       erector
224 221
       nokogiri
225 222
       rest-client
226 223
     ruby-growl (4.1)
227 224
       uuid (~> 2.3, >= 2.3.5)
228
-    rufus-scheduler (3.0.2)
225
+    rufus-scheduler (3.0.7)
229 226
       tzinfo
230
-    safe_yaml (0.9.5)
231
-    sass (3.2.9)
227
+    safe_yaml (1.0.2)
228
+    sass (3.3.5)
232 229
     sass-rails (3.2.6)
233 230
       railties (~> 3.2.0)
234 231
       sass (>= 3.1.10)
235 232
       tilt (~> 1.3)
236
-    select2-rails (3.4.3)
233
+    select2-rails (3.4.9)
237 234
       sass-rails
238 235
       thor (~> 0.14)
239
-    shoulda-matchers (2.2.0)
236
+    shoulda-matchers (2.6.0)
240 237
       activesupport (>= 3.0.0)
241 238
     simple_oauth (0.2.0)
242 239
     simplecov (0.8.2)
@@ -244,28 +241,26 @@ GEM
244 241
       multi_json
245 242
       simplecov-html (~> 0.8.0)
246 243
     simplecov-html (0.8.0)
247
-    slop (3.4.5)
244
+    slop (3.5.0)
248 245
     sprockets (2.2.2)
249 246
       hike (~> 1.2)
250 247
       multi_json (~> 1.0)
251 248
       rack (~> 1.0)
252 249
       tilt (~> 1.1, != 1.3.0)
253
-    system_timer (1.2.4)
254 250
     systemu (2.6.4)
255
-    term-ansicolor (1.2.2)
256
-      tins (~> 0.8)
257
-    therubyracer (0.12.0)
251
+    term-ansicolor (1.3.0)
252
+      tins (~> 1.0)
253
+    therubyracer (0.12.1)
258 254
       libv8 (~> 3.16.14.0)
259 255
       ref
260
-    thor (0.18.1)
261
-    thread_safe (0.1.3)
262
-      atomic
256
+    thor (0.19.1)
257
+    thread_safe (0.3.3)
263 258
     tilt (1.4.1)
264
-    tins (0.13.1)
259
+    tins (1.1.0)
265 260
     treetop (1.4.15)
266 261
       polyglot
267 262
       polyglot (>= 0.3.1)
268
-    twilio-ruby (3.10.0)
263
+    twilio-ruby (3.10.1)
269 264
       builder (>= 2.1.2)
270 265
       jwt (>= 0.1.2)
271 266
       multi_json (>= 1.3.0)
@@ -280,12 +275,12 @@ GEM
280 275
       memoizable (~> 0.4.0)
281 276
       naught (~> 1.0)
282 277
       simple_oauth (~> 0.2.0)
283
-    typhoeus (0.6.3)
284
-      ethon (~> 0.5.11)
285
-    tzinfo (0.3.38)
286
-    uglifier (2.1.2)
278
+    typhoeus (0.6.8)
279
+      ethon (>= 0.7.0)
280
+    tzinfo (0.3.39)
281
+    uglifier (2.5.0)
287 282
       execjs (>= 0.3.0)
288
-      multi_json (~> 1.0, >= 1.0.2)
283
+      json (>= 1.8.0)
289 284
     uuid (2.3.7)
290 285
       macaddr (~> 1.0)
291 286
     warden (1.2.3)
@@ -293,9 +288,9 @@ GEM
293 288
     webmock (1.13.0)
294 289
       addressable (>= 2.2.7)
295 290
       crack (>= 0.3.2)
296
-    weibo_2 (0.1.4)
291
+    weibo_2 (0.1.6)
297 292
       hashie (~> 2.0.4)
298
-      multi_json (~> 1.7.2)
293
+      multi_json (~> 1)
299 294
       oauth2 (~> 0.9.1)
300 295
       rest-client (~> 1.6.7)
301 296
     wunderground (1.1.0)
@@ -307,48 +302,46 @@ PLATFORMS
307 302
   ruby
308 303
 
309 304
 DEPENDENCIES
310
-  ace-rails-ap
305
+  ace-rails-ap (~> 2.0.1)
311 306
   better_errors
312 307
   binding_of_caller
313
-  bootstrap-kaminari-views
308
+  bootstrap-kaminari-views (~> 0.0.2)
314 309
   coffee-rails (~> 3.2.1)
315 310
   coveralls
316
-  daemons
317
-  delayed_job
318
-  delayed_job_active_record
319
-  devise
311
+  daemons (~> 1.1.9)
312
+  delayed_job (~> 4.0.0)
313
+  delayed_job_active_record (~> 4.0.0)
314
+  devise (~> 3.0.0)
320 315
   dotenv-rails
321
-  em-http-request
322
-  fastercsv
323
-  forecast_io
324
-  foreman
325
-  geokit-rails3
326
-  jquery-rails
316
+  em-http-request (~> 1.1.2)
317
+  forecast_io (~> 2.0.0)
318
+  foreman (~> 0.63.0)
319
+  geokit (~> 1.6.7)
320
+  geokit-rails3 (~> 0.1.5)
321
+  jquery-rails (~> 3.0.4)
327 322
   json (>= 1.7.7)
328
-  jsonpath
329
-  kaminari
330
-  kramdown
331
-  mysql2
332
-  nokogiri
323
+  jsonpath (~> 0.5.3)
324
+  kaminari (~> 0.14.1)
325
+  kramdown (~> 1.1.0)
326
+  mysql2 (~> 0.3.13)
327
+  nokogiri (~> 1.6.0)
333 328
   pry
334
-  rails
335
-  rake
329
+  rails (= 3.2.17)
336 330
   rr
337 331
   rspec
338 332
   rspec-rails
339
-  rturk
340
-  ruby-growl
341
-  rufus-scheduler
333
+  rturk (~> 2.11.0)
334
+  ruby-growl (~> 4.1.0)
335
+  rufus-scheduler (~> 3.0.7)
342 336
   sass-rails (~> 3.2.3)
343
-  select2-rails
337
+  select2-rails (~> 3.4.3)
344 338
   shoulda-matchers
345
-  system_timer
346
-  therubyracer
347
-  twilio-ruby
339
+  therubyracer (~> 0.12.1)
340
+  twilio-ruby (~> 3.10.0)
348 341
   twitter (~> 5.7.1)
349 342
   twitter-stream!
350
-  typhoeus
343
+  typhoeus (~> 0.6.3)
351 344
   uglifier (>= 1.0.3)
352 345
   webmock
353
-  weibo_2
354
-  wunderground
346
+  weibo_2 (~> 0.1.4)
347
+  wunderground (~> 1.1.0)