From d0282a6293f1f5afda81f2b40cdf7985288ff244 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:40 +0100 Subject: [PATCH 01/18] [v3] Move existing exercises to exercises/practice --- exercises/{ => practice}/accumulate/AccumulateTest.vb | 0 exercises/{ => practice}/accumulate/Example.vb | 0 exercises/{ => practice}/accumulate/README.md | 0 exercises/{ => practice}/allergies/AllergiesTest.vb | 0 exercises/{ => practice}/allergies/Example.vb | 0 exercises/{ => practice}/allergies/README.md | 0 exercises/{ => practice}/anagram/AnagramTest.vb | 0 exercises/{ => practice}/anagram/Example.vb | 0 exercises/{ => practice}/anagram/README.md | 0 exercises/{ => practice}/atbash-cipher/AtbashTest.vb | 0 exercises/{ => practice}/atbash-cipher/Example.vb | 0 exercises/{ => practice}/atbash-cipher/README.md | 0 exercises/{ => practice}/binary/BinaryTest.vb | 0 exercises/{ => practice}/binary/Example.vb | 0 exercises/{ => practice}/binary/README.md | 0 exercises/{ => practice}/bob/.meta/description.md | 0 exercises/{ => practice}/bob/BobTest.vb | 0 exercises/{ => practice}/bob/Example.vb | 0 exercises/{ => practice}/bob/README.md | 0 exercises/{ => practice}/crypto-square/CryptoSquareTest.vb | 0 exercises/{ => practice}/crypto-square/Example.vb | 0 exercises/{ => practice}/crypto-square/README.md | 0 exercises/{ => practice}/hello-world/Example.vb | 0 exercises/{ => practice}/hello-world/HelloWorld.vb | 0 exercises/{ => practice}/hello-world/HelloWorld.vbproj | 0 exercises/{ => practice}/hello-world/HelloWorldTest.vb | 0 exercises/{ => practice}/hello-world/README.md | 0 exercises/{ => practice}/reverse-string/Example.vb | 0 exercises/{ => practice}/reverse-string/README.md | 0 exercises/{ => practice}/reverse-string/ReverseString.vb | 0 exercises/{ => practice}/reverse-string/ReverseString.vbproj | 0 exercises/{ => practice}/reverse-string/ReverseStringTests.vb | 0 exercises/{ => practice}/two-fer/Example.vb | 0 exercises/{ => practice}/two-fer/README.md | 0 exercises/{ => practice}/two-fer/TwoFer.vb | 0 exercises/{ => practice}/two-fer/TwoFer.vbproj | 0 exercises/{ => practice}/two-fer/TwoFerTests.vb | 0 37 files changed, 0 insertions(+), 0 deletions(-) rename exercises/{ => practice}/accumulate/AccumulateTest.vb (100%) rename exercises/{ => practice}/accumulate/Example.vb (100%) rename exercises/{ => practice}/accumulate/README.md (100%) rename exercises/{ => practice}/allergies/AllergiesTest.vb (100%) rename exercises/{ => practice}/allergies/Example.vb (100%) rename exercises/{ => practice}/allergies/README.md (100%) rename exercises/{ => practice}/anagram/AnagramTest.vb (100%) rename exercises/{ => practice}/anagram/Example.vb (100%) rename exercises/{ => practice}/anagram/README.md (100%) rename exercises/{ => practice}/atbash-cipher/AtbashTest.vb (100%) rename exercises/{ => practice}/atbash-cipher/Example.vb (100%) rename exercises/{ => practice}/atbash-cipher/README.md (100%) rename exercises/{ => practice}/binary/BinaryTest.vb (100%) rename exercises/{ => practice}/binary/Example.vb (100%) rename exercises/{ => practice}/binary/README.md (100%) rename exercises/{ => practice}/bob/.meta/description.md (100%) rename exercises/{ => practice}/bob/BobTest.vb (100%) rename exercises/{ => practice}/bob/Example.vb (100%) rename exercises/{ => practice}/bob/README.md (100%) rename exercises/{ => practice}/crypto-square/CryptoSquareTest.vb (100%) rename exercises/{ => practice}/crypto-square/Example.vb (100%) rename exercises/{ => practice}/crypto-square/README.md (100%) rename exercises/{ => practice}/hello-world/Example.vb (100%) rename exercises/{ => practice}/hello-world/HelloWorld.vb (100%) rename exercises/{ => practice}/hello-world/HelloWorld.vbproj (100%) rename exercises/{ => practice}/hello-world/HelloWorldTest.vb (100%) rename exercises/{ => practice}/hello-world/README.md (100%) rename exercises/{ => practice}/reverse-string/Example.vb (100%) rename exercises/{ => practice}/reverse-string/README.md (100%) rename exercises/{ => practice}/reverse-string/ReverseString.vb (100%) rename exercises/{ => practice}/reverse-string/ReverseString.vbproj (100%) rename exercises/{ => practice}/reverse-string/ReverseStringTests.vb (100%) rename exercises/{ => practice}/two-fer/Example.vb (100%) rename exercises/{ => practice}/two-fer/README.md (100%) rename exercises/{ => practice}/two-fer/TwoFer.vb (100%) rename exercises/{ => practice}/two-fer/TwoFer.vbproj (100%) rename exercises/{ => practice}/two-fer/TwoFerTests.vb (100%) diff --git a/exercises/accumulate/AccumulateTest.vb b/exercises/practice/accumulate/AccumulateTest.vb similarity index 100% rename from exercises/accumulate/AccumulateTest.vb rename to exercises/practice/accumulate/AccumulateTest.vb diff --git a/exercises/accumulate/Example.vb b/exercises/practice/accumulate/Example.vb similarity index 100% rename from exercises/accumulate/Example.vb rename to exercises/practice/accumulate/Example.vb diff --git a/exercises/accumulate/README.md b/exercises/practice/accumulate/README.md similarity index 100% rename from exercises/accumulate/README.md rename to exercises/practice/accumulate/README.md diff --git a/exercises/allergies/AllergiesTest.vb b/exercises/practice/allergies/AllergiesTest.vb similarity index 100% rename from exercises/allergies/AllergiesTest.vb rename to exercises/practice/allergies/AllergiesTest.vb diff --git a/exercises/allergies/Example.vb b/exercises/practice/allergies/Example.vb similarity index 100% rename from exercises/allergies/Example.vb rename to exercises/practice/allergies/Example.vb diff --git a/exercises/allergies/README.md b/exercises/practice/allergies/README.md similarity index 100% rename from exercises/allergies/README.md rename to exercises/practice/allergies/README.md diff --git a/exercises/anagram/AnagramTest.vb b/exercises/practice/anagram/AnagramTest.vb similarity index 100% rename from exercises/anagram/AnagramTest.vb rename to exercises/practice/anagram/AnagramTest.vb diff --git a/exercises/anagram/Example.vb b/exercises/practice/anagram/Example.vb similarity index 100% rename from exercises/anagram/Example.vb rename to exercises/practice/anagram/Example.vb diff --git a/exercises/anagram/README.md b/exercises/practice/anagram/README.md similarity index 100% rename from exercises/anagram/README.md rename to exercises/practice/anagram/README.md diff --git a/exercises/atbash-cipher/AtbashTest.vb b/exercises/practice/atbash-cipher/AtbashTest.vb similarity index 100% rename from exercises/atbash-cipher/AtbashTest.vb rename to exercises/practice/atbash-cipher/AtbashTest.vb diff --git a/exercises/atbash-cipher/Example.vb b/exercises/practice/atbash-cipher/Example.vb similarity index 100% rename from exercises/atbash-cipher/Example.vb rename to exercises/practice/atbash-cipher/Example.vb diff --git a/exercises/atbash-cipher/README.md b/exercises/practice/atbash-cipher/README.md similarity index 100% rename from exercises/atbash-cipher/README.md rename to exercises/practice/atbash-cipher/README.md diff --git a/exercises/binary/BinaryTest.vb b/exercises/practice/binary/BinaryTest.vb similarity index 100% rename from exercises/binary/BinaryTest.vb rename to exercises/practice/binary/BinaryTest.vb diff --git a/exercises/binary/Example.vb b/exercises/practice/binary/Example.vb similarity index 100% rename from exercises/binary/Example.vb rename to exercises/practice/binary/Example.vb diff --git a/exercises/binary/README.md b/exercises/practice/binary/README.md similarity index 100% rename from exercises/binary/README.md rename to exercises/practice/binary/README.md diff --git a/exercises/bob/.meta/description.md b/exercises/practice/bob/.meta/description.md similarity index 100% rename from exercises/bob/.meta/description.md rename to exercises/practice/bob/.meta/description.md diff --git a/exercises/bob/BobTest.vb b/exercises/practice/bob/BobTest.vb similarity index 100% rename from exercises/bob/BobTest.vb rename to exercises/practice/bob/BobTest.vb diff --git a/exercises/bob/Example.vb b/exercises/practice/bob/Example.vb similarity index 100% rename from exercises/bob/Example.vb rename to exercises/practice/bob/Example.vb diff --git a/exercises/bob/README.md b/exercises/practice/bob/README.md similarity index 100% rename from exercises/bob/README.md rename to exercises/practice/bob/README.md diff --git a/exercises/crypto-square/CryptoSquareTest.vb b/exercises/practice/crypto-square/CryptoSquareTest.vb similarity index 100% rename from exercises/crypto-square/CryptoSquareTest.vb rename to exercises/practice/crypto-square/CryptoSquareTest.vb diff --git a/exercises/crypto-square/Example.vb b/exercises/practice/crypto-square/Example.vb similarity index 100% rename from exercises/crypto-square/Example.vb rename to exercises/practice/crypto-square/Example.vb diff --git a/exercises/crypto-square/README.md b/exercises/practice/crypto-square/README.md similarity index 100% rename from exercises/crypto-square/README.md rename to exercises/practice/crypto-square/README.md diff --git a/exercises/hello-world/Example.vb b/exercises/practice/hello-world/Example.vb similarity index 100% rename from exercises/hello-world/Example.vb rename to exercises/practice/hello-world/Example.vb diff --git a/exercises/hello-world/HelloWorld.vb b/exercises/practice/hello-world/HelloWorld.vb similarity index 100% rename from exercises/hello-world/HelloWorld.vb rename to exercises/practice/hello-world/HelloWorld.vb diff --git a/exercises/hello-world/HelloWorld.vbproj b/exercises/practice/hello-world/HelloWorld.vbproj similarity index 100% rename from exercises/hello-world/HelloWorld.vbproj rename to exercises/practice/hello-world/HelloWorld.vbproj diff --git a/exercises/hello-world/HelloWorldTest.vb b/exercises/practice/hello-world/HelloWorldTest.vb similarity index 100% rename from exercises/hello-world/HelloWorldTest.vb rename to exercises/practice/hello-world/HelloWorldTest.vb diff --git a/exercises/hello-world/README.md b/exercises/practice/hello-world/README.md similarity index 100% rename from exercises/hello-world/README.md rename to exercises/practice/hello-world/README.md diff --git a/exercises/reverse-string/Example.vb b/exercises/practice/reverse-string/Example.vb similarity index 100% rename from exercises/reverse-string/Example.vb rename to exercises/practice/reverse-string/Example.vb diff --git a/exercises/reverse-string/README.md b/exercises/practice/reverse-string/README.md similarity index 100% rename from exercises/reverse-string/README.md rename to exercises/practice/reverse-string/README.md diff --git a/exercises/reverse-string/ReverseString.vb b/exercises/practice/reverse-string/ReverseString.vb similarity index 100% rename from exercises/reverse-string/ReverseString.vb rename to exercises/practice/reverse-string/ReverseString.vb diff --git a/exercises/reverse-string/ReverseString.vbproj b/exercises/practice/reverse-string/ReverseString.vbproj similarity index 100% rename from exercises/reverse-string/ReverseString.vbproj rename to exercises/practice/reverse-string/ReverseString.vbproj diff --git a/exercises/reverse-string/ReverseStringTests.vb b/exercises/practice/reverse-string/ReverseStringTests.vb similarity index 100% rename from exercises/reverse-string/ReverseStringTests.vb rename to exercises/practice/reverse-string/ReverseStringTests.vb diff --git a/exercises/two-fer/Example.vb b/exercises/practice/two-fer/Example.vb similarity index 100% rename from exercises/two-fer/Example.vb rename to exercises/practice/two-fer/Example.vb diff --git a/exercises/two-fer/README.md b/exercises/practice/two-fer/README.md similarity index 100% rename from exercises/two-fer/README.md rename to exercises/practice/two-fer/README.md diff --git a/exercises/two-fer/TwoFer.vb b/exercises/practice/two-fer/TwoFer.vb similarity index 100% rename from exercises/two-fer/TwoFer.vb rename to exercises/practice/two-fer/TwoFer.vb diff --git a/exercises/two-fer/TwoFer.vbproj b/exercises/practice/two-fer/TwoFer.vbproj similarity index 100% rename from exercises/two-fer/TwoFer.vbproj rename to exercises/practice/two-fer/TwoFer.vbproj diff --git a/exercises/two-fer/TwoFerTests.vb b/exercises/practice/two-fer/TwoFerTests.vb similarity index 100% rename from exercises/two-fer/TwoFerTests.vb rename to exercises/practice/two-fer/TwoFerTests.vb From 207613d2ff573e8eef5474ccd9da56eecd1a70a2 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:40 +0100 Subject: [PATCH 02/18] [v3] Add version property to config.json --- config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.json b/config.json index 022e6f8e..0fa8d6e9 100644 --- a/config.json +++ b/config.json @@ -2,6 +2,7 @@ "language": "VB.NET", "active": false, "blurb": "VB.NET is an object-oriented programming language implemented on the .NET Framework.", + "version": 3, "checklist_issue": 3, "exercises": [ { From b054f9ce990a0cd215c019ecb777aac8031da48b Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:40 +0100 Subject: [PATCH 03/18] [v3] Add status to config.json --- config.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config.json b/config.json index 0fa8d6e9..90ac23ad 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,12 @@ { "language": "VB.NET", "active": false, + "status": { + "concept_exercises": false, + "test_runner": false, + "representer": false, + "analyzer": false + }, "blurb": "VB.NET is an object-oriented programming language implemented on the .NET Framework.", "version": 3, "checklist_issue": 3, From fab1dec1d8b1522369e3196f4ac318efaac2b0b3 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:40 +0100 Subject: [PATCH 04/18] [v3] Add slug to config.json --- config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.json b/config.json index 90ac23ad..cb76de93 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,6 @@ { "language": "VB.NET", + "slug": "vbnet", "active": false, "status": { "concept_exercises": false, From efc2dc2f91bdba11e1e413610f86a5c7468367e4 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:40 +0100 Subject: [PATCH 05/18] [v3] Add online_editor property to config.json --- config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.json b/config.json index cb76de93..6a47e1bd 100644 --- a/config.json +++ b/config.json @@ -10,6 +10,10 @@ }, "blurb": "VB.NET is an object-oriented programming language implemented on the .NET Framework.", "version": 3, + "online_editor": { + "indent_style": "space", + "indent_size": 4 + }, "checklist_issue": 3, "exercises": [ { From cd640d27f21d8ac01fade87b9fb9aa045611f2bc Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:40 +0100 Subject: [PATCH 06/18] [v3] Re-order practice exercises in config.json --- config.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/config.json b/config.json index 6a47e1bd..20415a11 100644 --- a/config.json +++ b/config.json @@ -49,50 +49,50 @@ ] }, { - "slug": "bob", - "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", + "slug": "accumulate", + "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", "core": false, "unlocked_by": null, "difficulty": 1, "topics": [] }, { - "slug": "anagram", - "uuid": "ff07d780-2531-4728-9432-bd786652ad51", + "slug": "allergies", + "uuid": "0488d664-0386-4471-b569-01f847ec6054", "core": false, "unlocked_by": null, "difficulty": 1, "topics": [] }, { - "slug": "binary", - "uuid": "b5363091-1350-428f-b709-550f9352d562", + "slug": "anagram", + "uuid": "ff07d780-2531-4728-9432-bd786652ad51", "core": false, "unlocked_by": null, "difficulty": 1, - "topics": [ - "math" - ] + "topics": [] }, { - "slug": "allergies", - "uuid": "0488d664-0386-4471-b569-01f847ec6054", + "slug": "atbash-cipher", + "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", "core": false, "unlocked_by": null, "difficulty": 1, "topics": [] }, { - "slug": "atbash-cipher", - "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", + "slug": "binary", + "uuid": "b5363091-1350-428f-b709-550f9352d562", "core": false, "unlocked_by": null, "difficulty": 1, - "topics": [] + "topics": [ + "math" + ] }, { - "slug": "accumulate", - "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", + "slug": "bob", + "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", "core": false, "unlocked_by": null, "difficulty": 1, From b0ec27d20b9600732fdcfa6710472945b2f30faf Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 07/18] [v3] Remove deprecated properties from practice exercises in config.json --- config.json | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/config.json b/config.json index 20415a11..c31247ed 100644 --- a/config.json +++ b/config.json @@ -19,9 +19,6 @@ { "slug": "hello-world", "uuid": "a3da97d9-8e55-47a2-ba80-7446ee8ddaa9", - "core": true, - "auto_approve": true, - "unlocked_by": null, "difficulty": 1, "topics": [ "strings" @@ -30,8 +27,6 @@ { "slug": "two-fer", "uuid": "22176233-7668-4faf-8ecc-f24a4c766307", - "core": true, - "unlocked_by": null, "difficulty": 1, "topics": [ "optional_values", @@ -41,8 +36,6 @@ { "slug": "reverse-string", "uuid": "af6ae113-35b5-45a2-bf24-27381adf5c6f", - "core": true, - "unlocked_by": null, "difficulty": 1, "topics": [ "strings" @@ -51,40 +44,30 @@ { "slug": "accumulate", "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [] }, { "slug": "allergies", "uuid": "0488d664-0386-4471-b569-01f847ec6054", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [] }, { "slug": "anagram", "uuid": "ff07d780-2531-4728-9432-bd786652ad51", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [] }, { "slug": "atbash-cipher", "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [] }, { "slug": "binary", "uuid": "b5363091-1350-428f-b709-550f9352d562", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [ "math" @@ -93,16 +76,12 @@ { "slug": "bob", "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [] }, { "slug": "crypto-square", "uuid": "5f6ed6d3-fd66-406a-9a92-544745a5e4ee", - "core": false, - "unlocked_by": null, "difficulty": 1, "topics": [] } From a06ba715456072bfc1d146554edb65952359d5b4 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 08/18] [v3] Add name property to practice exercises in config.json --- config.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config.json b/config.json index c31247ed..e7e5bd91 100644 --- a/config.json +++ b/config.json @@ -18,6 +18,7 @@ "exercises": [ { "slug": "hello-world", + "name": "Hello World", "uuid": "a3da97d9-8e55-47a2-ba80-7446ee8ddaa9", "difficulty": 1, "topics": [ @@ -26,6 +27,7 @@ }, { "slug": "two-fer", + "name": "Two Fer", "uuid": "22176233-7668-4faf-8ecc-f24a4c766307", "difficulty": 1, "topics": [ @@ -35,6 +37,7 @@ }, { "slug": "reverse-string", + "name": "Reverse String", "uuid": "af6ae113-35b5-45a2-bf24-27381adf5c6f", "difficulty": 1, "topics": [ @@ -43,30 +46,35 @@ }, { "slug": "accumulate", + "name": "Accumulate", "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", "difficulty": 1, "topics": [] }, { "slug": "allergies", + "name": "Allergies", "uuid": "0488d664-0386-4471-b569-01f847ec6054", "difficulty": 1, "topics": [] }, { "slug": "anagram", + "name": "Anagram", "uuid": "ff07d780-2531-4728-9432-bd786652ad51", "difficulty": 1, "topics": [] }, { "slug": "atbash-cipher", + "name": "Atbash Cipher", "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", "difficulty": 1, "topics": [] }, { "slug": "binary", + "name": "Binary", "uuid": "b5363091-1350-428f-b709-550f9352d562", "difficulty": 1, "topics": [ @@ -75,12 +83,14 @@ }, { "slug": "bob", + "name": "Bob", "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", "difficulty": 1, "topics": [] }, { "slug": "crypto-square", + "name": "Crypto Square", "uuid": "5f6ed6d3-fd66-406a-9a92-544745a5e4ee", "difficulty": 1, "topics": [] From 90df82e8f137340f45be6ee4e2a684d9dc9672c2 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 09/18] [v3] Add (empty) prerequisites property to practice exercises in config.json --- config.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config.json b/config.json index e7e5bd91..cb67d713 100644 --- a/config.json +++ b/config.json @@ -20,6 +20,7 @@ "slug": "hello-world", "name": "Hello World", "uuid": "a3da97d9-8e55-47a2-ba80-7446ee8ddaa9", + "prerequisites": [], "difficulty": 1, "topics": [ "strings" @@ -29,6 +30,7 @@ "slug": "two-fer", "name": "Two Fer", "uuid": "22176233-7668-4faf-8ecc-f24a4c766307", + "prerequisites": [], "difficulty": 1, "topics": [ "optional_values", @@ -39,6 +41,7 @@ "slug": "reverse-string", "name": "Reverse String", "uuid": "af6ae113-35b5-45a2-bf24-27381adf5c6f", + "prerequisites": [], "difficulty": 1, "topics": [ "strings" @@ -48,6 +51,7 @@ "slug": "accumulate", "name": "Accumulate", "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", + "prerequisites": [], "difficulty": 1, "topics": [] }, @@ -55,6 +59,7 @@ "slug": "allergies", "name": "Allergies", "uuid": "0488d664-0386-4471-b569-01f847ec6054", + "prerequisites": [], "difficulty": 1, "topics": [] }, @@ -62,6 +67,7 @@ "slug": "anagram", "name": "Anagram", "uuid": "ff07d780-2531-4728-9432-bd786652ad51", + "prerequisites": [], "difficulty": 1, "topics": [] }, @@ -69,6 +75,7 @@ "slug": "atbash-cipher", "name": "Atbash Cipher", "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", + "prerequisites": [], "difficulty": 1, "topics": [] }, @@ -76,6 +83,7 @@ "slug": "binary", "name": "Binary", "uuid": "b5363091-1350-428f-b709-550f9352d562", + "prerequisites": [], "difficulty": 1, "topics": [ "math" @@ -85,6 +93,7 @@ "slug": "bob", "name": "Bob", "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", + "prerequisites": [], "difficulty": 1, "topics": [] }, @@ -92,6 +101,7 @@ "slug": "crypto-square", "name": "Crypto Square", "uuid": "5f6ed6d3-fd66-406a-9a92-544745a5e4ee", + "prerequisites": [], "difficulty": 1, "topics": [] } From 20fe376c6bc3577c8581fc9aadee09465b1f3717 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 10/18] [v3] Move exercises to practice exercises property in config.json --- config.json | 184 ++++++++++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 91 deletions(-) diff --git a/config.json b/config.json index cb67d713..88c4e021 100644 --- a/config.json +++ b/config.json @@ -15,95 +15,97 @@ "indent_size": 4 }, "checklist_issue": 3, - "exercises": [ - { - "slug": "hello-world", - "name": "Hello World", - "uuid": "a3da97d9-8e55-47a2-ba80-7446ee8ddaa9", - "prerequisites": [], - "difficulty": 1, - "topics": [ - "strings" - ] - }, - { - "slug": "two-fer", - "name": "Two Fer", - "uuid": "22176233-7668-4faf-8ecc-f24a4c766307", - "prerequisites": [], - "difficulty": 1, - "topics": [ - "optional_values", - "strings" - ] - }, - { - "slug": "reverse-string", - "name": "Reverse String", - "uuid": "af6ae113-35b5-45a2-bf24-27381adf5c6f", - "prerequisites": [], - "difficulty": 1, - "topics": [ - "strings" - ] - }, - { - "slug": "accumulate", - "name": "Accumulate", - "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", - "prerequisites": [], - "difficulty": 1, - "topics": [] - }, - { - "slug": "allergies", - "name": "Allergies", - "uuid": "0488d664-0386-4471-b569-01f847ec6054", - "prerequisites": [], - "difficulty": 1, - "topics": [] - }, - { - "slug": "anagram", - "name": "Anagram", - "uuid": "ff07d780-2531-4728-9432-bd786652ad51", - "prerequisites": [], - "difficulty": 1, - "topics": [] - }, - { - "slug": "atbash-cipher", - "name": "Atbash Cipher", - "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", - "prerequisites": [], - "difficulty": 1, - "topics": [] - }, - { - "slug": "binary", - "name": "Binary", - "uuid": "b5363091-1350-428f-b709-550f9352d562", - "prerequisites": [], - "difficulty": 1, - "topics": [ - "math" - ] - }, - { - "slug": "bob", - "name": "Bob", - "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", - "prerequisites": [], - "difficulty": 1, - "topics": [] - }, - { - "slug": "crypto-square", - "name": "Crypto Square", - "uuid": "5f6ed6d3-fd66-406a-9a92-544745a5e4ee", - "prerequisites": [], - "difficulty": 1, - "topics": [] - } - ] + "exercises": { + "practice": [ + { + "slug": "hello-world", + "name": "Hello World", + "uuid": "a3da97d9-8e55-47a2-ba80-7446ee8ddaa9", + "prerequisites": [], + "difficulty": 1, + "topics": [ + "strings" + ] + }, + { + "slug": "two-fer", + "name": "Two Fer", + "uuid": "22176233-7668-4faf-8ecc-f24a4c766307", + "prerequisites": [], + "difficulty": 1, + "topics": [ + "optional_values", + "strings" + ] + }, + { + "slug": "reverse-string", + "name": "Reverse String", + "uuid": "af6ae113-35b5-45a2-bf24-27381adf5c6f", + "prerequisites": [], + "difficulty": 1, + "topics": [ + "strings" + ] + }, + { + "slug": "accumulate", + "name": "Accumulate", + "uuid": "b2e12f15-5cae-4848-9ee8-2e1b0992b69c", + "prerequisites": [], + "difficulty": 1, + "topics": [] + }, + { + "slug": "allergies", + "name": "Allergies", + "uuid": "0488d664-0386-4471-b569-01f847ec6054", + "prerequisites": [], + "difficulty": 1, + "topics": [] + }, + { + "slug": "anagram", + "name": "Anagram", + "uuid": "ff07d780-2531-4728-9432-bd786652ad51", + "prerequisites": [], + "difficulty": 1, + "topics": [] + }, + { + "slug": "atbash-cipher", + "name": "Atbash Cipher", + "uuid": "cd829c1c-8e35-4cf7-a47e-3b394a036637", + "prerequisites": [], + "difficulty": 1, + "topics": [] + }, + { + "slug": "binary", + "name": "Binary", + "uuid": "b5363091-1350-428f-b709-550f9352d562", + "prerequisites": [], + "difficulty": 1, + "topics": [ + "math" + ] + }, + { + "slug": "bob", + "name": "Bob", + "uuid": "c26876c4-060e-4870-b20c-a4a3ebbfcf7c", + "prerequisites": [], + "difficulty": 1, + "topics": [] + }, + { + "slug": "crypto-square", + "name": "Crypto Square", + "uuid": "5f6ed6d3-fd66-406a-9a92-544745a5e4ee", + "prerequisites": [], + "difficulty": 1, + "topics": [] + } + ] + } } From 3bb94d443b6d3a5d96b0e24a23e07cb8628e9910 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 11/18] [v3] Add concept exercises to config.json --- config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.json b/config.json index 88c4e021..aa31e6b0 100644 --- a/config.json +++ b/config.json @@ -16,6 +16,7 @@ }, "checklist_issue": 3, "exercises": { + "concept": [], "practice": [ { "slug": "hello-world", From 2ce9abd3a5ed637bc540ec79a08d6ea17ce15d53 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 12/18] [v3] Add concepts to config.json --- config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.json b/config.json index aa31e6b0..983b17a8 100644 --- a/config.json +++ b/config.json @@ -108,5 +108,6 @@ "topics": [] } ] - } + }, + "concepts": [] } From 00f51f20f93f079590fd6ca9b9a391ea04d20615 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 13/18] [v3] Add key features to config.json --- config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.json b/config.json index 983b17a8..d82bcb0d 100644 --- a/config.json +++ b/config.json @@ -109,5 +109,6 @@ } ] }, - "concepts": [] + "concepts": [], + "key_features": [] } From 953c7909656ec02402a83c68db644522135e5a74 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:41 +0100 Subject: [PATCH 14/18] [v3] Add tags to config.json --- config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.json b/config.json index d82bcb0d..acdd2e5c 100644 --- a/config.json +++ b/config.json @@ -110,5 +110,6 @@ ] }, "concepts": [], - "key_features": [] + "key_features": [], + "tags": [] } From fbe869f821b27835691de39c1509956c3ec57115 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:42 +0100 Subject: [PATCH 15/18] [v3] Use main branch for Exercism GitHub Actions --- .github/workflows/configlet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/configlet.yml b/.github/workflows/configlet.yml index 850b75f5..1499bb4d 100644 --- a/.github/workflows/configlet.yml +++ b/.github/workflows/configlet.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - name: Fetch configlet - uses: exercism/github-actions/configlet-ci@master + uses: exercism/github-actions/configlet-ci@main - name: Configlet Linter run: configlet lint . From 78cf912c9d7304d80ca9f4dabe40cbd5c1ec36b9 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:42 +0100 Subject: [PATCH 16/18] [v3] Update fetch-configlet script to work with configlet v3 --- bin/fetch-configlet | 90 +++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/bin/fetch-configlet b/bin/fetch-configlet index 4f64c5b9..43f1c83c 100755 --- a/bin/fetch-configlet +++ b/bin/fetch-configlet @@ -1,32 +1,58 @@ -#!/bin/bash - -LATEST=https://github.com/exercism/configlet/releases/latest - -OS=$( -case $(uname) in - (Darwin*) - echo "mac";; - (Linux*) - echo "linux";; - (Windows*) - echo "windows";; - (*) - echo "linux";; -esac) - -ARCH=$( -case $(uname -m) in - (*64*) - echo 64bit;; - (*686*) - echo 32bit;; - (*386*) - echo 32bit;; - (*) - echo 64bit;; -esac) - -VERSION="$(curl --head --silent $LATEST | awk -v FS=/ '/Location:/{print $NF}' | tr -d '\r')" -URL=https://github.com/exercism/configlet/releases/download/$VERSION/configlet-$OS-${ARCH}.tgz - -curl -s --location $URL | tar xz -C bin/ +#!/usr/bin/env bash + +set -eo pipefail + +readonly LATEST='https://api.github.com/repos/exercism/configlet/releases/latest' + +case "$(uname)" in + Darwin*) os='mac' ;; + Linux*) os='linux' ;; + Windows*) os='windows' ;; + MINGW*) os='windows' ;; + MSYS_NT-*) os='windows' ;; + *) os='linux' ;; +esac + +case "${os}" in + windows*) ext='zip' ;; + *) ext='tgz' ;; +esac + +case "$(uname -m)" in + *64*) arch='64bit' ;; + *686*) arch='32bit' ;; + *386*) arch='32bit' ;; + *) arch='64bit' ;; +esac + +curlopts=( + --silent + --show-error + --fail + --location + --retry 3 +) + +if [[ -n "${GITHUB_TOKEN}" ]]; then + curlopts+=(--header "authorization: Bearer ${GITHUB_TOKEN}") +fi + +suffix="${os}-${arch}.${ext}" + +get_download_url() { + curl "${curlopts[@]}" --header 'Accept: application/vnd.github.v3+json' "${LATEST}" | + grep "\"browser_download_url\": \".*/download/.*/configlet.*${suffix}\"$" | + cut -d'"' -f4 +} + +download_url="$(get_download_url)" +output_dir="bin" +output_path="${output_dir}/latest-configlet.${ext}" +curl "${curlopts[@]}" --output "${output_path}" "${download_url}" + +case "${ext}" in + *zip) unzip "${output_path}" -d "${output_dir}" ;; + *) tar xzf "${output_path}" -C "${output_dir}" ;; +esac + +rm -f "${output_path}" From e90a1e3326ca8cf56d598a2531a9b455dd79736f Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:04:42 +0100 Subject: [PATCH 17/18] [v3] Add dependabot to keep GHA dependencies up-to-date --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..ed8f4a43 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +version: 2 + +updates: + + # Keep dependencies for GitHub Actions up-to-date + - package-ecosystem: 'github-actions' + directory: '/' + schedule: + interval: 'daily' From e8c1398ea2c064f40d86e4c704f454632db04931 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 29 Jan 2021 16:36:28 +0100 Subject: [PATCH 18/18] [v3] Fix configlet CI workflow --- .github/workflows/configlet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/configlet.yml b/.github/workflows/configlet.yml index 1499bb4d..3c422c27 100644 --- a/.github/workflows/configlet.yml +++ b/.github/workflows/configlet.yml @@ -21,4 +21,4 @@ jobs: uses: exercism/github-actions/configlet-ci@main - name: Configlet Linter - run: configlet lint . + run: configlet lint