trackler 2.1.0.2 → 2.1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11bdb5b1d6a2fdfcc6f3b2804ff0de87d01dda5f
-  data.tar.gz: 739035a2434c6e4a34deccca06e6c90a2c927f87
+  metadata.gz: 8fb16c70320bfab64f3c4ce4ebbbb49672f9d74e
+  data.tar.gz: 71e5765ed2b9ef40d7ca43c24237aad49d0b0680
 SHA512:
-  metadata.gz: be2f4153e3178291a6c4b0e6df06ecdab554d119d87fa16207466abee760f8531129675441dde45bb574dfab129a7e81f844351de929120ad770f1ee2203bc83
-  data.tar.gz: d824ba18c322a95eae1d0f23839bd74cf7f425e4ac05729c83d28355df7ae521e8f2797ec5abe3367932aa8f8c1868698cc1b5d9a06fbab60486d8ecbc1b2629
+  metadata.gz: 14f69d678943dcb0f9ee681022f033a4c2d2d1b24bb6030e9fed9cca560eaf380d82d0c4d21b11aa2273b46d51d3ca3becb3be616cc87c4a2e641733042c616b
+  data.tar.gz: 635b4af5725bbef3017df9d3b75c24f6cd2e397e686e6bedd6c08e422bf5f7bd6892d0a1ff899288ba6cec9e93f23d0557a8d1cf334922ac608d77f49812e521

data/common/exercises/phone-number/canonical-data.json

@@ -1,6 +1,6 @@
 {
   "exercise": "phone-number",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "cases": [
     {
       "description": "Cleanup user-entered phone numbers",
@@ -13,20 +13,20 @@
         {
           "description": "cleans the number",
           "property": "clean",
-          "phrase": "(123) 456-7890",
-          "expected": "1234567890"
+          "phrase": "(223) 456-7890",
+          "expected": "2234567890"
         },
         {
           "description": "cleans numbers with dots",
           "property": "clean",
-          "phrase": "123.456.7890",
-          "expected": "1234567890"
+          "phrase": "223.456.7890",
+          "expected": "2234567890"
         },
         {
           "description": "cleans numbers with multiple spaces",
           "property": "clean",
-          "phrase": "123 456   7890   ",
-          "expected": "1234567890"
+          "phrase": "223 456   7890   ",
+          "expected": "2234567890"
         },
         {
           "description": "invalid when 9 digits",
@@ -37,14 +37,20 @@
         {
           "description": "invalid when 11 digits does not start with a 1",
           "property": "clean",
-          "phrase": "21234567890",
+          "phrase": "22234567890",
           "expected": null
         },
         {
           "description": "valid when 11 digits and starting with 1",
           "property": "clean",
-          "phrase": "11234567890",
-          "expected": "1234567890"
+          "phrase": "12234567890",
+          "expected": "2234567890"
+        },
+        {
+          "description": "valid when 11 digits and starting with 1 even with punctuation",
+          "property": "clean",
+          "phrase": "+1 (223) 456-7890",
+          "expected": "2234567890"
         },
         {
           "description": "invalid when more than 11 digits",
@@ -69,6 +75,18 @@
           "property": "clean",
           "phrase": "1a2b3c4d5e6f7g8h9i0j",
           "expected": null
+        },
+        {
+          "description": "invalid if area code does not start with 2-9",
+          "property": "clean",
+          "phrase": "(123) 456-7890",
+          "expected": null
+        },
+        {
+          "description": "invalid if exchange code does not start with 2-9",
+          "property": "clean",
+          "phrase": "(223) 056-7890",
+          "expected": null
         }
       ]
     }

data/common/exercises/phone-number/description.md

@@ -1,16 +1,22 @@
-The rules are as follows:
+The **North American Numbering Plan (NANP)** is a telephone numbering system used by many countries in North America like the United States, Canada or Bermuda. All NANP-countries share the same international country code `1`.
 
-- If the phone number is less than 10 digits assume that it is bad
-  number
-- If the phone number is 10 digits assume that it is good
-- If the phone number is 11 digits and the first number is 1, trim the 1
-  and use the last 10 digits
-- If the phone number is 11 digits and the first number is not 1, then
-  it is a bad number
-- If the phone number is more than 11 digits assume that it is a bad
-  number
+NANP numbers are ten-digit numbers consisting of a three-digit Numbering Plan Area code, commonly known as *area code*, followed by a seven-digit local number. The first three digits of the local number represent the *exchange code*, followed by the unique four-digit number which is the *subscriber number*.
 
-We've provided tests, now make them pass.
 
-Hint: Only make one test pass at a time. Disable the others, then flip
-each on in turn after you get the current failing one to pass.
+The format is usually represented as
+```
+(NXX)-NXX-XXXX
+```
+where N is any digit from 2 through 9 and X is any digit from 0 through 9.
+
+Your task is to clean up differently formated telephone numbers by removing punctuation and the country code (1) if present.
+
+**Example:**
++1 (613)-995-0253
+613-995-0253
+1 613 995 0253
+613.995.0253
+- - - - - - - - - - - - -
+6139950253
+
+**Note:** As this exercise only deals with telephone numbers used in NANP-countries only 1 is considered a valid country code.

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.1.0.2"
+  VERSION = "2.1.0.3"
 end

data/tracks/go/exercises/bob/.meta/gen.go

@@ -32,9 +32,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package bob
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 var testCases = []struct {
 	description string

data/tracks/go/exercises/bob/bob.go

@@ -1,3 +1,3 @@
 package bob
 
-const testVersion = 2
+const testVersion = 3

data/tracks/go/exercises/bob/bob_test.go

@@ -2,7 +2,7 @@ package bob
 
 import "testing"
 
-const targetTestVersion = 2
+const targetTestVersion = 3
 
 func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {

data/tracks/go/exercises/bob/cases_test.go

@@ -1,7 +1,8 @@
 package bob
 
 // Source: exercism/x-common
-// Commit: 945d08e Merge pull request #50 from soniakeys/master
+// Commit: 65756b1 bob: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 var testCases = []struct {
 	description string
@@ -73,16 +74,6 @@ var testCases = []struct {
 		"ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!",
 		"Whoa, chill out!",
 	},
-	{
-		"shouting with umlauts",
-		"ÜMLÄÜTS!",
-		"Whoa, chill out!",
-	},
-	{
-		"calmly speaking with umlauts",
-		"ÜMLäÜTS!",
-		"Whatever.",
-	},
 	{
 		"shouting with no exclamation mark",
 		"I HATE YOU",
@@ -135,7 +126,12 @@ var testCases = []struct {
 	},
 	{
 		"other whitespace",
-		"\n\r \t\v\u00a0\u2002",
+		"\n\r \t",
 		"Fine. Be that way!",
 	},
+	{
+		"non-question ending with whitespace",
+		"This is a statement ending with whitespace      ",
+		"Whatever.",
+	},
 }

data/tracks/go/exercises/bob/example.go

@@ -2,7 +2,7 @@ package bob
 
 import "strings"
 
-const testVersion = 2
+const testVersion = 3
 
 func Hey(drivel string) string {
 	switch drivel = strings.TrimSpace(drivel); {

data/tracks/go/exercises/largest-series-product/.meta/gen.go

@@ -33,9 +33,7 @@ type js struct {
 // template applied to above data structure generates the Go test cases
 var tmpl = `package lsproduct
 
-// Source: {{.Ori}}
-{{if .Commit}}// Commit: {{.Commit}}
-{{end}}
+{{.Header}}
 
 var tests = []struct {
 	digits  string

data/tracks/go/exercises/largest-series-product/cases_test.go

@@ -1,7 +1,8 @@
 package lsproduct
 
 // Source: exercism/x-common
-// Commit: 3764abd Merge pull request #167 from petertseng/largest-series-product-json
+// Commit: e79b832 largest-series-product: Fix canonical-data.json formatting
+// x-common version: 1.0.0
 
 var tests = []struct {
 	digits  string
@@ -9,15 +10,13 @@ var tests = []struct {
 	product int64
 	ok      bool
 }{
+	{"29", 2, 18, true},
 	{"0123456789", 2, 72, true},
 	{"576802143", 2, 48, true},
-	{"29", 2, 18, true},
 	{"0123456789", 3, 504, true},
 	{"1027839564", 3, 270, true},
 	{"0123456789", 5, 15120, true},
 	{"73167176531330624919225119674426574742355349194934", 6, 23520, true},
-	{"52677741234314237566414902593461595376319419139427", 6, 28350, true},
-	{"7316717653133062491922511967442657474235534919493496983520312774506326239578318016984801869478851843858615607891129494954595017379583319528532088055111254069874715852386305071569329096329522744304355766896648950445244523161731856403098711121722383113622298934233803081353362766142828064444866452387493035890729629049156044077239071381051585930796086670172427121883998797908792274921901699720888093776657273330010533678812202354218097512545405947522435258490771167055601360483958644670632441572215539753697817977846174064955149290862569321978468622482839722413756570560574902614079729686524145351004748216637048440319989000889524345065854122758866688116427171479924442928230863465674813919123162824586178664583591245665294765456828489128831426076900422421902267105562632111110937054421750694165896040807198403850962455444362981230987879927244284909188845801561660979191338754992005240636899125607176060588611646710940507754100225698315520005593572972571636269561882670428252483600823257530420752963450", 13, 23514624000, true},
 	{"0000", 2, 0, true},
 	{"99099", 3, 0, true},
 	{"123", 4, -1, false},

data/tracks/go/exercises/largest-series-product/example.go

@@ -2,7 +2,7 @@ package lsproduct
 
 import "fmt"
 
-const testVersion = 4
+const testVersion = 5
 
 func LargestSeriesProduct(digits string, span int) (int64, error) {
 	if span < 0 {

data/tracks/go/exercises/largest-series-product/largest_series_product_test.go

@@ -2,7 +2,7 @@ package lsproduct
 
 import "testing"
 
-const targetTestVersion = 4
+const targetTestVersion = 5
 
 func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {

data/tracks/java/exercises/accumulate/src/test/java/AccumulateTest.java

@@ -17,7 +17,7 @@ public class AccumulateTest {
         assertEquals(expectedOutput, Accumulate.accumulate(input, x -> x * x));
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void accumulateSquares() {
         List<Integer> input = Arrays.asList(1, 2, 3);
@@ -25,7 +25,7 @@ public class AccumulateTest {
         assertEquals(expectedOutput, Accumulate.accumulate(input, x -> x * x));
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void accumulateUpperCases() {
         List<String> input = Arrays.asList("hello", "world");
@@ -33,7 +33,7 @@ public class AccumulateTest {
         assertEquals(expectedOutput, Accumulate.accumulate(input, x -> x.toUpperCase()));
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void accumulateReversedStrings() {
         List<String> input = Arrays.asList("the quick brown fox etc".split(" "));
@@ -45,7 +45,7 @@ public class AccumulateTest {
         return new StringBuilder(input).reverse().toString();
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void accumulateWithinAccumulate() {
         List<String> input1 = Arrays.asList("a", "b", "c");

data/tracks/java/exercises/acronym/src/test/java/AcronymTest.java

@@ -12,7 +12,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromOtherTitleCasedPhrases() {
         final String phrase = "Ruby on Rails";
@@ -20,7 +20,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromInconsistentlyCasedPhrases() {
         final String phrase = "HyperText Markup Language";
@@ -28,7 +28,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromPhrasesWithPunctuation() {
         final String phrase = "First In, First Out";
@@ -36,7 +36,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromOtherPhrasesWithPunctuation() {
         final String phrase = "PHP: Hypertext Preprocessor";
@@ -44,7 +44,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromPhrasesWithNonAcronymAllCapsWord() {
         final String phrase = "GNU Image Manipulation Program";
@@ -52,7 +52,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromPhrasesWithPunctuationAndSentenceCasing() {
         final String phrase = "Complementary metal-oxide semiconductor";
@@ -60,7 +60,7 @@ public class AcronymTest {
         assertEquals(expected, new Acronym(phrase).get());
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void fromPhraseWithSingleLetterWord() {
         final String phrase = "Cat in a Hat";

data/tracks/java/exercises/all-your-base/src/test/java/BaseConverterTest.java

@@ -32,7 +32,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testBinaryToSingleDecimal() {
         final BaseConverter baseConverter = new BaseConverter(2, new int[]{1, 0, 1});
@@ -49,7 +49,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testSingleDecimalToBinary() {
         final BaseConverter baseConverter = new BaseConverter(10, new int[]{5});
@@ -66,7 +66,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testBinaryToMultipleDecimal() {
         final BaseConverter baseConverter = new BaseConverter(2, new int[]{1, 0, 1, 0, 1, 0});
@@ -83,7 +83,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testDecimalToBinary() {
         final BaseConverter baseConverter = new BaseConverter(10, new int[]{4, 2});
@@ -100,7 +100,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testTrinaryToHexadecimal() {
         final BaseConverter baseConverter = new BaseConverter(3, new int[]{1, 1, 2, 0});
@@ -117,7 +117,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testHexadecimalToTrinary() {
         final BaseConverter baseConverter = new BaseConverter(16, new int[]{2, 10});
@@ -134,7 +134,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void test15BitInteger() {
         final BaseConverter baseConverter = new BaseConverter(97, new int[]{3, 46, 60});
@@ -151,7 +151,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testEmptyDigits() {
         expectedException.expect(IllegalArgumentException.class);
@@ -160,7 +160,7 @@ public final class BaseConverterTest {
         new BaseConverter(2, new int[]{});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testSingleZero() {
         final BaseConverter baseConverter = new BaseConverter(10, new int[]{0});
@@ -177,7 +177,7 @@ public final class BaseConverterTest {
                 actualDigits);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testMultipleZeros() {
         expectedException.expect(IllegalArgumentException.class);
@@ -186,7 +186,7 @@ public final class BaseConverterTest {
         new BaseConverter(10, new int[]{0, 0, 0});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testLeadingZeros() {
         expectedException.expect(IllegalArgumentException.class);
@@ -195,7 +195,7 @@ public final class BaseConverterTest {
         new BaseConverter(7, new int[]{0, 6, 0});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testNegativeDigit() {
         expectedException.expect(IllegalArgumentException.class);
@@ -204,7 +204,7 @@ public final class BaseConverterTest {
         new BaseConverter(2, new int[]{1, -1, 1, 0, 1, 0});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testInvalidPositiveDigit() {
         expectedException.expect(IllegalArgumentException.class);
@@ -213,7 +213,7 @@ public final class BaseConverterTest {
         new BaseConverter(2, new int[]{1, 2, 1, 0, 1, 0});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testFirstBaseIsOne() {
         expectedException.expect(IllegalArgumentException.class);
@@ -222,7 +222,7 @@ public final class BaseConverterTest {
         new BaseConverter(1, new int[]{});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testSecondBaseIsOne() {
         final BaseConverter baseConverter = new BaseConverter(2, new int[]{1, 0, 1, 0, 1, 0});
@@ -233,7 +233,7 @@ public final class BaseConverterTest {
         baseConverter.convertToBase(1);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testFirstBaseIsZero() {
         expectedException.expect(IllegalArgumentException.class);
@@ -242,7 +242,7 @@ public final class BaseConverterTest {
         new BaseConverter(0, new int[]{});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testSecondBaseIsZero() {
         final BaseConverter baseConverter = new BaseConverter(2, new int[]{1, 0, 1, 0, 1, 0});
@@ -253,7 +253,7 @@ public final class BaseConverterTest {
         baseConverter.convertToBase(0);
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testFirstBaseIsNegative() {
         expectedException.expect(IllegalArgumentException.class);
@@ -262,7 +262,7 @@ public final class BaseConverterTest {
         new BaseConverter(-2, new int[]{});
     }
 
-    @Ignore
+    @Ignore("Remove to run test")
     @Test
     public void testSecondBaseIsNegative() {
         final BaseConverter baseConverter = new BaseConverter(2, new int[]{1});