trackler 2.2.1.99 → 2.2.1.100

data/tracks/fsharp/generators/Generators.fsproj

@@ -9,6 +9,7 @@
     <Compile Include="Common.fs" />
     <Compile Include="Options.fs" />
     <Compile Include="CanonicalData.fs" />
+    <Compile Include="Track.fs" />
     <Compile Include="Formatting.fs" />
     <Compile Include="Rendering.fs" />
     <Compile Include="Exercise.fs" />

data/tracks/fsharp/generators/Options.fs

@@ -8,6 +8,7 @@ type Status =
     | Implemented
     | Unimplemented
     | MissingData
+    | Deprecated
     | Custom
 
 type CommandLineOptions = 
@@ -36,13 +37,19 @@ let private normalizeCanonicalDataDirectory canonicalDataDirectory =
         
 let private normalizeExercise exercise = Option.ofNonEmptyString exercise
 
-let private normalizeStatus status = 
-    match Option.ofNonEmptyString status with
-    | Some "Implemented"   -> Some Implemented
-    | Some "Unimplemented" -> Some Unimplemented
-    | Some "MissingData"   -> Some MissingData
-    | Some "Custom"        -> Some Custom
-    | Some "All"           -> None
+let private normalizeStatus status =
+    let normalizedStatus = 
+        status 
+        |> Option.ofNonEmptyString 
+        |> Option.map String.toLower
+
+    match normalizedStatus with
+    | Some "implemented"   -> Some Implemented
+    | Some "unimplemented" -> Some Unimplemented
+    | Some "missingdata"   -> Some MissingData
+    | Some "custom"        -> Some Custom
+    | Some "deprecated"    -> Some Deprecated
+    | Some "all"           -> None
     | Some _               -> failwith "Invalid status" 
     | None                 -> Some Implemented
 

data/tracks/fsharp/generators/Program.fs

@@ -16,6 +16,7 @@ let private isNotFilteredByStatus options (exercise: Exercise) =
     | Some Status.Implemented,   Exercise.Generator _     -> true
     | Some Status.Unimplemented, Exercise.Unimplemented _ -> true
     | Some Status.MissingData,   Exercise.MissingData _   -> true
+    | Some Status.Deprecated,    Exercise.Deprecated _    -> true
     | Some Status.Custom,        Exercise.Custom _        -> true
     | _ -> false
 
@@ -34,6 +35,8 @@ let private regenerateTestClass options =
             Log.Error("{Exercise}: missing test generator", unimplemented.Name)
         | Exercise.MissingData missingData ->
             Log.Warning("{Exercise}: missing canonical data", missingData.Name)
+        | Exercise.Deprecated deprecated ->
+            Log.Warning("{Exercise}: deprecated", deprecated.Name)
         | Exercise.Generator generator ->
             let canonicalData = parseCanonicalData' generator.Name
             generator.Regenerate(canonicalData)

data/tracks/fsharp/generators/Rendering.fs

@@ -7,7 +7,6 @@ open FSharp.Reflection
 open DotLiquid
 open DotLiquid.FileSystems
 open Formatting
-open System.Collections
 
 type OutputFilter() =
     static member Format (input: string) = formatValue input

data/tracks/fsharp/generators/Track.fs

@@ -0,0 +1,26 @@
+module Generators.Track
+
+open System.IO
+open Newtonsoft.Json
+
+type ConfigExercise = 
+    { Slug: string
+      Deprecated: bool }
+
+type Config = 
+    { Exercises: ConfigExercise list }
+
+let private convertTrackConfig trackConfigContents = JsonConvert.DeserializeObject<Config>(trackConfigContents)
+
+let private trackConfigFile = Path.Combine("..", "config.json")
+
+let private readTrackConfig = File.ReadAllText trackConfigFile
+
+let private parseTrackConfig = convertTrackConfig readTrackConfig
+
+let isDeprecated =
+    let config = parseTrackConfig
+
+    fun exercise -> 
+        config.Exercises
+        |> List.exists (fun x -> x.Slug = exercise && x.Deprecated)

data/tracks/go/exercises/custom-set/.meta/gen.go

@@ -86,11 +86,13 @@ type TestGroups []struct {
 type OneCase struct {
 	Description string
 	Property    string
-	Set         []int       // "empty"/"contains"/"add" cases
-	Set1        []int       // "subset"/"disjoint"/"equal"/"difference"/"intersection"/"union" cases
-	Set2        []int       // "subset"/"disjoint"/"equal"/"difference"/"intersection"/"union" cases
-	Element     int         // "contains"/"add" cases
-	Expected    interface{} // bool or []int
+	Input       struct {
+		Set     []int // "empty"/"contains"/"add" cases
+		Set1    []int // "subset"/"disjoint"/"equal"/"difference"/"intersection"/"union" cases
+		Set2    []int // "subset"/"disjoint"/"equal"/"difference"/"intersection"/"union" cases
+		Element int   // "contains"/"add" cases
+	}
+	Expected interface{} // bool or []int
 }
 
 func (c OneCase) PropertyMatch(property string) bool { return c.Property == property }
@@ -127,7 +129,7 @@ var tmpl = `
 // {{ .GroupComment $property}}
 var {{$property}}Cases = []unaryBoolCase{ {{range .}} {{range .Cases}}
 {{if .PropertyMatch $property}} { // {{.Description}}
-	{{strs .Set | printf "%#v"}},
+	{{strs .Input.Set | printf "%#v"}},
 	{{.Expected}},
 },
 {{- end}}{{end}}{{end}}
@@ -138,8 +140,8 @@ var {{$property}}Cases = []unaryBoolCase{ {{range .}} {{range .Cases}}
 // {{ .GroupComment $property}}
 var {{$property}}Cases = []eleBoolCase{ {{range .}} {{range .Cases}}
 {{if .PropertyMatch $property}} { // {{.Description}}
-	{{strs .Set | printf "%#v"}},
-	{{str .Element | printf "%q"}},
+	{{strs .Input.Set | printf "%#v"}},
+	{{str .Input.Element | printf "%q"}},
 	{{.Expected}},
 },
 {{- end}}{{end}}{{end}}
@@ -150,8 +152,8 @@ var {{$property}}Cases = []eleBoolCase{ {{range .}} {{range .Cases}}
 // {{ .GroupComment $property}}
 var {{$property}}Cases = []eleOpCase{ {{range .}} {{range .Cases}}
 {{if .PropertyMatch $property}} { // {{.Description}}
-	{{strs .Set | printf "%#v"}},
-	{{str .Element | printf "%q"}},
+	{{strs .Input.Set | printf "%#v"}},
+	{{str .Input.Element | printf "%q"}},
 	{{istrs .Expected | printf "%#v"}},
 },
 {{- end}}{{end}}{{end}}
@@ -162,8 +164,8 @@ var {{$property}}Cases = []eleOpCase{ {{range .}} {{range .Cases}}
 // {{ .GroupComment $property}}
 var {{$property}}Cases = []binBoolCase{ {{range .}} {{range .Cases}}
 {{if .PropertyMatch $property}} { // {{.Description}}
-	{{strs .Set1 | printf "%#v"}},
-	{{strs .Set2 | printf "%#v"}},
+	{{strs .Input.Set1 | printf "%#v"}},
+	{{strs .Input.Set2 | printf "%#v"}},
 	{{.Expected}},
 },
 {{- end}}{{end}}{{end}}
@@ -174,8 +176,8 @@ var {{$property}}Cases = []binBoolCase{ {{range .}} {{range .Cases}}
 // {{ .GroupComment $property}}
 var {{$property}}Cases = []binOpCase{ {{range .}} {{range .Cases}}
 {{if .PropertyMatch $property}} { // {{.Description}}
-	{{strs .Set1 | printf "%#v"}},
-	{{strs .Set2 | printf "%#v"}},
+	{{strs .Input.Set1 | printf "%#v"}},
+	{{strs .Input.Set2 | printf "%#v"}},
 	{{istrs .Expected | printf "%#v"}},
 },
 {{- end}}{{end}}{{end}}

data/tracks/go/exercises/custom-set/cases_test.go

@@ -1,8 +1,8 @@
 package stringset
 
 // Source: exercism/problem-specifications
-// Commit: 390a769 custom-set: add test for inequality of subset (#991)
-// Problem Specifications Version: 1.1.0
+// Commit: 1ef368e custom-set: apply "input" policy
+// Problem Specifications Version: 1.3.0
 
 // Returns true if the set contains no elements
 var emptyCases = []unaryBoolCase{

data/tracks/java/exercises/food-chain/.meta/version

@@ -0,0 +1 @@
+2.1.0

data/tracks/java/exercises/sieve/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/java/exercises/sieve/src/test/java/SieveTest.java

@@ -9,7 +9,15 @@ import static org.junit.Assert.assertEquals;
 
 public class SieveTest {
 
+    @Test
+    public void noPrimesUnder2(){
+        Sieve sieve = new Sieve(1);
+        List<Integer> expectedOutput = Collections.emptyList();
+
+        assertEquals(expectedOutput, sieve.getPrimes());
+    }
 
+    @Ignore("Remove to run test")
     @Test
     public void findFirstPrime() {
         Sieve sieve = new Sieve(2);
@@ -27,6 +35,15 @@ public class SieveTest {
         assertEquals(expectedOutput, sieve.getPrimes());
     }
 
+    @Ignore("Remove to run test")
+    @Test
+    public void limitIsPrime(){
+        Sieve sieve = new Sieve(13);
+        List<Integer> expectedOutput = Arrays.asList(2, 3, 5, 7, 11, 13);
+
+        assertEquals(expectedOutput, sieve.getPrimes());
+    }
+
     @Ignore("Remove to run test")
     @Test
     public void findPrimesUpTo1000() {

data/tracks/java/exercises/twelve-days/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/java/exercises/twelve-days/src/test/java/TwelveDaysTest.java

@@ -119,14 +119,26 @@ public class TwelveDaysTest {
 
     @Ignore("Remove to run test")
     @Test
-    public void testMultipleVerses() {
-        String expectedVerseOneToThree = "On the first day of Christmas my true love gave to me, " +
+    public void testFirstThreeVerses() {
+        String expectedVersesOneToThree = "On the first day of Christmas my true love gave to me, " +
                 "a Partridge in a Pear Tree.\n\n" +
                 "On the second day of Christmas my true love gave to me, two Turtle Doves, " +
                 "and a Partridge in a Pear Tree.\n\n" +
                 "On the third day of Christmas my true love gave to me, three French Hens, two Turtle Doves, " +
                 "and a Partridge in a Pear Tree.\n";
-        assertEquals(expectedVerseOneToThree, twelveDays.verses(1, 3));
+        assertEquals(expectedVersesOneToThree, twelveDays.verses(1, 3));
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void testFourthToSixthVerses() {
+        String expectedVersesFourToSix = "On the fourth day of Christmas my true love gave to me, " + 
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n\n" +
+                "On the fifth day of Christmas my true love gave to me, five Gold Rings, four Calling Birds, " + 
+                "three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n\n" +
+                "On the sixth day of Christmas my true love gave to me, six Geese-a-Laying, five Gold Rings, " + 
+                "four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.\n";
+        assertEquals(expectedVersesFourToSix, twelveDays.verses(4, 6));
     }
 
     @Ignore("Remove to run test")

data/tracks/java/exercises/two-fer/.meta/version

@@ -0,0 +1 @@
+1.2.0

data/tracks/java/exercises/two-fer/src/test/java/TwoferTest.java

@@ -38,13 +38,4 @@ public class TwoferTest {
 
         assertEquals(expected, twofer.twofer(input));
     }
-
-    @Ignore("Remove to run test")
-    @Test
-    public void emptyStringGiven() {
-        String input = "";
-        String expected = "One for , one for me.";
-
-        assertEquals(expected, twofer.twofer(input) );
-    }
 }

data/tracks/ocaml/config/exercise_readme.go.tmpl

@@ -4,10 +4,44 @@
 {{- with .Hints }}
 {{ . }}
 {{ end }}
-{{- with .TrackInsert }}
-{{ . }}
-{{ end }}
-{{- with .Spec.Credits -}}
+## Getting Started
+For installation and learning resources, refer to the
+[exercism help page](http://exercism.io/languages/ocaml).
+
+## Installation
+To work on the exercises, you will need `Opam` and `Core`. Consult [opam](https://opam.ocaml.org) website for instructions on how to install `opam` for your OS. Once `opam` is installed open a terminal window and run the following command to install core:
+
+```bash
+opam install core
+```
+
+To run the tests you will need `OUnit`. Install it using `opam`:
+
+```bash
+opam install ounit
+```
+
+## Running Tests
+A Makefile is provided with a default target to compile your solution and run the tests. At the command line, type:
+
+```bash
+make
+```
+
+## Interactive Shell
+`utop` is a command line program which allows you to run Ocaml code interactively. The easiest way to install it is via opam:
+```bash
+opam install utop
+```
+Consult [utop](https://github.com/diml/utop/blob/master/README.md) for more detail.
+
+## Feedback, Issues, Pull Requests
+The [exercism/ocaml](https://github.com/exercism/ocaml) repository on
+GitHub is the home for all of the Ocaml exercises.
+
+If you have feedback about an exercise, or want to help implementing a new
+one, head over there and create an issue.  We'll do our best to help you!
+{{ with .Spec.Credits }}
 ## Source
 
 {{ . }}

data/tracks/ocaml/exercises/acronym/README.md

@@ -7,8 +7,6 @@ Techies love their TLA (Three Letter Acronyms)!
 Help generate some jargon by writing a program that converts a long name
 like Portable Network Graphics to its acronym (PNG).
 
-
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).

data/tracks/ocaml/exercises/all-your-base/README.md

@@ -6,6 +6,7 @@ Implement general base conversion. Given a number in base **a**,
 represented as a sequence of digits, convert it to base **b**.
 
 ## Note
+
 - Try to implement the conversion yourself.
   Do not use something else to perform the conversion for you.
 
@@ -28,10 +29,8 @@ The number 1120, *in base 3*, means:
 
 I think you got the idea!
 
-
 *Yes. Those three numbers above are exactly the same. Congratulations!*
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).
@@ -70,6 +69,5 @@ GitHub is the home for all of the Ocaml exercises.
 If you have feedback about an exercise, or want to help implementing a new
 one, head over there and create an issue.  We'll do our best to help you!
 
-
 ## Submitting Incomplete Solutions
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/ocaml/exercises/anagram/README.md

@@ -6,7 +6,6 @@ Given `"listen"` and a list of candidates like `"enlists" "google"
 "inlets" "banana"` the program should return a list containing
 `"inlets"`.
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).

data/tracks/ocaml/exercises/atbash-cipher/README.md

@@ -9,7 +9,7 @@ letter, the second with the second-last, and so on.
 
 An Atbash cipher for the Latin alphabet would be as follows:
 
-```plain
+```text
 Plain:  abcdefghijklmnopqrstuvwxyz
 Cipher: zyxwvutsrqponmlkjihgfedcba
 ```
@@ -23,6 +23,7 @@ being 5 letters, and punctuation is excluded. This is to make it harder to guess
 things based on word boundaries.
 
 ## Examples
+
 - Encoding `test` gives `gvhg`
 - Decoding `gvhg` gives `test`
 - Decoding `gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt` gives `thequickbrownfoxjumpsoverthelazydog`
@@ -46,7 +47,6 @@ See [String documentation](http://caml.inria.fr/pub/docs/manual-ocaml/libref/Str
 for more useful functions.
 
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).

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

@@ -1,10 +1,10 @@
 # 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.
 
-```plain
+```text
 99 bottles of beer on the wall, 99 bottles of beer.
 Take one down and pass it around, 98 bottles of beer on the wall.
 
@@ -320,7 +320,6 @@ are some additional things you could try:
 Then please share your thoughts in a comment on the submission. Did this
 experiment make the code better? Worse? Did you learn anything from it?
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).

data/tracks/ocaml/exercises/binary-search/README.md

@@ -34,7 +34,6 @@ A binary search halves the number of items to check with each iteration,
 so locating an item (or determining its absence) takes logarithmic time.
 A binary search is a dichotomic divide and conquer search algorithm.
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).

data/tracks/ocaml/exercises/bob/README.md

@@ -6,6 +6,8 @@ Bob answers 'Sure.' if you ask him a question.
 
 He answers 'Whoa, chill out!' if you yell at him.
 
+He answers 'Calm down, I know what I'm doing!' if you yell a question at him.
+
 He says 'Fine. Be that way!' if you address him without actually saying
 anything.
 
@@ -40,7 +42,6 @@ test.native: *.ml *.mli
 Note the additional `-pkg str` option.
 
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).

data/tracks/ocaml/exercises/bowling/README.md

@@ -2,19 +2,29 @@
 
 Score a bowling game.
 
-Bowling is game where players roll a heavy ball to knock down pins
+Bowling is a game where players roll a heavy ball to knock down pins
 arranged in a triangle. Write code to keep track of the score
 of a game of bowling.
 
 ## Scoring Bowling
 
-The game consists of 10 frames. A frame is composed of one or two ball throws with 10 pins standing at frame initialization. There are three cases for the tabulation of a frame.
+The game consists of 10 frames. A frame is composed of one or two ball
+throws with 10 pins standing at frame initialization. There are three
+cases for the tabulation of a frame.
 
-* An open frame is where a score of less than 10 is recorded for the frame. In this case the score for the frame is the number of pins knocked down.
+* An open frame is where a score of less than 10 is recorded for the
+  frame. In this case the score for the frame is the number of pins
+  knocked down.
 
-* A spare is where all ten pins are knocked down after the second throw. The total value of a spare is 10 plus the number of pins knocked down in their next throw.
+* A spare is where all ten pins are knocked down by the second
+  throw. The total value of a spare is 10 plus the number of pins
+  knocked down in their next throw.
 
-* A strike is where all ten pins are knocked down after the first throw. The total value of a strike is 10 plus the number of pins knocked down in their next two throws. If a strike is immediately followed by a second strike, then we can not total the value of first strike until they throw the ball one more time.
+* A strike is where all ten pins are knocked down by the first
+  throw. The total value of a strike is 10 plus the number of pins
+  knocked down in the next two throws. If a strike is immediately
+  followed by a second strike, then the value of the first strike
+  cannot be determined until the ball is thrown one more time.
 
 Here is a three frame example:
 
@@ -30,7 +40,11 @@ Frame 3 is (9 + 0) = 9
 
 This means the current running total is 48.
 
-The tenth frame in the game is a special case. If someone throws a strike or a spare then they get a fill ball. Fill balls exist to calculate the total of the 10th frame. Scoring a strike or spare on the fill ball does not give the player more fill balls. The total value of the 10th frame is the total number of pins knocked down.
+The tenth frame in the game is a special case. If someone throws a
+strike or a spare then they get a fill ball. Fill balls exist to
+calculate the total of the 10th frame. Scoring a strike or spare on
+the fill ball does not give the player more fill balls. The total
+value of the 10th frame is the total number of pins knocked down.
 
 For a tenth frame of X1/ (strike and a spare), the total value is 20.
 
@@ -46,7 +60,6 @@ support two operations:
 * `score() : int` is called only at the very end of the game.  It
   returns the total score for that game.
 
-
 ## Getting Started
 For installation and learning resources, refer to the
 [exercism help page](http://exercism.io/languages/ocaml).