trackler 2.1.0.48 → 2.1.0.49

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

@@ -28,7 +28,6 @@ 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.
@@ -36,7 +35,6 @@ 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
@@ -53,7 +51,6 @@ 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.
@@ -63,7 +60,6 @@ var eqTests = []struct {
 	c1, c2 hm
 	want   bool
 }{
-
 	// clocks with same time
 	{
 		hm{15, 37},

data/tracks/go/gen/gen.go

@@ -130,6 +130,10 @@ func Gen(exercise string, j interface{}, t *template.Template) error {
 		return fmt.Errorf(`didn't contain version: %v`, err)
 	}
 
+	if err := classifyByProperty(j); err != nil {
+		return fmt.Errorf("couldn't auto-classify based on property: %v", err)
+	}
+
 	// package up a little meta data
 	d := struct {
 		Header

data/tracks/go/gen/property.go

@@ -0,0 +1,70 @@
+package gen
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+)
+
+const tagName = "property"
+
+func classifyByProperty(group interface{}) error {
+	v := reflect.ValueOf(group)
+	if v.Kind() != reflect.Ptr || v.IsNil() {
+		return fmt.Errorf("Can only classify pointers, not %s (%v)", v.Kind(), v)
+	}
+
+	e := v.Elem()
+	t := e.Type()
+
+	var raws []json.RawMessage
+	properties := make(map[string]reflect.Value)
+
+	for i := 0; i < t.NumField(); i++ {
+		tag := t.Field(i).Tag.Get(tagName)
+		field := e.Field(i)
+		if tag == "RAW" {
+			raws = field.Interface().([]json.RawMessage)
+		} else if tag != "" {
+			properties[tag] = field
+		} else {
+			switch field.Kind() {
+			case reflect.Slice:
+				elem := field.Type().Elem()
+				if elem.Kind() == reflect.Struct {
+					for j := 0; j < field.Len(); j++ {
+						err := classifyByProperty(field.Index(j).Addr().Interface())
+						if err != nil {
+							return fmt.Errorf("Couldn't classify %s element %d: %s", t.Field(i).Name, j, err)
+						}
+					}
+				}
+			case reflect.Struct:
+				err := classifyByProperty(field.Addr().Interface())
+				if err != nil {
+					return fmt.Errorf("Couldn't classify %s: %s", t.Field(i).Name, err)
+				}
+			}
+		}
+	}
+
+	for _, raw := range raws {
+		var prop struct {
+			Property string
+		}
+		if err := json.Unmarshal(raw, &prop); err != nil {
+			return err
+		}
+		caseSlice, ok := properties[prop.Property]
+		if !ok {
+			return fmt.Errorf("Found property %s but no element tagged with that property", prop.Property)
+		}
+		oneCase := reflect.New(caseSlice.Type().Elem()).Interface()
+		if err := json.Unmarshal(raw, &oneCase); err != nil {
+			return err
+		}
+		caseSlice.Set(reflect.Append(caseSlice, reflect.ValueOf(oneCase).Elem()))
+	}
+
+	return nil
+}

data/tracks/groovy/README.md

@@ -1,4 +1,4 @@
-# xGroovy
+# Exercism Groovy Track
 
 Exercism problems in Groovy
 

data/tracks/groovy/config.json

@@ -1,7 +1,7 @@
 {
   "slug": "groovy",
   "language": "Groovy",
-  "repository": "https://github.com/exercism/xgroovy",
+  "repository": "https://github.com/exercism/groovy",
   "checklist_issue": 9,
   "active": false,
   "deprecated": [
@@ -77,9 +77,7 @@
     {
       "difficulty": 4,
       "slug": "roman-numerals",
-      "topics": [
-
-      ]
+      "topics": [ "metaprogramming" ]
     },
     {
       "difficulty": 2,

data/tracks/groovy/exercises/roman-numerals/Example.groovy

@@ -1,19 +1,19 @@
 class Roman {
   def Roman() {
-    Integer.metaClass.toRoman = {->
+    Integer.metaClass.getRoman = {->
       def romanMappings = [
-        1000:"M", 
-        900:"CM", 
+        1000:"M",
+        900:"CM",
         500:"D",
-        400:"CD", 
-        100:"C", 
+        400:"CD",
+        100:"C",
         90:"XC",
-        50:"L", 
-        40:"XL", 
+        50:"L",
+        40:"XL",
         10:"X",
-        9:"IX", 
-        5:"V", 
-        4:"IV", 
+        9:"IX",
+        5:"V",
+        4:"IV",
         1:"I"
       ]
 

data/tracks/groovy/exercises/roman-numerals/Roman.groovy

@@ -0,0 +1,33 @@
+class Roman {
+  def Roman() {
+    Integer.metaClass.getRoman = {->
+      def romanMappings = [
+        1000:"M",
+        900:"CM",
+        500:"D",
+        400:"CD",
+        100:"C",
+        90:"XC",
+        50:"L",
+        40:"XL",
+        10:"X",
+        9:"IX",
+        5:"V",
+        4:"IV",
+        1:"I"
+      ]
+
+      def roman = new String()
+      def num = delegate
+
+      romanMappings.each() { k, v ->
+        while (num >= k) {
+          roman += v
+          num -= k
+        }
+      }
+
+      roman
+    }
+  }
+}

data/tracks/groovy/exercises/roman-numerals/RomanSpec.groovy

@@ -0,0 +1,35 @@
+@Grab('org.spockframework:spock-core:1.0-groovy-2.4')
+import spock.lang.*
+
+class RomanSpec extends Specification {
+
+    // register metaclass on Integers
+    def setup() { new Roman() }
+
+    @Unroll
+    def "can convert arabic #arabic to roman #roman"() {
+        expect:
+            arabic.roman == roman
+        where:
+            arabic | roman
+            1      | 'I'
+            2      | 'II'
+            3      | 'III'
+            4      | 'IV'
+            5      | 'V'
+            6      | 'VI'
+            9      | 'IX'
+            27     | 'XXVII'
+            48     | 'XLVIII'
+            59     | 'LIX'
+            93     | 'XCIII'
+            141    | 'CXLI'
+            163    | 'CLXIII'
+            402    | 'CDII'
+            575    | 'DLXXV'
+            911    | 'CMXI'
+            1024   | 'MXXIV'
+            3000   | 'MMM'
+    }
+
+}

data/tracks/haskell/bin/test-example

@@ -50,9 +50,13 @@ runstack () {
     stack "$@" ${SET_RESOLVER}     `# Select the correct resolver. `\
                --install-ghc       `# Download GHC if not in cache.`\
                --no-terminal       `# Terminal detection is broken.`\
-               --bench             `# Build benchmarks, but        `\
-               --no-run-benchmarks `# do not run them.             `\
-               --pedantic          `# Enable -Wall and -Werror.    `
+               --pedantic          `# Enable -Wall and -Werror.    `\
+             # --bench             `# Build benchmarks, but        `\
+             # --no-run-benchmarks `# do not run them.             `
+             #
+             # We are temporarily disabling the benchmarks
+             # to speed up Travis-CI and try to stay below
+             # the 50 minutes limit.
 }
 
 if [ "$exampletype" = "success" ]; then

data/tracks/haskell/bin/test-stub

@@ -50,5 +50,9 @@ else
     echo "building stub with everything else"
     stack build ${SET_RESOLVER} --install-ghc --no-terminal \
                 --test  --no-run-tests                      \
-                --bench --no-run-benchmarks
+              # --bench --no-run-benchmarks
+              #
+              # We are temporarily disabling the benchmarks
+              # to speed up Travis-CI and try to stay below
+              # the 50 minutes limit.
 fi

data/tracks/haskell/config.json

@@ -345,6 +345,12 @@
         "Refactoring"
       ]
     },
+    {
+      "slug": "spiral-matrix",
+      "difficulty": 5,
+      "topics": [
+      ]
+    },
     {
       "slug": "custom-set",
       "difficulty": 5,

data/tracks/haskell/exercises/pangram/package.yaml

@@ -1,5 +1,5 @@
 name: pangram
-version: 1.0.0.2
+version: 1.1.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/pangram/test/Tests.hs

@@ -53,7 +53,7 @@ cases = [ Case { description = "sentence empty"
                , expected    = True
                }
         , Case { description = "upper and lower case versions of the same character should not be counted separately"
-               , input       = "the quick brown fox jumped over the lazy FOX"
+               , input       = "the quick brown fox jumps over with lazy FX"
                , expected    = False
                }
         ]

data/tracks/haskell/exercises/simple-linked-list/test/Tests.hs

@@ -1,10 +1,10 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-import Test.Hspec        (Spec, it, shouldBe)
-import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
-import Test.QuickCheck   (property)
-import Test.QuickCheck.Arbitrary
+import Test.Hspec                (Spec, it, shouldBe)
+import Test.Hspec.Runner         (configFastFail, defaultConfig, hspecWith)
+import Test.QuickCheck           (property)
+import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
 
 import LinkedList
   ( datum

data/tracks/haskell/exercises/spiral-matrix/examples/success-standard/package.yaml

@@ -0,0 +1,16 @@
+name: spiral-matrix
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Spiral
+  source-dirs: src
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - spiral-matrix
+      - hspec

data/tracks/haskell/exercises/spiral-matrix/examples/success-standard/src/Spiral.hs

@@ -0,0 +1,17 @@
+module Spiral (spiral) where
+
+-- | Create a square matrix of natural numbers in a inward, clockwise spiral.
+spiral :: Int -> [[Int]]
+spiral l = matrix (spiralIndex (l, l)) (l, l)
+  where
+    -- If an index isn't in the first row of a matrix, it is in the
+    -- 90 degress-rotated, complementary matrix.
+    spiralIndex :: Integral a => (a, a) -> (a, a) -> a
+    spiralIndex     _  (1, j) = j
+    spiralIndex (h, w) (i, j) = w + spiralIndex (w, h - 1) (w - j + 1, i - 1)
+
+-- Build a lazy, list-based matrix based on a formula.
+matrix :: ((Int, Int) -> a) -> (Int, Int) -> [[a]]
+matrix f (rows, columns) = [[ f (i, j)
+                            | j <- [1..columns] ]
+                            | i <- [1..rows   ] ]

data/tracks/haskell/exercises/spiral-matrix/package.yaml

@@ -0,0 +1,20 @@
+name: spiral-matrix
+version: 1.0.0.1
+
+dependencies:
+  - base
+
+library:
+  exposed-modules: Spiral
+  source-dirs: src
+  dependencies:
+  # - foo       # List here the packages you
+  # - bar       # want to use in your solution.
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - spiral-matrix
+      - hspec

data/tracks/haskell/exercises/spiral-matrix/src/Spiral.hs

@@ -0,0 +1,4 @@
+module Spiral (spiral) where
+
+spiral :: Int -> [[Int]]
+spiral size = error "You need to implement this function."

data/tracks/haskell/exercises/spiral-matrix/stack.yaml

@@ -0,0 +1 @@
+resolver: lts-8.2

data/tracks/haskell/exercises/spiral-matrix/test/Tests.hs

@@ -0,0 +1,40 @@
+{-# OPTIONS_GHC -fno-warn-type-defaults #-}
+
+import Spiral (spiral)
+
+import Test.Hspec        (Spec, describe, it, shouldBe)
+import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+
+main :: IO ()
+main = hspecWith defaultConfig {configFastFail = True} specs
+
+specs :: Spec
+specs = describe "spiral" $ do
+
+  it "empty spiral" $
+    spiral 0 `shouldBe` []
+
+  it "trivial spiral" $
+    spiral 1 `shouldBe` [ [1] ]
+
+  it "spiral of side length 2" $
+    spiral 2 `shouldBe` [ [1, 2]
+                        , [4, 3] ]
+
+  it "spiral of side length 3" $
+    spiral 3 `shouldBe` [ [1, 2, 3]
+                        , [8, 9, 4]
+                        , [7, 6, 5] ]
+
+  it "spiral of side length 4" $
+    spiral 4 `shouldBe` [ [ 1,  2,  3, 4]
+                        , [12, 13, 14, 5]
+                        , [11, 16, 15, 6]
+                        , [10,  9,  8, 7] ]
+
+  it "spiral of side length 5" $
+    spiral 5 `shouldBe` [ [ 1,  2,  3,  4, 5]
+                        , [16, 17, 18, 19, 6]
+                        , [15, 24, 25, 20, 7]
+                        , [14, 23, 22, 21, 8]
+                        , [13, 12, 11, 10, 9] ]

data/tracks/haxe/README.md

@@ -1,4 +1,4 @@
-# xHaxe
+# Exercism Haxe Track
 
 Exercism problems in Haxe.
 

data/tracks/haxe/config.json

@@ -1,7 +1,7 @@
 {
   "slug": "haxe",
   "language": "Haxe",
-  "repository": "https://github.com/exercism/xhaxe",
+  "repository": "https://github.com/exercism/haxe",
   "checklist_issue": 2,
   "active": false,
   "test_pattern": "TODO",