trackler 2.2.1.105 → 2.2.1.106

data/tracks/perl5/exercises/house/house.t

@@ -8,7 +8,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'House';
+my $module = 'House';
 
 plan tests => 5;
 

data/tracks/perl5/exercises/kindergarten-garden/{Example.pm → .meta/solutions/Kindergarten.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Kindergarten;
 
 my @default_students = qw(
    alice bob charlie david

data/tracks/perl5/exercises/kindergarten-garden/.meta/solutions/kindergarten.t

@@ -0,0 +1 @@
+../../kindergarten.t

data/tracks/perl5/exercises/kindergarten-garden/kindergarten.t

@@ -171,7 +171,7 @@ my @cases = (
     },
 );
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Kindergarten';
+my $module = 'Kindergarten';
 
 plan tests => 3 + @cases;
 

data/tracks/perl5/exercises/largest-series-product/{Example.pm → .meta/solutions/Series.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Series;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/largest-series-product/.meta/solutions/series_product.t

@@ -0,0 +1 @@
+../../series_product.t

data/tracks/perl5/exercises/largest-series-product/series_product.t

@@ -9,7 +9,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Series';
+my $module = 'Series';
 
 plan tests => 14;
 

data/tracks/perl5/exercises/leap/{example.yaml → .meta/exercise-data.yaml}

@@ -6,7 +6,6 @@ tests: |-
   is $subs{is_leap}->($_->{input}), $_->{expected}, $_->{description} foreach @{$C_DATA->{cases}};
 
 exercise_comment: '# The name of this exercise.'
-module_comment: "# $ENV{EXERCISM} is for tests not directly for the exercise, don't worry about these :)"
 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.'

data/tracks/perl5/exercises/leap/.meta/solutions/leap.t

@@ -0,0 +1 @@
+../../leap.t

data/tracks/perl5/exercises/leap/leap.t

@@ -8,10 +8,9 @@ use JSON::PP;
 
 my $exercise = 'Leap'; # The name of this exercise.
 my $test_version = 2; # The version we will be matching against the exercise.
-my $module = $ENV{EXERCISM} ? 'Example' : $exercise; # $ENV{EXERCISM} is for tests not directly for the exercise, don't worry about these :)
 use Test::More tests => 7; # This is how many tests we expect to run.
 
-use_ok $module or BAIL_OUT; # Check that the module can be use-d.
+use_ok $exercise or BAIL_OUT; # Check that the module can be use-d.
 
 # 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!

data/tracks/perl5/exercises/linked-list/{Example.pm → .meta/solutions/Deque.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Deque;
 use strict;
 use warnings;
 

data/tracks/perl5/exercises/linked-list/.meta/solutions/deque.t

@@ -0,0 +1 @@
+../../deque.t

data/tracks/perl5/exercises/linked-list/deque.t

@@ -3,21 +3,18 @@ use strict;
 use warnings;
 
 use Test::More;
-use JSON qw(from_json);
+use JSON::PP qw(decode_json);
 use FindBin;
 my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Deque';
+my $module = 'Deque';
 
-my $cases_file = "${dir}cases.json";
 my $cases;
-if (open my $fh, '<', $cases_file) {
+{
     local $/ = undef;
-    $cases = from_json scalar <$fh>;
-} else {
-    die "Could not open '$cases_file' $!";
+    $cases = decode_json scalar <DATA>;
 }
 
 #plan tests => 3 + @$cases;
@@ -51,3 +48,59 @@ foreach my $c (@$cases) {
 
 
 done_testing();
+
+__DATA__
+[
+  {
+    "set" : [
+      { "push" : 10 },
+      { "push" : 20 },
+      { "pop"  : 20 },
+      { "pop"  : 10 }
+    ],
+    "name" : "push_pop"
+  },
+  {
+    "set" : [
+      { "push" : 10  },
+      { "push" : 20  },
+      { "shift" : 10 },
+      { "shift" : 20 }
+    ],
+    "name" : "push_shift"
+  },
+  {
+    "set" : [
+      { "unshift" : 10 },
+      { "unshift" : 20 },
+      { "shift"   : 20 },
+      { "shift"   : 10 }
+    ],
+    "name" : "unshift_shift"
+  },
+  {
+    "set" : [
+      { "unshift" : 10 },
+      { "unshift" : 20 },
+      { "pop"     : 10 },
+      { "pop"     : 20 }
+    ],
+    "name" : "unshift_pop"
+  },
+  {
+    "set" : [
+      { "push"    : 10 },
+      { "push"    : 20 },
+      { "pop"     : 20 },
+      { "push"    : 30 },
+      { "shift"   : 10 },
+      { "unshift" : 40 },
+      { "push"    : 50 },
+      { "shift"   : 40 },
+      { "pop"     : 50 },
+      { "shift"   : 30 }
+    ],
+    "name" : "example"
+  }
+]
+

data/tracks/perl5/exercises/list-ops/{Example.pm → .meta/solutions/ListOps.pm}

@@ -1,4 +1,4 @@
-package Example;
+package ListOps;
 
 use strict;
 use warnings; 

data/tracks/perl5/exercises/list-ops/.meta/solutions/list-ops.t

@@ -0,0 +1 @@
+../../list-ops.t

data/tracks/perl5/exercises/list-ops/list-ops.t

@@ -8,7 +8,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'ListOps';
+my $module = 'ListOps';
 
 my %test_cases = (
    map => {

data/tracks/perl5/exercises/luhn/.meta/solutions/luhn.t

@@ -0,0 +1 @@
+../../luhn.t

data/tracks/perl5/exercises/luhn/luhn.t

@@ -8,10 +8,9 @@ use JSON::PP;
 
 my $exercise = 'Luhn';
 my $test_version = 2;
-my $module = $ENV{EXERCISM} ? 'Example' : $exercise;
 use Test::More tests => 16;
 
-use_ok $module or BAIL_OUT;
+use_ok $exercise or BAIL_OUT;
 
 my $exercise_version = $exercise->VERSION // 0;
 if ($exercise_version != $test_version) {

data/tracks/perl5/exercises/matrix/{Example.pm → .meta/solutions/Matrix.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Matrix;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/matrix/.meta/solutions/matrix.t

@@ -0,0 +1 @@
+../../matrix.t

data/tracks/perl5/exercises/matrix/matrix.t

@@ -8,7 +8,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Matrix';
+my $module = 'Matrix';
 
 plan tests => 11;
 

data/tracks/perl5/exercises/meetup/{Example.pm → .meta/solutions/Meetup.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Meetup;
 use strict;
 use warnings;
 use DateTime;

data/tracks/perl5/exercises/meetup/.meta/solutions/meetup.t

@@ -0,0 +1 @@
+../../meetup.t

data/tracks/perl5/exercises/meetup/meetup.t

@@ -9,7 +9,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Meetup';
+my $module = 'Meetup';
 
 plan tests => 95;
 

data/tracks/perl5/exercises/minesweeper/{Example.pm → .meta/solutions/Minesweeper.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Minesweeper;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/minesweeper/.meta/solutions/minesweeper.t

@@ -0,0 +1 @@
+../../minesweeper.t

data/tracks/perl5/exercises/minesweeper/minesweeper.t

@@ -9,7 +9,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Minesweeper';
+my $module = 'Minesweeper';
 my $name = 'count_adjacent_bombs';
 my $sub = join('::', $module, $name);
 

data/tracks/perl5/exercises/nucleotide-count/{Example.pm → .meta/solutions/NucleotideCount.pm}

@@ -1,4 +1,4 @@
-package Example;
+package NucleotideCount;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/nucleotide-count/.meta/solutions/nucleotide_count.t

@@ -0,0 +1 @@
+../../nucleotide_count.t

data/tracks/perl5/exercises/nucleotide-count/nucleotide_count.t

@@ -8,7 +8,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'NucleotideCount';
+my $module = 'NucleotideCount';
 
 use_ok($module) or BAIL_OUT "You need to create a module called $module.pm";
 

data/tracks/perl5/exercises/ocr-numbers/{Example.pm → .meta/solutions/OCR.pm}

@@ -1,4 +1,4 @@
-package Example;
+package OCR;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/ocr-numbers/.meta/solutions/ocr.t

@@ -0,0 +1 @@
+../../ocr.t

data/tracks/perl5/exercises/ocr-numbers/ocr.t

@@ -8,7 +8,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'OCR';
+my $module = 'OCR';
 
 ok -e "${dir}${module}.pm", "Missing $module.pm" or BAIL_OUT "You need to create file: $module.pm";
 

data/tracks/perl5/exercises/palindrome-products/{Example.pm → .meta/solutions/Palindrome.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Palindrome;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/palindrome-products/.meta/solutions/palindrome.t

@@ -0,0 +1 @@
+../../palindrome.t

data/tracks/perl5/exercises/palindrome-products/palindrome.t

@@ -8,7 +8,7 @@ my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Palindrome';
+my $module = 'Palindrome';
 
 plan tests => 15;
 

data/tracks/perl5/exercises/pascals-triangle/{Example.pm → .meta/solutions/Triangle.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Triangle;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/pascals-triangle/.meta/solutions/triangle.t

@@ -0,0 +1 @@
+../../triangle.t

data/tracks/perl5/exercises/pascals-triangle/triangle.t

@@ -3,21 +3,18 @@ use strict;
 use warnings;
 
 use Test::More;
-use JSON qw(from_json);
+use JSON::PP qw(decode_json);
 use FindBin;
 my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'Triangle';
+my $module = 'Triangle';
 
-my $cases_file = "${dir}cases.json";
 my $cases;
-if (open my $fh, '<', $cases_file) {
+{
     local $/ = undef;
-    $cases = from_json scalar <$fh>;
-} else {
-    die "Could not open '$cases_file' $!";
+    $cases = decode_json scalar <DATA>;
 }
 
 plan tests => 5 + @$cases;
@@ -42,3 +39,50 @@ foreach my $c (@$cases) {
         is $sub->($c->{param}), $c->{expected}, $c->{name};
     }
 }
+
+__DATA__
+[
+    {
+        "sub"      : "triangle",
+        "param"    : 4,
+        "expected" : ["1", "1 1", "1 2 1", "1 3 3 1", "1 4 6 4 1"],
+        "name"     : "pascals triangle of 0-4 rows"
+    },
+    {
+        "sub"      : "triangle",
+        "param"    : 6,
+        "expected" : ["1", "1 1", "1 2 1", "1 3 3 1", "1 4 6 4 1", "1 5 10 10 5 1",
+                       "1 6 15 20 15 6 1"],
+        "name"     : "pascals triangle of 0-6 rows"
+    },
+    {
+        "sub"      : "is_triangle",
+        "param"    : ["1", "1 1", "1 2 1", "1 3 3 1", "1 4 6 4 1", "1 5 10 10 5 1"],
+        "expected" : true,
+        "name"     : "test a valid triangle"
+    },
+    {
+        "sub"      : "is_triangle",
+        "param"    : ["1", "1 1", "1 2 1", "1 4 4 1"],
+        "expected" : false,
+        "name"     : "test a NOT valid triangle"
+    },
+    {
+        "sub"      : "row",
+        "param"    : 0,
+        "expected" : "1",
+        "name"     : "row 0 of pascals triangle"
+    },
+    {
+        "sub"      : "row",
+        "param"    : 2,
+        "expected" : "1 2 1",
+        "name"     : "row 2 of pascals triangle"
+    },
+    {
+        "sub"      : "row",
+        "param"    : 7,
+        "expected" : "1 7 21 35 35 21 7 1",
+        "name"     : "row 7 of pascals triangle"
+    }
+]

data/tracks/perl5/exercises/phone-number/.meta/solutions/phone-number.t

@@ -0,0 +1 @@
+../../phone-number.t

data/tracks/perl5/exercises/phone-number/phone-number.t

@@ -8,10 +8,9 @@ use JSON::PP;
 
 my $exercise = 'PhoneNumber';
 my $test_version = 2;
-my $module = $ENV{EXERCISM} ? 'Example' : $exercise;
 use Test::More tests => 15;
 
-use_ok $module or BAIL_OUT;
+use_ok $exercise or BAIL_OUT;
 
 my $exercise_version = $exercise->VERSION // 0;
 if ($exercise_version != $test_version) {

data/tracks/perl5/exercises/pig-latin/{Example.pm → .meta/solutions/PigLatin.pm}

@@ -1,4 +1,4 @@
-package Example;
+package PigLatin;
 
 use v5.10.1;
 use strict;

data/tracks/perl5/exercises/pig-latin/.meta/solutions/piglatin.t

@@ -0,0 +1 @@
+../../piglatin.t

data/tracks/perl5/exercises/pig-latin/piglatin.t

@@ -67,7 +67,7 @@ my @cases = (
     }
 );
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'PigLatin';
+my $module = 'PigLatin';
 
 plan tests => 3 + @cases;
 

data/tracks/perl5/exercises/point-mutations/{Example.pm → .meta/solutions/DNA.pm}

@@ -1,4 +1,4 @@
-package Example;
+package DNA;
 
 use strict;
 use warnings;

data/tracks/perl5/exercises/point-mutations/.meta/solutions/dna.t

@@ -0,0 +1 @@
+../../dna.t

data/tracks/perl5/exercises/point-mutations/dna.t

@@ -3,21 +3,18 @@ use strict;
 use warnings;
 
 use Test::More;
-use JSON qw(from_json);
+use JSON::PP qw(decode_json);
 use FindBin;
 my $dir;
 BEGIN { $dir = $FindBin::Bin . '/' };
 use lib $dir;
 
-my $module = $ENV{EXERCISM} ? 'Example' : 'DNA'; 
+my $module = 'DNA'; 
 
-my $cases_file = "${dir}cases.json";
 my $cases;
-if (open my $fh, '<', $cases_file) {
+{
     local $/ = undef;
-    $cases = from_json scalar <$fh>;
-} else {
-    die "Could not open '$cases_file' $!";
+    $cases = decode_json scalar <DATA>;
 }
 
 plan tests => 4 + @$cases;
@@ -39,3 +36,74 @@ foreach my $c (@$cases) {
       $c->{expected},
       $c->{name};
 }
+
+__DATA__
+[
+    {
+        "strand"   : "",
+        "input"    : "",
+        "expected" : 0,
+        "name"     : "empty strands"
+    },
+    {
+        "strand"   : "GGACGTA",
+        "input"    : "GGACGTA",
+        "expected" : 0,
+        "name"     : "identical strands"
+    },
+    {
+        "strand"   : "ACT",
+        "input"    : "GGA",
+        "expected" : 3,
+        "name"     : "small strands"
+    },
+    {
+        "strand"   : "GGACGGATTCTGACCTGGACTAATTTTGGGG",
+        "input"    : "AGGACGGATTCTGACCTGGACTAATTTTGGGG",
+        "expected" : 19,
+        "name"     : "input strand is longer by one"
+    },
+    {
+        "strand"   : "GGACG",
+        "input"    : "GGTCG",
+        "expected" : 1,
+        "name"     : "distance in the middle"
+    },
+    {
+        "strand"   : "ACCAGGG",
+        "input"    : "ACTATGG",
+        "expected" : 2,
+        "name"     : "longer strands of same length"
+
+    },
+    {
+        "strand"   : "AAACTAGGGG",
+        "input"    : "AGGCTAGCGGTAGGAC",
+        "expected" : 3,
+        "name"     : "input strand is longer"
+    },
+    {
+        "strand"   : "GACTACGGACAGGGTAGGGAAT",
+        "input"    : "GACATCGCACACC",
+        "expected" : 5,
+        "name"     : "original strand is longer"
+    },
+    {
+        "strand"   : "AGACAACAGCCAGCCGCCGGATT",
+        "input"    : "AGGCAA",
+        "expected" : 1,
+        "name"     : "does not shorten original strand test 1"
+    },
+    {
+        "strand"   : "AGACAACAGCCAGCCGCCGGATT",
+        "input"    : "AGACATCTTTCAGCCGCCGGATTAGGCAA",
+        "expected" : 4,
+        "name"     : "does not shorten original strand test 2"
+    },
+    {
+        "strand"   : "AGACAACAGCCAGCCGCCGGATT",
+        "input"    : "AGG",
+        "expected" : 1,
+        "name"     : "does not shorten original strand test 3"
+    }
+]

data/tracks/perl5/exercises/prime-factors/{Example.pm → .meta/solutions/Prime.pm}

@@ -1,4 +1,4 @@
-package Example;
+package Prime;
 use strict;
 use warnings;
 

data/tracks/perl5/exercises/prime-factors/.meta/solutions/prime.t

@@ -0,0 +1 @@
+../../prime.t