trackler 2.1.0.30 → 2.1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74cde339f5cdb1ac6755c1107093a003ebe1aa59
-  data.tar.gz: a504d24c826d0e30cb2ba137a09768679be8a11c
+  metadata.gz: ba0238c5efd0610f51d605a41a98489110c75117
+  data.tar.gz: 3749d5108159a055ad4d2c68a99ed6297f01c272
 SHA512:
-  metadata.gz: 5618589cbec041969591deecf786a8603074d858d17f68ef8200fad1e42ab9c6dd6d726d15e348c79050bc5beb592e44cb5123aa74683bd56277fbde2957c69f
-  data.tar.gz: 596445c4128d4f3080a3c81c766793d47ea6baed7cb3ed9fdd865c644d6cab3e83cec0e5b55d6e189b47d8ae58461c33d5f5bdc412b5290e0b51076110951091
+  metadata.gz: ba96c15d0f423acd0aee7ec87c11308d95bc8d634626361803a779bdbab47a278466de2baa348f698c628a95c3c0ab02e558f598aa6fcd4d65f19b2d9cdfbff4
+  data.tar.gz: 70e84d13ae79a5d25eeba58d39ac848d2ae2b68c8d8c7f3d7c972e5beec589d58339005aa39fc1626242627fe1a041751b86e1bf7ff137c4a36621e73283ac2d

data/common/CONTRIBUTING.md

@@ -27,13 +27,10 @@ themselves. There are other guides about contributing to other parts of the Exer
 * [Overview](#overview)
 * [Updating an Exercise Test Suite](#updating-an-exercise-test-suite)
     * [Updating a Generated Test Suite](#updating-a-generated-test-suite)
-* [Porting an Exercise to Another Language Track](#porting-an-exercise-to-another-language-track)
-    * [Providing Feedback on the Site for an Exercise You Implemented](#providing-feedback-on-the-site-for-an-exercise-you-implemented)
 * [Implementing a Completely New Exercise](#implementing-a-completely-new-exercise)
 * [Track Anatomy](#track-anatomy)
 * [Starting a New Track](#starting-a-new-track)
     * [Beta-Testing a Language Track](#beta-testing-a-language-track)
-* [Maintaining a Track](#maintaining-a-track)
 * [Useful Tidbits](#useful-tidbits)
     * [Pull Request Guidelines](#pull-request-guidelines)
     * [Exercise Versioning](#exercise-versioning)
@@ -219,80 +216,6 @@ Follow the guidelines for setting up a development environment, verifying the ch
 and submitting a pull request, as described in the [main section about updating an
 exercise test suite](#updating-an-exercise-test-suite).
 
-## Porting an Exercise to Another Language Track
-
-To get a list of all the exercises that can be ported to a track,
-go to the url `http://exercism.io/languages/:track_id/todo`.
-
-For example here is the list of exercises that have not yet been implemented
-for the Ruby track: http://exercism.io/languages/ruby/todo
-
-Each unimplemented exercise links to existing implementations of the exercise in
-other language tracks, so that people can use those example solutions and test
-suites as inspiration.
-
-We are also extracting canonical inputs and outputs for a given
-exercise and storing them in JSON format in the x-common repository.  We've accomplished this on a few exercises, but there are many more to do.
-
-Although this page is now implemented, you can still get this information from the raw data
-served by the API endpoint `http://x.exercism.io/v3/tracks/:track_id/todo`.
-
-For example, here's the list of exercises that have not yet been implemented
-in the Elm track: http://x.exercism.io/v3/tracks/elm/todo
-
-It can be pretty unwieldy to read the JSON directly. To make it easier,
-install a browser extension that formats the JSON nicely, or copy/paste the
-response body into [jsonlint.com](http://jsonlint.com/) and click "validate JSON", which not
-only validates it, but pretty-prints it.
-
-The description of the problem can be found in the
-[x-common](https://github.com/exercism/x-common) repository, in a folder named
-after the problem slug: `exercises/<slug>/description.md`.
-
-**When you decide to implement an exercise**
-
-* check that there are no open pull requests for the same exercise
-* open a "work in progress" (WIP) pull request
-
-The way to open a WIP pull request even if you haven't done any work yet is:
-
-* Fork and clone the repository
-* Check out a branch for your the exercise
-* Add an empty commit `git commit --allow-empty -m "dibs: I will implement exercise <slug>"`
-  (replace <slug> with the actual name of the exercise).
-* Push the new branch to your repository, and open a pull request against that branch.
-
-Once you have added the actual exercise, then you can rebase your branch onto the upstream
-master, which will make the WIP commit go away.
-
-The exercise should consist of, at minimum:
-
-* A test suite
-* A reference solution that passes the test (see [#reference-solution](#reference-solution))
-
-You will need to add the exercise to `"exercises"` section of the `config.json` file in the track.
-The order in which the exercises are listed there is the order in which they are fetched by default by `exercism fetch`.
-Typically, exercises are ordered by difficulty, unless there is a particular reason to do otherwise.
-
-Each language track might have additional guidance on how to order their
-exercises or additional requirements on new exercise files; check the README in
-the repository for the track.
-
-### Providing Feedback on the Site for an Exercise You Implemented
-
-Once you've created an exercise, you'll probably want to provide feedback to people who
-submit solutions to it. By default you only get access to exercises you've submitted
-a solution for.
-
-You can fetch the problem directly using the CLI:
-
-```bash
-$ exercism fetch <track_id> <slug>
-```
-
-Go ahead and submit the reference solution that you wrote when creating the problem.
-Remember to archive it if you don't want other people to comment on it.
-
 ## Implementing a Completely New Exercise
 
 A problem must have a unique slug. This slug is used as
@@ -405,93 +328,6 @@ satisfy the tests provided for each problem.
 You can include advice and helpful links for your language track in the
 `SETUP.md` file.
 
-## Maintaining a Track
-
-Maintaining a language track generally consists of:
-
-- Reviewing/merging pull requests.
-- Discussing improvements in the exercises.
-- Implementing or porting new exercises.
-- Improving the development tooling (e.g. implementing continuous
-  integration).
-- Language-Specific support.
-- Adding/improving language-specific documentation.
-
-Ideally a track will have several maintainers, for two reasons:
-
-- more lively
-- spread the workload
-
-**More Lively**
-
-We've noticed that as soon as there are at least two people maintaining
-the same track we get rich discussions about quality and idioms. There's a lot
-more activity, and it's a lot more fun.
-
-**Spread the Workload**
-
-We don't want to burn people out, and it's really nice to be able to
-go on vacation or get busy at work without worrying too much about a growing
-backlog of unanswered issues and unreviewed and unmerged pull requests.
-
-**Caveat**
-
-There's a small chance that when more people are involved there's a bit of
-diffusion of responsibility (worth googling and reading about if you haven't
-heard the term before).
-
-### Reviewing/Merging Pull Requests
-
-In general:
-
-- Avoid merging your own pull requests (but it's fine if it's really simple).
-- If the change is significant, get a second opinion.
-- If it's insignificant or simple or uncontroversial, go ahead and merge.
-- If nobody else responds within a certain amount of time, go ahead and merge
-  it anyway, if you feel like it's good enough (we can always fix things
-  later).
-
-Many maintainers have mentioned that they like to get a second pair of eyes
-even for simple fixes, because it's so easy to for typos and really silly
-things to slip in.
-
-### Use Branches (Probably, Mostly)
-
-Even for simple fixes (documentation, typos) branches let others see what's
-going on in the repository. If it's insignificant, go ahead and merge it
-yourself.
-
-Sometimes it's just silly to create a branch. In that case, go ahead and put
-it in master, unless there's a track-level policy about not doing that.
-
-### Claiming Issues
-
-When you start working on an issue, claim it (either assign it to yourself
-or just add a comment that you're taking it).
-
-If you have a big list of similar, related things, it's fine to create
-a single issue with a todo list, and people can claim individual things
-in the comment thread.
-
-### Implementing / Reviewing New Exercises
-
-The tracks should implement the exercise idiomatically in the language
-at hand, without veering too far from the README as described (does expanding
-the exercise introduce new ideas or just add more work? Is this better off
-treated as a new, separate exercise?).
-
-If there are interesting corner cases, then these should be added to the
-README, they help make the discussions better.
-
-Exercises should not enforce a single way to solve the problem, if possible.
-The more interesting exercises allow several approaches, and create rich
-opportunities for discussing trade-offs when people submit their solutions.
-
-### Skipping Uninteresting Exercises
-
-Don't be afraid to 'forego' exercises that don't make sense in the language,
-or that are not particularly interesting.
-
 ## Useful Tidbits
 
 Here are a few bits and pieces that are referenced from some of the

data/common/exercises/collatz-conjecture/canonical-data.json

@@ -1,6 +1,6 @@
 {
   "exercise": "collatz-conjecture",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "cases": [
     {
       "description": "zero steps for one",
@@ -20,6 +20,12 @@
       "number": 12,
       "expected": 9
     },
+    {
+      "description": "Large number of even and odd steps",
+      "property": "steps",
+      "number": 1000000,
+      "expected": 152
+    },
     {
       "description": "zero is an error",
       "property": "steps",

data/common/exercises/dominoes/canonical-data.json

@@ -1,6 +1,6 @@
 {
   "exercise": "dominoes",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "comments": [
     "Inputs are given as lists of two-element lists.",
     "Feel free to convert the input to a sensible type in the specific language",
@@ -41,37 +41,37 @@
       "description": "empty input = empty output",
       "property": "canChain",
       "input": [],
-      "can_chain": true
+      "expected": true
     },
     {
       "description": "singleton input = singleton output",
       "property": "canChain",
       "input": [[1, 1]],
-      "can_chain": true
+      "expected": true
     },
     {
       "description": "singleton that can't be chained",
       "property": "canChain",
       "input": [[1, 2]],
-      "can_chain": false
+      "expected": false
     },
     {
       "description": "three elements",
       "property": "canChain",
       "input": [[1, 2], [3, 1], [2, 3]],
-      "can_chain": true
+      "expected": true
     },
     {
       "description": "can reverse dominoes",
       "property": "canChain",
       "input": [[1, 2], [1, 3], [2, 3]],
-      "can_chain": true
+      "expected": true
     },
     {
       "description": "can't be chained",
       "property": "canChain",
       "input": [[1, 2], [4, 1], [2, 3]],
-      "can_chain": false
+      "expected": false
     },
     {
       "description": "disconnected - simple",
@@ -84,19 +84,19 @@
       ],
       "property": "canChain",
       "input": [[1, 1], [2, 2]],
-      "can_chain": false
+      "expected": false
     },
     {
       "description": "disconnected - double loop",
       "property": "canChain",
       "input": [[1, 2], [2, 1], [3, 4], [4, 3]],
-      "can_chain": false
+      "expected": false
     },
     {
       "description": "disconnected - single isolated",
       "property": "canChain",
       "input": [[1, 2], [2, 3], [3, 1], [4, 4]],
-      "can_chain": false
+      "expected": false
     },
     {
       "description": "need backtrack",
@@ -109,19 +109,19 @@
       ],
       "property": "canChain",
       "input": [[1, 2], [2, 3], [3, 1], [2, 4], [2, 4]],
-      "can_chain": true
+      "expected": true
     },
     {
       "description": "separate loops",
       "property": "canChain",
       "input": [[1, 2], [2, 3], [3, 1], [1, 1], [2, 2], [3, 3]],
-      "can_chain": true
+      "expected": true
     },
     {
       "description": "nine elements",
       "property": "canChain",
       "input": [[1, 2], [5, 3], [3, 1], [1, 2], [2, 4], [1, 6], [2, 3], [3, 4], [5, 6]],
-      "can_chain": true
+      "expected": true
     }
   ]
 }

data/common/exercises/proverb/description.md

@@ -1,10 +1,10 @@
 For want of a horseshoe nail, a kingdom was lost, or so the saying goes. Output
-the full text of this proverbial rhyme.
+the full text of this proverbial rhyme:
 
-For want of a nail the shoe was lost.
-For want of a shoe the horse was lost.
-For want of a horse the rider was lost.
-For want of a rider the message was lost.
-For want of a message the battle was lost.
-For want of a battle the kingdom was lost.
-And all for the want of a horseshoe nail.
+> For want of a nail the shoe was lost.  
+> For want of a shoe the horse was lost.  
+> For want of a horse the rider was lost.  
+> For want of a rider the message was lost.  
+> For want of a message the battle was lost.  
+> For want of a battle the kingdom was lost.  
+> And all for the want of a horseshoe nail.

data/common/exercises/scale-generator/description.md

@@ -48,17 +48,8 @@ Sometimes they may be smaller than usual (diminished, written "D"), or larger
 
 Here is a table of pitches with the names of their interval distance from the tonic (A).
 
-    A    |    A#   |    B    |    C    |    C#   |    D    |    D#   |
-----------------------------------------------------------------------
-  Unison | Min 2nd | Maj 2nd | Min 3rd | Maj 3rd | Per 4th | Tritone |
-         |         | Dim 3rd | Aug 2nd | Dim 4th |         | Aug 4th |
-                                                           | Dim 5th |
-
-
-    E    |    F    |    F#   |    G    |    G#   |    A   |
------------------------------------------------------------
- Per 5th | Min 6th | Maj 6th | Min 7th | Maj 7th | Octave |
- Dim 5th | Aug 5th | Dim 7th | Aug 6th | Dim 8ve |        |
-
-
-
+|   A    |    A#   |    B    |    C    |    C#   |    D    |    D#   |    E    |    F    |    F#   |    G    |    G#   |    A   |
+|:------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:------:|
+| Unison | Min 2nd | Maj 2nd | Min 3rd | Maj 3rd | Per 4th | Tritone | Per 5th | Min 6th | Maj 6th | Min 7th | Maj 7th | Octave |
+|        |         | Dim 3rd | Aug 2nd | Dim 4th |         | Aug 4th | Dim 5th | Aug 5th | Dim 7th | Aug 6th | Dim 8ve |        |
+|        |         |         |         |         |         | Dim 5th |         |         |         |         |         |        |

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.1.0.30"
+  VERSION = "2.1.0.31"
 end

data/tracks/java/config.json

@@ -270,11 +270,6 @@
       "difficulty": 7,
       "topics": []
     },
-    {
-      "slug": "rectangles",
-      "difficulty": 7,
-      "topics": []
-    },
     {
       "slug": "meetup",
       "difficulty": 7,
@@ -290,6 +285,16 @@
       "difficulty": 7,
       "topics": []
     },
+    {
+      "slug": "ocr-numbers",
+      "difficulty": 8,
+      "topics": []
+    },
+    {
+      "slug": "rectangles",
+      "difficulty": 8,
+      "topics": []
+    },
     {
       "slug": "book-store",
       "difficulty": 8,
@@ -325,11 +330,6 @@
       "difficulty": 1,
       "topics": []
     },
-    {
-      "slug": "ocr-numbers",
-      "difficulty": 1,
-      "topics": []
-    },
     {
       "slug": "run-length-encoding",
       "difficulty": 1,

data/tracks/java/exercises/ocr-numbers/src/example/java/OpticalCharacterReader.java

@@ -8,7 +8,7 @@ import java.util.List;
  */
 final class OpticalCharacterReader {
 
-    private static final int ROWS_PER_LINE  = 4;
+    private static final int ROWS_PER_LINE = 4;
 
     private static final int COLS_PER_SSD = 3;
 
@@ -56,9 +56,9 @@ final class OpticalCharacterReader {
                     "Number of input rows must be a positive multiple of " + ROWS_PER_LINE);
         }
 
-        final int inputColumnCount = input.get(0).length();
+        final int inputColCount = input.get(0).length();
 
-        if (inputColumnCount == 0 || inputColumnCount % 3 != 0) {
+        if (inputColCount == 0 || inputColCount % 3 != 0) {
             throw new IllegalArgumentException(
                     "Number of input columns must be a positive multiple of " + COLS_PER_SSD);
         }

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

@@ -1,4 +1,4 @@
-(* Test/exercise version: "1.0.1" *)
+(* Test/exercise version: "2.0.0" *)
 
 open Core
 open OUnit2

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

@@ -1,4 +1,4 @@
-(* Test/exercise version: "1.0.0" *)
+(* Test/exercise version: "1.1.0" *)
 
 open Core
 open OUnit2

data/tracks/ocaml/exercises/list-ops/test.ml

@@ -6,76 +6,68 @@ module L = List_ops
 let aei exp got _test_ctxt = assert_equal ~printer:Int.to_string exp got
 
 let ael exp got _test_ctxt =
-  (* There's a little problem with the [List.to_string] function apparently
-     getting a stack overflow on very long lists. *)
-  if List.length exp < 1000 then
-    assert_equal ~printer:(List.to_string ~f:Int.to_string) exp got
-  else
-    assert_equal exp got
+  assert_equal ~printer:(List.to_string ~f:Int.to_string) exp got
 
 let is_odd n = n % 2 = 1
 
-let tests =
-  ["length of empty list">::
-   aei 0 (L.length []);
+let tests = [
+  "length of empty list">::
+     aei 0 (L.length []);
    "length of normal list">::
-   aei 4 (L.length [1;3;5;7]);
+     aei 4 (L.length [1;3;5;7]);
    "length of huge list">::
-   aei 1_000_000 (L.length (List.range 0 1_000_000));
+     aei 1_000_000 (L.length (List.range 0 1_000_000));
    "reverse of empty list">::
-   ael [] (L.reverse []);
+     ael [] (L.reverse []);
    "reverse of normal list">::
-   ael [7;5;3;1] (L.reverse [1;3;5;7]);
+     ael [7;5;3;1] (L.reverse [1;3;5;7]);
    "reverse of huge list">::
-   ael (List.range ~start:`exclusive ~stop:`inclusive ~stride:(-1) 1_000_000 0)
-     (L.reverse (List.range 0 1_000_000));
+     ael (List.range ~start:`exclusive ~stop:`inclusive ~stride:(-1) 1_000_000 0) 
+         (L.reverse (List.range 0 1_000_000));
    "map of empty list">::
-   ael [] (L.map ~f:((+) 1) []);
+     ael [] (L.map ~f:((+) 1) []);
    "map of normal list">::
-   ael [2;4;6;8] (L.map ~f:((+) 1) [1;3;5;7]);
+     ael [2;4;6;8] (L.map ~f:((+) 1) [1;3;5;7]);
    "map of huge list">::
-   ael (List.range 1 1_000_001) (L.map ~f:((+) 1) (List.range 0 1_000_000));
+     ael (List.range 1 1_000_001) (L.map ~f:((+) 1) (List.range 0 1_000_000));
    "filter of empty list">::
-   ael [] (L.filter ~f:is_odd []);
+     ael [] (L.filter ~f:is_odd []);
    "filter of normal list">::
-   ael [1;3] (L.filter ~f:is_odd [1;2;3;4]);
+     ael [1;3] (L.filter ~f:is_odd [1;2;3;4]);
    "filter of huge list">::
-   ael (List.range ~stride:2 1 1_000_000)
-     (L.filter ~f:is_odd (List.range 0 1_000_000));
+     ael (List.range ~stride:2 1 1_000_000) 
+         (L.filter ~f:is_odd (List.range 0 1_000_000));
    "fold of empty list">::
-   aei 0 (L.fold ~init:0 ~f:(+) []);
+     aei 0 (L.fold ~init:0 ~f:(+) []);
    "fold of normal list">::
-   aei 7 (L.fold ~init:(-3) ~f:(+) [1;2;3;4]);
+     aei 7 (L.fold ~init:(-3) ~f:(+) [1;2;3;4]);
    "fold of huge list">::
-   aei (List.fold ~init:0 ~f:(+) (List.range 0 1_000_000))
-     (L.fold ~init:0 ~f:(+) (List.range 0 1_000_000));
+     aei (List.fold ~init:0 ~f:(+) (List.range 0 1_000_000)) 
+         (L.fold ~init:0 ~f:(+) (List.range 0 1_000_000));
    "append of empty lists">::
-   ael [] (L.append [] []);
+     ael [] (L.append [] []);
    "append of empty and non-empty list">::
-   ael [1;2;3;4] (L.append [] [1;2;3;4]);
+     ael [1;2;3;4] (L.append [] [1;2;3;4]);
    "append of non-empty and empty list">::
-   ael [1;2;3;4] (L.append [1;2;3;4] []);
+     ael [1;2;3;4] (L.append [1;2;3;4] []);
    "append of non-empty lists">::
    ael [1;2;3;4;5] (L.append [1;2;3] [4;5]);
    "append of huge lists">::
-   ael (List.range 0 2_000_000)
-     (L.append (List.range 0 1_000_000) (List.range 1_000_000 2_000_000));
+     ael (List.range 0 2_000_000)
+       (L.append (List.range 0 1_000_000) (List.range 1_000_000 2_000_000));
    "concat of empty list of lists">::
-   ael [] (L.concat []);
+     ael [] (L.concat []);
    "concat of normal list of lists">::
-   ael [1;2;3;4;5;6] (L.concat [[1;2];[3];[];[4;5;6]]);
+     ael [1;2;3;4;5;6] (L.concat [[1;2];[3];[];[4;5;6]]);
    "concat of huge list of small lists">::
-   ael (List.range 0 1_000_000)
-     (L.concat (List.map ~f:(fun x -> [x]) (List.range 0 1_000_000)));
+     ael (List.range 0 1_000_000) 
+         (L.concat (List.map ~f:(fun x -> [x]) (List.range 0 1_000_000)));
    "concat of small list of huge lists">::
-   ael (List.range 0 1_000_000)
-     (L.concat 
-        (List.map ~f:(fun x -> List.range (x*100_000) ((x+1)*100_000))
-           (List.range 0 10)))
+     ael (List.range 0 1_000_000)
+       (L.concat 
+          (List.map ~f:(fun x -> List.range (x*100_000) ((x+1)*100_000))
+             (List.range 0 10)))
   ]
 
 let () =
   run_test_tt_main ("list-ops tests" >::: tests)
-
-(* vim:et:ts=2:sw=2:sts=2
-*)

data/tracks/ocaml/tools/test-generator/src/controller.ml

@@ -3,7 +3,6 @@ open Parser
 open Model
 open Utils
 open Codegen
-open Special_cases
 open Template
 open Files
 open Languages
@@ -40,13 +39,13 @@ let prepend_version (version_printer: string -> string) (v: string option) (str:
 let generate_code ~(lc: language_config) ~(slug: string) ~(template_file: content) ~(canonical_data_file: content): (content, string) Result.t =
   let open Result.Monad_infix in
   Result.of_option ~error:("cannot recognize file for " ^ slug ^ " as a template") @@ find_template template_file lc.test_start_marker lc.test_end_marker >>= fun template ->
-  let edit_expected = edit_expected ~language:lc.name ~stringify:json_to_string ~slug in
+  let edit_expected = lc.edit_expected ~stringify:json_to_string ~slug in
   let edit_parameters = edit_parameters ~slug in
   let fill_in_template = fill_in_template edit_expected edit_parameters in
   let file_text = template.file_text in
   let file_lines = String.split_lines file_text |> List.to_array in
   let prepend_version = prepend_version lc.version_printer in
-  parse_json_text canonical_data_file (expected_key_name slug) (cases_name slug)
+  parse_json_text canonical_data_file "expected" "cases"
   |> Result.map_error ~f:show_error >>| simplify_single_test_suite >>= fun cd -> (match cd.tests with
       | Single cases ->
         let template = to_single template.template in
@@ -90,7 +89,7 @@ let check_canonical_data canonical_data_folder =
   let canonical_data_files = List.sort canonical_data_files ~cmp:(fun (s1, _) (s2, _) -> String.compare s1 s2) in
   let total_count = List.length canonical_data_files in
   List.iter canonical_data_files ~f:(fun (slug, text) ->
-    match parse_json_text text (expected_key_name slug) (cases_name slug) with
+    match parse_json_text text "expected" "cases" with
     | Error e -> print_endline @@ slug ^ ": " ^ (show_error e)
     | _ -> ok_count := !ok_count + 1
   );

data/tracks/ocaml/tools/test-generator/src/languages.ml

@@ -1,30 +1,32 @@
 open Core
+open Yojson.Basic
+include Ocaml_special_cases 
 
 type language_config = {
-  name: string;
   template_file_name: string;
   default_base_folder: string;
   test_start_marker: string;
   test_end_marker: string;
-  version_printer: string -> string
+  version_printer: string -> string;
+  edit_expected: stringify: (json -> string) -> slug: string -> value: json -> string;
 }
 
 let default_language_config = function
 | "ocaml" -> {
-    name = "ocaml";
-    template_file_name = "template.ml"; 
+    template_file_name = "test.ml"; 
     default_base_folder = "../..";
     test_start_marker = "(* TEST"; 
     test_end_marker = "END TEST";
-    version_printer = fun v -> "(* Test/exercise version: \"" ^ v ^ "\" *)\n\n";
+    version_printer = (fun v -> "(* Test/exercise version: \"" ^ v ^ "\" *)\n\n");
+    edit_expected = ocaml_edit_expected;
     }
 | "purescript" ->  {
-    name = "purescript";
     template_file_name = "Main.purs"; 
     default_base_folder = "../../../xpurescript";
     test_start_marker = "--TEST"; 
     test_end_marker = "--END TEST";
-    version_printer = fun v -> "-- Test/exercise version: \"" ^ v ^ "\"\n\n";
+    version_printer = (fun v -> "-- Test/exercise version: \"" ^ v ^ "\"\n\n");
+    edit_expected = Purescript_special_cases.edit_expected;
     }
 | x -> failwith @@ "unknown language " ^ x
 

data/tracks/ocaml/tools/test-generator/src/ocaml_special_cases.ml

@@ -129,9 +129,3 @@ let edit_parameters ~(slug: string) (parameters: (string * json) list) = match (
 | ("bowling", ps) -> edit_bowling ps
 | ("binary-search", ps) -> edit_binary_search ps
 | (_, ps) -> map_elements json_to_string ps
-
-let expected_key_name slug = match slug with
-| "dominoes" -> "can_chain"
-| _ -> "expected"
-
-let cases_name _slug = "cases"

data/tracks/python/README.md

@@ -5,38 +5,53 @@
 
 Exercism exercises in Python
 
+
 ## Contributing Guide
 
 Please see the [contributing guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md)
 
+
 ## Working on the Exercises
 
 We welcome both improvements to the existing exercises and new exercises.
-A pool of exercise ideas can be found in the [x-common repo](https://github.com/exercism/x-common).
+A list of missing exercise can be found here: http://exercism.io/languages/python/todo
+
+
+### Conventions
+
+- We use minimalistic stub files for all exercises (#272).
+- We use `unittest` (Python Standard Library) and no 3rd-party-framework.
+- We use the parameter order `self.assertEqual(actual, expected)` (#440).
+
+
+### Testing
 
 All exercises must be compatible with Python versions 2.7 and 3.3 upwards.
-Therefore please test your changes with these versions.
 
-Test a single exercise with Python 2.7:
+To test a single exercise (e.g., with Python 2.7):
 ```
 python2.7 test/check-exercises.py [exercise-name]
 ```
 
-Test a single exercise with Python 3.3:
+To test all exercises (e.g., with Python 3):
 ```
-python3.3 test/check-exercises.py [exercise-name]
+python3 test/check-exercises.py
 ```
 
-Test all exercises:
-```
-python test/check-exercises.py
-```
 
-## Code Style
+### Code Style
+
+The Python code in this repo is meant to follow the [PEP8 style guide](https://www.python.org/dev/peps/pep-0008/) (a stylized version http://pep8.org).
+
+This repo uses [flake8](http://flake8.readthedocs.org/en/latest/) with default settings to enforce the coding standard.
+
+
+### CI build
+
+This repo uses `travis-ci` in the following configuration: [travis.yml](https://github.com/exercism/xpython/blob/master/.travis.yml)
 
-The Python code in this repo is meant to follow the [PEP8 style guide](https://www.python.org/dev/peps/pep-0008/).
+It will check automatically the code style, the problem configuration and runns the unittests with all supported Python versions.
 
-This repo uses [flake8](http://flake8.readthedocs.org/en/latest/) with default settings to enforce the coding standard. When you submit a PR, it needs to pass the flake8 tool with no warnings, or it won't be accepted.
 
 ## Pull Requests
 

data/tracks/rust/README.md

@@ -7,7 +7,7 @@ Exercism exercises in Rust
 
 ## Contributing Guide
 
-Please see the [contributing guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md)
+Please see the [contributing guide](https://github.com/exercism/docs/tree/master/contributing-to-language-tracks)
 
 
 ## Rust icon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.1.0.30
+  version: 2.1.0.31
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -6251,40 +6251,39 @@ files:
 - tracks/ocaml/tools/test-generator/src/ocaml_special_cases.ml
 - tracks/ocaml/tools/test-generator/src/parser.ml
 - tracks/ocaml/tools/test-generator/src/purescript_special_cases.ml
-- tracks/ocaml/tools/test-generator/src/special_cases.ml
 - tracks/ocaml/tools/test-generator/src/template.ml
 - tracks/ocaml/tools/test-generator/src/test_gen.ml
 - tracks/ocaml/tools/test-generator/src/utils.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/acronym/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/all-your-base/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/anagram/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/atbash-cipher/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/beer-song/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/binary-search/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/bob/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/bowling/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/bracket-push/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/change/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/connect/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/difference-of-squares/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/dominoes/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/etl/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/forth/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/hamming/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/hello-world/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/leap/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/luhn/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/minesweeper/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/pangram/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/phone-number/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/prime-factors/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/raindrops/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/roman-numerals/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/run-length-encoding/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/say/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/space-age/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/triangle/template.ml
-- tracks/ocaml/tools/test-generator/templates/ocaml/word-count/template.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/acronym/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/all-your-base/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/anagram/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/atbash-cipher/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/beer-song/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/binary-search/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/bob/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/bowling/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/bracket-push/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/change/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/connect/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/difference-of-squares/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/dominoes/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/etl/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/forth/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/hamming/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/hello-world/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/leap/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/luhn/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/minesweeper/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/pangram/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/phone-number/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/prime-factors/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/raindrops/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/roman-numerals/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/run-length-encoding/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/say/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/space-age/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/triangle/test.ml
+- tracks/ocaml/tools/test-generator/templates/ocaml/word-count/test.ml
 - tracks/ocaml/tools/test-generator/templates/purescript/hamming/Main.purs
 - tracks/ocaml/tools/test-generator/test/all_tests.ml
 - tracks/ocaml/tools/test-generator/test/beer-song.json

data/tracks/ocaml/tools/test-generator/src/special_cases.ml

@@ -1,12 +0,0 @@
-open Core
-
-open Yojson.Basic
-open Ocaml_special_cases
-open Purescript_special_cases
-
-let edit_expected ~(language: string) ~(stringify: json -> string) ~(slug: string) ~(value: json) = match language with
-| "ocaml" -> Ocaml_special_cases.ocaml_edit_expected ~stringify ~slug ~value
-| "purescript" -> Purescript_special_cases.edit_expected ~stringify ~slug ~value
-| _ -> failwith "unknown language"
-
-include Ocaml_special_cases