trackler 2.2.1.60 → 2.2.1.61

data/tracks/c/config/maintainers.json

@@ -0,0 +1,45 @@
+{
+  "maintainers": [
+    {
+      "github_username": "ryanplusplus",
+      "show_on_website": false,
+      "alumnus": false,
+      "name": null,
+      "bio": null,
+      "link_text": null,
+      "link_url": null,
+      "avatar_url": null
+    },
+    {
+      "github_username": "patricksjackson",
+      "show_on_website": false,
+      "alumnus": false,
+      "name": null,
+      "bio": null,
+      "link_text": null,
+      "link_url": null,
+      "avatar_url": null
+    },
+    {
+      "github_username": "RealBarretBrown",
+      "show_on_website": false,
+      "alumnus": false,
+      "name": null,
+      "bio": null,
+      "link_text": null,
+      "link_url": null,
+      "avatar_url": null
+    },
+    {
+      "github_username": "wolf99",
+      "show_on_website": false,
+      "alumnus": false,
+      "name": "Toby",
+      "bio": null,
+      "link_text": "My GitHub Profile",
+      "link_url": "https://github.com/wolf99",
+      "avatar_url": null
+    }
+  ],
+  "docs_url": "https://github.com/exercism/docs/blob/master/maintaining-a-track/maintainer-configuration.md"
+}

data/tracks/c/config.json

@@ -1,6 +1,5 @@
 {
-  "active": false,
-  "checklist_issue": 8,
+  "active": true,
   "exercises": [
     {
       "core": true,

data/tracks/c/docs/TESTS.md

@@ -1,62 +1,61 @@
-Each exercise supplies the unit tests and a Make build recipe.  You
-provide the implementation.
+Each exercise supplies the unit tests and a Make build recipe.
+You provide the implementation.
 
-Each test file is meant to link against your implementation to provide a
-console executable that runs the tests.  Running the test executable
-prints messages for each failing test and reports a non-zero exit status
-when tests fail.
+Each test file is meant to link against your implementation to provide a console executable that runs the tests.
+Running the test executable prints messages for each failing test and reports a non-zero exit status when tests fail.
 
-Working through each exercise is a process of:
-* Creating the initial build with Make
+To work through an exercise:
+* Create the initial build with Make
 * For each unit test:
- * Satisfy compile errors to make the test fail.
- * Implement just enough to make the test pass.
- * Refactor your implementation to enhance readability, reduce duplication,
-   etc.
- * Uncomment the next test
+  * Remove the `TEST_IGNORE()` line.
+  * Satisfy any compile errors to make the test fail.
+  * Implement just enough to make the test pass.
+  * Refactor your implementation to enhance readability, reduce duplication, etc.
 
+## Compiling and running the tests
 
-### Compiling and running the tests
+Each exercise will bring a `makefile` file along with the unit tests in the `tests/` directory.
+You should not need to edit the Make file.
+The provided recipe assumes that your implementation exists as a header file and a source file named after the exercise.
 
-Each exercise will bring a `makefile` file along with the unit
-tests in the `tests/` directory.  You should not need to edit the Make file.
-The provided recipe assumes that your implementation exists as a header file
-and a source file named after the exercise.
+For instance, the exercise `bob` expects an implementation in `src/bob.h` and `src/bob.c`.
+For exercises with dashes in their name, the source files are assumed to use underscores, so `word-count` expects `src/word_count.h` and `src/word_count.c`.
+You may decide that your implementation is sufficiently simple that it can live entirely in the header, in which case you can omit the `c` file.
 
-For instance, the exercise `bob` expects an implementation in `src/bob.h`
-and `src/bob.c`.  For exercises with dashes in their name, the source
-files are assumed to use underscores, so `word-count` expects
-`src/word_count.h` and `src/word_count.c`.  You may decide that your
-impementation is sufficiently simple that it can live entirely in the
-header, in which case you can omit the `c` file.
+**Create your initial implementation files before running Make.**  
+If you do not have files `src/bob.h` and `src/bob.c` when running Make for exercise `bob`, then Make will generate an error about files not being found.
+**These files can be empty, but they must exist.**
 
-**Create your initial implementation files before running Make.**  If
-you do not have files `src/bob.h` and `src/bob.c` when running
-Make for exercise `bob`, then Make will generate an error about files
-not being found.  **These files can be empty, but they must exist.**
+### Build your code
 
-You can build your code using the appropriate command for your environment:
+The simplest way to build your code is by using `make` at the command line (CLI).
+On Linux the CLI is available in bash or similar, on MacOS use Terminal. 
+On Windows 10, the Windows Subsystem for Linux (WSL) Bash is available.
+To do this, assuming the current exercise is `bob` and we're in the exercise folder:
 
-* Linux with make: `make`
-* Windows with Visual Studio 2013: Select Build / Build Solution from the menu.
-* MacOS with Xcode: Select Build from the toolbar
-
-
-#### Testing on Linux or MacOS with make
-
-Assuming the current exercise is `bob` and we're in the exercise folder:
-
-```
+```bash
 $ touch src/bob.{h,c}
-$ make test
+$ make
 ```
 
+Then to test:
 
-#### Testing on Windows with Visual Studio 2013
+```bash
+$ make test
+```
 
-?
+#### MacOS Build Alternative
+On MacOS you can also use Xcode. 
+To build the code select _Build_ from the toolbar.
 
+#### Windows Build Alternatives
+On Microsoft Windows 10 the recommended option, as above, is [WSL Bash](https://msdn.microsoft.com/en-us/commandline/wsl/about).
+If you are using an earlier version of Windows or WSL Bash is not available to you you can use Microsoft's [Visual Studio](https://www.visualstudio.com/vs/) IDE, which comes with its own compiler. 
+Alternatively you could use [MSYS/MinGW](http://www.mingw.org/) (32-bit only) or [mingw6-w64](http://mingw-w64.org/doku.php) (32 & 64-bit).
 
-#### Testing on MacOS with Xcode
+If using Visual Studio, the easiest way to open an exercise is to start a "Blank Project" from the C project template types.
+Then manually add the files from the exercise to it by right clicking on the project in the Solution Explorer and selecting _Add_ > _Existing File_ and selecting each of the .c and .h files within the exercise directory. 
+This allows you to build the project by selecting _Build_ > _Build Solution_ from the menu. Then  select _Debug_ > _Start Debugging_ to run it.
 
-?
+Visual Studio can also be made to build the project using the makefile. 
+This requires a per exercise configuration. See the documentation on this [here](https://docs.microsoft.com/en-gb/cpp/ide/non-msbuild-projects).

data/tracks/d/docs/INSTALLATION.md

@@ -66,7 +66,7 @@ The [DUB website's download page](https://code.dlang.org/download) has a Windows
 #### Mac OS X
 
 * The [DUB website's download page](https://code.dlang.org/download) has OS X binaries.
-* or using [Homebrew](http://brew.sh/): brew install dmd
+* or using [Homebrew](http://brew.sh/): brew install dub
 
 #### Linux
 

data/tracks/delphi/exercises/beer-song/README.md

@@ -1,6 +1,6 @@
 # Beer Song
 
-Produce the lyrics to that beloved classic, that field-trip favorite: 99 Bottles of Beer on the Wall.
+Recite the lyrics to that beloved classic, that field-trip favorite: 99 Bottles of Beer on the Wall.
 
 Note that not all verses are identical.
 

data/tracks/delphi/exercises/beer-song/inputdata.txt

@@ -1,7 +1,9 @@
 99 bottles of beer on the wall, 99 bottles of beer.\nTake one down and pass it around, 98 bottles of beer on the wall.\n
 44 bottles of beer on the wall, 44 bottles of beer.\nTake one down and pass it around, 43 bottles of beer on the wall.\n
 2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n
+3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n
 1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n
 No more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n
-3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n\n2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n
+2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n
+99 bottles of beer on the wall, 99 bottles of beer.\nTake one down and pass it around, 98 bottles of beer on the wall.\n\n98 bottles of beer on the wall, 98 bottles of beer.\nTake one down and pass it around, 97 bottles of beer on the wall.\n
 99 bottles of beer on the wall, 99 bottles of beer.\nTake one down and pass it around, 98 bottles of beer on the wall.\n\n98 bottles of beer on the wall, 98 bottles of beer.\nTake one down and pass it around, 97 bottles of beer on the wall.\n\n97 bottles of beer on the wall, 97 bottles of beer.\nTake one down and pass it around, 96 bottles of beer on the wall.\n\n96 bottles of beer on the wall, 96 bottles of beer.\nTake one down and pass it around, 95 bottles of beer on the wall.\n\n95 bottles of beer on the wall, 95 bottles of beer.\nTake one down and pass it around, 94 bottles of beer on the wall.\n\n94 bottles of beer on the wall, 94 bottles of beer.\nTake one down and pass it around, 93 bottles of beer on the wall.\n\n93 bottles of beer on the wall, 93 bottles of beer.\nTake one down and pass it around, 92 bottles of beer on the wall.\n\n92 bottles of beer on the wall, 92 bottles of beer.\nTake one down and pass it around, 91 bottles of beer on the wall.\n\n91 bottles of beer on the wall, 91 bottles of beer.\nTake one down and pass it around, 90 bottles of beer on the wall.\n\n90 bottles of beer on the wall, 90 bottles of beer.\nTake one down and pass it around, 89 bottles of beer on the wall.\n\n89 bottles of beer on the wall, 89 bottles of beer.\nTake one down and pass it around, 88 bottles of beer on the wall.\n\n88 bottles of beer on the wall, 88 bottles of beer.\nTake one down and pass it around, 87 bottles of beer on the wall.\n\n87 bottles of beer on the wall, 87 bottles of beer.\nTake one down and pass it around, 86 bottles of beer on the wall.\n\n86 bottles of beer on the wall, 86 bottles of beer.\nTake one down and pass it around, 85 bottles of beer on the wall.\n\n85 bottles of beer on the wall, 85 bottles of beer.\nTake one down and pass it around, 84 bottles of beer on the wall.\n\n84 bottles of beer on the wall, 84 bottles of beer.\nTake one down and pass it around, 83 bottles of beer on the wall.\n\n83 bottles of beer on the wall, 83 bottles of beer.\nTake one down and pass it around, 82 bottles of beer on the wall.\n\n82 bottles of beer on the wall, 82 bottles of beer.\nTake one down and pass it around, 81 bottles of beer on the wall.\n\n81 bottles of beer on the wall, 81 bottles of beer.\nTake one down and pass it around, 80 bottles of beer on the wall.\n\n80 bottles of beer on the wall, 80 bottles of beer.\nTake one down and pass it around, 79 bottles of beer on the wall.\n\n79 bottles of beer on the wall, 79 bottles of beer.\nTake one down and pass it around, 78 bottles of beer on the wall.\n\n78 bottles of beer on the wall, 78 bottles of beer.\nTake one down and pass it around, 77 bottles of beer on the wall.\n\n77 bottles of beer on the wall, 77 bottles of beer.\nTake one down and pass it around, 76 bottles of beer on the wall.\n\n76 bottles of beer on the wall, 76 bottles of beer.\nTake one down and pass it around, 75 bottles of beer on the wall.\n\n75 bottles of beer on the wall, 75 bottles of beer.\nTake one down and pass it around, 74 bottles of beer on the wall.\n\n74 bottles of beer on the wall, 74 bottles of beer.\nTake one down and pass it around, 73 bottles of beer on the wall.\n\n73 bottles of beer on the wall, 73 bottles of beer.\nTake one down and pass it around, 72 bottles of beer on the wall.\n\n72 bottles of beer on the wall, 72 bottles of beer.\nTake one down and pass it around, 71 bottles of beer on the wall.\n\n71 bottles of beer on the wall, 71 bottles of beer.\nTake one down and pass it around, 70 bottles of beer on the wall.\n\n70 bottles of beer on the wall, 70 bottles of beer.\nTake one down and pass it around, 69 bottles of beer on the wall.\n\n69 bottles of beer on the wall, 69 bottles of beer.\nTake one down and pass it around, 68 bottles of beer on the wall.\n\n68 bottles of beer on the wall, 68 bottles of beer.\nTake one down and pass it around, 67 bottles of beer on the wall.\n\n67 bottles of beer on the wall, 67 bottles of beer.\nTake one down and pass it around, 66 bottles of beer on the wall.\n\n66 bottles of beer on the wall, 66 bottles of beer.\nTake one down and pass it around, 65 bottles of beer on the wall.\n\n65 bottles of beer on the wall, 65 bottles of beer.\nTake one down and pass it around, 64 bottles of beer on the wall.\n\n64 bottles of beer on the wall, 64 bottles of beer.\nTake one down and pass it around, 63 bottles of beer on the wall.\n\n63 bottles of beer on the wall, 63 bottles of beer.\nTake one down and pass it around, 62 bottles of beer on the wall.\n\n62 bottles of beer on the wall, 62 bottles of beer.\nTake one down and pass it around, 61 bottles of beer on the wall.\n\n61 bottles of beer on the wall, 61 bottles of beer.\nTake one down and pass it around, 60 bottles of beer on the wall.\n\n60 bottles of beer on the wall, 60 bottles of beer.\nTake one down and pass it around, 59 bottles of beer on the wall.\n\n59 bottles of beer on the wall, 59 bottles of beer.\nTake one down and pass it around, 58 bottles of beer on the wall.\n\n58 bottles of beer on the wall, 58 bottles of beer.\nTake one down and pass it around, 57 bottles of beer on the wall.\n\n57 bottles of beer on the wall, 57 bottles of beer.\nTake one down and pass it around, 56 bottles of beer on the wall.\n\n56 bottles of beer on the wall, 56 bottles of beer.\nTake one down and pass it around, 55 bottles of beer on the wall.\n\n55 bottles of beer on the wall, 55 bottles of beer.\nTake one down and pass it around, 54 bottles of beer on the wall.\n\n54 bottles of beer on the wall, 54 bottles of beer.\nTake one down and pass it around, 53 bottles of beer on the wall.\n\n53 bottles of beer on the wall, 53 bottles of beer.\nTake one down and pass it around, 52 bottles of beer on the wall.\n\n52 bottles of beer on the wall, 52 bottles of beer.\nTake one down and pass it around, 51 bottles of beer on the wall.\n\n51 bottles of beer on the wall, 51 bottles of beer.\nTake one down and pass it around, 50 bottles of beer on the wall.\n\n50 bottles of beer on the wall, 50 bottles of beer.\nTake one down and pass it around, 49 bottles of beer on the wall.\n\n49 bottles of beer on the wall, 49 bottles of beer.\nTake one down and pass it around, 48 bottles of beer on the wall.\n\n48 bottles of beer on the wall, 48 bottles of beer.\nTake one down and pass it around, 47 bottles of beer on the wall.\n\n47 bottles of beer on the wall, 47 bottles of beer.\nTake one down and pass it around, 46 bottles of beer on the wall.\n\n46 bottles of beer on the wall, 46 bottles of beer.\nTake one down and pass it around, 45 bottles of beer on the wall.\n\n45 bottles of beer on the wall, 45 bottles of beer.\nTake one down and pass it around, 44 bottles of beer on the wall.\n\n44 bottles of beer on the wall, 44 bottles of beer.\nTake one down and pass it around, 43 bottles of beer on the wall.\n\n43 bottles of beer on the wall, 43 bottles of beer.\nTake one down and pass it around, 42 bottles of beer on the wall.\n\n42 bottles of beer on the wall, 42 bottles of beer.\nTake one down and pass it around, 41 bottles of beer on the wall.\n\n41 bottles of beer on the wall, 41 bottles of beer.\nTake one down and pass it around, 40 bottles of beer on the wall.\n\n40 bottles of beer on the wall, 40 bottles of beer.\nTake one down and pass it around, 39 bottles of beer on the wall.\n\n39 bottles of beer on the wall, 39 bottles of beer.\nTake one down and pass it around, 38 bottles of beer on the wall.\n\n38 bottles of beer on the wall, 38 bottles of beer.\nTake one down and pass it around, 37 bottles of beer on the wall.\n\n37 bottles of beer on the wall, 37 bottles of beer.\nTake one down and pass it around, 36 bottles of beer on the wall.\n\n36 bottles of beer on the wall, 36 bottles of beer.\nTake one down and pass it around, 35 bottles of beer on the wall.\n\n35 bottles of beer on the wall, 35 bottles of beer.\nTake one down and pass it around, 34 bottles of beer on the wall.\n\n34 bottles of beer on the wall, 34 bottles of beer.\nTake one down and pass it around, 33 bottles of beer on the wall.\n\n33 bottles of beer on the wall, 33 bottles of beer.\nTake one down and pass it around, 32 bottles of beer on the wall.\n\n32 bottles of beer on the wall, 32 bottles of beer.\nTake one down and pass it around, 31 bottles of beer on the wall.\n\n31 bottles of beer on the wall, 31 bottles of beer.\nTake one down and pass it around, 30 bottles of beer on the wall.\n\n30 bottles of beer on the wall, 30 bottles of beer.\nTake one down and pass it around, 29 bottles of beer on the wall.\n\n29 bottles of beer on the wall, 29 bottles of beer.\nTake one down and pass it around, 28 bottles of beer on the wall.\n\n28 bottles of beer on the wall, 28 bottles of beer.\nTake one down and pass it around, 27 bottles of beer on the wall.\n\n27 bottles of beer on the wall, 27 bottles of beer.\nTake one down and pass it around, 26 bottles of beer on the wall.\n\n26 bottles of beer on the wall, 26 bottles of beer.\nTake one down and pass it around, 25 bottles of beer on the wall.\n\n25 bottles of beer on the wall, 25 bottles of beer.\nTake one down and pass it around, 24 bottles of beer on the wall.\n\n24 bottles of beer on the wall, 24 bottles of beer.\nTake one down and pass it around, 23 bottles of beer on the wall.\n\n23 bottles of beer on the wall, 23 bottles of beer.\nTake one down and pass it around, 22 bottles of beer on the wall.\n\n22 bottles of beer on the wall, 22 bottles of beer.\nTake one down and pass it around, 21 bottles of beer on the wall.\n\n21 bottles of beer on the wall, 21 bottles of beer.\nTake one down and pass it around, 20 bottles of beer on the wall.\n\n20 bottles of beer on the wall, 20 bottles of beer.\nTake one down and pass it around, 19 bottles of beer on the wall.\n\n19 bottles of beer on the wall, 19 bottles of beer.\nTake one down and pass it around, 18 bottles of beer on the wall.\n\n18 bottles of beer on the wall, 18 bottles of beer.\nTake one down and pass it around, 17 bottles of beer on the wall.\n\n17 bottles of beer on the wall, 17 bottles of beer.\nTake one down and pass it around, 16 bottles of beer on the wall.\n\n16 bottles of beer on the wall, 16 bottles of beer.\nTake one down and pass it around, 15 bottles of beer on the wall.\n\n15 bottles of beer on the wall, 15 bottles of beer.\nTake one down and pass it around, 14 bottles of beer on the wall.\n\n14 bottles of beer on the wall, 14 bottles of beer.\nTake one down and pass it around, 13 bottles of beer on the wall.\n\n13 bottles of beer on the wall, 13 bottles of beer.\nTake one down and pass it around, 12 bottles of beer on the wall.\n\n12 bottles of beer on the wall, 12 bottles of beer.\nTake one down and pass it around, 11 bottles of beer on the wall.\n\n11 bottles of beer on the wall, 11 bottles of beer.\nTake one down and pass it around, 10 bottles of beer on the wall.\n\n10 bottles of beer on the wall, 10 bottles of beer.\nTake one down and pass it around, 9 bottles of beer on the wall.\n\n9 bottles of beer on the wall, 9 bottles of beer.\nTake one down and pass it around, 8 bottles of beer on the wall.\n\n8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n\n7 bottles of beer on the wall, 7 bottles of beer.\nTake one down and pass it around, 6 bottles of beer on the wall.\n\n6 bottles of beer on the wall, 6 bottles of beer.\nTake one down and pass it around, 5 bottles of beer on the wall.\n\n5 bottles of beer on the wall, 5 bottles of beer.\nTake one down and pass it around, 4 bottles of beer on the wall.\n\n4 bottles of beer on the wall, 4 bottles of beer.\nTake one down and pass it around, 3 bottles of beer on the wall.\n\n3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n\n2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n\n1 bottle of beer on the wall, 1 bottle of beer.\nTake it down and pass it around, no more bottles of beer on the wall.\n\nNo more bottles of beer on the wall, no more bottles of beer.\nGo to the store and buy some more, 99 bottles of beer on the wall.\n

data/tracks/delphi/exercises/beer-song/uBeerSongExample.pas

@@ -4,9 +4,10 @@ interface
 
 type
   Beer = class
-  public
+  private
     class function Verse(number: integer): string; static;
-    class function Verses(start, stop: integer): string; static;
+  public
+    class function Recite(start, takeDown: integer): string; static;
   end;
 
 implementation
@@ -31,15 +32,23 @@ begin
   end; //case
 end;
 
-class function Beer.Verses(start, stop: integer): string;
+class function Beer.Recite(start, takeDown: integer): string;
 var i: integer;
+    stop: integer;
+    verseNum: integer;
 begin
+   stop := (start - takeDown) + 1;
    result := '';
    for i := start downto stop do
+   begin
+     verseNum := i;
+     if verseNum < 0 then
+       verseNum := verseNum + 100;
      if i = stop then
-       result := result + Verse(i)
+       result := result + Verse(verseNum)
      else
-       result := result + Verse(i) + '\n';
+       result := result + Verse(verseNum) + '\n';
+   end;
 end;
 
 end.

data/tracks/delphi/exercises/beer-song/uBeerSongTests.pas

@@ -4,42 +4,49 @@ interface
 uses
   DUnitX.TestFramework;
 
+const
+  CanonicalVersion = '2.0.0';
+
 type
 
-  [TestFixture('Return 1 verse')]
-  VerseTests = class(TObject)
+  [TestFixture('single verse')]
+  SingleVerseTests = class(TObject)
   public
-    [Test]
-//  [Ignore('Comment the "[Ignore]" statement to run the test')]
-    procedure First_verse;
+    [TestCase('single verse','99,1')]
+//    [Ignore('Comment the "[Ignore]" statement to run the test')]
+    procedure first_generic_verse(const startBottles: integer; const takeDown: integer);
 
-    [Test]
+    [TestCase('last generic verse','3,1')]
     [Ignore]
-    procedure Middle_verse;
+    procedure last_generic_verse(const startBottles: integer; const takeDown: integer);
 
-    [Test]
+    [TestCase('verse with 2 bottles','2,1')]
     [Ignore]
-    procedure Third_to_last_verse;
+    procedure verse_with_2_bottles(const startBottles: integer; const takeDown: integer);
 
-    [Test]
+    [TestCase('verse with 1 bottle','1,1')]
     [Ignore]
-    procedure Penultimate_verse;
+    procedure verse_with_1_bottle(const startBottles: integer; const takeDown: integer);
 
-    [Test]
+    [TestCase('verse with 0 bottles','0,1')]
     [Ignore]
-    procedure Last_verse;
+    procedure verse_with_0_bottles(const startBottles: integer; const takeDown: integer);
   end;
 
-  [TextFixture('Return multiple verses')]
-  LyricsTests = class(TObject)
+  [TextFixture('multiple verses')]
+  MultipleVersesTests = class(TObject)
   public
-    [Test]
+    [TestCase('first two verses','99,2')]
+    [Ignore]
+    procedure first_two_verses(const startBottles: integer; const takeDown: integer);
+
+    [TestCase('last three verses','2,3')]
     [Ignore]
-    procedure Last_4_verses;
+    procedure last_three_verses(const startBottles: integer; const takeDown: integer);
 
-    [Test]
+    [TestCase('all verses','99,100')]
     [Ignore]
-    procedure All_verses;
+    procedure all_verses(const startBottles: integer; const takeDown: integer);
   end;
 
 implementation
@@ -47,71 +54,80 @@ uses System.SysUtils, System.Classes, uBeerSong;
 
 var inputFile: TStringlist;
 
-{$region 'Return 1 verse'}
+{$region 'single verse'}
 
-procedure VerseTests.First_verse;
+procedure SingleVerseTests.first_generic_verse(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
   Expected := inputFile[0];
-  Actual := Beer.Verse(99);
+  Actual := Beer.Recite(startBottles,takeDown);
   Assert.AreEqual(Expected, Actual);
 end;
 
-procedure VerseTests.Middle_verse;
+procedure SingleVerseTests.verse_with_1_bottle(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
-  Expected := inputFile[1];
-  Actual := Beer.Verse(44);
+  Expected := inputFile[4];
+  Actual := Beer.Recite(startBottles,takeDown);
   Assert.AreEqual(Expected, Actual);
 end;
 
-procedure VerseTests.Third_to_last_verse;
+procedure SingleVerseTests.verse_with_2_bottles(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
   Expected := inputFile[2];
-  Actual := Beer.Verse(2);
+  Actual := Beer.Recite(startBottles,takeDown);
   Assert.AreEqual(Expected, Actual);
 end;
 
-procedure VerseTests.Penultimate_verse;
+procedure SingleVerseTests.last_generic_verse(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
   Expected := inputFile[3];
-  Actual := Beer.Verse(1);
-  assert.AreEqual(Expected, Actual);
+  Actual := Beer.Recite(startBottles,takeDown);
+  Assert.AreEqual(Expected, Actual);
 end;
 
-procedure VerseTests.Last_verse;
+procedure SingleVerseTests.verse_with_0_bottles(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
-  Expected := inputFile[4];
-  Actual := Beer.Verse(0);
-  assert.AreEqual(Expected, Actual);
+  Expected := inputFile[5];
+  Actual := Beer.Recite(startBottles,takeDown);
+  Assert.AreEqual(Expected, Actual);
 end;
 {$endregion}
 
-{$region 'Return multiple verses'}
+{$region 'multiple verses'}
 
-procedure LyricsTests.Last_4_verses;
+procedure MultipleVersesTests.first_two_verses(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
-  Expected := inputFile[5];
-  Actual := Beer.Verses(3,0);
+  Expected := inputFile[7];
+  Actual := Beer.Recite(startBottles,takeDown);
   assert.AreEqual(Expected, Actual);
 end;
 
-procedure LyricsTests.All_verses;
+procedure MultipleVersesTests.last_three_verses(const startBottles: integer; const takeDown: integer);
 var Expected,
     Actual: string;
 begin
   Expected := inputFile[6];
-  Actual := Beer.Verses(99,0);
+  Actual := Beer.Recite(startBottles,takeDown);
+  assert.AreEqual(Expected, Actual);
+end;
+
+procedure MultipleVersesTests.all_verses(const startBottles: integer; const takeDown: integer);
+var Expected,
+    Actual: string;
+begin
+  Expected := inputFile[8];
+  Actual := Beer.Recite(startBottles,takeDown);
   assert.AreEqual(Expected, Actual);
 end;
 
@@ -125,8 +141,8 @@ end;
 
 initialization
   inputFile := loadInputData;
-  TDUnitX.RegisterTestFixture(VerseTests);
-  TDUnitX.RegisterTestFixture(LyricsTests);
+  TDUnitX.RegisterTestFixture(SingleVerseTests);
+  TDUnitX.RegisterTestFixture(MultipleVersesTests);
 
 finalization
   inputFile.DisposeOf;

data/tracks/delphi/exercises/nucleotide-count/README.md

@@ -2,8 +2,8 @@
 
 Given a single stranded DNA string, compute how many times each nucleotide occurs in the string.
 
-The genetic language of every living thing on the planet is DNA. 
-DNA is a large molecule that is built from an extremely long sequence of individual elements called nucleotides. 
+The genetic language of every living thing on the planet is DNA.
+DNA is a large molecule that is built from an extremely long sequence of individual elements called nucleotides.
 4 types exist in DNA and these differ only slightly and can be represented as the following symbols: 'A' for adenine, 'C' for cytosine, 'G' for guanine, and 'T' thymine.
 
 Here is an analogy:

data/tracks/ecmascript/config.json

@@ -781,6 +781,20 @@
         "Text formatting"
       ]
     },
+    {
+      "uuid": "03889544-064a-a980-2c2a-c7eb7d8407f8f737fb8",
+      "slug": "house",
+      "core": false,
+      "unlocked_by": "bob",
+      "difficulty": 4,
+      "topics": [
+        "Control-flow (conditionals)",
+        "Control-flow (loops)",
+        "Strings",
+        "Arrays",
+        "Recursion"
+      ]
+    },
     {
       "uuid": "7c569e5d-bb00-44b8-8adc-34253790c19b",
       "slug": "binary-search",

data/tracks/ecmascript/exercises/house/README.md

@@ -0,0 +1,146 @@
+# House
+
+Recite the nursery rhyme 'This is the House that Jack Built'.
+
+> [The] process of placing a phrase of clause within another phrase of
+> clause is called embedding. It is through the processes of recursion
+> and embedding that we are able to take a finite number of forms (words
+> and phrases) and construct an infinite number of expressions.
+> Furthermore, embedding also allows us to construct an infinitely long
+> structure, in theory anyway.
+
+- [papyr.com](http://papyr.com/hypertextbooks/grammar/ph_noun.htm)
+
+The nursery rhyme reads as follows:
+
+```text
+This is the house that Jack built.
+
+This is the malt
+that lay in the house that Jack built.
+
+This is the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the maiden all forlorn
+that milked the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the man all tattered and torn
+that kissed the maiden all forlorn
+that milked the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the priest all shaven and shorn
+that married the man all tattered and torn
+that kissed the maiden all forlorn
+that milked the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the rooster that crowed in the morn
+that woke the priest all shaven and shorn
+that married the man all tattered and torn
+that kissed the maiden all forlorn
+that milked the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the farmer sowing his corn
+that kept the rooster that crowed in the morn
+that woke the priest all shaven and shorn
+that married the man all tattered and torn
+that kissed the maiden all forlorn
+that milked the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+
+This is the horse and the hound and the horn
+that belonged to the farmer sowing his corn
+that kept the rooster that crowed in the morn
+that woke the priest all shaven and shorn
+that married the man all tattered and torn
+that kissed the maiden all forlorn
+that milked the cow with the crumpled horn
+that tossed the dog
+that worried the cat
+that killed the rat
+that ate the malt
+that lay in the house that Jack built.
+```
+
+## Hints
+
+Try to capture the structure of the song in your code, where you build up the song by composing its parts.
+
+## Setup
+
+Go through the setup instructions for ECMAScript to
+install the necessary dependencies:
+
+http://exercism.io/languages/ecmascript
+
+## Requirements
+
+Install assignment dependencies:
+
+```bash
+$ npm install
+```
+
+## Making the test suite pass
+
+Execute the tests with:
+
+```bash
+$ npm test
+```
+
+In the test suites all tests but the first have been skipped.
+
+Once you get a test passing, you can enable the next one by
+changing `xtest` to `test`.
+
+
+## Source
+
+British nursery rhyme http://en.wikipedia.org/wiki/This_Is_The_House_That_Jack_Built
+
+## Submitting Incomplete Solutions
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.