Skip to content
This repository was archived by the owner on Aug 13, 2019. It is now read-only.

Commit 95a0f07

Browse files
committed
Bump Mongo for compatibility with more modern servers
1 parent 53642d4 commit 95a0f07

File tree

2 files changed

+84
-64
lines changed

2 files changed

+84
-64
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ gem 'rack_csrf'
1313
gem 'erubis'
1414
gem 'sinatra'
1515
gem 'mongo_mapper'
16+
# Needed for MongoLab which requires SCRAM-SHA-1
17+
gem 'mongo', '~> 1.12'
1618
gem 'bson_ext'
1719
gem 'einhorn'
1820
gem 'chalk-log'

Gemfile.lock

Lines changed: 82 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,119 +9,133 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activemodel (4.1.8)
13-
activesupport (= 4.1.8)
12+
activemodel (4.2.5.1)
13+
activesupport (= 4.2.5.1)
1414
builder (~> 3.1)
15-
activesupport (4.1.8)
16-
i18n (~> 0.6, >= 0.6.9)
15+
activesupport (4.2.5.1)
16+
i18n (~> 0.7)
1717
json (~> 1.7, >= 1.7.7)
1818
minitest (~> 5.1)
19-
thread_safe (~> 0.1)
19+
thread_safe (~> 0.3, >= 0.3.4)
2020
tzinfo (~> 1.1)
21-
addressable (2.3.6)
22-
autoparse (0.3.3)
23-
addressable (>= 2.3.1)
24-
extlib (>= 0.9.15)
25-
multi_json (>= 1.0.0)
26-
bson (1.11.1)
27-
bson_ext (1.11.1)
28-
bson (~> 1.11.1)
21+
addressable (2.4.0)
22+
bson (1.12.5)
23+
bson_ext (1.12.5)
24+
bson (~> 1.12.5)
2925
builder (3.2.2)
3026
chalk-config (0.2.1)
3127
configatron (~> 4.4)
32-
chalk-log (0.1.2)
28+
chalk-log (0.1.3)
3329
chalk-config
3430
logging
3531
lspace
36-
coderay (1.1.0)
32+
coderay (1.1.1)
3733
coercible (1.0.0)
3834
descendants_tracker (~> 0.0.1)
39-
configatron (4.4.1)
35+
configatron (4.5.0)
4036
descendants_tracker (0.0.4)
4137
thread_safe (~> 0.3, >= 0.3.1)
42-
einhorn (0.6.3)
38+
domain_name (0.5.20160216)
39+
unf (>= 0.0.5, < 1.0.0)
40+
einhorn (0.7.1)
4341
erubis (2.7.0)
44-
extlib (0.9.16)
45-
faraday (0.9.0)
42+
faraday (0.9.2)
4643
multipart-post (>= 1.2, < 3)
47-
google-api-client (0.7.1)
48-
addressable (>= 2.3.2)
49-
autoparse (>= 0.3.3)
50-
extlib (>= 0.9.15)
51-
faraday (>= 0.9.0)
52-
jwt (>= 0.1.5)
53-
launchy (>= 2.1.1)
54-
multi_json (>= 1.0.0)
55-
retriable (>= 1.4)
56-
signet (>= 0.5.0)
57-
uuidtools (>= 2.1.0)
58-
haml (3.1.8)
59-
i18n (0.6.11)
60-
json (1.8.1)
61-
jwt (1.2.0)
62-
launchy (2.4.3)
44+
google-api-client (0.9.3)
6345
addressable (~> 2.3)
64-
little-plugger (1.1.3)
65-
logging (1.8.2)
66-
little-plugger (>= 1.1.3)
67-
multi_json (>= 1.8.4)
46+
googleauth (~> 0.5)
47+
httpclient (~> 2.7)
48+
hurley (~> 0.1)
49+
memoist (~> 0.11)
50+
mime-types (>= 1.6)
51+
representable (~> 2.3.0)
52+
retriable (~> 2.0)
53+
thor (~> 0.19)
54+
googleauth (0.5.1)
55+
faraday (~> 0.9)
56+
jwt (~> 1.4)
57+
logging (~> 2.0)
58+
memoist (~> 0.12)
59+
multi_json (~> 1.11)
60+
os (~> 0.9)
61+
signet (~> 0.7)
62+
haml (3.1.8)
63+
http-cookie (1.0.2)
64+
domain_name (~> 0.5)
65+
httpclient (2.7.1)
66+
hurley (0.2)
67+
i18n (0.7.0)
68+
json (1.8.3)
69+
jwt (1.5.3)
70+
little-plugger (1.1.4)
71+
logging (2.0.0)
72+
little-plugger (~> 1.1)
73+
multi_json (~> 1.10)
6874
lspace (0.13)
6975
mail (2.6.3)
7076
mime-types (>= 1.16, < 3)
77+
memoist (0.14.0)
7178
metaclass (0.0.4)
7279
method_source (0.8.2)
73-
mime-types (2.4.3)
74-
minitest (5.4.3)
80+
mime-types (2.99.1)
81+
minitest (5.8.4)
7582
mocha (1.1.0)
7683
metaclass (~> 0.0.1)
77-
mongo (1.11.1)
78-
bson (= 1.11.1)
84+
mongo (1.12.5)
85+
bson (= 1.12.5)
7986
mongo_mapper (0.13.1)
8087
activemodel (>= 3.0.0)
8188
activesupport (>= 3.0)
8289
mongo (~> 1.8)
8390
plucky (~> 0.6.5)
84-
multi_json (1.10.1)
91+
multi_json (1.11.2)
8592
multipart-post (2.0.0)
86-
netrc (0.8.0)
93+
netrc (0.11.0)
94+
os (0.9.6)
8795
plucky (0.6.6)
8896
mongo (~> 1.5)
89-
pry (0.10.1)
97+
pry (0.10.3)
9098
coderay (~> 1.1.0)
9199
method_source (~> 0.8.1)
92100
slop (~> 3.4)
93-
puma (2.10.1)
94-
rack (>= 1.1, < 2.0)
95-
rack (1.5.2)
101+
puma (3.0.2)
102+
rack (1.6.4)
96103
rack-flash3 (1.0.5)
97104
rack
98105
rack-protection (1.5.3)
99106
rack
100107
rack_csrf (2.5.0)
101108
rack (>= 1.1.0)
102-
rake (10.4.0)
103-
rest-client (1.7.2)
109+
rake (10.5.0)
110+
representable (2.3.0)
111+
uber (~> 0.0.7)
112+
rest-client (1.8.0)
113+
http-cookie (>= 1.0.2, < 2.0)
104114
mime-types (>= 1.16, < 3.0)
105115
netrc (~> 0.7)
106-
retriable (1.4.1)
107-
signet (0.5.1)
108-
addressable (>= 2.2.3)
109-
faraday (>= 0.9.0.rc5)
110-
jwt (>= 0.1.5)
111-
multi_json (>= 1.0.0)
112-
sinatra (1.4.5)
113-
rack (~> 1.4)
116+
retriable (2.1.0)
117+
signet (0.7.2)
118+
addressable (~> 2.3)
119+
faraday (~> 0.9)
120+
jwt (~> 1.5)
121+
multi_json (~> 1.10)
122+
sinatra (1.4.7)
123+
rack (~> 1.5)
114124
rack-protection (~> 1.4)
115-
tilt (~> 1.3, >= 1.3.4)
125+
tilt (>= 1.3, < 3)
116126
slop (3.6.0)
117127
symmetric-encryption (3.8.2)
118128
coercible (~> 1.0)
119-
thread (0.1.4)
120-
thread_safe (0.3.4)
121-
tilt (1.4.1)
129+
thor (0.19.1)
130+
thread (0.2.2)
131+
thread_safe (0.3.5)
132+
tilt (2.0.2)
122133
tzinfo (1.2.2)
123134
thread_safe (~> 0.1)
124-
uuidtools (2.1.5)
135+
uber (0.0.15)
136+
unf (0.1.4)
137+
unf_ext
138+
unf_ext (0.0.7.2)
125139

126140
PLATFORMS
127141
ruby
@@ -137,6 +151,7 @@ DEPENDENCIES
137151
google-api-client
138152
mail
139153
mocha
154+
mongo (~> 1.12)
140155
mongo_mapper
141156
pry
142157
puma
@@ -147,3 +162,6 @@ DEPENDENCIES
147162
sinatra
148163
symmetric-encryption
149164
thread
165+
166+
BUNDLED WITH
167+
1.11.2

0 commit comments

Comments
 (0)