trackler 2.0.8.1 → 2.0.8.2

data/tracks/python/exercises/word-search/word_search.py

@@ -0,0 +1,27 @@
+class Point(object):
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    def __repr__(self):
+        return 'Point({}:{})'.format(self.x, self.y)
+
+    def __add__(self, other):
+        return Point(self.x + other.x, self.y + other.y)
+
+    def __sub__(self, other):
+        return Point(self.x - other.x, self.y - other.y)
+
+    def __eq__(self, other):
+        return self.x == other.x and self.y == other.y
+
+    def __ne__(self, other):
+        return not(self == other)
+
+
+class WordSearch(object):
+    def __init__(self, puzzle):
+        pass
+
+    def search(self, word):
+        return None

data/tracks/python/exercises/word-search/word_search_test.py

@@ -0,0 +1,84 @@
+import unittest
+
+from word_search import WordSearch, Point
+
+
+class WordSearchTests(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'screeaumgr\n'
+                  'alxhpburyi\n'
+                  'jalaycalmp\n'
+                  'clojurermt')
+        self.example = WordSearch(puzzle)
+
+    def test_horizontal_words_left_to_right(self):
+        self.assertEqual(
+            self.example.search('clojure'),
+            (Point(0, 9), Point(6, 9))
+        )
+
+    def test_horizontal_words_right_to_left(self):
+        self.assertEqual(
+            self.example.search('elixir'),
+            (Point(5, 4), Point(0, 4))
+        )
+
+    def test_vertical_words_top_to_bottom(self):
+        self.assertEqual(
+            self.example.search('ecmascript'),
+            (Point(9, 0), Point(9, 9))
+        )
+
+    def test_vertical_words_bottom_to_top(self):
+        self.assertEqual(
+            self.example.search('rust'),
+            (Point(8, 4), Point(8, 1))
+        )
+
+    def test_diagonal_words_top_left_to_bottom_right(self):
+        self.assertEqual(
+            self.example.search('java'),
+            (Point(0, 0), Point(3, 3))
+        )
+
+    def test_diagonal_upper_bottom_right_to_top_left(self):
+        self.assertEqual(
+            self.example.search('lua'),
+            (Point(7, 8), Point(5, 6))
+        )
+
+    def test_diagonal_upper_bottom_left_to_top_right(self):
+        self.assertEqual(
+            self.example.search('lisp'),
+            (Point(2, 5), Point(5, 2))
+        )
+
+    def test_diagonal_upper_top_right_to_bottom_left(self):
+        self.assertEqual(
+            self.example.search('ruby'),
+            (Point(7, 5), Point(4, 8))
+        )
+
+    def test_words_that_are_not_in_the_puzzle(self):
+        self.assertIsNone(self.example.search('haskell'))
+
+    def test_search_differently_sized_puzzles(self):
+        puzzle = ('qwertyuiopz\n'
+                  'luamsicrexe\n'
+                  'abcdefghijk')
+        self.assertEqual(
+            WordSearch(puzzle).search('exercism'),
+            (Point(10, 1), Point(3, 1))
+        )
+
+
+if __name__ == '__main__':
+    unittest.main()

data/tracks/python/requirements-travis.txt

@@ -1,3 +1,3 @@
-flake8>=3.2,<3.2.99
+flake8>=3.3,<3.3.99
 pep8>=1.7,<1.7.99
 pyflakes>=1.5,<1.5.99

data/tracks/python/test/check-exercises.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import print_function
+
 import os
 import ast
 import imp
@@ -7,11 +9,13 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import json
 
 
-def check_assignment(name, test_file, example_name):
+def check_assignment(name, test_file):
     # Returns the exit code of the tests
     workdir = tempfile.mkdtemp(name)
+    example_name = modname_heuristic(test_file)
     try:
         test_file_out = os.path.join(workdir, os.path.basename(test_file))
         shutil.copyfile(test_file, test_file_out)
@@ -49,29 +53,50 @@ def is_module_missing(modname):
         return False
 
 
-def assignment_name(test_file):
-    return os.path.basename(test_file).rpartition('_')[0]
+def load_config():
+    try:
+        with open('./config.json') as json_file:
+            data = json.load(json_file)
+    except IOError:
+        print('FAIL: config.json file not found')
+        raise SystemExit(1)
+
+    try:
+        problems = [entry['slug'] for entry in data['exercises']]
+        deprecated_problems = data['deprecated']
+    except KeyError:
+        print('FAIL: config.json has an incorrect format')
+        raise SystemExit(1)
+
+    return problems, deprecated_problems
 
 
 def main():
-    if len(sys.argv) == 2:  # test a specific exercise
-        exercise_path = sys.argv[1].strip('/')
-        test_file = glob.glob('./exercises/{}/*_test.py'.format(exercise_path))[0]
-        check_assignment(assignment_name(test_file), test_file,
-                         modname_heuristic(test_file))
+    if len(sys.argv) >= 2:
+        # test specific exercises
+        exercises = [exercise.strip('/') for exercise in sys.argv[1:]]
     else:
-        failures = []
-        for test_file in glob.glob('./exercises/*/*_test.py'):
-            name = assignment_name(test_file)
-            print('# ' + name)
-            if check_assignment(name, test_file, modname_heuristic(test_file)):
-                failures.append(name)
-            print('')
-        if failures:
-            print('FAILURES: ' + ' '.join(failures))
-            raise SystemExit(1)
+        # load exercises from config-file
+        exercises, _ = load_config()
+
+    failures = []
+    for exercise in exercises:
+        test_file = glob.glob('./exercises/{}/*_test.py'.format(exercise))
+        print('# ', exercise)
+        if not test_file:
+            print('FAIL: File with test cases not found')
+            failures.append('{} (FileNotFound)'.format(exercise))
         else:
-            print('SUCCESS!')
+            if check_assignment(exercise, test_file[0]):
+                failures.append('{} (TestFailed)'.format(exercise))
+        print('')
+
+    if failures:
+        print('FAILURES: ', ', '.join(failures))
+        raise SystemExit(1)
+    else:
+        print('SUCCESS!')
+
 
 if __name__ == '__main__':
     main()

data/tracks/scala/config.json

@@ -366,6 +366,15 @@
             "Transforming"
          ]
       },
+      {
+         "slug":"perfect-numbers",
+         "difficulty":1,
+         "topics":[
+            "Enumerations",
+            "Integers",
+            "Mathematics"
+         ]
+      },
       {
          "slug":"clock",
          "difficulty":1,

data/tracks/scala/exercises/perfect-numbers/build.sbt

@@ -0,0 +1,3 @@
+scalaVersion := "2.12.1"
+
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"

data/tracks/scala/exercises/perfect-numbers/example.scala

@@ -0,0 +1,24 @@
+import NumberType.NumberType
+
+object PerfectNumbers {
+  def classify(n: Int): NumberType = {
+    val sumOfFactors
+    = (1 until n)
+      .foldLeft(0)((acc, i) => if (n % i == 0) acc + i else acc)
+
+    if (sumOfFactors < n)
+      NumberType.Deficient
+    else if (sumOfFactors > n)
+      NumberType.Abundant
+    else
+      NumberType.Perfect
+  }
+}
+
+object NumberType extends Enumeration {
+  type NumberType = Value
+
+  val Perfect = Value("Perfect")
+  val Abundant = Value("Abundant")
+  val Deficient = Value("Deficient")
+}

data/tracks/scala/exercises/perfect-numbers/src/test/scala/PerfectNumbersTest.scala

@@ -0,0 +1,62 @@
+import org.scalatest.{FlatSpec, Matchers}
+
+class PerfectNumbersTest extends FlatSpec with Matchers {
+  it should "handle deficient - 3" in {
+    PerfectNumbers.classify(3) should be (NumberType.Deficient)
+  }
+
+  it should "handle deficient - 7" in {
+    pending
+    PerfectNumbers.classify(7) should be (NumberType.Deficient)
+  }
+
+  it should "handle deficient - 13" in {
+    pending
+    PerfectNumbers.classify(13) should be (NumberType.Deficient)
+  }
+
+  it should "handle deficient - 33550337" in {
+    pending
+    PerfectNumbers.classify(33550337) should be (NumberType.Deficient)
+  }
+
+  it should "handle perfect - 6" in {
+    pending
+    PerfectNumbers.classify(6) should be (NumberType.Perfect)
+  }
+
+  it should "handle perfect - 28" in {
+    pending
+    PerfectNumbers.classify(28) should be (NumberType.Perfect)
+  }
+
+  it should "handle perfect - 33550336" in {
+    pending
+    PerfectNumbers.classify(33550336) should be (NumberType.Perfect)
+  }
+
+  it should "handle perfect - 496" in {
+    pending
+    PerfectNumbers.classify(496) should be (NumberType.Perfect)
+  }
+
+  it should "handle abundant - 12" in {
+    pending
+    PerfectNumbers.classify(12) should be (NumberType.Abundant)
+  }
+
+  it should "handle abundant - 18" in {
+    pending
+    PerfectNumbers.classify(18) should be (NumberType.Abundant)
+  }
+
+  it should "handle abundant - 20" in {
+    pending
+    PerfectNumbers.classify(20) should be (NumberType.Abundant)
+  }
+
+  it should "handle abundant - 33550335" in {
+    pending
+    PerfectNumbers.classify(33550335) should be (NumberType.Abundant)
+  }
+}

data/tracks/typescript/Makefile

@@ -44,7 +44,11 @@ moveAllIntoCommonDir:
 moveCommonIntoSubDir:
 	@for assignment in $(ASSIGNMENTS); do ASSIGNMENT=$$assignment $(MAKE) moveAssigmentToSub || exit 1; done
 	
+<<<<<<< HEAD
 all: replacePackageFileFromCommonToSubFolders
+=======
+all: replacePackageFilesFromCommonToSubFolders
+>>>>>>> f5528ecd7751462ac6590cc77304a7ac2489c895
 
 copyPackageFilesToSubFolder:
 	@cp ./common/package.json exercises/$(ASSIGNMENT)/package.json
@@ -52,6 +56,10 @@ copyPackageFilesToSubFolder:
 	@cp ./common/tslint.json exercises/$(ASSIGNMENT)/tslint.json
 	@cp ./common/yarn.lock exercises/$(ASSIGNMENT)/yarn.lock
 
+<<<<<<< HEAD
 replacePackageFileFromCommonToSubFolders:
+=======
+replacePackageFilesFromCommonToSubFolders:
+>>>>>>> f5528ecd7751462ac6590cc77304a7ac2489c895
 	@for assignment in $(ASSIGNMENTS); do ASSIGNMENT=$$assignment $(MAKE) copyPackageFilesToSubFolder || exit 1; done
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.1
+  version: 2.0.8.2
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -6108,6 +6108,8 @@ files:
 - tracks/python/exercises/accumulate/example.py
 - tracks/python/exercises/acronym/acronym_test.py
 - tracks/python/exercises/acronym/example.py
+- tracks/python/exercises/all-your-base/all_your_base_test.py
+- tracks/python/exercises/all-your-base/example.py
 - tracks/python/exercises/allergies/allergies_test.py
 - tracks/python/exercises/allergies/example.py
 - tracks/python/exercises/anagram/anagram_test.py
@@ -6145,6 +6147,8 @@ files:
 - tracks/python/exercises/grade-school/grade_school_test.py
 - tracks/python/exercises/grains/example.py
 - tracks/python/exercises/grains/grains_test.py
+- tracks/python/exercises/grep/example.py
+- tracks/python/exercises/grep/grep_test.py
 - tracks/python/exercises/hamming/example.py
 - tracks/python/exercises/hamming/hamming_test.py
 - tracks/python/exercises/hello-world/example.py
@@ -6252,6 +6256,9 @@ files:
 - tracks/python/exercises/twelve-days/twelve_days_test.py
 - tracks/python/exercises/word-count/example.py
 - tracks/python/exercises/word-count/word_count_test.py
+- tracks/python/exercises/word-search/example.py
+- tracks/python/exercises/word-search/word_search.py
+- tracks/python/exercises/word-search/word_search_test.py
 - tracks/python/exercises/wordy/example.py
 - tracks/python/exercises/wordy/wordy_test.py
 - tracks/python/exercises/zebra-puzzle/example.py
@@ -7240,6 +7247,10 @@ files:
 - tracks/scala/exercises/pascals-triangle/example.scala
 - tracks/scala/exercises/pascals-triangle/src/main/scala/.keep
 - tracks/scala/exercises/pascals-triangle/src/test/scala/PascalsTriangleTest.scala
+- tracks/scala/exercises/perfect-numbers/build.sbt
+- tracks/scala/exercises/perfect-numbers/example.scala
+- tracks/scala/exercises/perfect-numbers/src/main/scala/PerfectNumbers.scala
+- tracks/scala/exercises/perfect-numbers/src/test/scala/PerfectNumbersTest.scala
 - tracks/scala/exercises/phone-number/HINTS.md
 - tracks/scala/exercises/phone-number/build.sbt
 - tracks/scala/exercises/phone-number/example.scala