trackler 2.2.1.95 → 2.2.1.96

data/tracks/perl6/exercises/accumulate/example.yaml

@@ -1,7 +1,6 @@
 exercise: Accumulate
-version: 1
-plan: 7
-imports: '&accumulate'
+version: 2
+plan: 6
 tests: |-
   is-deeply accumulate([ ], sub {}),
             [ ],

data/tracks/perl6/exercises/acronym/Acronym.pm6

@@ -1,4 +1,4 @@
-unit module Acronym:ver<1>;
+unit module Acronym:ver<2>;
 
 sub abbreviate ($phrase) is export {
 }

data/tracks/perl6/exercises/acronym/Example.pm6

@@ -1,4 +1,4 @@
-unit module Acronym:ver<1>;
+unit module Acronym:ver<2>;
 
 sub abbreviate ($phrase) is export {
   [~] $phrase.uc.comb(/\w+/).map: *.substr(0, 1);

data/tracks/perl6/exercises/acronym/acronym.t

@@ -1,26 +1,19 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname;
 use JSON::Fast;
+use lib $?FILE.IO.dirname;
+use Acronym;
+plan 6;
 
-my Str:D $exercise := 'Acronym';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 8;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if Acronym.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
-    ~ "\n$exercise is $(::($exercise).^ver.gist). "
-    ~ "Test is $($version.gist).\n";
-  bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
+    ~ "\nAcronym is {Acronym.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&abbreviate>;
-
 my $c-data = from-json $=pod.pop.contents;
 
 for $c-data<cases>»<cases>».Array.flat {
@@ -91,18 +84,3 @@ for $c-data<cases>»<cases>».Array.flat {
 }
 
 =end code
-
-unless %*ENV<EXERCISM> {
-  skip-rest 'exercism tests';
-  exit;
-}
-
-subtest 'canonical-data' => {
-  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
-    $dir.IO.resolve.basename
-  }/canonical-data.json".IO.resolve) ~~ :f ??
-    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
-    flunk 'problem-specifications file not found';
-}
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }

data/tracks/perl6/exercises/acronym/example.yaml

@@ -1,7 +1,6 @@
 exercise: Acronym
-version: 1
-plan: 8
-imports: '&abbreviate'
+version: 2
+plan: 6
 tests: |-
 
   for $c-data<cases>»<cases>».Array.flat {

data/tracks/perl6/exercises/all-your-base/AllYourBase.pm6

@@ -1,4 +1,4 @@
-unit module AllYourBase:ver<3>;
+unit module AllYourBase:ver<4>;
 
 sub convert-base (:%bases!, :@digits!) is export {
 }

data/tracks/perl6/exercises/all-your-base/Example.pm6

@@ -1,4 +1,4 @@
-unit module AllYourBase:ver<3>;
+unit module AllYourBase:ver<4>;
 
 sub convert-base (
   :%bases! where all(.keys ~~ <from to>.Set, .values.all > 1),

data/tracks/perl6/exercises/all-your-base/all-your-base.t

@@ -1,26 +1,19 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname;
 use JSON::Fast;
+use lib $?FILE.IO.dirname;
+use AllYourBase;
+plan 21;
 
-my Str:D $exercise := 'AllYourBase';
-my Version:D $version = v3;
-my Str $module //= $exercise;
-plan 23;
+my Version:D $version = v4;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if AllYourBase.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
-    ~ "\n$exercise is $(::($exercise).^ver.gist). "
-    ~ "Test is $($version.gist).\n";
-  bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
+    ~ "\nAllYourBase is {AllYourBase.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&convert-base>;
-
 my $c-data = from-json $=pod.pop.contents;
 for $c-data<cases>.values -> $case {
   sub call-convert-base {
@@ -272,18 +265,3 @@ for $c-data<cases>.values -> $case {
 }
 
 =end code
-
-unless %*ENV<EXERCISM> {
-  skip-rest 'exercism tests';
-  exit;
-}
-
-subtest 'canonical-data' => {
-  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
-    $dir.IO.resolve.basename
-  }/canonical-data.json".IO.resolve) ~~ :f ??
-    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
-    flunk 'problem-specifications file not found';
-}
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }

data/tracks/perl6/exercises/all-your-base/example.yaml

@@ -1,7 +1,6 @@
 exercise: AllYourBase
-version: 3
-plan: 23
-imports: '&convert-base'
+version: 4
+plan: 21
 tests: |-
   for $c-data<cases>.values -> $case {
     sub call-convert-base {

data/tracks/perl6/exercises/allergies/Allergies.pm6

@@ -1 +1 @@
-unit module Allergies:ver<3>;
+unit module Allergies:ver<4>;

data/tracks/perl6/exercises/allergies/Example.pm6

@@ -1,4 +1,4 @@
-unit module Allergies:ver<3>;
+unit module Allergies:ver<4>;
 
 our @allergens = <
     eggs

data/tracks/perl6/exercises/allergies/allergies.t

@@ -1,26 +1,19 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname;
 use JSON::Fast;
+use lib $?FILE.IO.dirname;
+use Allergies;
+plan 2;
 
-my Str:D $exercise := 'Allergies';
-my Version:D $version = v3;
-my Str $module //= $exercise;
-plan 4;
+my Version:D $version = v4;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if Allergies.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
-    ~ "\n$exercise is $(::($exercise).^ver.gist). "
-    ~ "Test is $($version.gist).\n";
-  bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
+    ~ "\nAllergies is {Allergies.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&allergic-to &list-allergies>;
-
 my $c-data = from-json $=pod.pop.contents;
 for $c-data<cases>.values -> %case-set {
 
@@ -226,18 +219,3 @@ for $c-data<cases>.values -> %case-set {
 }
 
 =end code
-
-unless %*ENV<EXERCISM> {
-  skip-rest 'exercism tests';
-  exit;
-}
-
-subtest 'canonical-data' => {
-  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
-    $dir.IO.resolve.basename
-  }/canonical-data.json".IO.resolve) ~~ :f ??
-    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
-    flunk 'problem-specifications file not found';
-}
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }

data/tracks/perl6/exercises/allergies/example.yaml

@@ -1,7 +1,6 @@
 exercise: Allergies
-version: 3
-plan: 4
-imports: '&allergic-to &list-allergies'
+version: 4
+plan: 2
 tests: |-
   for $c-data<cases>.values -> %case-set {
 

data/tracks/perl6/exercises/anagram/Anagram.pm6

@@ -1,4 +1,4 @@
-unit module Anagram:ver<2>;
+unit module Anagram:ver<3>;
 
 sub match-anagrams (:$subject!, :@candidates!) is export {
 }

data/tracks/perl6/exercises/anagram/Example.pm6

@@ -1,4 +1,4 @@
-unit module Anagram:ver<2>;
+unit module Anagram:ver<3>;
 
 sub match-anagrams ( :$subject!, :@candidates! ) is export {
   given $subject.uc -> $ucs {

data/tracks/perl6/exercises/anagram/anagram.t

@@ -1,26 +1,19 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname;
 use JSON::Fast;
+use lib $?FILE.IO.dirname;
+use Anagram;
+plan 16;
 
-my Str:D $exercise := 'Anagram';
-my Version:D $version = v2;
-my Str $module //= $exercise;
-plan 18;
+my Version:D $version = v3;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if Anagram.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
-    ~ "\n$exercise is $(::($exercise).^ver.gist). "
-    ~ "Test is $($version.gist).\n";
-  bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
+    ~ "\nAnagram is {Anagram.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&match-anagrams>;
-
 my $c-data = from-json $=pod.pop.contents;
 cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.Set, .<description> for $c-data<cases>.values;
 
@@ -192,18 +185,3 @@ cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.S
 }
 
 =end code
-
-unless %*ENV<EXERCISM> {
-  skip-rest 'exercism tests';
-  exit;
-}
-
-subtest 'canonical-data' => {
-  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
-    $dir.IO.resolve.basename
-  }/canonical-data.json".IO.resolve) ~~ :f ??
-    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
-    flunk 'problem-specifications file not found';
-}
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }

data/tracks/perl6/exercises/anagram/example.yaml

@@ -1,7 +1,6 @@
 exercise: Anagram
-version: 2
-plan: 18
-imports: '&match-anagrams'
+version: 3
+plan: 16
 tests: |-
   cmp-ok match-anagrams( |%(.<input><subject candidates>:p) ), '~~', .<expected>.Set, .<description> for $c-data<cases>.values;
 

data/tracks/perl6/exercises/atbash-cipher/AtbashCipher.pm6

@@ -1,4 +1,4 @@
-unit module AtbashCipher:ver<1>;
+unit module AtbashCipher:ver<2>;
 
 sub encode ($phrase) is export {
 }

data/tracks/perl6/exercises/atbash-cipher/Example.pm6

@@ -1,4 +1,4 @@
-unit module AtbashCipher:ver<1>;
+unit module AtbashCipher:ver<2>;
 
 sub encode($input) is export {
     decode($input.lc.trans( ['a'..'z', 0..9] => '', :complement ) )

data/tracks/perl6/exercises/atbash-cipher/atbash-cipher.t

@@ -1,26 +1,19 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname;
 use JSON::Fast;
+use lib $?FILE.IO.dirname;
+use AtbashCipher;
+plan 12;
 
-my Str:D $exercise := 'AtbashCipher';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 14;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if AtbashCipher.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
-    ~ "\n$exercise is $(::($exercise).^ver.gist). "
-    ~ "Test is $($version.gist).\n";
-  bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
+    ~ "\nAtbashCipher is {AtbashCipher.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&encode &decode>;
-
 my $c-data = from-json $=pod.pop.contents;
 is .<input><phrase>.&::(.<property>), |.<expected description> for $c-data<cases>»<cases>».Array.flat;
 
@@ -147,18 +140,3 @@ is .<input><phrase>.&::(.<property>), |.<expected description> for $c-data<cases
   ]
 }
 =end code
-
-unless %*ENV<EXERCISM> {
-  skip-rest 'exercism tests';
-  exit;
-}
-
-subtest 'canonical-data' => {
-  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
-    $dir.IO.resolve.basename
-  }/canonical-data.json".IO.resolve) ~~ :f ??
-    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
-    flunk 'problem-specifications file not found';
-}
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }

data/tracks/perl6/exercises/atbash-cipher/example.yaml

@@ -1,7 +1,6 @@
 exercise: AtbashCipher
-version: 1
-plan: 14
-imports: '&encode &decode'
+version: 2
+plan: 12
 tests: |-
   is .<input><phrase>.&::(.<property>), |.<expected description> for $c-data<cases>»<cases>».Array.flat;
 

data/tracks/perl6/exercises/binary/binary.t

@@ -1,12 +1,10 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib IO::Path.new($?FILE).parent.path;
+use lib $?FILE.IO.dirname;
+use Binary;
 
-plan 10;
-my $module = %*ENV<EXERCISM> ?? 'Example' !! 'Binary';
-use-ok $module;
-require ::($module) <Binary>;
+plan 9;
 
 ok Binary.can('to_decimal'), 'Class Binary has to_decimal method';
 

data/tracks/perl6/exercises/bob/Bob.pm6

@@ -2,7 +2,7 @@
   Declare class 'Bob' with version and unit-scope the class
   i.e. everything in this file is part of 'Bob'.
 ]
-unit class Bob:ver<2>;
+unit class Bob:ver<3>;
 
 method hey ($msg) {
   #`[

data/tracks/perl6/exercises/bob/Example.pm6

@@ -2,7 +2,7 @@
   Declare class 'Bob' with version and unit-scope the class
   i.e. everything in this file is part of 'Bob'.
 ]
-unit class Bob:ver<2>;
+unit class Bob:ver<3>;
 
 method hey ( Str:D $_ --> Str:D ) {
   my \shouting = /<:L>/ ^ /<:Ll>/;

data/tracks/perl6/exercises/bob/bob.t

@@ -1,36 +1,30 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname; #`[Look for the module inside the same directory as this test file.]
 use JSON::Fast;
+use lib $?FILE.IO.dirname; #`[Look for the module inside the same directory as this test file.]
+use Bob;
+plan 26; #`[This is how many tests we expect to run.]
 
-my Str:D $exercise := 'Bob'; #`[The name of this exercise.]
-my Version:D $version = v2; #`[The version we will be matching against the exercise.]
-my Str $module //= $exercise; #`[The name of the module file to be loaded.]
-plan 28; #`[This is how many tests we expect to run.]
-
-#`[Check that the module can be use-d.]
-use-ok $module or bail-out;
-require ::($module);
+my Version:D $version = v3; #`[The version we will be matching against the exercise.]
 
 #`[If the exercise is updated, we want to make sure other people testing
 your code don't think you've made a mistake if things have changed!]
-if ::($exercise).^ver !~~ $version {
+if Bob.^ver !~~ $version {
   warn "\nExercise version mismatch. Further tests may fail!"
-    ~ "\n$exercise is $(::($exercise).^ver.gist). "
-    ~ "Test is $($version.gist).\n";
-  bail-out 'Example version must match test version.' if %*ENV<EXERCISM>;
+    ~ "\nBob is {Bob.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
 #`[Check that the class 'Bob' can use all of the methods
 needed in the tests (only 'hey' for this one).]
 subtest 'Class methods', {
-  ok ::($exercise).can($_), $_ for <hey>;
+  ok Bob.can($_), $_ for <hey>;
 }
 
 my $c-data = from-json $=pod.pop.contents;
 # Go through the cases and check that Bob gives us the correct responses.
-is ::($exercise).?hey(.<input><heyBob>), |.<expected description> for @($c-data<cases>);
+is Bob.?hey(.<input><heyBob>), |.<expected description> for @($c-data<cases>);
 
 =head2 Canonical Data
 =begin code
@@ -243,20 +237,3 @@ is ::($exercise).?hey(.<input><heyBob>), |.<expected description> for @($c-data<
 }
 
 =end code
-
-#`[Don't worry about the stuff below here for your exercise.
-This is for Exercism folks to check that everything is in order.]
-unless %*ENV<EXERCISM> {
-  skip-rest 'exercism tests';
-  exit;
-}
-
-subtest 'canonical-data' => {
-  (my $c-data-file = "$dir/../../problem-specifications/exercises/{
-    $dir.IO.resolve.basename
-  }/canonical-data.json".IO.resolve) ~~ :f ??
-    is-deeply $c-data, EVAL('from-json $c-data-file.slurp'), 'match problem-specifications' !!
-    flunk 'problem-specifications file not found';
-}
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }