trackler 2.2.1.96 → 2.2.1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81eca53e081d3529ffccdc505c2470677bcd75fa
-  data.tar.gz: 5c658d2fdc47d731a5c12857851e327019bfcf0f
+  metadata.gz: a879165bbaf3374166c71dc34a41c6aec1bb4810
+  data.tar.gz: c2523fd9d3a926cc23467b989899bdf68f0fa565
 SHA512:
-  metadata.gz: dcb54de6244b11bc2ac9ade0eee35db7a0436a8fbb1eabcd8f5d6be9e46df5a4d35015df8f3f0c31ffb470b766bce0d0b07fb426566a22de1ca454809860f3a1
-  data.tar.gz: b188c9715563d6aa42540f7f85295b58c99841515fdcc8ef9e3322d8887006a8a08ac664bc05bf7a0875d94019e9e8901f46d0a6e4a937283162775204e9fe57
+  metadata.gz: 1cc0663e27885b9b49fe12f96d9157edd8e461124f5dec5d6e6cd80e479086938f1064cd8bc14eaba7e81b52d491f1e2332c3d754f8c81b31063939d2a541d3d
+  data.tar.gz: a0dac94954516db51e090848ee10285b9303d1e5b6f0fb3ad23a1a4e465c50cadab72b7d98503922a9c8e1c5a2cf768ed6411e69513a1c34fb0b16f52621d5b8

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.2.1.96"
+  VERSION = "2.2.1.97"
 end

data/tracks/fsharp/exercises/bowling/BowlingTest.fs

@@ -1,7 +1,9 @@
+// This file was auto-generated based on version 1.1.0 of the canonical data.
+
 module BowlingTest
 
-open Xunit
 open FsUnit.Xunit
+open Xunit
 
 open Bowling
 
@@ -12,141 +14,174 @@ let ``Should be able to score a game with all zeros`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 0
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Should be able to score a game with no strikes or spares`` () =
     let rolls = [3; 6; 3; 6; 3; 6; 3; 6; 3; 6; 3; 6; 3; 6; 3; 6; 3; 6; 3; 6]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 90
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``A spare followed by zeros is worth ten points`` () =
     let rolls = [6; 4; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 10
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Points scored in the roll after a spare are counted twice`` () =
     let rolls = [6; 4; 3; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 16
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Consecutive spares each get a one roll bonus`` () =
     let rolls = [5; 5; 3; 7; 4; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 31
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``A spare in the last frame gets a one roll bonus that is counted once`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 7; 3; 7]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 17
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``A strike earns ten points in frame with a single roll`` () =
+let ``A strike earns ten points in a frame with a single roll`` () =
     let rolls = [10; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 10
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Points scored in the two rolls after a strike are counted twice as a bonus`` () =
     let rolls = [10; 5; 3; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 26
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Consecutive strikes each get the two roll bonus`` () =
     let rolls = [10; 10; 10; 5; 3; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 81
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``A strike in the last frame gets a two roll bonus that is counted once`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 7; 1]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 18
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Rolling a spare with the two roll bonus does not get a bonus roll`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 7; 3]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 20
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Strikes with the two roll bonus do not get bonus rolls`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 10; 10]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 30
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``A strike with the one roll bonus after a spare in the last frame does not get a bonus`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 7; 3; 10]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 20
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``All strikes is a perfect game`` () =
     let rolls = [10; 10; 10; 10; 10; 10; 10; 10; 10; 10; 10; 10]
     let game = rollMany rolls (newGame())
     score game |> should equal <| Some 300
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``Rolls can not score negative points`` () =
-    let rolls = [-1; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
-    let game = rollMany rolls (newGame())
+let ``Rolls cannot score negative points`` () =
+    let rolls = []
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll -1 startingRolls
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``A roll can not score more than 10 points`` () =
-    let rolls = [11; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
-    let game = rollMany rolls (newGame())
+let ``A roll cannot score more than 10 points`` () =
+    let rolls = []
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 11 startingRolls
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``Two rolls in a frame can not score more than 10 points`` () =
-    let rolls = [5; 6; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
-    let game = rollMany rolls (newGame())
+let ``Two rolls in a frame cannot score more than 10 points`` () =
+    let rolls = [5]
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 6 startingRolls
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``Two bonus rolls after a strike in the last frame can not score more than 10 points`` () =
-    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 5; 6]
+let ``Bonus roll after a strike in the last frame cannot score more than 10 points`` () =
+    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10]
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 11 startingRolls
+    score game |> should equal None
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Two bonus rolls after a strike in the last frame cannot score more than 10 points`` () =
+    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 5]
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 6 startingRolls
+    score game |> should equal None
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Two bonus rolls after a strike in the last frame can score more than 10 points if one is a strike`` () =
+    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 10; 6]
     let game = rollMany rolls (newGame())
+    score game |> should equal <| Some 26
+
+[<Fact(Skip = "Remove to run test")>]
+let ``The second bonus rolls after a strike in the last frame cannot be a strike if the first one is not a strike`` () =
+    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 6]
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 10 startingRolls
+    score game |> should equal None
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Second bonus roll after a strike in the last frame cannot score more than 10 points`` () =
+    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 10]
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 11 startingRolls
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``An unstarted game can not be scored`` () =
+let ``An unstarted game cannot be scored`` () =
     let rolls = []
     let game = rollMany rolls (newGame())
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``An incomplete game can not be scored`` () =
+let ``An incomplete game cannot be scored`` () =
     let rolls = [0; 0]
     let game = rollMany rolls (newGame())
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
-let ``A game with more than ten frames can not be scored`` () =
-    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
-    let game = rollMany rolls (newGame())
+let ``Cannot roll if game already has ten frames`` () =
+    let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0]
+    let startingRolls = rollMany rolls (newGame())
+    let game = roll 0 startingRolls
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Bonus rolls for a strike in the last frame must be rolled before score can be calculated`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10]
     let game = rollMany rolls (newGame())
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Both bonus rolls for a strike in the last frame must be rolled before score can be calculated`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 10; 10]
     let game = rollMany rolls (newGame())
     score game |> should equal None
-    
+
 [<Fact(Skip = "Remove to run test")>]
 let ``Bonus roll for a spare in the last frame must be rolled before score can be calculated`` () =
     let rolls = [0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 7; 3]
     let game = rollMany rolls (newGame())
-    score game |> should equal None
+    score game |> should equal None
+

data/tracks/fsharp/generators/Generators.fs

@@ -132,6 +132,30 @@ type BookStore() =
     override __.PropertiesUsedAsSutParameter canonicalDataCase =
         base.PropertiesUsedAsSutParameter canonicalDataCase |> List.except ["targetgrouping"]
 
+type Bowling() = 
+    inherit GeneratorExercise()
+
+    override __.RenderSut _ ="score game"
+
+    override __.RenderSetup canonicalDataCase = 
+        "let rollMany rolls game = List.fold (fun game pins -> roll pins game) game rolls"
+
+    override __.RenderArrange canonicalDataCase =
+        seq {
+            let arr = (canonicalDataCase.Input.["previousRolls"] :?> JToken).ToObject<string[]>()
+            yield sprintf "let rolls = %s" (formatList arr)
+            if canonicalDataCase.Input.ContainsKey "roll" then
+                let roll = canonicalDataCase.Input.["roll"] :?> int64
+                yield sprintf "let startingRolls = rollMany rolls (newGame())" 
+                yield sprintf "let game = roll %i startingRolls" roll
+            else
+                yield sprintf "let game = rollMany rolls (newGame())" 
+        }
+        |> Seq.toList
+
+    override __.RenderExpected (_, _, value) = 
+        if value :? JObject then "None" else sprintf "<| Some %s" (formatValue value)
+    
 type BracketPush() =
     inherit GeneratorExercise()
 

data/tracks/go/exercises/acronym/cases_test.go

@@ -1,8 +1,8 @@
 package acronym
 
 // Source: exercism/problem-specifications
-// Commit: c5fb622 acronym: Update json for new "input" policy (#1032)
-// Problem Specifications Version: 1.2.0
+// Commit: 5ae1dba Acronym canonical-data: Remove redundant test case
+// Problem Specifications Version: 1.3.0
 
 type acronymTest struct {
 	input    string
@@ -22,10 +22,6 @@ var stringTestCases = []acronymTest{
 		input:    "First In, First Out",
 		expected: "FIFO",
 	},
-	{
-		input:    "PHP: Hypertext Preprocessor",
-		expected: "PHP",
-	},
 	{
 		input:    "GNU Image Manipulation Program",
 		expected: "GIMP",

data/tracks/go/exercises/anagram/cases_test.go

@@ -1,8 +1,8 @@
 package anagram
 
 // Source: exercism/problem-specifications
-// Commit: a0f7663 anagram: Update json for new "input" policy (#1036)
-// Problem Specifications Version: 1.1.0
+// Commit: b8359f9 Anagram canonical-data: Update version
+// Problem Specifications Version: 1.2.0
 
 var testCases = []struct {
 	description string
@@ -20,23 +20,6 @@ var testCases = []struct {
 			"pants"},
 		expected: []string{},
 	},
-	{
-		description: "detects simple anagram",
-		subject:     "ant",
-		candidates: []string{
-			"tan",
-			"stand",
-			"at"},
-		expected: []string{
-			"tan"},
-	},
-	{
-		description: "does not detect false positives",
-		subject:     "galea",
-		candidates: []string{
-			"eagle"},
-		expected: []string{},
-	},
 	{
 		description: "detects two anagrams",
 		subject:     "master",
@@ -82,20 +65,6 @@ var testCases = []struct {
 			"regally",
 			"largely"},
 	},
-	{
-		description: "does not detect identical words",
-		subject:     "corn",
-		candidates: []string{
-			"corn",
-			"dark",
-			"Corn",
-			"rank",
-			"CORN",
-			"cron",
-			"park"},
-		expected: []string{
-			"cron"},
-	},
 	{
 		description: "does not detect non-anagrams with identical checksum",
 		subject:     "mass",
@@ -133,13 +102,6 @@ var testCases = []struct {
 		expected: []string{
 			"Carthorse"},
 	},
-	{
-		description: "does not detect a word as its own anagram",
-		subject:     "banana",
-		candidates: []string{
-			"Banana"},
-		expected: []string{},
-	},
 	{
 		description: "does not detect a anagram if the original word is repeated",
 		subject:     "go",

data/tracks/go/exercises/hamming/.meta/gen.go

@@ -25,9 +25,11 @@ type js struct {
 
 type oneCase struct {
 	Description string
-	Strand1     string
-	Strand2     string
-	Expected    interface{}
+	Input       struct {
+		Strand1 string
+		Strand2 string
+	}
+	Expected interface{}
 }
 
 func (o oneCase) Want() int {
@@ -49,8 +51,8 @@ var testCases = []struct {
 	want int
 }{
 {{range .J.Cases}}{ // {{.Description}}
-	{{printf "%q" .Strand1}},
-	{{printf "%q" .Strand2}},
+	{{printf "%q" .Input.Strand1}},
+	{{printf "%q" .Input.Strand2}},
 	{{.Want}},
 },
 {{end}}}

data/tracks/go/exercises/hamming/cases_test.go

@@ -1,8 +1,8 @@
 package hamming
 
 // Source: exercism/problem-specifications
-// Commit: f79dfd7 Simplify two tests so the difference is easily spotted.
-// Problem Specifications Version: 2.0.1
+// Commit: b5d154b hamming: move inputs (strand1, strand2) to input object
+// Problem Specifications Version: 2.1.0
 
 var testCases = []struct {
 	s1   string

data/tracks/go/exercises/largest-series-product/.meta/gen.go

@@ -22,9 +22,11 @@ func main() {
 type js struct {
 	Cases []struct {
 		Description string
-		Digits      string
-		Span        int
-		Expected    int64
+		Input       struct {
+			Digits string
+			Span   int
+		}
+		Expected int64
 	}
 }
 
@@ -39,6 +41,6 @@ var tests = []struct {
 	product int64
 	ok      bool
 }{
-{{range .J.Cases}}{ "{{.Digits}}", {{.Span}}, {{.Expected}}, {{ge .Expected 0}}},
+{{range .J.Cases}}{ "{{.Input.Digits}}", {{.Input.Span}}, {{.Expected}}, {{ge .Expected 0}}},
 {{end}}}
 `

data/tracks/go/exercises/largest-series-product/cases_test.go

@@ -1,8 +1,8 @@
 package lsproduct
 
 // Source: exercism/problem-specifications
-// Commit: e79b832 largest-series-product: Fix canonical-data.json formatting
-// Problem Specifications Version: 1.0.0
+// Commit: 92b86a8 largest-series-product: Apply new "input" policy
+// Problem Specifications Version: 1.1.0
 
 var tests = []struct {
 	digits  string

data/tracks/go/exercises/leap/.meta/gen.go

@@ -22,8 +22,10 @@ func main() {
 type js struct {
 	Cases []struct {
 		Description string
-		Input       int
-		Expected    bool
+		Input       struct {
+			Year int
+		}
+		Expected bool
 	}
 }
 
@@ -37,6 +39,6 @@ var testCases = []struct {
 	expected    bool
 	description string
 }{
-{{range .J.Cases}}{ {{.Input}}, {{.Expected}}, {{printf "%q" .Description}}},
+{{range .J.Cases}}{ {{.Input.Year}}, {{.Expected}}, {{printf "%q" .Description}}},
 {{end}}}
 `