Skip to content

Commit d0a6441

Browse files
dblockdblock
committed
Updated dependencies.
1 parent 09cd630 commit d0a6441

File tree

4 files changed

+99
-131
lines changed

4 files changed

+99
-131
lines changed

‎Gemfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ source 'https://rubygems.org'
22

33
ruby '2.3.1'
44

5-
gem 'slack-ruby-bot-server', '~> 0.4.0'
6-
gem 'rack-server-pages', github: 'dblock/rack-server-pages', branch: 'next'
5+
gem 'mongoid'
6+
gem 'mongoid-scroll'
7+
gem 'slack-ruby-bot-server'
78
gem 'newrelic-slack-ruby-bot'
89

910
group :test do
@@ -14,4 +15,5 @@ group :test do
1415
gem 'vcr'
1516
gem 'webmock'
1617
gem 'database_cleaner'
18+
gem 'rack-test'
1719
end

‎Gemfile.lock‎

Lines changed: 93 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,21 @@
1-
GIT
2-
remote: git://github.com/dblock/rack-server-pages.git
3-
revision: e77a45f208affed84b02b379b9c4cdb181826a8d
4-
branch: next
5-
specs:
6-
rack-server-pages (0.0.6)
7-
rack
8-
91
GEM
102
remote: https://rubygems.org/
113
specs:
12-
actionpack (5.0.0.1)
13-
actionview (= 5.0.0.1)
14-
activesupport (= 5.0.0.1)
15-
rack (~> 2.0)
16-
rack-test (~> 0.6.3)
17-
rails-dom-testing (~> 2.0)
18-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
19-
actionview (5.0.0.1)
20-
activesupport (= 5.0.0.1)
21-
builder (~> 3.1)
22-
erubis (~> 2.7.0)
23-
rails-dom-testing (~> 2.0)
24-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
25-
activemodel (5.0.0.1)
26-
activesupport (= 5.0.0.1)
27-
activesupport (5.0.0.1)
4+
activemodel (5.1.3)
5+
activesupport (= 5.1.3)
6+
activesupport (5.1.3)
287
concurrent-ruby (~> 1.0, >= 1.0.2)
298
i18n (~> 0.7)
309
minitest (~> 5.1)
3110
tzinfo (~> 1.1)
32-
addressable (2.4.0)
11+
addressable (2.5.1)
12+
public_suffix (~> 2.0, >= 2.0.2)
3313
axiom-types (0.1.1)
3414
descendants_tracker (~> 0.0.4)
3515
ice_nine (~> 0.11.0)
3616
thread_safe (~> 0.3, >= 0.3.1)
37-
bson (4.1.1)
38-
builder (3.2.2)
17+
bson (4.2.2)
18+
builder (3.2.3)
3919
celluloid (0.17.3)
4020
celluloid-essentials
4121
celluloid-extras
@@ -59,148 +39,136 @@ GEM
5939
timers (>= 4.1.1)
6040
coercible (1.0.0)
6141
descendants_tracker (~> 0.0.1)
62-
concurrent-ruby (1.0.2)
42+
concurrent-ruby (1.0.5)
6343
crack (0.4.3)
6444
safe_yaml (~> 1.0.0)
65-
database_cleaner (1.5.3)
45+
database_cleaner (1.6.1)
46+
declarative (0.0.9)
47+
declarative-option (0.1.0)
6648
descendants_tracker (0.0.4)
6749
thread_safe (~> 0.3, >= 0.3.1)
68-
diff-lcs (1.2.5)
50+
diff-lcs (1.3)
6951
equalizer (0.0.11)
70-
erubis (2.7.0)
71-
fabrication (2.15.2)
72-
faker (1.6.6)
52+
fabrication (2.16.2)
53+
faker (1.8.4)
7354
i18n (~> 0.5)
74-
faraday (0.9.2)
55+
faraday (0.13.0)
7556
multipart-post (>= 1.2, < 3)
76-
faraday_middleware (0.10.0)
77-
faraday (>= 0.7.4, < 0.10)
78-
foreman (0.82.0)
57+
faraday_middleware (0.12.2)
58+
faraday (>= 0.7.4, < 1.0)
59+
foreman (0.84.0)
7960
thor (~> 0.19.1)
80-
gli (2.14.0)
81-
grape (0.18.0)
61+
gli (2.16.1)
62+
grape (1.0.0)
8263
activesupport
8364
builder
84-
hashie (>= 2.1.0)
85-
multi_json (>= 1.3.2)
86-
multi_xml (>= 0.5.2)
87-
mustermann-grape (~> 0.4.0)
65+
mustermann-grape (~> 1.0.0)
8866
rack (>= 1.3.0)
8967
rack-accept
9068
virtus (>= 1.0.0)
91-
grape-roar (0.3.0)
69+
grape-roar (0.4.1)
9270
grape
93-
roar (>= 1.0)
94-
grape-swagger (0.24.0)
95-
grape (>= 0.12.0)
96-
hashdiff (0.3.0)
97-
hashie (3.4.6)
98-
hitimes (1.2.4)
99-
i18n (0.7.0)
71+
multi_json
72+
roar (~> 1.1.0)
73+
grape-swagger (0.27.3)
74+
grape (>= 0.16.2)
75+
hashdiff (0.3.5)
76+
hashie (3.5.6)
77+
hitimes (1.2.6)
78+
i18n (0.8.6)
10079
ice_nine (0.11.2)
101-
json (2.0.2)
102-
kaminari (0.17.0)
103-
actionpack (>= 3.0.0)
104-
activesupport (>= 3.0.0)
105-
kaminari-mongoid (0.1.2)
106-
kaminari
107-
kgio (2.10.0)
108-
loofah (2.0.3)
109-
nokogiri (>= 1.5.9)
110-
mini_portile2 (2.1.0)
111-
minitest (5.9.1)
112-
mongo (2.3.0)
113-
bson (~> 4.1)
114-
mongoid (6.0.2)
115-
activemodel (~> 5.0)
116-
mongo (~> 2.3)
117-
mongoid-compatibility (0.4.0)
80+
json (2.1.0)
81+
kaminari-core (1.0.1)
82+
kaminari-grape (1.0.1)
83+
grape
84+
kaminari-core (~> 1.0)
85+
kgio (2.11.0)
86+
minitest (5.10.3)
87+
mongo (2.4.3)
88+
bson (>= 4.2.1, < 5.0.0)
89+
mongoid (6.2.1)
90+
activemodel (~> 5.1)
91+
mongo (>= 2.4.1, < 3.0.0)
92+
mongoid-compatibility (0.4.1)
11893
activesupport
11994
mongoid (>= 2.0)
12095
mongoid-scroll (0.3.5)
12196
i18n
12297
mongoid (>= 3.0)
12398
mongoid-compatibility
12499
multi_json (1.12.1)
125-
multi_xml (0.5.5)
126100
multipart-post (2.0.0)
127-
mustermann (0.4.0)
128-
tool (~> 0.2)
129-
mustermann-grape (0.4.0)
130-
mustermann (= 0.4.0)
101+
mustermann (1.0.0)
102+
mustermann-grape (1.0.0)
103+
mustermann (~> 1.0.0)
131104
newrelic-slack-ruby-bot (0.1.0)
132105
newrelic_rpm
133106
slack-ruby-bot
134-
newrelic_rpm (3.17.0.325)
135-
nio4r (1.2.1)
136-
nokogiri (1.6.8.1)
137-
mini_portile2 (~> 2.1.0)
138-
rack (2.0.1)
107+
newrelic_rpm (4.3.0.335)
108+
nio4r (2.1.0)
109+
public_suffix (2.0.5)
110+
rack (2.0.3)
139111
rack-accept (0.4.5)
140112
rack (>= 0.4)
141-
rack-cors (0.4.0)
113+
rack-cors (1.0.1)
142114
rack-rewrite (1.5.1)
143-
rack-test (0.6.3)
144-
rack (>= 1.0)
145-
rails-dom-testing (2.0.1)
146-
activesupport (>= 4.2.0, < 6.0)
147-
nokogiri (~> 1.6.0)
148-
rails-html-sanitizer (1.0.3)
149-
loofah (~> 2.0)
150-
raindrops (0.17.0)
151-
rake (11.3.0)
152-
representable (2.3.0)
153-
uber (~> 0.0.7)
154-
roar (1.0.4)
155-
representable (>= 2.0.1, < 2.4.0)
156-
rspec (3.5.0)
157-
rspec-core (~> 3.5.0)
158-
rspec-expectations (~> 3.5.0)
159-
rspec-mocks (~> 3.5.0)
160-
rspec-core (3.5.4)
161-
rspec-support (~> 3.5.0)
162-
rspec-expectations (3.5.0)
115+
rack-server-pages (0.1.0)
116+
rack
117+
rack-test (0.7.0)
118+
rack (>= 1.0, < 3)
119+
raindrops (0.19.0)
120+
rake (12.0.0)
121+
representable (3.0.4)
122+
declarative (< 0.1.0)
123+
declarative-option (< 0.2.0)
124+
uber (< 0.2.0)
125+
roar (1.1.0)
126+
representable (~> 3.0.0)
127+
rspec (3.6.0)
128+
rspec-core (~> 3.6.0)
129+
rspec-expectations (~> 3.6.0)
130+
rspec-mocks (~> 3.6.0)
131+
rspec-core (3.6.0)
132+
rspec-support (~> 3.6.0)
133+
rspec-expectations (3.6.0)
163134
diff-lcs (>= 1.2.0, < 2.0)
164-
rspec-support (~> 3.5.0)
165-
rspec-mocks (3.5.0)
135+
rspec-support (~> 3.6.0)
136+
rspec-mocks (3.6.0)
166137
diff-lcs (>= 1.2.0, < 2.0)
167-
rspec-support (~> 3.5.0)
168-
rspec-support (3.5.0)
138+
rspec-support (~> 3.6.0)
139+
rspec-support (3.6.0)
169140
safe_yaml (1.0.4)
170-
slack-ruby-bot (0.9.0)
141+
slack-ruby-bot (0.10.4)
171142
hashie
172143
slack-ruby-client (>= 0.6.0)
173-
slack-ruby-bot-server (0.4.0)
144+
slack-ruby-bot-server (0.6.1)
174145
celluloid-io
175146
foreman
176147
grape
177-
grape-roar
148+
grape-roar (>= 0.4.0)
178149
grape-swagger
179-
kaminari-mongoid
180-
mongoid
181-
mongoid-scroll
150+
kaminari-grape
182151
rack-cors
183152
rack-rewrite
184153
rack-server-pages
185154
slack-ruby-bot
186155
unicorn
187-
slack-ruby-client (0.7.7)
156+
slack-ruby-client (0.9.0)
188157
activesupport
189-
faraday
158+
faraday (>= 0.9)
190159
faraday_middleware
191160
gli
192161
hashie
193162
json
194163
websocket-driver
195-
thor (0.19.1)
196-
thread_safe (0.3.5)
197-
timers (4.1.1)
164+
thor (0.19.4)
165+
thread_safe (0.3.6)
166+
timers (4.1.2)
198167
hitimes
199-
tool (0.2.3)
200-
tzinfo (1.2.2)
168+
tzinfo (1.2.3)
201169
thread_safe (~> 0.1)
202-
uber (0.0.15)
203-
unicorn (5.1.0)
170+
uber (0.1.0)
171+
unicorn (5.3.0)
204172
kgio (~> 2.6)
205173
raindrops (~> 0.7)
206174
vcr (3.0.3)
@@ -209,11 +177,11 @@ GEM
209177
coercible (~> 1.0)
210178
descendants_tracker (~> 0.0, >= 0.0.3)
211179
equalizer (~> 0.0, >= 0.0.9)
212-
webmock (2.1.0)
180+
webmock (3.0.1)
213181
addressable (>= 2.3.6)
214182
crack (>= 0.3.2)
215183
hashdiff
216-
websocket-driver (0.6.4)
184+
websocket-driver (0.6.5)
217185
websocket-extensions (>= 0.1.0)
218186
websocket-extensions (0.1.2)
219187

@@ -224,16 +192,18 @@ DEPENDENCIES
224192
database_cleaner
225193
fabrication
226194
faker
195+
mongoid
196+
mongoid-scroll
227197
newrelic-slack-ruby-bot
228-
rack-server-pages!
198+
rack-test
229199
rake
230200
rspec
231-
slack-ruby-bot-server (~> 0.4.0)
201+
slack-ruby-bot-server
232202
vcr
233203
webmock
234204

235205
RUBY VERSION
236206
ruby 2.3.1p112
237207

238208
BUNDLED WITH
239-
1.13.6
209+
1.14.6

‎config.ru‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ require_relative 'commands'
66

77
Mongoid.load!(File.expand_path('config/mongoid.yml', __dir__), ENV['RACK_ENV'])
88

9-
if ENV['RACK_ENV'] == 'development'
10-
puts 'Loading NewRelic in developer mode ...'
11-
require 'new_relic/rack/developer_mode'
12-
use NewRelic::Rack::DeveloperMode
13-
end
14-
159
NewRelic::Agent.manual_start
1610

1711
SlackRubyBotServer::App.instance.prepare!

‎spec/spec_helper.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
ENV['RACK_ENV'] = 'test'
44

5+
Bundler.require
6+
57
require 'slack-ruby-bot-server/rspec'
68

79
Mongoid.load!(File.expand_path('../config/mongoid.yml', __dir__), ENV['RACK_ENV'])

0 commit comments

Comments
 (0)