Skip to content

Commit e20ee96

Browse files
committed
Upgrade dependencies.
1 parent 9acf176 commit e20ee96

File tree

12 files changed

+145
-147
lines changed

12 files changed

+145
-147
lines changed

.rubocop.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
1-
inherit_from: .rubocop_todo.yml
1+
AllCops:
2+
Exclude:
3+
- vendor/**/*
4+
5+
Metrics:
6+
Enabled: false
7+
8+
Metrics/LineLength:
9+
Max: 256
10+
Enabled: false
211

12+
Style/Documentation:
13+
Enabled: false
14+
15+
Style/FrozenStringLiteralComment:
16+
Enabled: false
17+
18+
inherit_from: .rubocop_todo.yml

.rubocop_todo.yml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,31 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2015-08-28 08:52:35 -0400 using RuboCop version 0.33.0.
3+
# on 2018-07-23 12:45:09 +0200 using RuboCop version 0.58.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

99
# Offense count: 1
10-
Metrics/AbcSize:
11-
Max: 19
12-
13-
# Offense count: 27
14-
# Configuration parameters: AllowURI, URISchemes.
15-
Metrics/LineLength:
16-
Max: 126
10+
Lint/AmbiguousBlockAssociation:
11+
Exclude:
12+
- 'api/entities.rb'
1713

1814
# Offense count: 1
19-
# Configuration parameters: CountComments.
20-
Metrics/MethodLength:
21-
Max: 15
22-
23-
# Offense count: 15
24-
Style/Documentation:
15+
Lint/UriEscapeUnescape:
2516
Exclude:
26-
- 'api/content_type.rb'
27-
- 'api/entities.rb'
28-
- 'api/get_json.rb'
29-
- 'api/header_versioning.rb'
30-
- 'api/path_versioning.rb'
31-
- 'api/ping.rb'
32-
- 'api/post_json.rb'
33-
- 'api/post_put.rb'
34-
- 'api/rescue_from.rb'
3517
- 'api/upload_file.rb'
36-
- 'api/wrap_response.rb'
37-
- 'api/wrap_response_decorator.rb'
38-
- 'app/acme_app.rb'
39-
- 'app/api.rb'
4018

4119
# Offense count: 1
4220
# Cop supports --auto-correct.
21+
# Configuration parameters: EnforcedStyle.
22+
# SupportedStyles: line_count_dependent, lambda, literal
4323
Style/Lambda:
4424
Exclude:
4525
- 'app/acme_app.rb'
4626

4727
# Offense count: 1
28+
# Cop supports --auto-correct.
4829
Style/RescueModifier:
4930
Exclude:
5031
- 'api/get_json.rb'

Gemfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ source 'http://rubygems.org'
22

33
ruby '2.3.1'
44

5-
gem 'grape', '~> 0.16'
5+
gem 'grape'
66
gem 'grape-entity'
77
gem 'grape-swagger'
88
gem 'grape-swagger-entity'
99
gem 'json'
10-
gem 'newrelic_rpm'
11-
gem 'rack-cors'
1210
gem 'mime-types'
11+
gem 'newrelic_rpm'
1312
gem 'nokogiri'
13+
gem 'rack-cors'
1414

1515
group :development do
16-
gem 'rake'
1716
gem 'guard'
1817
gem 'guard-bundler'
1918
gem 'guard-rack'
19+
gem 'rake'
2020
gem 'rubocop'
2121
end
2222

2323
group :test do
24-
gem 'rspec'
25-
gem 'rack-test'
2624
gem 'capybara'
25+
gem 'rack-test'
26+
gem 'rspec'
2727
gem 'selenium-webdriver'
2828
end

Gemfile.lock

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,57 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
5-
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
4+
activesupport (5.2.0)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
6+
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
10-
addressable (2.4.0)
11-
ast (2.3.0)
9+
addressable (2.5.2)
10+
public_suffix (>= 2.0.2, < 4.0)
11+
ast (2.4.0)
1212
axiom-types (0.1.1)
1313
descendants_tracker (~> 0.0.4)
1414
ice_nine (~> 0.11.0)
1515
thread_safe (~> 0.3, >= 0.3.1)
16-
builder (3.2.2)
17-
capybara (2.7.1)
16+
builder (3.2.3)
17+
capybara (3.4.1)
1818
addressable
19-
mime-types (>= 1.16)
20-
nokogiri (>= 1.3.3)
21-
rack (>= 1.0.0)
22-
rack-test (>= 0.5.4)
23-
xpath (~> 2.0)
24-
childprocess (0.5.9)
19+
mini_mime (>= 0.1.3)
20+
nokogiri (~> 1.8)
21+
rack (>= 1.6.0)
22+
rack-test (>= 0.6.3)
23+
xpath (~> 3.1)
24+
childprocess (0.9.0)
2525
ffi (~> 1.0, >= 1.0.11)
26-
coderay (1.1.1)
26+
coderay (1.1.2)
2727
coercible (1.0.0)
2828
descendants_tracker (~> 0.0.1)
29+
concurrent-ruby (1.0.5)
2930
descendants_tracker (0.0.4)
3031
thread_safe (~> 0.3, >= 0.3.1)
31-
diff-lcs (1.2.5)
32-
enumerable-lazy (0.0.1)
32+
diff-lcs (1.3)
3333
equalizer (0.0.11)
34-
ffi (1.9.10)
34+
ffi (1.9.25)
3535
formatador (0.2.5)
36-
grape (0.16.2)
36+
grape (1.0.3)
3737
activesupport
3838
builder
39-
hashie (>= 2.1.0)
40-
multi_json (>= 1.3.2)
41-
multi_xml (>= 0.5.2)
42-
mustermann19 (~> 0.4.3)
39+
mustermann-grape (~> 1.0.0)
4340
rack (>= 1.3.0)
4441
rack-accept
4542
virtus (>= 1.0.0)
46-
grape-entity (0.5.1)
47-
activesupport
43+
grape-entity (0.7.1)
44+
activesupport (>= 4.0)
4845
multi_json (>= 1.3.2)
49-
grape-swagger (0.21.0)
50-
grape (>= 0.12.0)
51-
grape-swagger-entity (0.1.4)
52-
grape-entity
46+
grape-swagger (0.30.1)
47+
grape (>= 0.16.2)
48+
grape-swagger-entity (0.2.5)
49+
grape-entity (>= 0.5.0)
5350
grape-swagger (>= 0.20.4)
54-
guard (2.14.0)
51+
guard (2.14.2)
5552
formatador (>= 0.2.4)
5653
listen (>= 2.7, < 4.0)
57-
lumberjack (~> 1.0)
54+
lumberjack (>= 1.0.12, < 2.0)
5855
nenv (~> 0.1)
5956
notiffany (~> 0.0)
6057
pry (>= 0.9.12)
@@ -69,102 +66,102 @@ GEM
6966
ffi
7067
guard (~> 2.3)
7168
spoon
72-
hashie (3.4.4)
73-
i18n (0.7.0)
69+
i18n (1.0.1)
70+
concurrent-ruby (~> 1.0)
7471
ice_nine (0.11.2)
75-
json (1.8.3)
72+
jaro_winkler (1.5.1)
73+
json (2.1.0)
7674
listen (3.1.5)
7775
rb-fsevent (~> 0.9, >= 0.9.4)
7876
rb-inotify (~> 0.9, >= 0.9.7)
7977
ruby_dep (~> 1.2)
80-
lumberjack (1.0.10)
81-
method_source (0.8.2)
78+
lumberjack (1.0.13)
79+
method_source (0.9.0)
8280
mime-types (3.1)
8381
mime-types-data (~> 3.2015)
8482
mime-types-data (3.2016.0521)
85-
mini_portile2 (2.1.0)
86-
minitest (5.9.0)
87-
multi_json (1.12.1)
88-
multi_xml (0.5.5)
89-
mustermann19 (0.4.3)
90-
enumerable-lazy
83+
mini_mime (1.0.0)
84+
mini_portile2 (2.3.0)
85+
minitest (5.11.3)
86+
multi_json (1.13.1)
87+
mustermann (1.0.2)
88+
mustermann-grape (1.0.0)
89+
mustermann (~> 1.0.0)
9190
nenv (0.3.0)
92-
newrelic_rpm (3.15.2.317)
93-
nokogiri (1.6.8)
94-
mini_portile2 (~> 2.1.0)
95-
pkg-config (~> 1.1.7)
96-
notiffany (0.1.0)
91+
newrelic_rpm (5.2.0.345)
92+
nokogiri (1.8.4)
93+
mini_portile2 (~> 2.3.0)
94+
notiffany (0.1.1)
9795
nenv (~> 0.1)
9896
shellany (~> 0.0)
99-
parser (2.3.1.2)
100-
ast (~> 2.2)
101-
pkg-config (1.1.7)
102-
powerpack (0.1.1)
103-
pry (0.10.3)
97+
parallel (1.12.1)
98+
parser (2.5.1.2)
99+
ast (~> 2.4.0)
100+
powerpack (0.1.2)
101+
pry (0.11.3)
104102
coderay (~> 1.1.0)
105-
method_source (~> 0.8.1)
106-
slop (~> 3.4)
107-
rack (1.6.4)
103+
method_source (~> 0.9.0)
104+
public_suffix (3.0.2)
105+
rack (2.0.5)
108106
rack-accept (0.4.5)
109107
rack (>= 0.4)
110-
rack-cors (0.4.0)
111-
rack-test (0.6.3)
112-
rack (>= 1.0)
113-
rainbow (2.1.0)
114-
rake (11.2.2)
115-
rb-fsevent (0.9.7)
116-
rb-inotify (0.9.7)
117-
ffi (>= 0.5.0)
118-
rspec (3.4.0)
119-
rspec-core (~> 3.4.0)
120-
rspec-expectations (~> 3.4.0)
121-
rspec-mocks (~> 3.4.0)
122-
rspec-core (3.4.4)
123-
rspec-support (~> 3.4.0)
124-
rspec-expectations (3.4.0)
108+
rack-cors (1.0.2)
109+
rack-test (1.1.0)
110+
rack (>= 1.0, < 3)
111+
rainbow (3.0.0)
112+
rake (12.3.1)
113+
rb-fsevent (0.10.3)
114+
rb-inotify (0.9.10)
115+
ffi (>= 0.5.0, < 2)
116+
rspec (3.7.0)
117+
rspec-core (~> 3.7.0)
118+
rspec-expectations (~> 3.7.0)
119+
rspec-mocks (~> 3.7.0)
120+
rspec-core (3.7.1)
121+
rspec-support (~> 3.7.0)
122+
rspec-expectations (3.7.0)
125123
diff-lcs (>= 1.2.0, < 2.0)
126-
rspec-support (~> 3.4.0)
127-
rspec-mocks (3.4.1)
124+
rspec-support (~> 3.7.0)
125+
rspec-mocks (3.7.0)
128126
diff-lcs (>= 1.2.0, < 2.0)
129-
rspec-support (~> 3.4.0)
130-
rspec-support (3.4.1)
131-
rubocop (0.40.0)
132-
parser (>= 2.3.1.0, < 3.0)
127+
rspec-support (~> 3.7.0)
128+
rspec-support (3.7.1)
129+
rubocop (0.58.1)
130+
jaro_winkler (~> 1.5.1)
131+
parallel (~> 1.10)
132+
parser (>= 2.5, != 2.5.1.1)
133133
powerpack (~> 0.1)
134-
rainbow (>= 1.99.1, < 3.0)
134+
rainbow (>= 2.2.2, < 4.0)
135135
ruby-progressbar (~> 1.7)
136136
unicode-display_width (~> 1.0, >= 1.0.1)
137-
ruby-progressbar (1.8.1)
138-
ruby_dep (1.3.1)
139-
rubyzip (1.2.0)
140-
selenium-webdriver (2.53.3)
137+
ruby-progressbar (1.9.0)
138+
ruby_dep (1.5.0)
139+
rubyzip (1.2.1)
140+
selenium-webdriver (3.13.1)
141141
childprocess (~> 0.5)
142-
rubyzip (~> 1.0)
143-
websocket (~> 1.0)
142+
rubyzip (~> 1.2)
144143
shellany (0.0.1)
145-
slop (3.6.0)
146-
spoon (0.0.4)
144+
spoon (0.0.6)
147145
ffi
148-
thor (0.19.1)
149-
thread_safe (0.3.5)
150-
tzinfo (1.2.2)
146+
thor (0.20.0)
147+
thread_safe (0.3.6)
148+
tzinfo (1.2.5)
151149
thread_safe (~> 0.1)
152-
unicode-display_width (1.0.5)
150+
unicode-display_width (1.4.0)
153151
virtus (1.0.5)
154152
axiom-types (~> 0.1)
155153
coercible (~> 1.0)
156154
descendants_tracker (~> 0.0, >= 0.0.3)
157155
equalizer (~> 0.0, >= 0.0.9)
158-
websocket (1.2.3)
159-
xpath (2.0.0)
160-
nokogiri (~> 1.3)
156+
xpath (3.1.0)
157+
nokogiri (~> 1.8)
161158

162159
PLATFORMS
163160
ruby
164161

165162
DEPENDENCIES
166163
capybara
167-
grape (~> 0.16)
164+
grape
168165
grape-entity
169166
grape-swagger
170167
grape-swagger-entity
@@ -182,5 +179,8 @@ DEPENDENCIES
182179
rubocop
183180
selenium-webdriver
184181

182+
RUBY VERSION
183+
ruby 2.3.1p112
184+
185185
BUNDLED WITH
186-
1.12.5
186+
1.16.1

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RSpec::Core::RakeTask.new(:spec)
1010

1111
task :environment do
1212
ENV['RACK_ENV'] ||= 'development'
13-
require File.expand_path('../config/environment', __FILE__)
13+
require File.expand_path('config/environment', __dir__)
1414
end
1515

1616
task routes: :environment do
@@ -24,4 +24,4 @@ end
2424
require 'rubocop/rake_task'
2525
RuboCop::RakeTask.new(:rubocop)
2626

27-
task default: [:rubocop, :spec]
27+
task default: %i[rubocop spec]

0 commit comments

Comments
 (0)