diff --git a/Gemfile b/Gemfile index 05b472f547..22c884c38e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' +gem 'base64' gem 'minitest' gem 'rake' gem 'mocha', require: false diff --git a/Gemfile.lock b/Gemfile.lock index ee00477db9..39da4effde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,6 +3,7 @@ GEM specs: ast (2.4.2) citrus (3.0.2) + base64 (0.2.0) docile (1.4.0) json (2.7.2) minitest (5.22.3) @@ -52,6 +53,7 @@ PLATFORMS ruby DEPENDENCIES + base64 minitest mocha racc diff --git a/bin/rubocop-quick b/bin/rubocop-quick index db00b3c19a..ca319c29bc 100755 --- a/bin/rubocop-quick +++ b/bin/rubocop-quick @@ -1,4 +1,4 @@ #!/bin/bash -git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --auto-correct --format quiet --force-exclusion Gemfile.lock && \ +git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --autocorrect --format quiet --force-exclusion Gemfile.lock && \ git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs git add diff --git a/config.json b/config.json index 1b4dbdc4ad..ba3faf7bf1 100644 --- a/config.json +++ b/config.json @@ -992,20 +992,6 @@ ], "difficulty": 3 }, - { - "slug": "beer-song", - "name": "Beer Song", - "uuid": "e4f0873a-e834-4b28-9902-795f52f76adb", - "practices": [ - "strings" - ], - "prerequisites": [ - "strings", - "numbers", - "loops" - ], - "difficulty": 3 - }, { "slug": "protein-translation", "name": "Protein Translation", @@ -1547,6 +1533,15 @@ "difficulty": 1, "status": "deprecated" }, + { + "slug": "beer-song", + "name": "Beer Song", + "uuid": "e4f0873a-e834-4b28-9902-795f52f76adb", + "practices": [], + "prerequisites": [], + "difficulty": 3, + "status": "deprecated" + }, { "slug": "microwave", "name": "Microwave",