Skip to content

Commit 87188be

Browse files
tmobairdjustin808
authored andcommitted
Updating ruby version and gem versions (#383)
* Updating ruby version and gem versions * Updating rubocop config. Auto-fixing rubocop warnings
1 parent f0ca4c2 commit 87188be

15 files changed

+97
-95
lines changed

.rubocop.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AllCops:
77
Include:
88
- '**/Rakefile'
99
- '**/config.ru'
10+
- '**/Gemfile'
1011
Exclude:
1112
- 'vendor/**/*'
1213
- 'spec/fixtures/**/*'
@@ -16,6 +17,7 @@ AllCops:
1617
- 'db/seeds.rb'
1718
- 'client/node_modules/**/*'
1819
- 'bin/**/*'
20+
- 'Procfile.*'
1921
- !ruby/regexp /old_and_unused\.rb$/
2022

2123
Metrics/LineLength:
@@ -24,6 +26,9 @@ Metrics/LineLength:
2426
Metrics/MethodLength:
2527
Max: 25
2628

29+
Metrics/BlockLength:
30+
Max: 105
31+
2732
Style/StringLiterals:
2833
EnforcedStyle: double_quotes
2934

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.1

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language:
22
- ruby
33
rvm:
4-
- 2.3.1
4+
- 2.4.1
55
sudo: false
66
notifications:
77
slack: shakacode:YvfXbuFMcFAHt6ZjABIs0KET

Gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source "https://rubygems.org"
2-
ruby "2.3.1"
2+
ruby "2.4.1"
33

44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
6-
gem "rails"
76
gem "listen"
7+
gem "rails"
88

99
# Note: We're using sqllite3 for development and testing
1010
# gem "sqlite3", group: [:development, :test]
@@ -27,7 +27,7 @@ gem "coffee-rails"
2727

2828
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
2929
gem "jbuilder"
30-
gem 'redis'
30+
gem "redis"
3131

3232
# bundle exec rake doc:rails generates the API under doc/api.
3333
gem "sdoc", group: :doc
@@ -65,38 +65,38 @@ group :development, :test do
6565

6666
################################################################################
6767
# Manage application processes
68-
gem "foreman"
6968
gem "factory_girl_rails"
69+
gem "foreman"
7070

7171
################################################################################
7272
# Linters and Security
7373
gem "rubocop", require: false
7474
gem "ruby-lint", require: false
7575
# Critical that require: false be set! https://github.com/brigade/scss-lint/issues/278
76-
gem "scss_lint", require: false
7776
gem "brakeman", require: false
7877
gem "bundler-audit", require: false
78+
gem "scss_lint", require: false
7979

8080
################################################################################
8181
# Favorite debugging gems
8282
gem "pry"
83+
gem "pry-byebug"
8384
gem "pry-doc"
8485
gem "pry-rails"
85-
gem "pry-stack_explorer"
8686
gem "pry-rescue"
87-
gem "pry-byebug"
87+
gem "pry-stack_explorer"
8888

8989
################################################################################
9090
# Color console output
9191
gem "rainbow"
9292
end
9393

94-
group :test do
95-
gem "coveralls", require: false
94+
group :test do
9695
gem "capybara"
9796
gem "capybara-screenshot"
9897
gem "capybara-webkit"
9998
gem "chromedriver-helper"
99+
gem "coveralls", require: false
100100
gem "database_cleaner"
101101
gem "generator_spec"
102102
gem "launchy"

Gemfile.lock

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,19 @@ GEM
4444
io-like (~> 0.3.0)
4545
arel (7.1.4)
4646
ast (2.3.0)
47-
autoprefixer-rails (6.5.3)
47+
autoprefixer-rails (6.7.7.1)
4848
execjs
4949
awesome_print (1.7.0)
50+
bindex (0.5.0)
5051
binding_of_caller (0.7.2)
5152
debug_inspector (>= 0.0.1)
52-
brakeman (3.4.1)
53+
brakeman (3.6.1)
5354
builder (3.2.3)
5455
bundler-audit (0.5.0)
5556
bundler (~> 1.2)
5657
thor (~> 0.18)
5758
byebug (9.0.6)
58-
capybara (2.7.1)
59+
capybara (2.13.0)
5960
addressable
6061
mime-types (>= 1.16)
6162
nokogiri (>= 1.3.3)
@@ -65,12 +66,12 @@ GEM
6566
capybara-screenshot (1.0.14)
6667
capybara (>= 1.0, < 3)
6768
launchy
68-
capybara-webkit (1.11.1)
69-
capybara (>= 2.3.0, < 2.8.0)
69+
capybara-webkit (1.14.0)
70+
capybara (>= 2.3.0, < 2.14.0)
7071
json
71-
childprocess (0.5.9)
72+
childprocess (0.6.3)
7273
ffi (~> 1.0, >= 1.0.11)
73-
chromedriver-helper (1.0.0)
74+
chromedriver-helper (1.1.0)
7475
archive-zip (~> 0.7.0)
7576
nokogiri (~> 1.6)
7677
cliver (0.3.2)
@@ -81,28 +82,28 @@ GEM
8182
coffee-script (2.4.1)
8283
coffee-script-source
8384
execjs
84-
coffee-script-source (1.10.0)
85+
coffee-script-source (1.12.2)
8586
concurrent-ruby (1.0.5)
8687
connection_pool (2.2.1)
87-
coveralls (0.8.15)
88+
coveralls (0.8.20)
8889
json (>= 1.8, < 3)
89-
simplecov (~> 0.12.0)
90+
simplecov (~> 0.14.1)
9091
term-ansicolor (~> 1.3)
91-
thor (~> 0.19.1)
92-
tins (>= 1.6.0, < 2)
92+
thor (~> 0.19.4)
93+
tins (~> 1.6)
9394
database_cleaner (1.5.3)
9495
debug_inspector (0.0.2)
95-
diff-lcs (1.2.5)
96+
diff-lcs (1.3)
9697
docile (1.1.5)
9798
erubis (2.7.0)
9899
execjs (2.7.0)
99-
factory_girl (4.7.0)
100+
factory_girl (4.8.0)
100101
activesupport (>= 3.0.0)
101-
factory_girl_rails (4.7.0)
102-
factory_girl (~> 4.7.0)
102+
factory_girl_rails (4.8.0)
103+
factory_girl (~> 4.8.0)
103104
railties (>= 3.0.0)
104-
ffi (1.9.14)
105-
foreman (0.82.0)
105+
ffi (1.9.18)
106+
foreman (0.84.0)
106107
thor (~> 0.19.1)
107108
generator_spec (0.9.3)
108109
activesupport (>= 3.0.0)
@@ -112,13 +113,13 @@ GEM
112113
i18n (0.8.1)
113114
interception (0.5)
114115
io-like (0.3.0)
115-
jbuilder (2.6.0)
116-
activesupport (>= 3.0.0, < 5.1)
116+
jbuilder (2.6.3)
117+
activesupport (>= 3.0.0, < 5.2)
117118
multi_json (~> 1.2)
118-
json (1.8.3)
119+
json (1.8.6)
119120
launchy (2.4.3)
120121
addressable (~> 2.3)
121-
libv8 (5.3.332.38.1)
122+
libv8 (5.3.332.38.5)
122123
listen (3.1.5)
123124
rb-fsevent (~> 0.9, >= 0.9.4)
124125
rb-inotify (~> 0.9, >= 0.9.7)
@@ -132,17 +133,17 @@ GEM
132133
mime-types-data (~> 3.2015)
133134
mime-types-data (3.2016.0521)
134135
mini_portile2 (2.1.0)
135-
mini_racer (0.1.7)
136+
mini_racer (0.1.9)
136137
libv8 (~> 5.3)
137138
minitest (5.10.1)
138139
multi_json (1.12.1)
139140
nio4r (2.0.0)
140141
nokogiri (1.7.1)
141142
mini_portile2 (~> 2.1.0)
142-
parser (2.3.2.0)
143+
parser (2.4.0.0)
143144
ast (~> 2.2)
144145
pg (0.20.0)
145-
poltergeist (1.11.0)
146+
poltergeist (1.14.0)
146147
capybara (~> 2.1)
147148
cliver (~> 0.3.1)
148149
websocket-driver (>= 0.2.0)
@@ -151,22 +152,22 @@ GEM
151152
coderay (~> 1.1.0)
152153
method_source (~> 0.8.1)
153154
slop (~> 3.4)
154-
pry-byebug (3.4.1)
155+
pry-byebug (3.4.2)
155156
byebug (~> 9.0)
156157
pry (~> 0.10)
157-
pry-doc (0.9.0)
158+
pry-doc (0.10.0)
158159
pry (~> 0.9)
159-
yard (~> 0.8)
160-
pry-rails (0.3.4)
161-
pry (>= 0.9.10)
162-
pry-rescue (1.4.4)
160+
yard (~> 0.9)
161+
pry-rails (0.3.6)
162+
pry (>= 0.10.4)
163+
pry-rescue (1.4.5)
163164
interception (>= 0.5)
164165
pry
165166
pry-stack_explorer (0.4.9.2)
166167
binding_of_caller (>= 0.7)
167168
pry (>= 0.9.11)
168169
public_suffix (2.0.5)
169-
puma (3.6.2)
170+
puma (3.8.2)
170171
rack (2.0.1)
171172
rack-test (0.6.3)
172173
rack (>= 1.0)
@@ -194,9 +195,9 @@ GEM
194195
rake (>= 0.8.7)
195196
thor (>= 0.18.1, < 2.0)
196197
rainbow (2.2.1)
197-
rake (11.3.0)
198+
rake (12.0.0)
198199
rb-fsevent (0.9.8)
199-
rb-inotify (0.9.7)
200+
rb-inotify (0.9.8)
200201
ffi (>= 0.5.0)
201202
rdoc (4.3.0)
202203
react_on_rails (6.9.3)
@@ -205,7 +206,7 @@ GEM
205206
execjs (~> 2.5)
206207
rails (>= 3.2)
207208
rainbow (~> 2.1)
208-
redis (3.3.0)
209+
redis (3.3.3)
209210
rspec-core (3.5.4)
210211
rspec-support (~> 3.5.0)
211212
rspec-expectations (3.5.0)
@@ -222,11 +223,11 @@ GEM
222223
rspec-expectations (~> 3.5.0)
223224
rspec-mocks (~> 3.5.0)
224225
rspec-support (~> 3.5.0)
225-
rspec-retry (0.5.2)
226+
rspec-retry (0.5.3)
226227
rspec-core (> 3.3, < 3.6)
227228
rspec-support (3.5.0)
228-
rubocop (0.45.0)
229-
parser (>= 2.3.1.1, < 3.0)
229+
rubocop (0.48.1)
230+
parser (>= 2.3.3.1, < 3.0)
230231
powerpack (~> 0.1)
231232
rainbow (>= 1.99.1, < 3.0)
232233
ruby-progressbar (~> 1.7)
@@ -236,16 +237,16 @@ GEM
236237
slop (~> 3.4, >= 3.4.7)
237238
ruby-progressbar (1.8.1)
238239
ruby_dep (1.5.0)
239-
rubyzip (1.2.0)
240-
sass (3.4.22)
240+
rubyzip (1.2.1)
241+
sass (3.4.23)
241242
sass-rails (5.0.6)
242243
railties (>= 4.0.0, < 6)
243244
sass (~> 3.1)
244245
sprockets (>= 2.8, < 4.0)
245246
sprockets-rails (>= 2.0, < 4.0)
246247
tilt (>= 1.1, < 3)
247-
scss_lint (0.50.3)
248-
rake (>= 0.9, < 12)
248+
scss_lint (0.52.0)
249+
rake (>= 0.9, < 13)
249250
sass (~> 3.4.20)
250251
sdoc (0.4.2)
251252
json (~> 1.7, >= 1.7.7)
@@ -254,13 +255,13 @@ GEM
254255
childprocess (~> 0.5)
255256
rubyzip (~> 1.0)
256257
websocket (~> 1.0)
257-
simplecov (0.12.0)
258+
simplecov (0.14.1)
258259
docile (~> 1.1.0)
259260
json (>= 1.8, < 3)
260261
simplecov-html (~> 0.10.0)
261262
simplecov-html (0.10.0)
262263
slop (3.6.0)
263-
spring (2.0.0)
264+
spring (2.0.1)
264265
activesupport (>= 4.2)
265266
spring-commands-rspec (1.0.4)
266267
spring (>= 0.9.1)
@@ -271,29 +272,29 @@ GEM
271272
actionpack (>= 4.0)
272273
activesupport (>= 4.0)
273274
sprockets (>= 3.0.0)
274-
term-ansicolor (1.4.0)
275+
term-ansicolor (1.5.0)
275276
tins (~> 1.0)
276277
thor (0.19.4)
277278
thread_safe (0.3.6)
278-
tilt (2.0.5)
279-
tins (1.12.0)
279+
tilt (2.0.7)
280+
tins (1.13.2)
280281
tzinfo (1.2.3)
281282
thread_safe (~> 0.1)
282-
uglifier (3.0.3)
283+
uglifier (3.1.13)
283284
execjs (>= 0.3.0, < 3)
284-
unicode-display_width (1.1.1)
285-
web-console (3.4.0)
285+
unicode-display_width (1.1.3)
286+
web-console (3.5.0)
286287
actionview (>= 5.0)
287288
activemodel (>= 5.0)
288-
debug_inspector
289+
bindex (>= 0.4.0)
289290
railties (>= 5.0)
290-
websocket (1.2.3)
291+
websocket (1.2.4)
291292
websocket-driver (0.6.5)
292293
websocket-extensions (>= 0.1.0)
293294
websocket-extensions (0.1.2)
294295
xpath (2.0.0)
295296
nokogiri (~> 1.3)
296-
yard (0.9.5)
297+
yard (0.9.8)
297298

298299
PLATFORMS
299300
ruby
@@ -345,7 +346,7 @@ DEPENDENCIES
345346
web-console
346347

347348
RUBY VERSION
348-
ruby 2.3.1p112
349+
ruby 2.4.1p111
349350

350351
BUNDLED WITH
351352
1.14.6

0 commit comments

Comments
 (0)