Skip to content

Commit

Permalink
Merge pull request makersacademy#1717 from makersacademy/update-depen…
Browse files Browse the repository at this point in the history
…dencies

Update dependencies
  • Loading branch information
jamesjoshuahill authored Jan 30, 2020
2 parents 67a757f + 9a4a69d commit 7a903d2
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 45 deletions.
13 changes: 7 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
# The linter file that doesn't lead junior developers to bad habits.
# https://github.com/makersacademy/scaffolint
#
# Tested with Rubocop version 0.56.0
# Problems (eg obselete names) may be due to an incompatible version.
# Check your Rubocop version with `rubocop -v` in the command line.
#
# Tested with Rubocop version 0.71.0
#
# Introduction
# ============
Expand Down Expand Up @@ -35,17 +38,15 @@
# Sometimes beginner devs interpret line or block length restrictions as a
# reason to make things so abbreviated as to be unreadable. These messages are
# designed to make you write more readable code - not less.

Metrics/LineLength:
Max: 100

#
# We want to encourage testing, but it can be verbose in the early stages.
# So we'll give you a break. As you learn, try removing the next two sections.

Metrics/LineLength:
Exclude:
- 'spec/**/*'
- 'test/**/*'
Max: 100

Metrics/BlockLength:
Exclude:
Expand Down Expand Up @@ -286,7 +287,7 @@ FirstMethodArgumentLineBreak:
Enabled: false
FirstMethodParameterLineBreak:
Enabled: false
IndentFirstArgument:
Layout/IndentFirstArgument:
Enabled: false
FlipFlop:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.0
2.6.5
4 changes: 0 additions & 4 deletions .travis.yml

This file was deleted.

4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
source 'https://rubygems.org'

gem 'rake'
gem 'rubocop', '0.71.0'

group :test do
gem 'rspec'
gem 'rubocop', '0.71.0'
gem 'simplecov', require: false
gem 'simplecov-console', require: false
end
49 changes: 24 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,26 @@ GEM
ansi (1.5.0)
ast (2.4.0)
diff-lcs (1.3)
docile (1.1.5)
hirb (0.7.3)
jaro_winkler (1.5.3)
json (2.1.0)
parallel (1.17.0)
parser (2.6.3.0)
docile (1.3.2)
jaro_winkler (1.5.4)
json (2.3.0)
parallel (1.19.1)
parser (2.7.0.2)
ast (~> 2.4.0)
rainbow (3.0.0)
rake (12.3.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rubocop (0.71.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand All @@ -34,26 +32,27 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
simplecov (0.15.1)
docile (~> 1.1.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-console (0.4.2)
simplecov-console (0.6.0)
ansi
hirb
simplecov
terminal-table
simplecov-html (0.10.2)
unicode-display_width (1.6.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.6.1)

PLATFORMS
ruby

DEPENDENCIES
rake
rspec
rubocop (= 0.71.0)
simplecov
simplecov-console

BUNDLED WITH
1.17.2
2.1.4
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ Note that is a practice 'tech test' of the kinds that employers use to screen de
Finally, don’t overcomplicate things. This task isn’t as hard as it may seem at first.
* **Submit a pull request early.** There are various checks that happen automatically when you send a pull request. **Fix these issues if you can**. Green is good.
* **Submit a pull request early.**
* Finally, please submit a pull request before Monday at 9am with your solution or partial solution. However much or little amount of code you wrote please please please submit a pull request before Monday at 9am.
5 changes: 0 additions & 5 deletions Rakefile

This file was deleted.

0 comments on commit 7a903d2

Please sign in to comment.