trackler 2.2.1.100 → 2.2.1.101

data/tracks/perl6/exercises/two-fer/.meta/exercise-data.yaml

@@ -4,8 +4,8 @@ plan: 3
 tests: |-
   # Go through the cases and check that &two-fer gives us the correct response.
   for $c-data<cases>.values {
-    is .<input> ??
-      two-fer(.<input>) !!
+    is .<input><name> ??
+      two-fer(.<input><name>) !!
       two-fer,
       |.<expected description>;
   }

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

@@ -19,38 +19,42 @@ if TwoFer.^ver !~~ $version {
 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 {
-  is .<input> ??
-    two-fer(.<input>) !!
+  is .<input><name> ??
+    two-fer(.<input><name>) !!
     two-fer,
     |.<expected description>;
 }
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "two-fer",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "cases": [
     {
       "description": "no name given",
-      "property": "name",
-      "input": null,
+      "property": "twoFer",
+      "input": {
+        "name": null
+      },
       "expected": "One for you, one for me."
     },
     {
       "description": "a name given",
-      "property": "name",
-      "input": "Alice",
+      "property": "twoFer",
+      "input": {
+        "name": "Alice"
+      },
       "expected": "One for Alice, one for me."
     },
     {
       "description": "another name given",
-      "property": "name",
-      "input": "Bob",
+      "property": "twoFer",
+      "input": {
+        "name": "Bob"
+      },
       "expected": "One for Bob, one for me."
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/word-count/.meta/exercise-data.yaml

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

data/tracks/perl6/exercises/word-count/word-count.t

@@ -15,14 +15,13 @@ if WordCount.^ver !~~ $version {
 }
 
 my $c-data = from-json $=pod.pop.contents;
-is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<cases>);
+is-deeply (% = .<input><sentence>.&count-words), |.<expected description> for @($c-data<cases>);
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "word-count",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "comments": [
     "For each word in the input, count the number of times it appears in the",
     "entire sentence."
@@ -30,16 +29,20 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
   "cases": [
     {
       "description": "count one word",
-      "property": "countwords",
-      "input": "word",
+      "property": "countWords",
+      "input": {
+        "sentence": "word"
+      },
       "expected": {
         "word": 1
       }
     },
     {
       "description": "count one of each word",
-      "property": "countwords",
-      "input": "one of each",
+      "property": "countWords",
+      "input": {
+        "sentence": "one of each"
+      },
       "expected": {
         "one": 1,
         "of": 1,
@@ -48,8 +51,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "multiple occurrences of a word",
-      "property": "countwords",
-      "input": "one fish two fish red fish blue fish",
+      "property": "countWords",
+      "input": {
+        "sentence": "one fish two fish red fish blue fish"
+      },
       "expected": {
         "one": 1,
         "fish": 4,
@@ -60,8 +65,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "handles cramped lists",
-      "property": "countwords",
-      "input": "one,two,three",
+      "property": "countWords",
+      "input": {
+        "sentence": "one,two,three"
+      },
       "expected": {
         "one": 1,
         "two": 1,
@@ -70,8 +77,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "handles expanded lists",
-      "property": "countwords",
-      "input": "one,\ntwo,\nthree",
+      "property": "countWords",
+      "input": {
+        "sentence": "one,\ntwo,\nthree"
+      },
       "expected": {
         "one": 1,
         "two": 1,
@@ -80,8 +89,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "ignore punctuation",
-      "property": "countwords",
-      "input": "car: carpet as java: javascript!!&@$%^&",
+      "property": "countWords",
+      "input": {
+        "sentence": "car: carpet as java: javascript!!&@$%^&"
+      },
       "expected": {
         "car": 1,
         "carpet": 1,
@@ -92,8 +103,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "include numbers",
-      "property": "countwords",
-      "input": "testing, 1, 2 testing",
+      "property": "countWords",
+      "input": {
+        "sentence": "testing, 1, 2 testing"
+      },
       "expected": {
         "testing": 2,
         "1": 1,
@@ -102,8 +115,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "normalize case",
-      "property": "countwords",
-      "input": "go Go GO Stop stop",
+      "property": "countWords",
+      "input": {
+        "sentence": "go Go GO Stop stop"
+      },
       "expected": {
         "go": 3,
         "stop": 2
@@ -111,8 +126,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "with apostrophes",
-      "property": "countwords",
-      "input": "First: don't laugh. Then: don't cry.",
+      "property": "countWords",
+      "input": {
+        "sentence": "First: don't laugh. Then: don't cry."
+      },
       "expected": {
         "first": 1,
         "don't": 2,
@@ -123,8 +140,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "with quotations",
-      "property": "countwords",
-      "input": "Joe can't tell between 'large' and large.",
+      "property": "countWords",
+      "input": {
+        "sentence": "Joe can't tell between 'large' and large."
+      },
       "expected": {
         "joe": 1,
         "can't": 1,
@@ -136,8 +155,10 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     },
     {
       "description": "multiple spaces not detected as a word",
-      "property": "countwords",
-      "input": " multiple   whitespaces",
+      "property": "countWords",
+      "input": {
+        "sentence": " multiple   whitespaces"
+      },
       "expected": {
         "multiple": 1,
         "whitespaces": 1
@@ -145,5 +166,4 @@ is-deeply (% = .<input>.&count-words), |.<expected description> for @($c-data<ca
     }
   ]
 }
-
 =end code

data/tracks/perl6/exercises/wordy/.meta/exercise-data.yaml

@@ -4,9 +4,9 @@ plan: 16
 tests: |-
   for @($c-data<cases>) {
     if .<expected> === False {
-      throws-like {.<input>.&answer}, Exception, .<description>;
+      throws-like {.<input><question>.&answer}, Exception, .<description>;
     } else {
-      is .<input>.&answer, |.<expected description>;
+      is .<input><question>.&answer, |.<expected description>;
     }
   }
 

data/tracks/perl6/exercises/wordy/wordy.t

@@ -17,18 +17,17 @@ if Wordy.^ver !~~ $version {
 my $c-data = from-json $=pod.pop.contents;
 for @($c-data<cases>) {
   if .<expected> === False {
-    throws-like {.<input>.&answer}, Exception, .<description>;
+    throws-like {.<input><question>.&answer}, Exception, .<description>;
   } else {
-    is .<input>.&answer, |.<expected description>;
+    is .<input><question>.&answer, |.<expected description>;
   }
 }
 
 =head2 Canonical Data
 =begin code
-
 {
   "exercise": "wordy",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "comments": [
     "The tests that expect 'false' should be implemented to raise",
     "an error, or indicate a failure. Implement this in a way that",
@@ -38,100 +37,131 @@ for @($c-data<cases>) {
     {
       "description": "addition",
       "property": "answer",
-      "input": "What is 1 plus 1?",
+      "input": {
+        "question": "What is 1 plus 1?"
+      },
       "expected": 2
     },
     {
       "description": "more addition",
       "property": "answer",
-      "input": "What is 53 plus 2?",
+      "input": {
+        "question": "What is 53 plus 2?"
+      },
       "expected": 55
     },
     {
       "description": "addition with negative numbers",
       "property": "answer",
-      "input": "What is -1 plus -10?",
+      "input": {
+        "question": "What is -1 plus -10?"
+      },
       "expected": -11
     },
     {
       "description": "large addition",
       "property": "answer",
-      "input": "What is 123 plus 45678?",
+      "input": {
+        "question": "What is 123 plus 45678?"
+      },
       "expected": 45801
     },
     {
       "description": "subtraction",
       "property": "answer",
-      "input": "What is 4 minus -12?",
+      "input": {
+        "question": "What is 4 minus -12?"
+      },
       "expected": 16
     },
     {
       "description": "multiplication",
       "property": "answer",
-      "input": "What is -3 multiplied by 25?",
+      "input": {
+        "question": "What is -3 multiplied by 25?"
+      },
       "expected": -75
     },
     {
       "description": "division",
       "property": "answer",
-      "input": "What is 33 divided by -3?",
+      "input": {
+        "question": "What is 33 divided by -3?"
+      },
       "expected": -11
     },
     {
       "description": "multiple additions",
       "property": "answer",
-      "input": "What is 1 plus 1 plus 1?",
+      "input": {
+        "question": "What is 1 plus 1 plus 1?"
+      },
       "expected": 3
     },
     {
       "description": "addition and subtraction",
       "property": "answer",
-      "input": "What is 1 plus 5 minus -2?",
+      "input": {
+        "question": "What is 1 plus 5 minus -2?"
+      },
       "expected": 8
     },
     {
       "description": "multiple subtraction",
       "property": "answer",
-      "input": "What is 20 minus 4 minus 13?",
+      "input": {
+        "question": "What is 20 minus 4 minus 13?"
+      },
       "expected": 3
     },
     {
       "description": "subtraction then addition",
       "property": "answer",
-      "input": "What is 17 minus 6 plus 3?",
+      "input": {
+        "question": "What is 17 minus 6 plus 3?"
+      },
       "expected": 14
     },
     {
       "description": "multiple multiplication",
       "property": "answer",
-      "input": "What is 2 multiplied by -2 multiplied by 3?",
+      "input": {
+        "question": "What is 2 multiplied by -2 multiplied by 3?"
+      },
       "expected": -12
     },
     {
       "description": "addition and multiplication",
       "property": "answer",
-      "input": "What is -3 plus 7 multiplied by -2?",
+      "input": {
+        "question": "What is -3 plus 7 multiplied by -2?"
+      },
       "expected": -8
     },
     {
       "description": "multiple division",
       "property": "answer",
-      "input": "What is -12 divided by 2 divided by -3?",
+      "input": {
+        "question": "What is -12 divided by 2 divided by -3?"
+      },
       "expected": 2
     },
     {
       "description": "unknown operation",
       "property": "answer",
-      "input": "What is 52 cubed?",
+      "input": {
+        "question": "What is 52 cubed?"
+      },
       "expected": false
     },
     {
       "description": "Non math question",
       "property": "answer",
-      "input": "Who is the President of the United States?",
+      "input": {
+        "question": "Who is the President of the United States?"
+      },
       "expected": false
     }
   ]
 }
-
 =end code

data/tracks/perl6/lib/Exercism/Generator.pm6

@@ -10,7 +10,7 @@ submethod TWEAK {
   if $!exercise && (my $cdata =
     $base-dir.add: "problem-specifications/exercises/$!exercise/canonical-data.json") ~~ :f
   {
-    %!data<cdata><json> = $cdata.slurp;
+    %!data<cdata><json> = $cdata.slurp.trim;
   }
 }
 

data/tracks/perl6/t/generated-tests.t

@@ -6,7 +6,7 @@ use lib (my $base-dir = $?FILE.IO.resolve.parent.parent).add('lib');
 use Exercism::Generator;
 
 bail-out if $base-dir.add('problem-specifications') !~~ :d;
-for $base-dir.add('exercises').dir {
+for $base-dir.add('exercises').dir.sort {
   if .add('.meta/exercise-data.yaml') ~~ :f {
     todo '';
     is .add("{.basename}.t").slurp,

data/tracks/perl6/templates/test.mustache

@@ -27,6 +27,5 @@ my $c-data = from-json $=pod.pop.contents;#`{{/cdata}}
 
 =head2 Canonical Data
 =begin code
-
 #`{{&json}}
 =end code#`{{/cdata}}