trackler 2.2.1.95 → 2.2.1.96

data/tracks/perl6/exercises/roman-numerals/Example.pm6

@@ -1,4 +1,4 @@
-unit module RomanNumerals:ver<1>;
+unit module RomanNumerals:ver<2>;
 
 
 my %table{Int} = <1000 900 500 400 100 90 50 40 10 9 5 4 1>

data/tracks/perl6/exercises/roman-numerals/RomanNumerals.pm6

@@ -1,4 +1,4 @@
-unit module RomanNumerals:ver<1>;
+unit module RomanNumerals:ver<2>;
 
 sub to-roman ($number) is export {
 }

data/tracks/perl6/exercises/roman-numerals/example.yaml

@@ -1,7 +1,6 @@
 exercise: RomanNumerals
-version: 1
-plan: 20
-imports: '&to-roman'
+version: 2
+plan: 18
 tests: |-
   for $c-data<cases>.values {
     is to-roman(.<number>), |.<expected description>;

data/tracks/perl6/exercises/roman-numerals/roman-numerals.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 RomanNumerals;
+plan 18;
 
-my Str:D $exercise := 'RomanNumerals';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 20;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if RomanNumerals.^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>;
+    ~ "\nRomanNumerals is {RomanNumerals.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&to-roman>;
-
 my $c-data = from-json $=pod.pop.contents;
 for $c-data<cases>.values {
   is to-roman(.<number>), |.<expected description>;
@@ -145,18 +138,3 @@ for $c-data<cases>.values {
 }
 
 =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/scrabble-score/Example.pm6

@@ -1,4 +1,4 @@
-unit module Scrabble:ver<1>;
+unit module Scrabble:ver<2>;
 
 sub score (Str:D $word --> Int:D) is export {
   my $score = 0;

data/tracks/perl6/exercises/scrabble-score/Scrabble.pm6

@@ -1,4 +1,4 @@
-unit module Scrabble:ver<1>;
+unit module Scrabble:ver<2>;
 
 sub score ($word) is export {
 }

data/tracks/perl6/exercises/scrabble-score/example.yaml

@@ -1,7 +1,6 @@
 exercise: Scrabble
-version: 1
-plan: 13
-imports: '&score'
+version: 2
+plan: 11
 tests: |-
   is .<input>.&score, |.<expected description> for @($c-data<cases>);
 

data/tracks/perl6/exercises/scrabble-score/scrabble-score.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 Scrabble;
+plan 11;
 
-my Str:D $exercise := 'Scrabble';
-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 Scrabble.^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>;
+    ~ "\nScrabble is {Scrabble.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&score>;
-
 my $c-data = from-json $=pod.pop.contents;
 is .<input>.&score, |.<expected description> for @($c-data<cases>);
 
@@ -101,18 +94,3 @@ is .<input>.&score, |.<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/space-age/Example.pm6

@@ -1,4 +1,4 @@
-unit module SpaceAge:ver<1>;
+unit module SpaceAge:ver<2>;
 
 role Planet {
   method age-on ($seconds) {

data/tracks/perl6/exercises/space-age/SpaceAge.pm6

@@ -1,4 +1,4 @@
-unit module SpaceAge:ver<1>;
+unit module SpaceAge:ver<2>;
 
 role Planet {
   method age-on ($seconds) {

data/tracks/perl6/exercises/space-age/example.yaml

@@ -1,7 +1,6 @@
 exercise: SpaceAge
-version: 1
-plan: 10
-imports: Mercury Venus Earth Mars Jupiter Saturn Uranus Neptune
+version: 2
+plan: 8
 tests: |-
   is (age-on ::(.<planet>): .<seconds>), |.<expected description> for @($c-data<cases>);
 

data/tracks/perl6/exercises/space-age/space-age.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 SpaceAge;
+plan 8;
 
-my Str:D $exercise := 'SpaceAge';
-my Version:D $version = v1;
-my Str $module //= $exercise;
-plan 10;
+my Version:D $version = v2;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if SpaceAge.^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>;
+    ~ "\nSpaceAge is {SpaceAge.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <Mercury Venus Earth Mars Jupiter Saturn Uranus Neptune>;
-
 my $c-data = from-json $=pod.pop.contents;
 is (age-on ::(.<planet>): .<seconds>), |.<expected description> for @($c-data<cases>);
 
@@ -91,18 +84,3 @@ is (age-on ::(.<planet>): .<seconds>), |.<expected description> for @($c-data<ca
 }
 
 =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/trinary/trinary.t

@@ -1,11 +1,8 @@
 #!/usr/bin/env perl6
 
 use Test;
-
-use lib ( my $dir = IO::Path.new($?FILE).parent ).path;
-
-my $module = %*ENV<EXERCISM> ?? 'Example' !! 'Trinary';
-require ::($module) <&to-decimal>;
+use lib $?FILE.IO.dirname;
+use Trinary;
 
 my @cases = (
     {

data/tracks/perl6/exercises/two-fer/Example.pm6

@@ -7,7 +7,7 @@
   and test suite line up. If the test is updated, it will indicate
   to others who test your code that some tests may no longer pass.
 )
-unit module TwoFer:ver<1>;
+unit module TwoFer:ver<2>;
 
 sub two-fer ($name = ‘you’) is export {
   “One for $name, one for me.”

data/tracks/perl6/exercises/two-fer/TwoFer.pm6

@@ -7,7 +7,7 @@
   and test suite line up. If the test is updated, it will indicate
   to others who test your code that some tests may no longer pass.
 )
-unit module TwoFer:ver<1>;
+unit module TwoFer:ver<2>;
 
 sub two-fer ($name?) is export {
   # Write your solution to pass the test suite here.

data/tracks/perl6/exercises/two-fer/example.yaml

@@ -1,7 +1,6 @@
 exercise: TwoFer
-version: 1
-plan: 5
-imports: '&two-fer'
+version: 2
+plan: 3
 tests: |-
   # Go through the cases and check that &two-fer gives us the correct response.
   for $c-data<cases>.values {
@@ -11,15 +10,10 @@ tests: |-
       |.<expected description>;
   }
 
-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!"
-imports_comment: Import '&two-fer' from 'TwoFer'
-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: module
 unit_comment: |-

data/tracks/perl6/exercises/two-fer/two-fer.t

@@ -1,30 +1,21 @@
 #!/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 TwoFer;
+plan 3; #`[This is how many tests we expect to run.]
 
-my Str:D $exercise := 'TwoFer'; #`[The name of this exercise.]
-my Version:D $version = v1; #`[The version we will be matching against the exercise.]
-my Str $module //= $exercise; #`[The name of the module file to be loaded.]
-plan 5; #`[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 = v2; #`[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 TwoFer.^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>;
+    ~ "\nTwoFer is {TwoFer.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-#`[Import '&two-fer' from 'TwoFer']
-require ::($module) <&two-fer>;
-
 my $c-data = from-json $=pod.pop.contents;
 # Go through the cases and check that &two-fer gives us the correct response.
 for $c-data<cases>.values {
@@ -63,20 +54,3 @@ for $c-data<cases>.values {
 }
 
 =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> }

data/tracks/perl6/exercises/word-count/Example.pm6

@@ -1,4 +1,4 @@
-unit module WordCount:ver<2>;
+unit module WordCount:ver<3>;
 
 sub count-words (Str:D $str --> Hash:D) is export {
   $str.lc.comb(/ <alnum>+ (\'<alnum>+)? /).Bag.hash

data/tracks/perl6/exercises/word-count/WordCount.pm6

@@ -1,4 +1,4 @@
-unit module WordCount:ver<2>;
+unit module WordCount:ver<3>;
 
 sub count-words ($str) is export {
 }

data/tracks/perl6/exercises/word-count/example.yaml

@@ -1,7 +1,6 @@
 exercise: WordCount
-version: 2
-plan: 13
-imports: '&count-words'
+version: 3
+plan: 11
 tests: |-
   is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<cases>);
 

data/tracks/perl6/exercises/word-count/word-count.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 WordCount;
+plan 11;
 
-my Str:D $exercise := 'WordCount';
-my Version:D $version = v2;
-my Str $module //= $exercise;
-plan 13;
+my Version:D $version = v3;
 
-use-ok $module or bail-out;
-require ::($module);
-
-if ::($exercise).^ver !~~ $version {
+if WordCount.^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>;
+    ~ "\nWordCount is {WordCount.^ver.gist}. "
+    ~ "Test is {$version.gist}.\n";
 }
 
-require ::($module) <&count-words>;
-
 my $c-data = from-json $=pod.pop.contents;
 is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<cases>);
 
@@ -154,18 +147,3 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
 }
 
 =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/wordy/Example.pm6

@@ -1,4 +1,4 @@
-unit module Wordy:ver<1>;
+unit module Wordy:ver<2>;
 
 sub answer ($q is copy) is export { 
   given $q {

data/tracks/perl6/exercises/wordy/Wordy.pm6

@@ -1,4 +1,4 @@
-unit module Wordy:ver<1>;
+unit module Wordy:ver<2>;
 
 sub answer ($question) is export { 
 }

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

@@ -1,7 +1,6 @@
 exercise: Wordy
-version: 1
-plan: 18
-imports: '&answer'
+version: 2
+plan: 16
 tests: |-
   for @($c-data<cases>) {
     if .<expected> === False {