trackler 2.0.8.6 → 2.0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc2b57e4b486bcc77b52bbfe5bc1098cca12d924
-  data.tar.gz: d622632279a4be7e8db15ab4e4bcd7d83c0aec7a
+  metadata.gz: 24f1a3e4a5a11da7a5de103a0fb55263037dba6c
+  data.tar.gz: 046a666971406ee116df5a9830b13332a2fbc175
 SHA512:
-  metadata.gz: 41d9d8c01652e2ff4bce110e180162b96c4c14986571e015a0a43a4fb95a1096f2db408290e552bda51c791eca1e860b80d13183a06d30a054de9ffd1acaa7de
-  data.tar.gz: 5313d089495cab376191ceb9096ecfd8208717b3491accab4e41bb7b43b48482bb4cde70da981f88fce929dc03544222c224969b3bc35d742df08d3df42db3c4
+  metadata.gz: 7cff9d347f2f4ad9973fd4584c05ed5cf4e48b922521b09026bf248f94f721ceed614a8a728d6c0887e52eaec5db6dea5d3a04b2fdb7f03cd6ef65816cdeb464
+  data.tar.gz: 06896ee26a2bc013de9fa5720348313949c69a0f7ab5140a8f6c13fe00d0aa704d79e3d31a66e2a34c83be49e122f118292144a6acfd9de8bc262d57f57aad0f

data/bin/verify-metadata

@@ -4,20 +4,16 @@ require 'json'
 
 require_relative '../lib/trackler'
 
-omissions = []
-Trackler.tracks.each do |track|
-  track.problems.each do |problem|
-    unless Trackler.problems[problem.slug].exists?
-      omissions << slug
-    end
-  end
+missing_problems = []
+Trackler.tracks.reject do |track|
+  missing_problems += track.problems.reject(&:exists?)
 end
 
-omissions = omissions.uniq
-unless omissions.empty?
+missing_problems = missing_problems.uniq
+unless missing_problems.empty?
   puts "missing:"
-  omissions.each do |omission|
-    puts "  #{omission}"
+  missing_problems.each do |problem|
+    puts "  #{problem.slug}"
   end
   exit 1
 end

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.8.6"
+  VERSION = "2.0.8.7"
 end

data/tracks/clojure/config.json

@@ -292,6 +292,11 @@
       "slug": "acronym",
       "topics": []
     },
+    {
+      "difficulty": 1,
+      "slug": "nth-prime",
+      "topics": []
+    },
     {
       "difficulty": 1,
       "slug": "pig-latin",

data/tracks/clojure/exercises/luhn/luhn.mustache

@@ -0,0 +1,9 @@
+(ns luhn-test
+  (:require [clojure.test :refer [deftest is testing]]
+            luhn))
+
+(deftest validity-tests
+{{#valid}}
+  (testing "{{{description}}}"
+    (is ({{{expected}}}? (luhn/valid? "{{{input}}}"))))
+{{/valid}})

data/tracks/clojure/exercises/luhn/src/example.clj

@@ -1,4 +1,5 @@
-(ns luhn)
+(ns luhn
+  (:require [clojure.string :as string]))
 
 (defn to-reversed-digits
   "returns a lazy sequence of least to most significant digits of n"
@@ -19,14 +20,15 @@
            (apply +))
       (mod 10)))
 
-(defn valid?
-  "whether n has a valid luhn check-digit"
+(defn string->long
+  "Strips any non-digit characters and converts the string into a Long"
   [n]
-  (zero? (checksum n)))
+  (-> n (string/replace #"[^0-9]+" "") Long/parseLong))
 
-(defn add-check-digit
-  "given a number, adds a luhn check digit at the end"
+(defn valid?
+  "whether n has a valid luhn check-digit"
   [n]
-  (let [n-shifted (* 10 n)
-        check-digit (- 10 (checksum n-shifted))]
-    (+ n-shifted check-digit)))
+  ; Numbers with non digit/whitespace or only 1 digit are invalid
+  (if (or (re-find #"[^0-9\s]+" n) (>= 1 (count (string/trim n))))
+    false
+    (zero? (-> n string->long checksum))))

data/tracks/clojure/exercises/luhn/test/luhn_test.clj

@@ -1,32 +1,32 @@
 (ns luhn-test
-  (:require [clojure.test :refer [deftest is]]
+  (:require [clojure.test :refer [deftest is testing]]
             luhn))
 
-(deftest checksum-works
-  (is (= 2 (luhn/checksum 10)))
-  (is (= 9 (luhn/checksum 90)))
-  (is (= 1 (luhn/checksum 100)))
-  (is (= 2 (luhn/checksum 1000)))
-  (is (= 1 (luhn/checksum 10000000000000000)))
-  (is (= 6 (luhn/checksum 1111)))
-  (is (= 0 (luhn/checksum 8763)))
-  (is (= 0 (luhn/checksum 2323200577663554))))
-
-(deftest valid?-works
-  (is (= true (luhn/valid? 18)))
-  (is (= true (luhn/valid? 59)))
-  (is (= false (luhn/valid? 63)))
-  (is (= true (luhn/valid? 8763)))
-  (is (= false (luhn/valid? 1111)))
-  (is (= true (luhn/valid? 4242424242424242)))
-  (is (= true (luhn/valid? 2323200577663554)))
-  (is (= false (luhn/valid? 2323200577663555)))
-  (is (= false (luhn/valid? 2223200577663554)))
-  (is (= false (luhn/valid? 3323200577663554))))
-
-(deftest add-check-digit-works
-  (is (= 18 (luhn/add-check-digit 1)))
-  (is (= 59 (luhn/add-check-digit 5)))
-  (is (= 8763 (luhn/add-check-digit 876)))
-  (is (= 4242424242424242 (luhn/add-check-digit 424242424242424)))
-  (is (= 2323200577663554 (luhn/add-check-digit 232320057766355))))
+(deftest validity-tests
+  (testing "single digit strings can not be valid"
+    (is (false? (luhn/valid? "1"))))
+  (testing "A single zero is invalid"
+    (is (false? (luhn/valid? "0"))))
+  (testing "simple valid sin"
+    (is (true? (luhn/valid? " 5 9 "))))
+  (testing "valid Canadian SIN"
+    (is (true? (luhn/valid? "046 454 286"))))
+  (testing "invalid Canadian SIN"
+    (is (false? (luhn/valid? "046 454 287"))))
+  (testing "invalid credit card"
+    (is (false? (luhn/valid? "8273 1232 7352 0569"))))
+  (testing "valid strings with a non-digit added become invalid"
+    (is (false? (luhn/valid? "046a 454 286"))))
+  (testing "punctuation is not allowed"
+    (is (false? (luhn/valid? "055-444-285"))))
+  (testing "symbols are not allowed"
+    (is (false? (luhn/valid? "055£ 444$ 285"))))
+  (testing "single zero with space is invalid"
+    (is (false? (luhn/valid? " 0"))))
+  (testing "lots of zeros are valid"
+    (is (true? (luhn/valid? " 00000"))))
+  (testing "another valid sin"
+    (is (true? (luhn/valid? "055 444 285"))))
+  (testing "nine doubled is nine"
+    (is (true? (luhn/valid? "091"))))
+)

data/tracks/clojure/exercises/nth-prime/project.clj

@@ -0,0 +1,4 @@
+(defproject nth-prime "0.1.0-SNAPSHOT"
+  :description "nth-prime exercise."
+  :url "https://github.com/exercism/xclojure/tree/master/exercises/nth-prime"
+  :dependencies [[org.clojure/clojure "1.8.0"]])

data/tracks/clojure/exercises/nth-prime/src/example.clj

@@ -0,0 +1,33 @@
+(ns nth-prime)
+
+(defn sqrt
+  "Wrapper around java's sqrt method."
+  [number]
+  (int (Math/ceil (Math/sqrt number))))
+
+(defn divides?
+  "Helper function to decide if a number is evenly divided by divisor."
+  [number divisor]
+  (zero? (mod number divisor)))
+
+(defn- prime-by-trial-division?
+  "Simple trial division prime check."
+  [number]
+  (empty? (for [n (range 3 (inc (sqrt number)) 2) :when (divides? number n)] n)))
+
+(defn prime? [number]
+  (or (= 2 number)
+      (and (odd? number) (prime-by-trial-division? number))))
+
+(defn next-prime [start]
+  (loop [n (inc start)]
+    (if (prime? n)
+      n
+      (recur (inc n)))))
+
+(def primes (iterate next-prime 1))
+
+(defn nth-prime [index]
+  (when-not (pos? index)
+    (throw (IllegalArgumentException. "nth-prime expects a positive integer for an argument")))
+  (nth primes index))

data/tracks/clojure/exercises/nth-prime/test/nth_prime_test.clj

@@ -0,0 +1,23 @@
+(ns nth-prime-test
+  (:require [clojure.test :refer [deftest testing is]]
+            nth-prime))
+
+(deftest first-prime
+  (testing "the first prime is 2"
+    (is (= 2 (nth-prime/nth-prime 1)))))
+
+(deftest second-prime
+  (testing "the second prime is 3"
+    (is (= 3 (nth-prime/nth-prime 2)))))
+
+(deftest sixth-prime
+  (testing "the sixth prime is 13"
+    (is (= 13 (nth-prime/nth-prime 6)))))
+
+(deftest ten-thousand-first-prime
+  (testing "the ten thousand and first prime is 104743"
+    (is (= 104743 (nth-prime/nth-prime 10001)))))
+
+(deftest zeroth-prime
+  (testing "there is no zeroth prime"
+    (is (thrown? IllegalArgumentException (nth-prime/nth-prime 0)))))

data/tracks/go/exercises/TRACK_HINTS.md

@@ -7,6 +7,9 @@ flag:
 
     go test -bench .
 
+Keep in mind that each reviewer will run benchmarks on a different machine, with
+different specs, so the results from these benchmark tests may vary.
+
 ## Further information
 
 For more detailed information about the Go track, including how to get help if

data/tracks/go/exercises/ocr-numbers/example.go

@@ -2,6 +2,8 @@ package ocr
 
 import "strings"
 
+const testVersion = 1
+
 var digit = map[string]byte{
 	" _ | ||_|   ": '0',
 	"     |  |   ": '1',

data/tracks/go/exercises/ocr-numbers/ocr_numbers_test.go

@@ -25,6 +25,8 @@ import (
 	"testing"
 )
 
+const targetTestVersion = 1
+
 var tests = []struct {
 	in  string
 	out []string
@@ -121,6 +123,12 @@ var tests = []struct {
 
 var _ = recognizeDigit // step 1.
 
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
+	}
+}
+
 func TestRecognize(t *testing.T) {
 	for _, test := range tests {
 		if res := Recognize(test.in); !reflect.DeepEqual(res, test.out) {

data/tracks/go/exercises/octal/octal_test.go

@@ -18,6 +18,12 @@ var testCases = []struct {
 	{"35682", 0, true},
 }
 
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
+	}
+}
+
 func TestParseOctal(t *testing.T) {
 	for _, test := range testCases {
 		actualNum, actualErr := ParseOctal(test.input)
@@ -38,12 +44,6 @@ func TestParseOctal(t *testing.T) {
 	}
 }
 
-func TestTestVersion(t *testing.T) {
-	if testVersion != targetTestVersion {
-		t.Errorf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
-	}
-}
-
 func BenchmarkParseOctal(b *testing.B) {
 	b.StopTimer()
 

data/tracks/go/exercises/paasio/paasio_test.go

@@ -11,13 +11,15 @@ import (
 	"time"
 )
 
-// testVersion identifies the API tested by the test program.
 const targetTestVersion = 3
 
-func TestMultiThreaded(t *testing.T) {
+func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {
-		t.Errorf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
+		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
 	}
+}
+
+func TestMultiThreaded(t *testing.T) {
 	mincpu := 2
 	minproc := 2
 	ncpu := runtime.NumCPU()

data/tracks/go/exercises/palindrome-products/palindrome_products_test.go

@@ -75,6 +75,12 @@ var bonusData = []struct {
 		""},
 }
 
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
+	}
+}
+
 func TestPalindromeProducts(t *testing.T) {
 	// Uncomment the following line to add the bonus test to the default tests
 	// testData = append(testData, bonusData...)
@@ -109,12 +115,6 @@ func TestPalindromeProducts(t *testing.T) {
 	}
 }
 
-func TestTestVersion(t *testing.T) {
-	if testVersion != targetTestVersion {
-		t.Errorf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
-	}
-}
-
 func BenchmarkPalindromeProducts(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		for _, test := range testData {

data/tracks/go/exercises/strain/strain_test.go

@@ -21,12 +21,6 @@ import (
 
 const targetTestVersion = 1
 
-func TestTestVersion(t *testing.T) {
-	if testVersion != targetTestVersion {
-		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
-	}
-}
-
 func lt10(x int) bool { return x < 10 }
 func gt10(x int) bool { return x > 10 }
 func odd(x int) bool  { return x&1 == 1 }
@@ -51,26 +45,6 @@ var keepTests = []struct {
 		Ints{2, 4}},
 }
 
-func TestKeepInts(t *testing.T) {
-	for _, test := range keepTests {
-		// setup here copies test.list, preserving the nil value if it is nil
-		// and making a fresh copy of the underlying array otherwise.
-		cp := test.list
-		if cp != nil {
-			cp = append(Ints{}, cp...)
-		}
-		switch res := cp.Keep(test.pred); {
-		case !reflect.DeepEqual(cp, test.list):
-			t.Fatalf("Ints%v.Keep() should not modify its reciever.  "+
-				"Found %v, reciever should stay %v",
-				test.list, cp, test.list)
-		case !reflect.DeepEqual(res, test.want):
-			t.Fatalf("Ints%v.Keep() = %v, want %v",
-				test.list, res, test.want)
-		}
-	}
-}
-
 var discardTests = []struct {
 	pred func(int) bool
 	list Ints
@@ -90,6 +64,32 @@ var discardTests = []struct {
 		Ints{1, 3, 5}},
 }
 
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
+	}
+}
+
+func TestKeepInts(t *testing.T) {
+	for _, test := range keepTests {
+		// setup here copies test.list, preserving the nil value if it is nil
+		// and making a fresh copy of the underlying array otherwise.
+		cp := test.list
+		if cp != nil {
+			cp = append(Ints{}, cp...)
+		}
+		switch res := cp.Keep(test.pred); {
+		case !reflect.DeepEqual(cp, test.list):
+			t.Fatalf("%#v.Keep() should not modify its receiver.  "+
+				"Found %#v, receiver should stay %#v",
+				test.list, cp, test.list)
+		case !reflect.DeepEqual(res, test.want):
+			t.Fatalf("%#v.Keep()\ngot: %#v\nwant: %#v",
+				test.list, res, test.want)
+		}
+	}
+}
+
 func TestDiscardInts(t *testing.T) {
 	for _, test := range discardTests {
 		cp := test.list
@@ -98,11 +98,11 @@ func TestDiscardInts(t *testing.T) {
 		}
 		switch res := cp.Discard(test.pred); {
 		case !reflect.DeepEqual(cp, test.list):
-			t.Fatalf("Ints%v.Discard() should not modify its reciever.  "+
-				"Found %v, reciever should stay %v",
+			t.Fatalf("%#v.Discard() should not modify its receiver.  "+
+				"Found %#v, receiver should stay %#v",
 				test.list, cp, test.list)
 		case !reflect.DeepEqual(res, test.want):
-			t.Fatalf("Ints%v.Discard() = %v, want %v",
+			t.Fatalf("%#v.Discard()\ngot: %#v\nwant: %#v",
 				test.list, res, test.want)
 		}
 	}
@@ -110,18 +110,17 @@ func TestDiscardInts(t *testing.T) {
 
 func TestKeepStrings(t *testing.T) {
 	zword := func(s string) bool { return len(s) > 0 && s[0] == 'z' }
-	list := Strings{"apple", "zebra", "banana", "zombies", "cherimoya", "zelot"}
-	want := Strings{"zebra", "zombies", "zelot"}
+	list := Strings{"apple", "zebra", "banana", "zombies", "cherimoya", "zealot"}
+	want := Strings{"zebra", "zombies", "zealot"}
 
 	cp := append(Strings{}, list...) // make copy, as with TestInts
 	switch res := cp.Keep(zword); {
 	case !reflect.DeepEqual(cp, list):
-		t.Fatalf("Strings%v.Keep() should not modify its reciever.  "+
-			"Found %v, reciever should stay %v",
+		t.Fatalf("%#v.Keep() should not modify its receiver.  "+
+			"Found %#v, receiver should stay %#v",
 			list, cp, list)
 	case !reflect.DeepEqual(res, want):
-		t.Fatalf("Strings%v.Keep() = %v, want %v",
-			list, res, want)
+		t.Fatalf("%#v.Keep()\ngot: %#v\nwant: %#v", list, res, want)
 	}
 }
 
@@ -152,12 +151,11 @@ func TestKeepLists(t *testing.T) {
 	cp := append(Lists{}, list...)
 	switch res := cp.Keep(has5); {
 	case !reflect.DeepEqual(cp, list):
-		t.Fatalf("Lists%v.Keep() should not modify its reciever.  "+
-			"Found %v, reciever should stay %v",
+		t.Fatalf("%#v.Keep() should not modify its receiver.  "+
+			"Found %#v, receiver should stay %#v",
 			list, cp, list)
 	case !reflect.DeepEqual(res, want):
-		t.Fatalf("Lists%v.Keep() = %v, want %v",
-			list, res, want)
+		t.Fatalf("%#v.Keep()\ngot: %#v\nwant: %#v", list, res, want)
 	}
 }