trackler 2.2.1.55 → 2.2.1.56

data/tracks/ecmascript/exercises/series/README.md

@@ -25,7 +25,7 @@ in the input; the digits need not be *numerically consecutive*.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/sieve/README.md

@@ -32,7 +32,7 @@ correct list of primes.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/simple-cipher/README.md

@@ -88,7 +88,7 @@ on Wikipedia][dh] for one of the first implementations of this scheme.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/simple-linked-list/README.md

@@ -26,7 +26,7 @@ implement your own abstract data type.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/space-age/README.md

@@ -22,7 +22,7 @@ youtube video](http://www.youtube.com/watch?v=Z_2gbGXzFbs).
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/strain/README.md

@@ -38,7 +38,7 @@ basic tools instead.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/sublist/README.md

@@ -22,7 +22,7 @@ Examples:
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/sum-of-multiples/README.md

@@ -16,7 +16,7 @@ up to but not including that number.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/transpose/README.md

@@ -63,7 +63,7 @@ the corresponding output row should contain the spaces in its right-most column(
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/triangle/README.md

@@ -24,7 +24,7 @@ a single line. Feel free to add your own code/tests to check for degenerate tria
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/trinary/README.md

@@ -26,7 +26,7 @@ conversion, pretend it doesn't exist and implement it yourself.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/twelve-days/README.md

@@ -34,7 +34,7 @@ On the twelfth day of Christmas my true love gave to me, twelve Drummers Drummin
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/two-bucket/README.md

@@ -34,7 +34,7 @@ Written with <3 at [Fullstack Academy](http://www.fullstackacademy.com/) by [Lin
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/two-fer/README.md

@@ -17,7 +17,7 @@ If the given name is "Alice", the result should be "One for Alice, one for me."
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/word-count/README.md

@@ -17,7 +17,7 @@ free: 1
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/word-search/README.md

@@ -31,7 +31,7 @@ letter of each word.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/ecmascript/exercises/wordy/README.md

@@ -61,7 +61,7 @@ If you'd like, handle exponentials.
 Go through the setup instructions for ECMAScript to
 install the necessary dependencies:
 
-http://exercism.io/languages/ecmascript
+http://exercism.io/languages/ecmascript/installation
 
 ## Requirements
 

data/tracks/erlang/exercises/bob/src/bob.erl

@@ -1,8 +1,8 @@
 -module(bob).
 
--export([response_for/1, test_version/0]).
+-export([response/1, test_version/0]).
 
-response_for(String) ->
-  undefined.
 
-test_version() -> 1.
+response(String) -> undefined.
+
+test_version() -> 2.

data/tracks/erlang/exercises/bob/src/example.erl

@@ -1,33 +1,48 @@
 -module(example).
 
--export([response_for/1, test_version/0]).
+-export([response/1, test_version/0]).
 
--spec response_for(string()) -> string().
-response_for(String) ->
+-spec response(string()) -> string().
+response(String) ->
   first_match(
-    String,
-    [{fun is_all_spaces/1, "Fine. Be that way!"},
+    trim(String),
+    [{fun is_silent/1, "Fine. Be that way!"},
      {fun is_shouting/1, "Whoa, chill out!"},
      {fun is_question/1, "Sure."},
      {fun (_) -> true end, "Whatever."}]).
 
 test_version() ->
-    1.
+    2.
 
 
 
 first_match(S, [{F, Res} | Fs]) ->
-  case F(S) of
-    true -> Res;
-    false -> first_match(S, Fs)
-  end.
+    case F(S) of
+        true -> Res;
+        false -> first_match(S, Fs)
+    end.
 
 is_shouting(String) ->
-  lists:any(fun (C) -> C >= $A andalso C =< $Z end, String) andalso
-  string:to_upper(String) =:= String.
+    lists:any(fun (C) -> C >= $A andalso C =< $Z end, String) andalso
+    string:to_upper(String) =:= String.
 
 is_question(String) ->
-  lists:last(String) =:= $?.
+    lists:last(String) =:= $?.
 
-is_all_spaces(String) ->
-  re:run(String, "^(\\h|\\v)*$", [unicode]) =/= nomatch.
+is_silent("") -> true;
+is_silent(_) -> false.
+
+trim(String) ->
+    trim_left(trim_right(String)).
+
+trim_left("") -> "";
+trim_left([$\s|T]) -> trim_left(T);
+trim_left([$\t|T]) -> trim_left(T);
+trim_left([$\n|T]) -> trim_left(T);
+trim_left([$\r|T]) -> trim_left(T);
+trim_left(S) -> S.
+
+trim_right(S) ->
+    S1 = lists:reverse(S),
+    S2 = trim_left(S1),
+    lists:reverse(S2).

data/tracks/erlang/exercises/bob/test/bob_tests.erl

@@ -1,71 +1,110 @@
 -module(bob_tests).
 
+% This file is automatically generated from the exercises canonical data.
+
 -define(TESTED_MODULE, (sut(bob))).
--define(TEST_VERSION, 1).
+-define(TEST_VERSION, 2).
 -include("exercism.hrl").
 
-responds_to_something_test() ->
-  bob_responds("Tom-ay-to, tom-aaaah-to.", "Whatever.").
 
-responds_to_shouts_test() ->
-  bob_responds("WATCH OUT!", "Whoa, chill out!").
+stating_something_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("Tom-ay-to, tom-aaaah-to.")).
+
+shouting_test() ->
+    ?assertMatch("Whoa, chill out!",
+		 ?TESTED_MODULE:response("WATCH OUT!")).
+
+shouting_gibberish_test() ->
+    ?assertMatch("Whoa, chill out!",
+		 ?TESTED_MODULE:response("FCECDFCAAB")).
+
+asking_a_question_test() ->
+    ?assertMatch("Sure.",
+		 ?TESTED_MODULE:response("Does this cryogenic chamber make me "
+					 "look fat?")).
+
+asking_a_numeric_question_test() ->
+    ?assertMatch("Sure.",
+		 ?TESTED_MODULE:response("You are, what, like 15?")).
 
-responds_to_questions_test() ->
-  bob_responds("Does this cryogenic chamber make me look fat?", "Sure.").
+asking_gibberish_test() ->
+    ?assertMatch("Sure.",
+		 ?TESTED_MODULE:response("fffbbcbeab?")).
 
-responds_to_forceful_talking_test() ->
-  bob_responds("Let's go make out behind the gym!", "Whatever.").
+talking_forcefully_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("Let's go make out behind the gym!")).
 
-responds_to_acronyms_test() ->
-  bob_responds("It's OK if you don't want to go to the DMV.", "Whatever.").
+using_acronyms_in_regular_speech_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("It's OK if you don't want to go to the "
+					 "DMV.")).
 
-responds_to_forceful_questions_test() ->
-  bob_responds("WHAT THE HELL WERE YOU THINKING?", "Whoa, chill out!").
+forceful_question_test() ->
+    ?assertMatch("Whoa, chill out!",
+		 ?TESTED_MODULE:response("WHAT THE HELL WERE YOU THINKING?")).
 
-responds_to_shouting_with_special_characters_test() ->
-  bob_responds("ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!",
-               "Whoa, chill out!").
+shouting_numbers_test() ->
+    ?assertMatch("Whoa, chill out!",
+		 ?TESTED_MODULE:response("1, 2, 3 GO!")).
 
-responds_to_shouting_numbers_test() ->
-  bob_responds("1, 2, 3, GO!", "Whoa, chill out!").
+only_numbers_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("1, 2, 3")).
 
-responds_to_shouting_with_no_exclamation_mark_test() ->
-  bob_responds("I HATE YOU", "Whoa, chill out!").
+question_with_only_numbers_test() ->
+    ?assertMatch("Sure.", ?TESTED_MODULE:response("4?")).
 
-responds_to_statement_containing_question_mark_test() ->
-  bob_responds("Ending with ? means a question", "Whatever.").
+shouting_with_special_characters_test() ->
+    ?assertMatch("Whoa, chill out!",
+		 ?TESTED_MODULE:response("ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!")).
 
-responds_to_silence_test() ->
-  bob_responds("", "Fine. Be that way!").
+shouting_with_no_exclamation_mark_test() ->
+    ?assertMatch("Whoa, chill out!",
+		 ?TESTED_MODULE:response("I HATE YOU")).
 
-responds_to_prolonged_silence_test() ->
-  bob_responds("    ", "Fine. Be that way!").
+statement_containing_question_mark_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("Ending with ? means a question.")).
 
+non_letters_with_question_test() ->
+    ?assertMatch("Sure.", ?TESTED_MODULE:response(":) ?")).
 
-responds_to_non_letters_with_question_test() ->
-  bob_responds(":) ?", "Sure.").
+prattling_on_test() ->
+    ?assertMatch("Sure.",
+		 ?TESTED_MODULE:response("Wait! Hang on. Are you going to be OK?")).
 
-responds_to_multiple_line_questions_test() ->
-  bob_responds("\nDoes this cryogenic chamber make me look fat? \nno",
-               "Whatever.").
+silence_test() ->
+    ?assertMatch("Fine. Be that way!",
+		 ?TESTED_MODULE:response([])).
 
-%% This one is especially challenging in Erlang, hint: use the re module.
+prolonged_silence_test() ->
+    ?assertMatch("Fine. Be that way!",
+		 ?TESTED_MODULE:response("          ")).
 
-%%responds_to_other_whitespace_test() ->
-%%    bob_responds("\n\r \t\v\xA0\x{2002}",
-%%                 "Fine. Be that way!").
+alternate_silence_test() ->
+    ?assertMatch("Fine. Be that way!",
+		 ?TESTED_MODULE:response("\t\t\t\t\t\t\t\t\t\t")).
 
-responds_to_only_numbers_test() ->
-  bob_responds("1, 2, 3", "Whatever.").
+multiple_line_question_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("\nDoes this cryogenic chamber make me "
+					 "look fat?\nno")).
 
-responds_to_question_with_only_numbers_test() ->
-  bob_responds("4?", "Sure.").
+starting_with_whitespace_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("         hmmmmmmm...")).
 
-responds_to_unicode_shout_test() ->
-  bob_responds("\xdcML\xc4\xdcTS!", "Whoa, chill out!").
+ending_with_whitespace_test() ->
+    ?assertMatch("Sure.",
+		 ?TESTED_MODULE:response("Okay if like my  spacebar  quite a bit?   ")).
 
-responds_to_unicode_non_shout_test() ->
-  bob_responds("\xdcML\xe4\xdcTS!", "Whatever.").
+other_whitespace_test() ->
+    ?assertMatch("Fine. Be that way!",
+		 ?TESTED_MODULE:response("\n\r \t")).
 
-bob_responds(Question, Answer) ->
-  ?assertEqual(Answer, ?TESTED_MODULE:response_for(Question)).
+non_question_ending_with_whitespace_test() ->
+    ?assertMatch("Whatever.",
+		 ?TESTED_MODULE:response("This is a statement ending with whitespace "
+					 "     ")).

data/tracks/erlang/exercises/collatz-conjecture/test/collatz_conjecture_tests.erl

@@ -1,5 +1,7 @@
 -module(collatz_conjecture_tests).
 
+% This file is automatically generated from the exercises canonical data.
+
 -define(TESTED_MODULE, (sut(collatz_conjecture))).
 -define(TEST_VERSION, 2).
 -include("exercism.hrl").

data/tracks/erlang/exercises/hamming/src/example.erl

@@ -1,15 +1,15 @@
 -module(example).
 
--export([hamming_distance/2, test_version/0]).
+-export([distance/2, test_version/0]).
 
-hamming_distance(From, To) ->
-  Comparisons = lists:zipwith(fun(X,Y) -> case X =:= Y of
-                                            true -> 0;
-                                            false -> 1
-                                          end
-                              end,
-                              From, To),
-  lists:sum(Comparisons).
+distance(Strand1, Strand2) ->
+    walk(Strand1, Strand2, 0).
 
 test_version() ->
-    1.
+    2.
+
+
+walk([], [], Dist) -> Dist;
+walk([A|As], [A|Bs], Dist) -> walk(As, Bs, Dist);
+walk([_|As], [_|Bs], Dist) -> walk(As, Bs, Dist + 1);
+walk(_, _, _) -> {error, "left and right strands must be of equal length"}.

data/tracks/erlang/exercises/hamming/src/hamming.erl

@@ -1,8 +1,8 @@
 -module(hamming).
 
--export([hamming_distance/2, test_version/0]).
+-export([distance/2, test_version/0]).
 
-hamming_distance(From, To) ->
-  undefined.
 
-test_version() -> 1.
+distance(Strand1, Strand2) -> undefined.
+
+test_version() -> 2.