Skip to content

Commit 92e9ca3

Browse files
authored
Merge pull request #7 from dblock/master
Bundle update
2 parents e0d78cf + c64d4ff commit 92e9ca3

File tree

3 files changed

+103
-112
lines changed

3 files changed

+103
-112
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.3.1'
3+
ruby '2.5.3'
44

55
gem 'mongoid'
66
gem 'mongoid-scroll'
77
gem 'newrelic-slack-ruby-bot'
88
gem 'slack-ruby-bot-server'
9+
gem 'unicorn'
910

1011
group :test do
1112
gem 'capybara'

Gemfile.lock

Lines changed: 100 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,65 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (5.1.3)
5-
activesupport (= 5.1.3)
6-
activesupport (5.1.3)
4+
activemodel (5.2.2.1)
5+
activesupport (= 5.2.2.1)
6+
activesupport (5.2.2.1)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
8-
i18n (~> 0.7)
8+
i18n (>= 0.7, < 2)
99
minitest (~> 5.1)
1010
tzinfo (~> 1.1)
11-
addressable (2.5.1)
12-
public_suffix (~> 2.0, >= 2.0.2)
11+
addressable (2.6.0)
12+
public_suffix (>= 2.0.2, < 4.0)
13+
async (1.17.0)
14+
event (~> 1.3)
15+
nio4r (~> 2.3)
16+
timers (~> 4.1)
17+
async-io (1.20.0)
18+
async (~> 1.14)
19+
async-websocket (0.8.0)
20+
async-io
21+
websocket-driver (~> 0.7.0)
1322
axiom-types (0.1.1)
1423
descendants_tracker (~> 0.0.4)
1524
ice_nine (~> 0.11.0)
1625
thread_safe (~> 0.3, >= 0.3.1)
17-
bson (4.2.2)
26+
bson (4.4.2)
1827
builder (3.2.3)
19-
capybara (2.15.1)
28+
capybara (3.15.0)
2029
addressable
2130
mini_mime (>= 0.1.3)
22-
nokogiri (>= 1.3.3)
23-
rack (>= 1.0.0)
24-
rack-test (>= 0.5.4)
25-
xpath (~> 2.0)
26-
celluloid (0.17.3)
27-
celluloid-essentials
28-
celluloid-extras
29-
celluloid-fsm
30-
celluloid-pool
31-
celluloid-supervision
32-
timers (>= 4.1.1)
33-
celluloid-essentials (0.20.5)
34-
timers (>= 4.1.1)
35-
celluloid-extras (0.20.5)
36-
timers (>= 4.1.1)
37-
celluloid-fsm (0.20.5)
38-
timers (>= 4.1.1)
39-
celluloid-io (0.17.3)
40-
celluloid (>= 0.17.2)
41-
nio4r (>= 1.1)
42-
timers (>= 4.1.1)
43-
celluloid-pool (0.20.5)
44-
timers (>= 4.1.1)
45-
celluloid-supervision (0.20.6)
46-
timers (>= 4.1.1)
47-
childprocess (0.7.1)
31+
nokogiri (~> 1.8)
32+
rack (>= 1.6.0)
33+
rack-test (>= 0.6.3)
34+
regexp_parser (~> 1.2)
35+
xpath (~> 3.2)
36+
childprocess (0.9.0)
4837
ffi (~> 1.0, >= 1.0.11)
4938
coercible (1.0.0)
5039
descendants_tracker (~> 0.0.1)
51-
concurrent-ruby (1.0.5)
40+
concurrent-ruby (1.1.5)
5241
crack (0.4.3)
5342
safe_yaml (~> 1.0.0)
54-
database_cleaner (1.6.1)
55-
declarative (0.0.9)
43+
database_cleaner (1.7.0)
44+
declarative (0.0.10)
5645
declarative-option (0.1.0)
5746
descendants_tracker (0.0.4)
5847
thread_safe (~> 0.3, >= 0.3.1)
5948
diff-lcs (1.3)
6049
equalizer (0.0.11)
61-
fabrication (2.16.2)
62-
faker (1.8.4)
63-
i18n (~> 0.5)
64-
faraday (0.13.0)
50+
event (1.5.0)
51+
fabrication (2.20.1)
52+
faker (1.9.3)
53+
i18n (>= 0.7)
54+
faraday (0.15.4)
6555
multipart-post (>= 1.2, < 3)
66-
faraday_middleware (0.12.2)
56+
faraday_middleware (0.13.1)
6757
faraday (>= 0.7.4, < 1.0)
68-
ffi (1.9.18)
69-
foreman (0.84.0)
58+
ffi (1.10.0)
59+
foreman (0.85.0)
7060
thor (~> 0.19.1)
71-
gli (2.16.1)
72-
grape (1.0.0)
61+
gli (2.18.0)
62+
grape (1.2.3)
7363
activesupport
7464
builder
7565
mustermann-grape (~> 1.0.0)
@@ -80,87 +70,87 @@ GEM
8070
grape
8171
multi_json
8272
roar (~> 1.1.0)
83-
grape-swagger (0.27.3)
73+
grape-swagger (0.32.1)
8474
grape (>= 0.16.2)
85-
hashdiff (0.3.5)
86-
hashie (3.5.6)
87-
hitimes (1.2.6)
88-
i18n (0.8.6)
75+
hashdiff (0.3.8)
76+
hashie (3.6.0)
77+
i18n (1.6.0)
78+
concurrent-ruby (~> 1.0)
8979
ice_nine (0.11.2)
90-
json (2.1.0)
91-
kaminari-core (1.0.1)
80+
kaminari-core (1.1.1)
9281
kaminari-grape (1.0.1)
9382
grape
9483
kaminari-core (~> 1.0)
95-
kgio (2.11.0)
96-
mini_mime (0.1.3)
97-
mini_portile2 (2.2.0)
98-
minitest (5.10.3)
99-
mongo (2.4.3)
100-
bson (>= 4.2.1, < 5.0.0)
101-
mongoid (6.2.1)
102-
activemodel (~> 5.1)
103-
mongo (>= 2.4.1, < 3.0.0)
104-
mongoid-compatibility (0.4.1)
84+
kgio (2.11.2)
85+
mini_mime (1.0.1)
86+
mini_portile2 (2.4.0)
87+
minitest (5.11.3)
88+
mongo (2.8.0)
89+
bson (>= 4.4.2, < 5.0.0)
90+
mongoid (7.0.2)
91+
activemodel (>= 5.1, < 6.0.0)
92+
mongo (>= 2.5.1, < 3.0.0)
93+
mongoid-compatibility (0.5.1)
10594
activesupport
10695
mongoid (>= 2.0)
107-
mongoid-scroll (0.3.5)
96+
mongoid-scroll (0.3.6)
10897
i18n
10998
mongoid (>= 3.0)
11099
mongoid-compatibility
111-
multi_json (1.12.1)
100+
multi_json (1.13.1)
112101
multipart-post (2.0.0)
113-
mustermann (1.0.0)
102+
mustermann (1.0.3)
114103
mustermann-grape (1.0.0)
115104
mustermann (~> 1.0.0)
116-
newrelic-slack-ruby-bot (0.1.0)
105+
newrelic-slack-ruby-bot (0.2.1)
117106
newrelic_rpm
118-
slack-ruby-bot
119-
newrelic_rpm (4.3.0.335)
120-
nio4r (2.1.0)
121-
nokogiri (1.8.0)
122-
mini_portile2 (~> 2.2.0)
123-
public_suffix (2.0.5)
124-
rack (2.0.3)
107+
slack-ruby-bot (>= 0.10.5)
108+
newrelic_rpm (6.2.0.354)
109+
nio4r (2.3.1)
110+
nokogiri (1.10.1)
111+
mini_portile2 (~> 2.4.0)
112+
public_suffix (3.0.3)
113+
rack (2.0.6)
125114
rack-accept (0.4.5)
126115
rack (>= 0.4)
127-
rack-cors (1.0.1)
116+
rack-cors (1.0.2)
128117
rack-rewrite (1.5.1)
129118
rack-server-pages (0.1.0)
130119
rack
131-
rack-test (0.7.0)
120+
rack-test (1.1.0)
132121
rack (>= 1.0, < 3)
133122
raindrops (0.19.0)
134-
rake (12.0.0)
123+
rake (12.3.2)
124+
regexp_parser (1.3.0)
135125
representable (3.0.4)
136126
declarative (< 0.1.0)
137127
declarative-option (< 0.2.0)
138128
uber (< 0.2.0)
139129
roar (1.1.0)
140130
representable (~> 3.0.0)
141-
rspec (3.6.0)
142-
rspec-core (~> 3.6.0)
143-
rspec-expectations (~> 3.6.0)
144-
rspec-mocks (~> 3.6.0)
145-
rspec-core (3.6.0)
146-
rspec-support (~> 3.6.0)
147-
rspec-expectations (3.6.0)
131+
rspec (3.8.0)
132+
rspec-core (~> 3.8.0)
133+
rspec-expectations (~> 3.8.0)
134+
rspec-mocks (~> 3.8.0)
135+
rspec-core (3.8.0)
136+
rspec-support (~> 3.8.0)
137+
rspec-expectations (3.8.2)
148138
diff-lcs (>= 1.2.0, < 2.0)
149-
rspec-support (~> 3.6.0)
150-
rspec-mocks (3.6.0)
139+
rspec-support (~> 3.8.0)
140+
rspec-mocks (3.8.0)
151141
diff-lcs (>= 1.2.0, < 2.0)
152-
rspec-support (~> 3.6.0)
153-
rspec-support (3.6.0)
154-
rubyzip (1.2.1)
155-
safe_yaml (1.0.4)
156-
selenium-webdriver (3.4.4)
142+
rspec-support (~> 3.8.0)
143+
rspec-support (3.8.0)
144+
rubyzip (1.2.2)
145+
safe_yaml (1.0.5)
146+
selenium-webdriver (3.141.0)
157147
childprocess (~> 0.5)
158-
rubyzip (~> 1.0)
159-
slack-ruby-bot (0.10.4)
148+
rubyzip (~> 1.2, >= 1.2.2)
149+
slack-ruby-bot (0.12.0)
160150
hashie
161-
slack-ruby-client (>= 0.6.0)
162-
slack-ruby-bot-server (0.6.1)
163-
celluloid-io
151+
slack-ruby-client (>= 0.14.0)
152+
slack-ruby-bot-server (0.10.0)
153+
async-websocket
164154
foreman
165155
grape
166156
grape-roar (>= 0.4.0)
@@ -169,41 +159,39 @@ GEM
169159
rack-cors
170160
rack-rewrite
171161
rack-server-pages
172-
slack-ruby-bot
162+
slack-ruby-bot (>= 0.12.0)
173163
unicorn
174-
slack-ruby-client (0.9.0)
164+
slack-ruby-client (0.14.1)
175165
activesupport
176166
faraday (>= 0.9)
177167
faraday_middleware
178168
gli
179169
hashie
180-
json
181170
websocket-driver
182171
thor (0.19.4)
183172
thread_safe (0.3.6)
184-
timers (4.1.2)
185-
hitimes
186-
tzinfo (1.2.3)
173+
timers (4.3.0)
174+
tzinfo (1.2.5)
187175
thread_safe (~> 0.1)
188176
uber (0.1.0)
189-
unicorn (5.3.0)
177+
unicorn (5.5.0)
190178
kgio (~> 2.6)
191179
raindrops (~> 0.7)
192-
vcr (3.0.3)
180+
vcr (4.0.0)
193181
virtus (1.0.5)
194182
axiom-types (~> 0.1)
195183
coercible (~> 1.0)
196184
descendants_tracker (~> 0.0, >= 0.0.3)
197185
equalizer (~> 0.0, >= 0.0.9)
198-
webmock (3.0.1)
186+
webmock (3.5.1)
199187
addressable (>= 2.3.6)
200188
crack (>= 0.3.2)
201189
hashdiff
202-
websocket-driver (0.6.5)
190+
websocket-driver (0.7.0)
203191
websocket-extensions (>= 0.1.0)
204-
websocket-extensions (0.1.2)
205-
xpath (2.1.0)
206-
nokogiri (~> 1.3)
192+
websocket-extensions (0.1.3)
193+
xpath (3.2.0)
194+
nokogiri (~> 1.8)
207195

208196
PLATFORMS
209197
ruby
@@ -221,11 +209,12 @@ DEPENDENCIES
221209
rspec
222210
selenium-webdriver
223211
slack-ruby-bot-server
212+
unicorn
224213
vcr
225214
webmock
226215

227216
RUBY VERSION
228-
ruby 2.3.1p112
217+
ruby 2.5.3p105
229218

230219
BUNDLED WITH
231-
1.14.6
220+
1.16.6

spec/support/capybara.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
Capybara.configure do |config|
44
config.app = SlackRubyBotServer::Api::Middleware.instance
5+
config.server = :webrick
56
config.server_port = 9293
67
end

0 commit comments

Comments
 (0)