trackler 2.1.0.53 → 2.1.0.54

data/tracks/swift/exercises/phone-number/Sources/PhoneNumberExample.swift

@@ -6,7 +6,7 @@ private extension String {
             let start = characters.index(startIndex, offsetBy: range.lowerBound)
             let end = characters.index(start, offsetBy: range.upperBound - range.lowerBound)
 
-            return self[start...end]
+            return String(self[start...end])
         }
     }
 

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

@@ -47,15 +47,15 @@ enum HandRank {
 
     func order() -> Int {
         switch self {
-        case .highCard(_): return 1
-        case .onePair(_, card1: _, card2: _, card3: _): return 2
-        case .twoPair(high: _, low: _, highCard: _): return 3
-        case .threeOfAKind(three:_): return 4
-        case .straight(high:_): return 5
-        case .flush(_, _): return 6
-        case .fullHouse(three:_): return 7
-        case .fourOfAKind(four:_): return 8
-        case .straightFlush(_, _): return 9
+        case .highCard: return 1
+        case .onePair: return 2
+        case .twoPair: return 3
+        case .threeOfAKind: return 4
+        case .straight: return 5
+        case .flush: return 6
+        case .fullHouse: return 7
+        case .fourOfAKind: return 8
+        case .straightFlush: return 9
         }
     }
 
@@ -185,6 +185,7 @@ func == (lhs: HandRank, rhs: HandRank) -> Bool {
     }
 }
 // swiftlint:disable:next cyclomatic_complexity
+// swiftlint:disable:next empty_enum_arguments
 func < (lhs: HandRank, rhs: HandRank) -> Bool {
     switch (lhs, rhs) {
     case (_, _) where lhs == rhs:
@@ -240,6 +241,7 @@ func < (lhs: HandRank, rhs: HandRank) -> Bool {
     }
 
 }
+// swiftlint:enable:next empty_enum_arguments
 
 struct PokerHand {
     let hand: [PlayingCard]

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

@@ -20,7 +20,7 @@ struct Triplet {
 
     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] {
+    static func fromWhere(_ minFactor: Int = 1, maxFactor: Int, sum: Int = 0) -> [Triplet] {
 
         func shouldIncludeTriplet(_ sum: Int, triplet: Triplet) -> Bool {
             return triplet.isPythagorean && (sum == 0 || triplet.sum == sum)

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

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

data/tracks/swift/exercises/rna-transcription/Sources/RnaTranscriptionExample.swift

@@ -1,6 +1,11 @@
-struct Nucleotide {
+enum TranscriptionError: Error {
+    case invalidNucleotide
+}
 
-    var complementOfDNA: String { return transcribe(dnaToRna) }
+struct Nucleotide {
+    func complementOfDNA() throws -> String {
+        return try transcribe(dnaToRna)
+    }
 
     private let value: String
 
@@ -10,9 +15,12 @@ struct Nucleotide {
 
     private let dnaToRna: [Character:String] = [ "G": "C", "C": "G", "T": "A", "A": "U" ]
 
-    private func transcribe(_ dict: [Character : String]) -> String {
+    private func transcribe(_ dict: [Character : String]) throws -> String {
         var tempText = ""
         for each in self.value.characters {
+            if dict[each] == nil {
+                throw TranscriptionError.invalidNucleotide
+            }
             tempText += dict[each] ?? ""
         }
         return tempText

data/tracks/swift/exercises/rna-transcription/Tests/RnaTranscriptionTests/RnaTranscriptionTests.swift

@@ -3,23 +3,50 @@ import XCTest
 
 class RnaTranscriptionTests: XCTestCase {
     func testRnaComplementOfCytosineIsGuanine() {
-        XCTAssertEqual("G", Nucleotide("C").complementOfDNA)
+        XCTAssertEqual("G", try Nucleotide("C").complementOfDNA())
     }
 
     func testRnaComplementOfGuanineIsCytosine() {
-        XCTAssertEqual("C", Nucleotide("G").complementOfDNA)
+        XCTAssertEqual("C", try Nucleotide("G").complementOfDNA())
     }
 
     func testRnaComplementOfThymineIsAdenine() {
-        XCTAssertEqual("A", Nucleotide("T").complementOfDNA)
+        XCTAssertEqual("A", try Nucleotide("T").complementOfDNA())
     }
 
     func testRnaComplementOfAdenineIsUracil() {
-        XCTAssertEqual("U", Nucleotide("A").complementOfDNA)
+        XCTAssertEqual("U", try Nucleotide("A").complementOfDNA())
     }
 
     func testRnaComplement() {
-        XCTAssertEqual("UGCACCAGAAUU", Nucleotide("ACGTGGTCTTAA").complementOfDNA)
+        XCTAssertEqual("UGCACCAGAAUU", try Nucleotide("ACGTGGTCTTAA").complementOfDNA())
+    }
+
+    func testInvalidRnaComplementOfUracil() {
+        XCTAssertThrowsError(try Nucleotide("U").complementOfDNA())
+
+        // Uncomment to see more specific error handling
+//        XCTAssertThrowsError(try Nucleotide("U").complementOfDNA(), "This didn't work") { (error) in
+//            XCTAssertEqual(error as? RnaTranscription.TranscriptionError, RnaTranscription.TranscriptionError.invalidNucleotide)
+//        }
+    }
+
+    func testInvalidRnaComplementOfXXX() {
+        XCTAssertThrowsError(try Nucleotide("XXX").complementOfDNA())
+
+        // Uncomment to see more specific error handling
+//        XCTAssertThrowsError(try Nucleotide("XXX").complementOfDNA(), "This didn't work") { (error) in
+//            XCTAssertEqual(error as? RnaTranscription.TranscriptionError, RnaTranscription.TranscriptionError.invalidNucleotide)
+//        }
+    }
+
+    func testInvalidRnaComplementOfACGTXXXCTTAA() {
+        XCTAssertThrowsError(try Nucleotide("ACGTXXXCTTAA").complementOfDNA())
+
+        // Uncomment to see more specific error handling
+//        XCTAssertThrowsError(try Nucleotide("ACGTXXXCTTAA").complementOfDNA(), "This didn't work") { (error) in
+//            XCTAssertEqual(error as? RnaTranscription.TranscriptionError, RnaTranscription.TranscriptionError.invalidNucleotide)
+//        }
     }
 
     static var allTests: [(String, (RnaTranscriptionTests) -> () throws -> Void)] {
@@ -29,6 +56,9 @@ class RnaTranscriptionTests: XCTestCase {
             ("testRnaComplementOfThymineIsAdenine", testRnaComplementOfThymineIsAdenine),
             ("testRnaComplementOfAdenineIsUracil", testRnaComplementOfAdenineIsUracil),
             ("testRnaComplement", testRnaComplement),
+            ("testInvalidRnaComplementOfUracil", testInvalidRnaComplementOfUracil),
+            ("testInvalidRnaComplementOfXXX", testInvalidRnaComplementOfXXX),
+            ("testInvalidRnaComplementOfACGTXXXCTTAA", testInvalidRnaComplementOfACGTXXXCTTAA)
         ]
     }
 }

data/tracks/swift/exercises/scrabble-score/Tests/ScrabbleScoreTests/ScrabbleScoreTests.swift

@@ -34,7 +34,7 @@ class ScrabbleScoreTests: XCTestCase {
         XCTAssertEqual( 41, Scrabble("OXYPHENBUTAZONE").score)
     }
 
-    func testConvenientScoring() {
+    func testScoringUtility() {
         XCTAssertEqual( 13, Scrabble.score("alacrity"))
     }
 
@@ -48,7 +48,7 @@ class ScrabbleScoreTests: XCTestCase {
             ("testSimpleWordScoresTheNumberOfLetters", testSimpleWordScoresTheNumberOfLetters),
             ("testComplicatedWordScoresMore", testComplicatedWordScoresMore),
             ("testScoresAreCaseInsensitive", testScoresAreCaseInsensitive),
-            ("testConvenientScoring", testConvenientScoring),
+            ("testScoringUtility", testScoringUtility),
         ]
     }
 }

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

@@ -13,10 +13,8 @@ struct SecretHandshake {
 
     private func commandsFunc() -> [String] {
         var commands = [String]()
-        for key in Array(commandValues.keys).sorted( by: < ) {
-            if (commandValue & key) != 0 {
-                commands.append(commandValues[key]!)
-            }
+        for key in Array(commandValues.keys).sorted( by: < ) where (commandValue & key) != 0 {
+            commands.append(commandValues[key]!)
         }
 
         if shouldReverse {

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

@@ -15,13 +15,11 @@ struct Series {
 
         let enumarated = (0..<(count)).enumerated()
 
-        for (_, _) in enumarated {
-            if end < count+1 {
-                let tempArray = Array(numberStringArray[start ..< end])
-                tempArrayReturn.append(tempArray)
-                start += 1
-                end += 1
-            }
+        for (_, _) in enumarated where end < (count + 1) {
+            let tempArray = Array(numberStringArray[start ..< end])
+            tempArrayReturn.append(tempArray)
+            start += 1
+            end += 1
         }
         return tempArrayReturn
     }

data/tracks/swift/exercises/sum-of-multiples/Sources/SumOfMultiplesExample.swift

@@ -11,13 +11,9 @@ struct SumOfMultiples {
 
         for each in 1..<limit {
             var lastAdded = 0
-            for multiple in multiples {
-                if each % multiple == 0 {
-                    if lastAdded != each {
-                        itemToReturn += each
-                        lastAdded = each
-                    }
-                }
+            for multiple in multiples where ((each % multiple == 0) && (lastAdded != each)) {
+                itemToReturn += each
+                lastAdded = each
             }
         }
 

data/tracks/swift/exercises/transpose/Sources/TransposeExample.swift

@@ -15,7 +15,7 @@ struct Transpose {
                 if let start = line.index(line.startIndex, offsetBy: i, limitedBy: line.endIndex),
                     let end = line.index(start, offsetBy: 1, limitedBy: line.endIndex) {
                     let character = line[start..<end]
-                    result[i].append(character)
+                    result[i].append(String(character))
                 } else {
                     result[i].append(" ")
                 }

data/tracks/swift/exercises/triangle/Sources/TriangleExample.swift

@@ -6,7 +6,7 @@ struct Triangle {
     var c: Double = 0
 
     var kind: String {
-        return self.Kind()
+        return self.kindOfTriangle()
     }
 
     init(_ a: Double, _ b: Double, _ c: Double) {
@@ -34,7 +34,7 @@ struct Triangle {
         return a + b < c || a + c < b || b + c < a
     }
 
-    func Kind() -> String {
+    func kindOfTriangle() -> String {
 
         if allSidesAreZero() || hasImpossibleSides() || violatesTriangleInequality() {
             return triangleKind.ErrorKind

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

@@ -5,10 +5,8 @@ struct WordCount {
     }
 
     func splitAt(_ characterToCompare: Character, charToSplitAt: String = " !&$%^&,:") -> Bool {
-        for each in charToSplitAt.characters {
-            if each == characterToCompare {
-                return true
-            }
+        for each in charToSplitAt.characters where each == characterToCompare {
+            return true
         }
         return false
     }

data/tracks/tcl/.travis.yml

@@ -2,4 +2,4 @@ language: bash
 
 script:
   - bin/fetch-configlet
-  - bin/configlet .
+  - bin/configlet lint .

data/tracks/teco/.travis.yml

@@ -2,4 +2,4 @@ language: bash
 
 script:
   - bin/fetch-configlet
-  - bin/configlet .
+  - bin/configlet lint .

data/tracks/typescript/.travis.yml

@@ -15,7 +15,7 @@ before_script:
 
 script:
   - bin/fetch-configlet
-  - bin/configlet .
+  - bin/configlet lint .
   - make test
 
 after_success:

data/tracks/vbnet/.travis.yml

@@ -2,5 +2,5 @@
 language: bash
 script:
 - bin/fetch-configlet
-- bin/configlet .
+- bin/configlet lint .
 sudo: false

data/tracks/vimscript/.travis.yml

@@ -15,6 +15,6 @@ install:
   - pip install vim-vint
 
 script:
-  - bin/configlet .
+  - bin/configlet lint .
   - bin/ci
   - vint .

data/tracks/vimscript/README.md

@@ -3,10 +3,6 @@
 ![build status](https://travis-ci.org/exercism/vimscript.svg?branch=master)
 [![Join the chat at https://gitter.im/exercism/xvimscript](https://badges.gitter.im/exercism/xvimscript.svg)](https://gitter.im/exercism/xvimscript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Exercism exercises in Vim script.
-
-## Contributing
-
 We welcome any kind of contribution!
 
 If you have a suggestion or question, create a new
@@ -22,3 +18,51 @@ Even if there are any uncertainties, go for it nevertheless. We can straighten
 out everything in the process.
 
 Thank you for contributing! :tada:
+
+## Linting Vim files
+
+If you add or change a Vim file, the CI will use vint to ensure best practices.
+Therefore it's recommended idea to run it locally first, before creating a pull
+request.
+
+1. Install [vint](https://github.com/Kuniwak/vint#quick-start).
+1. Recursively lint all Vim files:
+    ```
+    $ vint .
+    ```
+
+## Writing test files
+
+#### Generating test files
+
+Use the [generator](lib/generate.vim) to create Vader files from their canonical
+test data:
+
+```vim
+" in Vim
+:source lib/generate.vim
+:Generate word-count
+```
+
+This would fetch the [canonical test data](https://raw.githubusercontent.com/exercism/x-common/master/exercises/word-count/canonical-data.json),
+decode the JSON to Vim data types, iterate over the result, and put the tests in
+a new unnamed buffer.
+
+_This script requires Vim 7.4.1304+ for `json_decode()`. It also relies on the
+netrw plugin (`:h netrw`), but that one is shipped and sourced by default._
+
+#### Type mismatch exceptions
+
+Older Vims don't like changing types for the same variable. If your tests use
+global variables, `unlet!` them in a `Before` block at the top of the Vader file.
+
+When each test uses `let expected = ...`, then put this at the top:
+
+```vim
+Before:
+  unlet! expected
+```
+
+This is patched as of
+[Vim 7.4.1546](https://github.com/vim/vim/commit/f6f32c38bf3319144a84a01a154c8c91939e7acf),
+but we shouldn't assume versions in favor of compatibility.

data/tracks/vimscript/config.json

@@ -136,6 +136,13 @@
       "difficulty": 1,
       "topics": [
 
+      ]
+    },
+    {
+      "slug": "pangram",
+      "difficulty": 1,
+      "topics": [
+
       ]
     }
   ],

data/tracks/vimscript/docs/EXERCISE_README_INSERT.md

@@ -1,110 +1,7 @@
-# TRACK HINTS
+# How to run the tests
 
-- [Intro](#intro)
-- [Running tests](#running-tests)
-- [Writing tests](#writing-tests)
-- [Linting Vim files](#linting-vim-files)
+If you don't know how to run Vader tests, see:
+[Tests](http://exercism.io/languages/vimscript/tests).
 
-## Intro
-
-This track uses two tools to run the test suite and ensure best practices:
-
-1. [vader.vim](https://github.com/junegunn/vader.vim)
-2. [vint](https://github.com/Kuniwak/vint)
-
-## Running tests
-
-1. Install [vader.vim](https://github.com/junegunn/vader.vim/#installation).
-1. Open your solution:
-    ```
-    $ vim exercise.vim
-    ```
-1. Source the current file to make its global functions available to Vim:
-    ```
-    :source %
-    ```
-1. Run the tests:
-    ```
-    :Vader exercise.vader
-    ```
-
-Paths may vary.
-
-If you want a convenient shortcut to the above steps, put this in your vimrc:
-
-```vim
-function! s:exercism_tests()
-  if expand('%:e') == 'vim'
-    let testfile = printf('%s/%s.vader', expand('%:h'),
-          \ tr(expand('%:h:t'), '-', '_'))
-    if !filereadable(testfile)
-      echoerr 'File does not exist: '. testfile
-      return
-    endif
-    source %
-    execute 'Vader' testfile
-  else
-    let sourcefile = printf('%s/%s.vim', expand('%:h'),
-          \ tr(expand('%:h:t'), '-', '_'))
-    if !filereadable(sourcefile)
-      echoerr 'File does not exist: '. sourcefile
-      return
-    endif
-    execute 'source' sourcefile
-    Vader
-  endif
-endfunction
-
-autocmd BufRead *.{vader,vim}
-      \ command! -buffer Test call s:exercism_tests()
-```
-
-Afterwards open any `.vim` or `.vader` file from an exercise directory and run
-the `:Test` command.
-
-## Writing tests
-
-#### Generate test files
-
-Use the [generator](lib/generate.vim) to create Vader files from their canonical
-test data:
-
-```vim
-" in Vim
-:source lib/generate.vim
-:Generate word-count
-```
-
-This would fetch the [canonical test data](https://raw.githubusercontent.com/exercism/x-common/master/exercises/word-count/canonical-data.json),
-decode the JSON to Vim data types, iterate over the result, and put the tests in
-a new unnamed buffer.
-
-_This script requires Vim 7.4.1304+ for `json_decode()`. It also relies on the
-netrw plugin (`:h netrw`), but that one is shipped and sourced by default._
-
-#### Type mismatch exceptions
-
-Older Vims don't like changing types for the same variable. If your tests use
-global variables, `unlet!` them in a `Before` block at the top of the Vader file.
-
-When each test uses `let expected = ...`, then put this at the top:
-
-```vim
-Before:
-  unlet! expected
-```
-
-This is patched as of
-[Vim 7.4.1546](https://github.com/vim/vim/commit/f6f32c38bf3319144a84a01a154c8c91939e7acf),
-but we shouldn't assume versions in favor of compatibility.
-
-## Linting Vim files
-
-1. Install [vint](https://github.com/Kuniwak/vint#quick-start).
-1. Recursively lint all Vim files:
-    ```
-    $ vint .
-    ```
-
-For more detailed information about the Vim script track, please see the
-[help page](http://exercism.io/languages/vimscript).
+For general information about the Vim script track, see:
+[Help](http://exercism.io/languages/vimscript).