trackler 2.0.8.30 → 2.0.8.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22e34478d4a5e03a5e77c1b87f9fc2100d8faa8
-  data.tar.gz: 8bddfa98a3186438edfda24f6e61909d4250dbeb
+  metadata.gz: ec9e8cd131aab975f2949305731a5eceef951290
+  data.tar.gz: f2825b0807a002fb5f28b2f0a42dc4159ed59353
 SHA512:
-  metadata.gz: d80291aa38a823730f5629df9a4f94032ccc6433f9b92c53cc6e96fbd8ad1fcf0ea3731ccf74bde0aaca7c81c02152f9680a095f532ccf365aa46ea8be16848e
-  data.tar.gz: c5152bb280c3a7afd284af2d8bbbea0d833baa517ae2ffe34b05918ee05fe9a2d13e4debf9cd078b8749e68d3eca12a6f26fced9d212106135ab7e45bde90e21
+  metadata.gz: b14e3d7c62d9f65bd83e693a9d866c473d386a1e06a118d54ea1a840eebeabe0c26c570046afcb91836c07fcd7dfecf7c63a247f6fa6f6b7e81d058d03c257e2
+  data.tar.gz: 572d3829ff054e6e3526f16b338c2fba8782fd73effcdcf302ccb5d0ceaed948162bd2699300fc740db5a2d5b5731fb8a6594285b2b461e8b3d90f999b63604f

data/common/exercises/wordy/description.md

@@ -38,7 +38,7 @@ left-to-right, _ignoring the typical order of operations._
 
 24
 
-> What is 3 plus 2 times 3?
+> What is 3 plus 2 multiplied by 3?
 
 15  (i.e. not 9)
 

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.8.30"
+  VERSION = "2.0.8.31"
 end

data/tracks/ocaml/exercises/etl/test.ml

@@ -2,34 +2,36 @@ open Core.Std
 open OUnit2
 open Etl
 
-
 let ae exp got _test_ctxt =
   let sexpr_of l = List.sexp_of_t (Tuple2.sexp_of_t Char.sexp_of_t Int.sexp_of_t) l in
   let printer l = Sexp.to_string (sexpr_of l) in
   assert_equal exp got ~printer
 
-let tests =
-  ["transform one character">::
-   ae [('a', 1)] (transform [(1,['A'])]);
-   "transform multiple characters">::
-   ae [('a', 1);('e', 1);('i', 1);('o', 1);('u', 1)] (transform [(1, ['A';'E';'I';'O';'U'])]);
-   "transform multiple values">::
-   ae [('a',1);('d',2);('e',1);('g',2);('i',1);('o',1);('u',1)] (transform [(1, ['A';'E';'I';'O';'U']);
-                                                                            (2, ['D';'G'])]);
-   "transform full dataset">::
-   ae [('a',1);('b',3);('c',3);('d',2);('e',1);
-       ('f',4);('g',2);('h',4);('i',1);('j',8);
-       ('k',5);('l',1);('m',3);('n',1);('o',1);
-       ('p',3);('q',10);('r',1);('s',1);('t',1);
-       ('u',1);('v',4);('w',4);('x',8);('y',4);
-       ('z',10)] (transform [(1,['A';'E';'I';'O';'U';'L';'N';'R';'S';'T']);
-                            (2,['D';'G']);
-                            (3,['B';'C';'M';'P']);
-                            (4,['F';'H';'V';'W';'Y']);
-                            (5,['K']);
-                            (8,['J';'X']);
-                            (10,['Q';'Z'])]);
-  ]
+let tests = [
+   "a single letter" >::
+      ae [('a', 1)] 
+         (transform [(1, ['A'])]);
+   "single score with multiple letters" >::
+      ae [('a', 1); ('e', 1); ('i', 1); ('o', 1); ('u', 1)] 
+         (transform [(1, ['A'; 'E'; 'I'; 'O'; 'U'])]);
+   "multiple scores with multiple letters" >::
+      ae [('a', 1); ('d', 2); ('e', 1); ('g', 2)] 
+         (transform [(1, ['A'; 'E']); (2, ['D'; 'G'])]);
+   "multiple scores with differing numbers of letters" >::
+      ae [('a', 1); ('b', 3); ('c', 3); ('d', 2); ('e', 1); 
+          ('f', 4); ('g', 2); ('h', 4); ('i', 1); ('j', 8); 
+          ('k', 5); ('l', 1); ('m', 3); ('n', 1); ('o', 1); 
+          ('p', 3); ('q', 10); ('r', 1); ('s', 1); ('t', 1); 
+          ('u', 1); ('v', 4); ('w', 4); ('x', 8); ('y', 4); 
+          ('z', 10)] 
+         (transform [(1, ['A'; 'E'; 'I'; 'O'; 'U'; 'L'; 'N'; 'R'; 'S'; 'T']); 
+                     (2, ['D'; 'G']); 
+                     (3, ['B'; 'C'; 'M'; 'P']); 
+                     (4, ['F'; 'H'; 'V'; 'W'; 'Y']); 
+                     (5, ['K']); 
+                     (8, ['J'; 'X']); 
+                     (10, ['Q'; 'Z'])]);
+]
 
 let () =
-  run_test_tt_main ("etl tests" >::: tests)
+  run_test_tt_main ("etl tests" >::: tests)

data/tracks/ocaml/tools/test-generator/templates/etl/template.ml

@@ -0,0 +1,19 @@
+open Core.Std
+open OUnit2
+open Etl
+
+let ae exp got _test_ctxt =
+  let sexpr_of l = List.sexp_of_t (Tuple2.sexp_of_t Char.sexp_of_t Int.sexp_of_t) l in
+  let printer l = Sexp.to_string (sexpr_of l) in
+  assert_equal exp got ~printer
+
+let tests = [
+(* TEST
+   "$description" >::
+      ae $expected 
+         (transform $input);
+   END TEST *)
+]
+
+let () =
+  run_test_tt_main ("etl tests" >::: tests)

data/tracks/swift/.swiftlint.yml

@@ -1,4 +1,4 @@
-variable_name:
+identifier_name:
     min_length:
         warning: 1
         error: 0
@@ -16,5 +16,6 @@ disabled_rules: # rule identifiers to exclude from running
   - function_body_length
   - line_length
   - trailing_comma
+  - force_try
 
 reporter: "json"

data/tracks/swift/.travis.yml

@@ -8,8 +8,9 @@ before_install:
 matrix:
   include:
     - script: 
-        - swiftlint lint --quiet >> lintreport.json
+        - swiftlint lint --quiet >> lintreport.json || true # Dont crash on errors
         - ls
+        - python -m json.tool lintreport.json
         - ./xswift-test-spm
       env: JOB=SPM
       os: osx

data/tracks/swift/Dangerfile

@@ -33,11 +33,14 @@ json.each do |object|
    shortFile.sub! "/Users/travis/build/exercism/xswift/", ''
    shortFile = shortFile.to_s || ''
    msg = object["reason"].to_s || ''
+   severity = object["severity"].to_s || ''
+   isError = severity == "Error"
    line = object["line"] || 1
    #only warn for files that were edited in this PR.
-   if git.modified_files.include? shortFile
-   	shortFile.prepend("/")  # get away from doing inline comments since they are buggy as of Sep-2016
-   	warn(msg, file: shortFile, line: line)
+   if isError
+    fail(msg, file: "/" + shortFile, line: line) if isError
+   elsif git.modified_files.include? shortFile
+   	warn(msg, file: "/" + shortFile, line: line) unless isError
    else
    	message(msg, file: shortFile, line: line)
    end

data/tracks/swift/Package.swift

@@ -9,7 +9,7 @@ if
     let json = try? JSONSerialization.jsonObject(with: jsonData, options: [])  ,
     let jsonDict = json as? [String: Any],
     let exercisesDict = jsonDict["exercises"] as? [[String:Any]],
-    let exercises = exercisesDict.map({$0["slug"]}) as? [String],
+    let exercises = exercisesDict.map({ $0["slug"] }) as? [String],
     let deprecated = jsonDict["deprecated"] as? [String] {
 
     allProblems += exercises

data/tracks/swift/exercises/accumulate/Tests/AccumulateTests/AccumulateTests.swift

@@ -2,7 +2,7 @@ import XCTest
 @testable import Accumulate
 
 private extension String {
-    var length: Int {return self.characters.count}
+    var length: Int { return self.characters.count }
 
     func reverse() -> String {
         var result: String = ""

data/tracks/swift/exercises/acronym/Sources/AcronymExample.swift

@@ -46,7 +46,7 @@ struct Acronym {
             var accumulate  = ""
             var lastIndexAdded = 0
 
-            for (index, each) in inString.characters.map({String($0)}).enumerated() {
+            for (index, each) in inString.characters.map({ String($0) }).enumerated() {
                 if splitCamelcaseAt(each, withString: &previousLetter) {
                     accumulate += inString.substringWithRangeInt(lastIndexAdded, end: index)+" " // inserts a space
                     lastIndexAdded = index
@@ -67,10 +67,10 @@ struct Acronym {
 
         func splitStringToArray(_ inString: String) -> [String] {
 
-            return inString.characters.split(whereSeparator: { splitAt($0) }).map {String($0)}
+            return inString.characters.split(whereSeparator: { splitAt($0) }).map { String($0) }
         }
 
-        return splitStringToArray(insertSpaceAtCamelcase(inString)).map({$0.uppercased().substringWithRangeInt(0, end: 1)}).joined(separator: "")
+        return splitStringToArray(insertSpaceAtCamelcase(inString)).map({ $0.uppercased().substringWithRangeInt(0, end: 1) }).joined(separator: "")
     }
 
 }

data/tracks/swift/exercises/bob/Sources/BobExample.swift

@@ -41,8 +41,8 @@ private extension String {
     private func containsLetters(_ input: String) -> Bool {
         let abc = "abcdefghijklmnopqrstuvwxyz"
         var contains = false
-        let inputStringCollection = input.characters.map({String($0)})
-        let abcStringCollection = abc.characters.map({String($0)})
+        let inputStringCollection = input.characters.map({ String($0) })
+        let abcStringCollection = abc.characters.map({ String($0) })
 
         for each in inputStringCollection {
             abcStringCollection.forEach({

data/tracks/swift/exercises/crypto-square/Sources/CryptoSquareExample.swift

@@ -35,7 +35,7 @@ struct Crypto {
         let tempRoot = tempDouble.squareRoot()
         let tempCeil = ceil(tempRoot)
         let tempFloor = floor(tempRoot)
-        if floorNoCeling { return Int(tempFloor)} else {
+        if floorNoCeling { return Int(tempFloor) } else {
             return Int(tempCeil)}
     }
 

data/tracks/swift/exercises/custom-set/Sources/CustomSetExample.swift

@@ -1,5 +1,5 @@
 func == <T> (lh: CustomSet<T>, rh: CustomSet<T>) -> Bool {
-    return lh.contents.keys.sorted {$0.hashValue < $1.hashValue} == rh.contents.keys.sorted {$0.hashValue < $1.hashValue}
+    return lh.contents.keys.sorted { $0.hashValue < $1.hashValue } == rh.contents.keys.sorted { $0.hashValue < $1.hashValue }
 
 }
 struct CustomSet<T:Hashable>:Equatable {
@@ -8,9 +8,9 @@ struct CustomSet<T:Hashable>:Equatable {
 
     fileprivate var contents = [Element: Bool]()
 
-    var size: Int {return contents.count}
+    var size: Int { return contents.count }
 
-    var toSortedArray: [Element] {return Array(contents.keys.sorted {$0.hashValue < $1.hashValue})}
+    var toSortedArray: [Element] { return Array(contents.keys.sorted { $0.hashValue < $1.hashValue }) }
 
     init<S: Sequence>(_ sequence: S) where S.Iterator.Element == Element {
         self.contents = [:]
@@ -34,7 +34,7 @@ struct CustomSet<T:Hashable>:Equatable {
     func intersection(_ item: CustomSet) -> CustomSet {
         var temp = [Element: Bool]()
         for each in Array(item.contents.keys) {
-            guard let _ =  contents[each] else {continue}
+            guard let _ =  contents[each] else { continue }
             temp[each] = true
         }
         return CustomSet(temp.keys)
@@ -56,7 +56,7 @@ struct CustomSet<T:Hashable>:Equatable {
     }
     func isSupersetOf (_ item: CustomSet) -> Bool {
 
-        return item.contents.count == item.contents.filter {self.contents.keys.contains($0.0)}.count
+        return item.contents.count == item.contents.filter { self.contents.keys.contains($0.0) }.count
 
     }
     func isDisjoint(_ item: CustomSet) -> Bool {

data/tracks/swift/exercises/dominoes/Sources/DominoesExample.swift

@@ -4,12 +4,12 @@ struct Dominoes {
     let doubles: [Bone]
 
     var chained: Bool {
-        if singles.isEmpty && doubles.count == 1 {return true }
+        if singles.isEmpty && doubles.count == 1 { return true }
         let (success, result) = chainning(swapDuplicate(singles))
         if doubles.isEmpty {
             return success
         } else if success == true {
-            return doubles.count == doubles.filter({each in return result.contains(where: {e in return e.value.head == each.value.head})}).count
+            return doubles.count == doubles.filter({ each in return result.contains(where: { e in return e.value.head == each.value.head }) }).count
         } else {
             return false
         }
@@ -31,7 +31,7 @@ struct Dominoes {
     private func chainning(_ input: [Bone]) -> (Bool, [Bone]) {
         var matched = input
 
-        guard !matched.isEmpty else {return (false, [])}
+        guard !matched.isEmpty else { return (false, []) }
 
         let total = matched.count - 1
 
@@ -40,7 +40,7 @@ struct Dominoes {
                 matched[index].connect(matched[innerIndex])
             }
         }
-        return (matched.filter({$0.connected >= 2}).count == matched.count) ?
+        return (matched.filter({ $0.connected >= 2 }).count == matched.count) ?
             (true, matched) :  (false, [])
     }
 
@@ -74,8 +74,8 @@ class Bone: CustomStringConvertible, Equatable {
     @discardableResult
     func connect(_ input: Bone) -> Bool {
 
-        guard self !== input else {return false}
-        guard self !== input.connectedTo else {return false}
+        guard self !== input else { return false }
+        guard self !== input.connectedTo else { return false }
 
         var toReturn = false
 

data/tracks/swift/exercises/flatten-array/Sources/FlattenArrayExample.swift

@@ -6,7 +6,7 @@ func flattenArray<T>(_ list: [Any?]) -> [T] {
 
     func extractArrayElements(array: [Any?]) {
 
-        for element in array.flatMap({$0}) {
+        for element in array.flatMap({ $0 }) {
 
             let anyObjectArray = element as? [Any?]
 

data/tracks/swift/exercises/gigasecond/Sources/GigasecondExample.swift

@@ -37,13 +37,13 @@ private extension tm {
         }
         if addZero {
             return "0\(input)"
-        } else {return String(input)}
+        } else { return String(input) }
 
     }
 
     var description: String {
 
-        let date = [year, month, day, time.hour, time.mins, time.secs].map {addLeadingZero($0)}
+        let date = [year, month, day, time.hour, time.mins, time.secs].map { addLeadingZero($0) }
 
         return date[0] + "-" + date[1] + "-" + date[2] + "T" + date[3] + ":" + date[4] + ":" + date[5]
     }
@@ -72,10 +72,10 @@ struct Gigasecond: Equatable, CustomStringConvertible {
     }
     private func parse(_ input: String) -> tm? {
 
-        let dateTime = input.characters.split(separator: "T").map {String($0)}
+        let dateTime = input.characters.split(separator: "T").map { String($0) }
         if dateTime.count > 1 {
-            let date = dateTime[0].characters.split(separator: "-").map {String($0)}
-            let time = dateTime[1].characters.split(separator: ":").map {String($0)}
+            let date = dateTime[0].characters.split(separator: "-").map { String($0) }
+            let time = dateTime[1].characters.split(separator: ":").map { String($0) }
             if date.count == 3 && time.count == date.count {
 
                 let year = Int32(date[0]) ?? 0

data/tracks/swift/exercises/grains/Sources/GrainsExample.swift

@@ -27,7 +27,7 @@ struct Grains {
         let numbers = (1...64).map { $0 }
 
         return numbers.reduce(UInt64(0)) {
-            guard let squared = try? square($1) else {return $0}
+            guard let squared = try? square($1) else { return $0 }
             return $0 + squared
         }
     }

data/tracks/swift/exercises/luhn/Sources/LuhnExample.swift

@@ -3,9 +3,9 @@ import Foundation
 struct Luhn {
 
     var number: Int64 = 0
-    var addends: [Int] { return addendsFunc(number)}
-    var checksum: Int {return addends.reduce(0, +) }
-    var isValid: Bool { return checksum % 10 == 0}
+    var addends: [Int] { return addendsFunc(number) }
+    var checksum: Int { return addends.reduce(0, +) }
+    var isValid: Bool { return checksum % 10 == 0 }
 
     init(_ num: Int64) {
         self.number = num
@@ -54,7 +54,7 @@ struct Luhn {
 
         let tempString = "\(num)"
 
-        return oddIndexInt64Minus9(Array(tempString.characters).map {char2Int($0)})
+        return oddIndexInt64Minus9(Array(tempString.characters).map { char2Int($0) })
     }
 
 }

data/tracks/swift/exercises/meetup/Sources/MeetupExample.swift

@@ -67,7 +67,7 @@ extension Date:CustomStringConvertible {
 
     var description: String {
 
-        let date = [year, month, day, hour, mins, secs].map {addLeadingZero($0)}
+        let date = [year, month, day, hour, mins, secs].map { addLeadingZero($0) }
 
         let dateOnly = date[0] + "-" + date[1] + "-" + date[2]
         let dateTime = dateOnly + "T" + date[3] + ":" + date[4] + ":" + date[5]
@@ -97,8 +97,8 @@ extension Date {
         var minute = Int32()
         var second = Int32()
 
-        let dateTime = input.characters.split(separator: "T").map {String($0)}
-        let date = dateTime[0].characters.split(separator: "-").map {String($0)}
+        let dateTime = input.characters.split(separator: "T").map { String($0) }
+        let date = dateTime[0].characters.split(separator: "-").map { String($0) }
         if date.count == 3 {
             year = Int32(date[0]) ?? 0
             month = Int32(date[1]) ?? 0
@@ -106,7 +106,7 @@ extension Date {
         }
 
         if dateTime.count == 2 {
-            let time = dateTime[1].characters.split(separator: ":").map {String($0)}
+            let time = dateTime[1].characters.split(separator: ":").map { String($0) }
             if time.count == 3 {
                 hour = Int32(time[0]) ?? 0
                 minute = Int32(time[1]) ?? 0
@@ -134,7 +134,7 @@ struct Meetup {
 
         let starDay = dateStart.weekday
         var month = Array(dateStart.day ... dateEnd.day)
-        month =  month.map {(($0 + 5 + starDay) % 7) + 1  }
+        month =  month.map { (($0 + 5 + starDay) % 7) + 1 }
 
         for (index, eachDay) in month.enumerated() {
             dateMonthWeekDays.append([Int32(index + 1), eachDay])
@@ -144,11 +144,11 @@ struct Meetup {
 
             if which == "teenth" {
                 let teenthRange = Array(dateMonthWeekDays[13...19])
-                let teenth = teenthRange.filter({$0[1] == Int32(dayOfTheWeek) })[0][0]
+                let teenth = teenthRange.filter({ $0[1] == Int32(dayOfTheWeek) })[0][0]
                 return Date(from: "\(dateStart.year)-\(dateStart.month)-\(teenth)") ?? Date()
 
             }
-            let count =  dateMonthWeekDays.filter({$0[1] == Int32(dayOfTheWeek) }).count
+            let count =  dateMonthWeekDays.filter({ $0[1] == Int32(dayOfTheWeek) }).count
             var dayIndex: Int = 0
             switch dateInput {
             case "1st": dayIndex = 0
@@ -160,7 +160,7 @@ struct Meetup {
             default: dayIndex = -1
             }
 
-            let first2last = dateMonthWeekDays.filter({$0[1] == Int32(dayOfTheWeek) })[dayIndex][0]
+            let first2last = dateMonthWeekDays.filter({ $0[1] == Int32(dayOfTheWeek) })[dayIndex][0]
 
             return Date(from:"\(dateStart.year)-\(dateStart.month)-\(first2last)") ?? Date()
         }

data/tracks/swift/exercises/ocr-numbers/Sources/OcrNumbersExample.swift

@@ -77,7 +77,7 @@ struct OCR {
     }
 
     func patternForGrouping(_ grouping: [String]) -> String {
-        guard let number = patterns.index(where: {$0 == grouping}) else {
+        guard let number = patterns.index(where: { $0 == grouping }) else {
             return "?"
         }
         return "\(number)"

data/tracks/swift/exercises/octal/Sources/OctalExample.swift

@@ -24,7 +24,7 @@ struct Octal {
         var tempInt: Int = 0
         for (inx, each) in orderedInput.enumerated() {
             let tempCharInt = Int("\(each)") ?? 0
-            if tempCharInt > 7 {return 0}
+            if tempCharInt > 7 { return 0 }
             let tempOctPower = Int(pow(Double(8), Double(inx)))
             tempInt += tempOctPower * tempCharInt
         }

data/tracks/swift/exercises/perfect-numbers/Sources/PerfectNumbersExample.swift

@@ -22,7 +22,7 @@ struct NumberClassifier {
     func aliquotSum (_ input: Int) -> Int {
         let array = Array(1..<(input-1))
 
-        return array.filter({input % $0 == 0}).reduce(0, +)
+        return array.filter({ input % $0 == 0 }).reduce(0, +)
     }
 
     init(number: Int) {

data/tracks/swift/exercises/pig-latin/Sources/PigLatinExample.swift

@@ -16,13 +16,13 @@ private extension String {
 struct PigLatin {
 
     static func translate (_ word: String) -> String {
-        return word.components(separatedBy: " ").map {self.translateWord($0)}.joined(separator: " ")
+        return word.components(separatedBy: " ").map { self.translateWord($0) }.joined(separator: " ")
     }
 
     static func translateWord(_ word: String) -> String {
 
         func wordStartsWithPrefixes(_ word: String, prefixes: [String]) -> Bool {
-            return 0 < prefixes.filter {word.hasPrefix($0)}.count
+            return 0 < prefixes.filter { word.hasPrefix($0) }.count
         }
 
         func wordStartsWithVowelLike(_ word: String) -> Bool {
@@ -34,7 +34,7 @@ struct PigLatin {
             return word.substring(from: index).hasPrefix("qu")
         }
 
-        if wordStartsWithVowelLike(word) {return word + "ay"}
+        if wordStartsWithVowelLike(word) { return word + "ay" }
         if wordStartsWithPrefixes(word, prefixes: ["thr", "sch"]) {
             return (word.substringFromIndexInt(3) + word.substringWithRangeInt(0..<3) + "ay") }
 

data/tracks/swift/exercises/poker/Sources/PokerExample.swift

@@ -27,7 +27,7 @@ struct Poker {
         }
 
         guard let topHand = (pokerHandsParsed.sorted(by: >)).first,
-            let indexTop = pokerHandsParsed.index(of: topHand) else {return nil}
+            let indexTop = pokerHandsParsed.index(of: topHand) else { return nil }
 
         return hands[indexTop]
 
@@ -60,7 +60,7 @@ enum HandRank {
     }
 
     static func parsePairs(_ inputHand: PokerHand) -> [(rank: Rank, count: Int)] {
-        let ranks = inputHand.hand.map({$0.rank})
+        let ranks = inputHand.hand.map({ $0.rank })
         let rankSet = Set(ranks)
         var toReturn = [Rank: Int]()
         for each in ranks {
@@ -68,7 +68,7 @@ enum HandRank {
                 toReturn[each] = (toReturn[each] ?? 0) + 1
             }
         }
-        let result = toReturn.map({key, value in return (rank:key, count:value)}).sorted(by: {
+        let result = toReturn.map({ key, value in return (rank:key, count:value) }).sorted(by: {
             (one, two) in
             return one.count == two.count ? one.rank > two.rank : one.count > two.count
         })
@@ -76,22 +76,22 @@ enum HandRank {
     }
 
     static func isFlush(_ inputHand: PokerHand) -> (bool: Bool, suit: Suit) {
-        let suits = inputHand.hand.map({$0.suit})
+        let suits = inputHand.hand.map({ $0.suit })
         let first = suits[0]
         for each in suits {
-            guard first == each else { return (false, .None)}
+            guard first == each else { return (false, .None) }
         }
         return (true, first)
     }
 
     static func isStraight(_ inputHand: PokerHand) -> (bool: Bool, highest: Rank) {
-        let sorted = inputHand.hand.sorted(by: {$0.rank < $1.rank})
+        let sorted = inputHand.hand.sorted(by: { $0.rank < $1.rank })
         let first = sorted[0].rank.rawValue
         for (index, each) in sorted.enumerated() {
             if each.rank.rawValue != index + first {
                 // checks for Ace as the lowest card
-                guard let aceIndex = inputHand.hand.index(where: {$0.rank.rawValue == 14})else {return (false, .ace)}
-                var replacedAced = inputHand.hand.map({$0.rank.rawValue})
+                guard let aceIndex = inputHand.hand.index(where: { $0.rank.rawValue == 14 })else { return (false, .ace) }
+                var replacedAced = inputHand.hand.map({ $0.rank.rawValue })
                 replacedAced[aceIndex] = 1 // swaps ace value to lowest
                 replacedAced.sort()
                 let firstVal = replacedAced[0]
@@ -255,11 +255,11 @@ struct PokerHand {
         var handParsed: [PlayingCard] = []
 
         for each in stringHand.split(" ") {
-            guard let card = PlayingCard(each) else {return nil}
+            guard let card = PlayingCard(each) else { return nil }
             handParsed.append(card)
         }
 
-        if handParsed.count == 5 {self.hand = handParsed } else {return nil}
+        if handParsed.count == 5 { self.hand = handParsed } else { return nil }
     }
 }
 extension PokerHand : Equatable, Comparable {}

data/tracks/swift/exercises/pythagorean-triplet/Sources/PythagoreanTripletExample.swift

@@ -14,11 +14,11 @@ struct Triplet {
         self.c = c
     }
 
-    var sum: Int {return a + b + c }
+    var sum: Int { return a + b + c }
 
-    var product: Int {return a * b * c }
+    var product: Int { return a * b * c }
 
-    var isPythagorean: Bool {return pow(Double(a), 2) + pow(Double(b), 2) == pow(Double(c), 2)}
+    var isPythagorean: Bool { return pow(Double(a), 2) + pow(Double(b), 2) == pow(Double(c), 2) }
 
     static func Where(_ minFactor: Int = 1, maxFactor: Int, sum: Int = 0) -> [Triplet] {
 

data/tracks/swift/exercises/pythagorean-triplet/Tests/PythagoreanTripletTests/PythagoreanTripletTests.swift

@@ -20,19 +20,19 @@ class PythagoreanTripletTests: XCTestCase {
 
     func testTripletsUpTo10() {
         let triplets = Triplet.Where(maxFactor: 10)
-        let products = triplets.map {$0.product}.sorted(by: <)
+        let products = triplets.map { $0.product }.sorted(by: <)
         XCTAssertEqual([60, 480], products)
     }
 
     func testTripletsFrom11UpTo20() {
         let triplets = Triplet.Where(11, maxFactor: 20)
-        let products = triplets.map {$0.product}.sorted(by: <)
+        let products = triplets.map { $0.product }.sorted(by: <)
         XCTAssertEqual([3840], products)
     }
 
     func testTripletsWhereSumX() {
         let triplets = Triplet.Where( maxFactor: 100, sum: 180)
-        let products = triplets.map {$0.product}.sorted(by: <)
+        let products = triplets.map { $0.product }.sorted(by: <)
         XCTAssertEqual([118_080, 168_480, 202_500], products)
     }
 

data/tracks/swift/exercises/secret-handshake/Sources/SecretHandshakeExample.swift

@@ -7,9 +7,9 @@ struct SecretHandshake {
         self.commandValue = commandValue
     }
 
-    var shouldReverse: Bool {return (commandValue & 16) != 0}
+    var shouldReverse: Bool { return (commandValue & 16) != 0 }
 
-    var commands: [String] {return commandsFunc()}
+    var commands: [String] { return commandsFunc() }
 
     private func commandsFunc() -> [String] {
         var commands = [String]()

data/tracks/swift/exercises/series/Sources/SeriesExample.swift

@@ -7,7 +7,7 @@ struct Series {
     }
 
     func slices(_ chunkSize: Int) -> [[Int]] {
-        var numberStringArray = Array(numberString.characters).map {Int("\($0)") ?? 0}
+        var numberStringArray = Array(numberString.characters).map { Int("\($0)") ?? 0 }
         let count = numberStringArray.count
         var start = 0
         var end = chunkSize

data/tracks/swift/exercises/sieve/Sources/SieveExample.swift

@@ -4,13 +4,13 @@ struct Sieve {
         self.value = num
     }
 
-    var primes: [Int] {return primesFunc(self.value ) }
+    var primes: [Int] { return primesFunc(self.value ) }
 
     func primesFunc(_ limit: Int) -> [Int] {
 
-        if limit < 2 { return []} else {
+        if limit < 2 { return [] } else {
             let tempArray =  Array(2...limit)
-            return tempArray.filter {Sieve.onlyDivisorSelf($0)}
+            return tempArray.filter { Sieve.onlyDivisorSelf($0) }
         }
     }
 
@@ -26,7 +26,7 @@ struct Sieve {
             }
             divisor += 1
         }
-        if primes.count == 1 {return true} else {return false}
+        if primes.count == 1 { return true } else { return false }
     }
 
 }

data/tracks/swift/exercises/strain/Tests/StrainTests/StrainTests.swift

@@ -11,15 +11,15 @@ private extension XCTest {
 class StrainTests: XCTestCase {
     func testEmptyKeep() {
 
-        XCTAssertTrue ([].keep {each -> Bool in each < 10}.isEmpty)
+        XCTAssertTrue ([].keep { each -> Bool in each < 10 }.isEmpty)
     }
 
     func testKeepEverything() {
-        XCTAssertEqual([1, 2, 3], [1, 2, 3].keep {each -> Bool in each < 10})
+        XCTAssertEqual([1, 2, 3], [1, 2, 3].keep { each -> Bool in each < 10 })
     }
 
     func testKeepFirstAndLast() {
-        XCTAssertEqual([1, 3], [1, 2, 3].keep { each -> Bool in (each % 2 != 0)})
+        XCTAssertEqual([1, 3], [1, 2, 3].keep { each -> Bool in (each % 2 != 0) })
     }
 
     func testKeepNeitherFirstNorLast() {
@@ -28,7 +28,7 @@ class StrainTests: XCTestCase {
 
     func testKeepStrings() {
         let words = ["apple", "zebra", "banana", "zombies", "cherimoya", "zealot"]
-        let result = words.keep {each -> Bool in (each as String).hasPrefix("z")}
+        let result = words.keep { each -> Bool in (each as String).hasPrefix("z") }
         XCTAssertEqual(["zebra", "zombies", "zealot"], result)
     }
 
@@ -42,29 +42,29 @@ class StrainTests: XCTestCase {
             [2, 2, 1],
             [1, 2, 5]
         ]
-        let result = rows.keep { each -> Bool in (each as [Int]).contains(5)}
+        let result = rows.keep { each -> Bool in (each as [Int]).contains(5) }
         XCTAssertEqualMultiArray([[5, 5, 5], [5, 1, 2], [1, 5, 2], [1, 2, 5]], result)
     }
 
     func testEmptyDiscard() {
-        XCTAssertEqual([], [].discard {each -> Bool in each < 10})
+        XCTAssertEqual([], [].discard { each -> Bool in each < 10 })
     }
 
     func testDiscardNothing() {
-        XCTAssertEqual([1, 2, 3], [1, 2, 3].discard {each -> Bool in each > 10})
+        XCTAssertEqual([1, 2, 3], [1, 2, 3].discard { each -> Bool in each > 10 })
     }
 
     func testDiscardFirstAndLast() {
-        XCTAssertEqual([2], [1, 2, 3].discard {each -> Bool in (each % 2 != 0)})
+        XCTAssertEqual([2], [1, 2, 3].discard { each -> Bool in (each % 2 != 0) })
     }
 
     func testDiscardNeitherFirstNorLast() {
-        XCTAssertEqual([1, 3, 5], [1, 2, 3, 4, 5].discard { each -> Bool in (each % 2 == 0)})
+        XCTAssertEqual([1, 3, 5], [1, 2, 3, 4, 5].discard { each -> Bool in (each % 2 == 0) })
     }
 
     func testDiscardStrings() {
         let words = ["apple", "zebra", "banana", "zombies", "cherimoya", "zealot"]
-        let result = words.discard {each -> Bool in (each as String).hasPrefix("z") }
+        let result = words.discard { each -> Bool in (each as String).hasPrefix("z") }
         XCTAssertEqual(["apple", "banana", "cherimoya"], result)
     }
 
@@ -78,7 +78,7 @@ class StrainTests: XCTestCase {
             [2, 2, 1],
             [1, 2, 5]
         ]
-        let result = rows.discard { each -> Bool in (each as [Int]).contains(5)}
+        let result = rows.discard { each -> Bool in (each as [Int]).contains(5) }
         XCTAssertEqualMultiArray([[1, 2, 3], [2, 1, 2], [2, 2, 1]], result)
     }
 

data/tracks/swift/exercises/tournament/Sources/TournamentExample.swift

@@ -122,7 +122,7 @@ struct Tournament {
                 let tempVal = teams[each]!
                 sortByValue.append((each, tempVal.score, tempVal.played))
             }
-            sortByValue.sort { $0.score == $1.score ? $0.mp > $1.mp : $0.score > $1.score  }
+            sortByValue.sort { $0.score == $1.score ? $0.mp > $1.mp : $0.score > $1.score }
             var sortedKeys = [String]()
             for each in sortByValue {
                 sortedKeys.append(each.0)
@@ -161,7 +161,7 @@ struct Tournament {
         var outcome: Outcome = Outcome.err
 
         // alternative to .componentsSeparatedByString
-        let textArrayLines = inStream.characters.split {$0 == "\n"}.map { String($0) }
+        let textArrayLines = inStream.characters.split { $0 == "\n" }.map { String($0) }
 
         for line in textArrayLines {
             let parts = line.trimWhiteSpace().components(separatedBy: ";")

data/tracks/swift/exercises/word-count/Sources/WordCountExample.swift

@@ -1,7 +1,7 @@
 struct WordCount {
 
     func splitStringToArray(_ inString: String) -> [String] {
-        return inString.characters.split(whereSeparator: { splitAt($0) }).map {String($0)}
+        return inString.characters.split(whereSeparator: { splitAt($0) }).map { String($0) }
     }
 
     func splitAt(_ characterToCompare: Character, charToSplitAt: String = " !&$%^&,:") -> Bool {

data/tracks/swift/exercises/wordy/Sources/WordyExample.swift

@@ -53,10 +53,10 @@ struct WordProblem {
          "divided by": "/"]
 
     private let funcs =
-        ["+": {(a: Int, b: Int) -> Int in return a + b},
-         "-": {(a: Int, b: Int) -> Int in return a - b},
-         "*": {(a: Int, b: Int) -> Int in return a * b},
-         "/": {(a: Int, b: Int) -> Int in return a / b}]
+        ["+": { (a: Int, b: Int) -> Int in return a + b },
+         "-": { (a: Int, b: Int) -> Int in return a - b },
+         "*": { (a: Int, b: Int) -> Int in return a * b },
+         "/": { (a: Int, b: Int) -> Int in return a / b }]
     func answer() throws -> Int {
         guard let toReturn = calculate(textIn) else {
             throw CalculateError.error
@@ -111,7 +111,7 @@ struct WordProblem {
 
         var newTextIn =  Array(textInp.characters)
         newTextIn = newTextIn.filter(checkCharInSet)
-        let newTextInString: [String] = newTextIn.map {String($0)}
+        let newTextInString: [String] = newTextIn.map { String($0) }
         return newTextInString.joined(separator: "").trimWhiteSpace()
 
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.30
+  version: 2.0.8.31
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -5935,6 +5935,7 @@ files:
 - tracks/ocaml/tools/test-generator/templates/connect/template.ml
 - tracks/ocaml/tools/test-generator/templates/difference-of-squares/template.ml
 - tracks/ocaml/tools/test-generator/templates/dominoes/template.ml
+- tracks/ocaml/tools/test-generator/templates/etl/template.ml
 - tracks/ocaml/tools/test-generator/templates/hamming/template.ml
 - tracks/ocaml/tools/test-generator/templates/hello-world/template.ml
 - tracks/ocaml/tools/test-generator/templates/leap/template.ml