trackler 2.0.8.48 → 2.0.8.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f9103d1bb0fccad3f8e1a1268d1e27805e27221
-  data.tar.gz: 4c3d8b30edf248fc9ffbba8d61013cc0f976c5b5
+  metadata.gz: 48201089c77e7b81845af6440956854c37235757
+  data.tar.gz: c8df11ee44d68548e4dc45916eb772d42db76d18
 SHA512:
-  metadata.gz: c5ab069fa0635df70cb2cffa4fd5515d8be46e14994dee37191f9c748c580a5c33827f39180c2a76612197567c9e7633fbbd88631c14add8fe026484746e502d
-  data.tar.gz: 2990d6c65e663be910fd127207db947485b3725a577d56934de2c44861aee2c847ec97712ed6da4bdb46a26a14e115a872551b0a7d342ab65990630c38e9b996
+  metadata.gz: 8c8ee5ad1aa4951cc1960e272f54ee5928757809050c731a15c4c68c76031b1ec7410315dd58479dea955c5f889fdcfd9cf2bcb35c3676c912df549b317cd59f
+  data.tar.gz: 8871ec457aebdc4366e1c910a2a2fdf95a44e309d32ea9d113435f3d5f23f2c5d2e9913e19708dd13f72460d5163a6f45f3682f89ecaea041fb4bef555c6d159

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.8.48"
+  VERSION = "2.0.8.49"
 end

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

@@ -22,71 +22,81 @@ func main() {
 
 // The JSON structure we expect to be able to umarshal into
 type js struct {
-	Create struct {
-		Description []string
-		Cases       []timeCase
-	}
-	Add struct {
-		Description []string
-		Cases       []addCase
-	}
-	Equal struct {
-		Description []string
-		Cases       []eqCase
-	}
+	Groups TestGroups `json:"Cases"`
 }
 
-// Handle the three tests similarly
-
-type timeCase struct {
-	Description  string
-	Hour, Minute int
-	Expected     string
+type TestGroups []struct {
+	Description string
+	Cases       []OneCase
 }
-type addCase struct {
-	Description       string
-	Hour, Minute, Add int
-	Expected          string
+
+type OneCase struct {
+	Description string
+	Property    string
+	Hour        int // "create"/"add" cases
+	Minute      int // "create"/"add" cases
+	Add         int // "add" cases only
+
+	Clock1   struct{ Hour, Minute int } // "equal" cases only
+	Clock2   struct{ Hour, Minute int } // "equal" cases only
+	Expected interface{}                // string or bool
 }
-type eqCase struct {
-	Description    string
-	Clock1, Clock2 struct{ Hour, Minute int }
-	Expected       bool
+
+func (c OneCase) IsTimeCase() bool  { return c.Property == "create" }
+func (c OneCase) IsAddCase() bool   { return c.Property == "add" }
+func (c OneCase) IsEqualCase() bool { return c.Property == "equal" }
+
+func (groups TestGroups) GroupComment(property string) string {
+	for _, group := range groups {
+		propertyGroupMatch := true
+		for _, testcase := range group.Cases {
+			if testcase.Property != property {
+				propertyGroupMatch = false
+				break
+			}
+		}
+		if propertyGroupMatch {
+			return group.Description
+		}
+	}
+	return "Note: Apparent inconsistent use of \"property\": \"" + property + "\" within test case group!"
 }
 
 var tmpl = `package clock
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
-{{range .J.Create.Description}}// {{.}}
-{{end}}var timeTests = []struct {
+{{with .J.Groups}}
+    // {{ .GroupComment "create"}}
+{{end}} var timeTests = []struct {
 	h, m int
 	want string
-}{
-{{range .J.Create.Cases}}{ {{.Hour}}, {{.Minute}}, {{.Expected | printf "%#v"}}},	// {{.Description}}
-{{end}}}
+}{ {{range .J.Groups}} {{range .Cases}}
+{{if .IsTimeCase}}{ {{.Hour}}, {{.Minute}}, {{.Expected | printf "%#v"}}}, // {{.Description}}
+{{- end}}{{end}}{{end}} }
 
-{{range .J.Add.Description}}// {{.}}
-{{end}}var addTests = []struct {
+{{with .J.Groups}}
+    // {{ .GroupComment "add"}}
+{{end}} var addTests = []struct {
 	h, m, a int
-	want  string
-}{
-{{range .J.Add.Cases}}{ {{.Hour}}, {{.Minute}}, {{.Add}}, {{.Expected | printf "%#v"}}}, // {{.Description}}
-{{end}}}
+	want string
+}{ {{range .J.Groups}} {{range .Cases}}
+{{if .IsAddCase}}{ {{.Hour}}, {{.Minute}}, {{.Add}}, {{.Expected | printf "%#v"}}}, // {{.Description}}
+{{- end}}{{end}}{{end}} }
 
-{{range .J.Equal.Description}}// {{.}}
-{{end}}type hm struct{ h, m int }
+{{with .J.Groups}}
+    // {{ .GroupComment "equal"}}
+{{end}} type hm struct{ h, m int }
 
 var eqTests = []struct {
 	c1, c2 hm
 	want   bool
-}{
-{{range .J.Equal.Cases}}// {{.Description}}
+}{ {{range .J.Groups}} {{range .Cases}}
+{{if .IsEqualCase}} // {{.Description}}
 {
 	hm{ {{.Clock1.Hour}}, {{.Clock1.Minute}}},
 	hm{ {{.Clock2.Hour}}, {{.Clock2.Minute}}},
 	{{.Expected}},
-},
-{{end}}}`
+}, {{- end}}{{end}}{{end}}
+}
+`

data/tracks/go/exercises/clock/cases_test.go

@@ -1,7 +1,8 @@
 package clock
 
 // Source: exercism/x-common
-// Commit: 180638f Merge pull request #217 from ErikSchierboom/patch-2
+// Commit: 8c7fc0c clock: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 // Test creating a new clock with an initial time.
 var timeTests = []struct {
@@ -27,6 +28,7 @@ var timeTests = []struct {
 	{1, -4820, "16:40"},    // negative minutes roll over continuously
 	{-25, -160, "20:20"},   // negative hour and minutes both roll over
 	{-121, -5810, "22:10"}, // negative hour and minutes both roll over continuously
+
 }
 
 // Test adding and subtracting minutes.
@@ -34,6 +36,7 @@ var addTests = []struct {
 	h, m, a int
 	want    string
 }{
+
 	{10, 0, 3, "10:03"},     // add minutes
 	{6, 41, 0, "06:41"},     // add no minutes
 	{0, 45, 40, "01:25"},    // add to next hour
@@ -50,6 +53,7 @@ var addTests = []struct {
 	{6, 15, -160, "03:35"},  // subtract more than two hours with borrow
 	{5, 32, -1500, "04:32"}, // subtract more than one day (1500 min = 25 hrs)
 	{2, 20, -3000, "00:20"}, // subtract more than two days
+
 }
 
 // Construct two separate clocks, set times, test if they are equal.
@@ -59,6 +63,7 @@ var eqTests = []struct {
 	c1, c2 hm
 	want   bool
 }{
+
 	// clocks with same time
 	{
 		hm{15, 37},

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

@@ -22,11 +22,12 @@ func main() {
 
 // The JSON structure we expect to be able to unmarshal into
 type js struct {
-	Add struct {
-		Description []string
+	Cases []struct {
+		Description string
 		Cases       []struct {
-			Input    string
-			Expected string
+			Description string
+			Input       string
+			Expected    string
 		}
 	}
 }
@@ -34,17 +35,19 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package gigasecond
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
-{{range .J.Add.Description}}// {{.}}
-{{end}}var addCases = []struct {
+{{.Header}}
+
+{{range .J.Cases}}// {{.Description}}
+var addCases = []struct {
+	description string
 	in   string
 	want string
 }{
-{{range .J.Add.Cases}}{
+{{range .Cases}}{
+	{{printf "%q" .Description}},
 	{{printf "%q" .Input}},
 	{{printf "%q" .Expected}},
 },
-{{end}}}
+{{end}}{{end}}
+}
 `

data/tracks/go/exercises/gigasecond/cases_test.go

@@ -1,30 +1,37 @@
 package gigasecond
 
 // Source: exercism/x-common
-// Commit: 1e9e232 Merge pull request #45 from soniakeys/gigasecond-tests
+// Commit: 61e7d70 Fix "Gigasecond: Schema Compliance"
+// x-common version: 1.0.0
 
 // Add one gigasecond to the input.
 var addCases = []struct {
-	in   string
-	want string
+	description string
+	in          string
+	want        string
 }{
 	{
+		"date only specification of time",
 		"2011-04-25",
 		"2043-01-01T01:46:40",
 	},
 	{
+		"second test for date only specification of time",
 		"1977-06-13",
 		"2009-02-19T01:46:40",
 	},
 	{
+		"third test for date only specification of time",
 		"1959-07-19",
 		"1991-03-27T01:46:40",
 	},
 	{
+		"full time specified",
 		"2015-01-24T22:00:00",
 		"2046-10-02T23:46:40",
 	},
 	{
+		"full time with day roll-over",
 		"2015-01-24T23:59:59",
 		"2046-10-03T01:46:39",
 	},

data/tracks/go/exercises/gigasecond/gigasecond_test.go

@@ -28,10 +28,12 @@ func TestAddGigasecond(t *testing.T) {
 		want := parse(tc.want, t)
 		got := AddGigasecond(in)
 		if !got.Equal(want) {
-			t.Fatalf(`AddGigasecond(%s)
+			t.Fatalf(`FAIL: %s
+AddGigasecond(%s)
    = %s
-want %s`, in, got, want)
+want %s`, tc.description, in, got, want)
 		}
+		t.Log("PASS:", tc.description)
 	}
 	t.Log("Tested", len(addCases), "cases.")
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.48
+  version: 2.0.8.49
 platform: ruby
 authors:
 - Katrina Owen