trackler 2.2.1.95 → 2.2.1.96

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

@@ -1,20 +1,16 @@
 exercise: Bob
-version: 2
-plan: 28
+version: 3
+plan: 26
 methods: hey
 tests: |-
   # 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>);
 
-exercise_comment: The name of this exercise.
-module_comment: The name of the module file to be loaded.
 version_comment: The version we will be matching against the exercise.
 lib_comment: Look for the module inside the same directory as this test file.
 plan_comment: This is how many tests we expect to run.
-use_test_comment: Check that the module can be use-d.
 version_test_comment: "If the exercise is updated, we want to make sure other people testing\nyour code don't think you've made a mistake if things have changed!"
 methods_comment: "Check that the class 'Bob' can use all of the methods\nneeded in the tests (only 'hey' for this one)."
-exercism_comment: "Don't worry about the stuff below here for your exercise.\nThis is for Exercism folks to check that everything is in order."
 
 unit: class
 unit_comment: |-

data/tracks/perl6/exercises/clock/Clock.pm6

@@ -1,4 +1,4 @@
-unit class Clock:ver<1>;
+unit class Clock:ver<2>;
 
 has $.hour;
 has $.minute;

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

@@ -1,4 +1,4 @@
-unit class Clock:ver<1>;
+unit class Clock:ver<2>;
 
 has Int:D $.hour = 0;
 has Int:D $.minute = 0;

data/tracks/perl6/exercises/clock/clock.t

@@ -1,44 +1,39 @@
 #!/usr/bin/env perl6
 use v6;
 use Test;
-use lib my $dir = $?FILE.IO.dirname;
 use JSON::Fast;
+use lib $?FILE.IO.dirname;
+use Clock;
+plan 52;
 
-my Str:D $exercise := 'Clock';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 54;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if Clock.^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>;
+    ~ "\nClock is {Clock.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
 subtest 'Class methods', {
-  ok ::($exercise).can($_), $_ for <time add-minutes>;
+  ok Clock.can($_), $_ for <time add-minutes>;
 }
 
 my $c-data = from-json $=pod.pop.contents;
 for $c-data<cases>»<cases>».Array.flat -> %case {
   given %case<property> {
     when 'create' {
-      is ::($exercise).?new( |%(.<hour minute>:p) ).?time, |.<expected description> given %case;
+      is Clock.?new( |%(.<hour minute>:p) ).?time, |.<expected description> given %case;
     }
     when 'add' {
       given %case {
-        my $clock = ::($exercise).?new: |%(.<hour minute>:p);
+        my $clock = Clock.?new: |%(.<hour minute>:p);
         $clock.?add-minutes: .<add>;
         is $clock.?time, |.<expected description>;
       }
     }
     when 'equal' {
       is-deeply ([eq] gather {
-        take ::($exercise).?new( |%(.<hour minute>:p) ).?time for %case<clock1 clock2>;
+        take Clock.?new( |%(.<hour minute>:p) ).?time for %case<clock1 clock2>;
       }), |%case<expected description>;
     }
     when %*ENV<EXERCISM>.so { bail-out "no case for property '%case<property>'" }
@@ -46,7 +41,7 @@ for $c-data<cases>»<cases>».Array.flat -> %case {
 }
 
 todo 'optional test' unless %*ENV<EXERCISM>;
-is ::($exercise).?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
+is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
 
 =head2 Canonical Data
 =begin code
@@ -542,18 +537,3 @@ is ::($exercise).?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-min
 }
 
 =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/clock/example.yaml

@@ -1,23 +1,23 @@
 exercise: Clock
-version: 1
+version: 2
 methods: time add-minutes
-plan: 54
+plan: 52
 tests: |-
   for $c-data<cases>»<cases>».Array.flat -> %case {
     given %case<property> {
       when 'create' {
-        is ::($exercise).?new( |%(.<hour minute>:p) ).?time, |.<expected description> given %case;
+        is Clock.?new( |%(.<hour minute>:p) ).?time, |.<expected description> given %case;
       }
       when 'add' {
         given %case {
-          my $clock = ::($exercise).?new: |%(.<hour minute>:p);
+          my $clock = Clock.?new: |%(.<hour minute>:p);
           $clock.?add-minutes: .<add>;
           is $clock.?time, |.<expected description>;
         }
       }
       when 'equal' {
         is-deeply ([eq] gather {
-          take ::($exercise).?new( |%(.<hour minute>:p) ).?time for %case<clock1 clock2>;
+          take Clock.?new( |%(.<hour minute>:p) ).?time for %case<clock1 clock2>;
         }), |%case<expected description>;
       }
       when %*ENV<EXERCISM>.so { bail-out "no case for property '%case<property>'" }
@@ -25,7 +25,7 @@ tests: |-
   }
 
   todo 'optional test' unless %*ENV<EXERCISM>;
-  is ::($exercise).?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
+  is Clock.?new(:0hour,:0minute).?add-minutes(65).?time, '01:05', 'add-minutes method can be chained';
 
 unit: class
 example: |-

data/tracks/perl6/exercises/etl/ETL.pm6

@@ -1,4 +1,4 @@
-unit module ETL:ver<1>;
+unit module ETL:ver<2>;
 
 no precompilation;
 

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

@@ -1,4 +1,4 @@
-unit module ETL:ver<1>;
+unit module ETL:ver<2>;
 
 no precompilation;
 

data/tracks/perl6/exercises/etl/etl.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 ETL;
+plan 4;
 
-my Str:D $exercise := 'ETL';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 6;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if ETL.^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>;
+    ~ "\nETL is {ETL.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&transform>;
-
 my $c-data = from-json $=pod.pop.contents;
 =head2 Notes
 =begin para
@@ -122,18 +115,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/etl/example.yaml

@@ -1,7 +1,6 @@
 exercise: ETL
-version: 1
-plan: 6
-imports: '&transform'
+version: 2
+plan: 4
 tests: |-
   =head2 Notes
   =begin para

data/tracks/perl6/exercises/flatten-array/Example.pm6

@@ -1,4 +1,4 @@
-unit module FlattenArray:ver<1>;
+unit module FlattenArray:ver<2>;
 
 sub flatten-array(@input --> Array) is export {
   @input.&denest;

data/tracks/perl6/exercises/flatten-array/FlattenArray.pm6

@@ -1,4 +1,4 @@
-unit module FlattenArray:ver<1>;
+unit module FlattenArray:ver<2>;
 
 sub flatten-array(@input) is export {
 }

data/tracks/perl6/exercises/flatten-array/example.yaml

@@ -1,7 +1,6 @@
 exercise: FlattenArray
-version: 1
-plan: 8
-imports: '&flatten-array'
+version: 2
+plan: 6
 tests: |-
   is-deeply flatten-array(.<input><array>), |.<expected description> for @($c-data<cases>);
 

data/tracks/perl6/exercises/flatten-array/flatten-array.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 FlattenArray;
+plan 6;
 
-my Str:D $exercise := 'FlattenArray';
-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 FlattenArray.^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>;
+    ~ "\nFlattenArray is {FlattenArray.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&flatten-array>;
-
 my $c-data = from-json $=pod.pop.contents;
 is-deeply flatten-array(.<input><array>), |.<expected description> for @($c-data<cases>);
 
@@ -83,18 +76,3 @@ is-deeply flatten-array(.<input><array>), |.<expected description> for @($c-data
 }
 
 =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/grade-school/Example.pm6

@@ -1,4 +1,4 @@
-unit module GradeSchool:ver<2>;
+unit module GradeSchool:ver<3>;
 
 class Roster is export {
   has %!roster;

data/tracks/perl6/exercises/grade-school/GradeSchool.pm6

@@ -1,4 +1,4 @@
-unit module GradeSchool:ver<2>;
+unit module GradeSchool:ver<3>;
 
 class Roster is export {
 }

data/tracks/perl6/exercises/grade-school/example.yaml

@@ -1,7 +1,6 @@
 exercise: GradeSchool
-version: 2
-plan: 19
-imports: Roster
+version: 3
+plan: 18
 tests: |-
   subtest "Roster class methods", {
     plan 3;

data/tracks/perl6/exercises/grade-school/grade-school.t

@@ -2,24 +2,17 @@
 use v6;
 use Test;
 use lib $?FILE.IO.dirname;
+use GradeSchool;
+plan 18;
 
-my Str:D $exercise := 'GradeSchool';
-my Version:D $version = v2;
-my Str $module //= $exercise;
-plan 19;
+my Version:D $version = v3;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if GradeSchool.^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>;
+    ~ "\nGradeSchool is {GradeSchool.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <Roster>;
-
 subtest "Roster class methods", {
   plan 3;
   ok ::('Roster').can($_), $_ for <add-student list-grade list-all>;
@@ -45,5 +38,3 @@ cmp-ok $roster.?list-grade(1), '~~', <Anna Barb Charlie>, 'List grade 1';
 cmp-ok $roster.?list-grade(2), '~~', <Alex Jim Zoe>, 'List grade 2';
 cmp-ok $roster.?list-grade(3), '~~', <Dick Harry Tom>, 'List grade 3';
 cmp-ok $roster.?list-all, '~~', ('Grade 1', <Anna Barb Charlie>, 'Grade 2', <Alex Jim Zoe>, 'Grade 3', <Dick Harry Tom>), 'List all';
-
-INIT { $module = 'Example' if %*ENV<EXERCISM> }

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

@@ -1,4 +1,4 @@
-unit module Grains:ver<1>;
+unit module Grains:ver<2>;
 
 sub grains-on-square ($number) is export {
   die if $number < 1 or $number > 64;

data/tracks/perl6/exercises/grains/Grains.pm6

@@ -1 +1 @@
-unit module Grains:ver<1>;
+unit module Grains:ver<2>;

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

@@ -1,7 +1,6 @@
 exercise: Grains
-version: 1
-plan: 13
-imports: '&grains-on-square &total-grains'
+version: 2
+plan: 11
 tests: |-
   for @($c-data<cases>[0]<cases>) {
     if .<expected> == -1 {

data/tracks/perl6/exercises/grains/grains.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 Grains;
+plan 11;
 
-my Str:D $exercise := 'Grains';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 13;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if Grains.^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>;
+    ~ "\nGrains is {Grains.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&grains-on-square &total-grains>;
-
 my $c-data = from-json $=pod.pop.contents;
 for @($c-data<cases>[0]<cases>) {
   if .<expected> == -1 {
@@ -117,18 +110,3 @@ is total-grains, |$c-data<cases>[1]<expected description>;
 }
 
 =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> }