trackler 2.0.6.32 → 2.0.6.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f6e3f97fb0442bba06845f093f9ab9ea5d92a79
-  data.tar.gz: cbb479cfd8d79e854facf50b3e114d21e76e637f
+  metadata.gz: e5a4eccbddd152c661534a7ae9a71ad4fd71f6ab
+  data.tar.gz: 4d1ec7fec9f35886d314ad5bee617846f3395cd8
 SHA512:
-  metadata.gz: 0f08eba9a5d7e964a238e50dc854d66444bd8f05d21e3263f4e8e272312cbb1ad46f628883621a181bdf23e4f7156bdfdb6eaf0312be81020061e927fea4d8c2
-  data.tar.gz: 7e7956710060f07e599ef66a935d2759340ab4a1598139b7314879db60fc6d863f9714ff36a88c3377ddc51130ba442d195b8769ffa7ac1b295b5a7d06b06786
+  metadata.gz: 56de61b12c3dd2fca7521f9ea629f5a0029d68a941156fa335f5f60ff466b19a1425da7eb528d89c18de8b11dfe5791cefc5d41a20fd3f7e2bb5b6d5acfa7d6c
+  data.tar.gz: e94acef7c5f3926878c87cf57a3b5fb3ced167acfed7f3662943a0a4a2d934e163ef2dbb06f6811f63685aff89e8061eda64d8bf3869f199a1bf11df0a2ba94f

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.6.32"
+  VERSION = "2.0.6.33"
 end

data/tracks/csharp/exercises/bank-account/BankAccountTest.cs

@@ -11,7 +11,7 @@ public class BankAccountTest
         var account = new BankAccount();
         account.Open();
 
-        Assert.That(account.GetBalance(), Is.EqualTo(0));
+        Assert.That(account.Balance, Is.EqualTo(0));
     }
 
     [Ignore("Remove to run test")]
@@ -21,10 +21,10 @@ public class BankAccountTest
         var account = new BankAccount();
         account.Open();
 
-        var openingBalance = account.GetBalance();
+        var openingBalance = account.Balance;
 
         account.UpdateBalance(10);
-        var updatedBalance = account.GetBalance();
+        var updatedBalance = account.Balance;
 
         Assert.That(openingBalance, Is.EqualTo(0));
         Assert.That(updatedBalance, Is.EqualTo(10));
@@ -36,13 +36,13 @@ public class BankAccountTest
     {
         var account = new BankAccount();
         account.Open();
-        var openingBalance = account.GetBalance();
+        var openingBalance = account.Balance;
 
         account.UpdateBalance(10);
-        var addedBalance = account.GetBalance();
+        var addedBalance = account.Balance;
 
         account.UpdateBalance(-15);
-        var subtractedBalance = account.GetBalance();
+        var subtractedBalance = account.Balance;
 
         Assert.That(openingBalance, Is.EqualTo(0));
         Assert.That(addedBalance, Is.EqualTo(10));
@@ -57,7 +57,7 @@ public class BankAccountTest
         account.Open();
         account.Close();
 
-        Assert.Throws<InvalidOperationException>(() => account.GetBalance());
+        Assert.That(() => account.Balance, Throws.InvalidOperationException);
     }
 
     [Ignore("Remove to run test")]
@@ -84,6 +84,6 @@ public class BankAccountTest
         }
         Task.WaitAll(tasks.ToArray());
 
-        Assert.That(account.GetBalance(), Is.EqualTo(0));
+        Assert.That(account.Balance, Is.EqualTo(0));
     }
 }

data/tracks/csharp/exercises/bank-account/Example.cs

@@ -23,16 +23,19 @@ public class BankAccount
         }
     }
 
-    public float GetBalance()
+    public float Balance
     {
-        lock(_lock)
+        get
         {
-            if (!isOpen)
+            lock (_lock)
             {
-                throw new InvalidOperationException("Cannot get balance on an account that isn't open");
-            }
+                if (!isOpen)
+                {
+                    throw new InvalidOperationException("Cannot get balance on an account that isn't open");
+                }
 
-            return balance;
+                return balance;
+            }
         }
     }
 

data/tracks/fsharp/exercises/markdown/Example.fs

@@ -12,8 +12,8 @@ let boldMarkdown = "__"
 let italicMarkdown = "_"
 let listItemMarkdown = "*"
 
-let boldTag = "em"
-let italicTag = "i"
+let boldTag = "strong"
+let italicTag = "em"
 let paragraphTag = "p"
 let listTag = "ul"
 let listItemTag = "li"

data/tracks/fsharp/exercises/markdown/Markdown.fs

@@ -26,10 +26,10 @@ let rec parse (markdown: string) =
 
                if __pos' > -1 then                                        
                    if __pos + 2 >= (line.Length - 1) then                     
-                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 2 .. __pos' - 1] + "</em>"
+                       line <- line.[0.. __pos - 1] + "<strong>" + line.[__pos + 2 .. __pos' - 1] + "</strong>"
                        __pos <- __pos' + 1
                    else
-                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 2 .. __pos' - 1] + "</em>" + line.[__pos' + 2 ..]
+                       line <- line.[0.. __pos - 1] + "<strong>" + line.[__pos + 2 .. __pos' - 1] + "</strong>" + line.[__pos' + 2 ..]
                        __pos <- __pos' + 1
                else
                    __pos <- -1
@@ -41,10 +41,10 @@ let rec parse (markdown: string) =
 
                if __pos' > -1 then                                        
                    if __pos + 1 >= (line.Length - 1) then                     
-                       line <- line.[0.. __pos - 1] + "<i>" + line.[__pos + 1 .. __pos' - 1] + "</i>"
+                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 1 .. __pos' - 1] + "</em>"
                        __pos <- __pos' + 1
                    else
-                       line <- line.[0.. __pos - 1] + "<i>" + line.[__pos + 1 .. __pos' - 1] + "</i>" + line.[__pos' + 1 ..]
+                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 1 .. __pos' - 1] + "</em>" + line.[__pos' + 1 ..]
                        __pos <- __pos' + 1
                else
                    __pos <- -1
@@ -75,10 +75,10 @@ let rec parse (markdown: string) =
 
                if __pos' > -1 then                                        
                    if __pos + 2 >= (line.Length - 1) then                     
-                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 2 .. __pos' - 1] + "</em>"
+                       line <- line.[0.. __pos - 1] + "<strong>" + line.[__pos + 2 .. __pos' - 1] + "</strong>"
                        __pos <- __pos' + 1
                    else
-                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 2 .. __pos' - 1] + "</em>" + line.[__pos' + 2 ..]
+                       line <- line.[0.. __pos - 1] + "<strong>" + line.[__pos + 2 .. __pos' - 1] + "</strong>" + line.[__pos' + 2 ..]
                        __pos <- __pos' + 1
                else
                    __pos <- -1
@@ -90,10 +90,10 @@ let rec parse (markdown: string) =
 
                if __pos' > -1 then                                        
                    if __pos + 1 >= (line.Length - 1) then                     
-                       line <- line.[0.. __pos - 1] + "<i>" + line.[__pos + 1 .. __pos' - 1] + "</i>"
+                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 1 .. __pos' - 1] + "</em>"
                        __pos <- __pos' + 1
                    else
-                       line <- line.[0.. __pos - 1] + "<i>" + line.[__pos + 1 .. __pos' - 1] + "</i>" + line.[__pos' + 1 ..]
+                       line <- line.[0.. __pos - 1] + "<em>" + line.[__pos + 1 .. __pos' - 1] + "</em>" + line.[__pos' + 1 ..]
                        __pos <- __pos' + 1
                else
                    __pos <- -1

data/tracks/fsharp/exercises/markdown/MarkdownTest.fs

@@ -13,19 +13,19 @@ let ``Parses normal text as a paragraph`` () =
 [<Test>]
 let ``Parsing italics`` () =
     let input = "_This will be italic_"
-    let expected = "<p><i>This will be italic</i></p>"
+    let expected = "<p><em>This will be italic</em></p>"
     Assert.That(parse input, Is.EqualTo(expected))
 
 [<Test>]
 let ``Parsing bold text`` () =
     let input = "__This will be bold__"
-    let expected = "<p><em>This will be bold</em></p>"
+    let expected = "<p><strong>This will be bold</strong></p>"
     Assert.That(parse input, Is.EqualTo(expected))
 
 [<Test>]
 let ``Mixed normal, italics and bold text`` () =
     let input = "This will _be_ __mixed__"
-    let expected = "<p>This will <i>be</i> <em>mixed</em></p>"
+    let expected = "<p>This will <em>be</em> <strong>mixed</strong></p>"
     Assert.That(parse input, Is.EqualTo(expected))
 
 [<Test>]
@@ -55,5 +55,5 @@ let ``Unordered lists`` () =
 [<Test>]
 let ``With a little bit of everything`` () =
     let input = "# Header!\n* __Bold Item__\n* _Italic Item_"
-    let expected = "<h1>Header!</h1><ul><li><em>Bold Item</em></li><li><i>Italic Item</i></li></ul>"
+    let expected = "<h1>Header!</h1><ul><li><strong>Bold Item</strong></li><li><em>Italic Item</em></li></ul>"
     Assert.That(parse input, Is.EqualTo(expected))

data/tracks/go/exercises/bank-account/bank_account_test.go

@@ -20,6 +20,14 @@ import (
 	"time"
 )
 
+const targetTestVersion = 1
+
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
+	}
+}
+
 func TestSeqOpenBalanceClose(t *testing.T) {
 	// open account
 	const amt = 10

data/tracks/go/exercises/bank-account/example.go

@@ -2,6 +2,8 @@ package account
 
 import "sync"
 
+const testVersion = 1
+
 type Account struct {
 	sync.RWMutex
 	open    bool

data/tracks/go/exercises/beer-song/beer_test.go

@@ -6,12 +6,6 @@ import (
 
 const targetTestVersion = 1
 
-func TestTestVersion(t *testing.T) {
-	if testVersion != targetTestVersion {
-		t.Errorf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
-	}
-}
-
 const verse8 = "8 bottles of beer on the wall, 8 bottles of beer.\nTake one down and pass it around, 7 bottles of beer on the wall.\n"
 const verse3 = "3 bottles of beer on the wall, 3 bottles of beer.\nTake one down and pass it around, 2 bottles of beer on the wall.\n"
 const verse2 = "2 bottles of beer on the wall, 2 bottles of beer.\nTake one down and pass it around, 1 bottle of beer on the wall.\n"
@@ -54,6 +48,12 @@ var verseTestCases = []struct {
 	{"invalid verse", 104, "", true},
 }
 
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v.", testVersion, targetTestVersion)
+	}
+}
+
 func TestBottlesVerse(t *testing.T) {
 	for _, tt := range verseTestCases {
 		actualVerse, err := Verse(tt.verse)

data/tracks/go/exercises/binary-search-tree/binary_search_tree_test.go

@@ -19,6 +19,14 @@ import (
 	"testing"
 )
 
+const targetTestVersion = 1
+
+func TestTestVersion(t *testing.T) {
+	if testVersion != targetTestVersion {
+		t.Fatalf("Found testVersion = %v, want %v", testVersion, targetTestVersion)
+	}
+}
+
 func TestDataIsRetained(t *testing.T) {
 	actual := Bst(4).data
 	expected := 4

data/tracks/go/exercises/binary-search-tree/example.go

@@ -1,5 +1,7 @@
 package binarysearchtree
 
+const testVersion = 1
+
 type SearchTreeData struct {
 	left  *SearchTreeData
 	data  int

data/tracks/go/exercises/word-count/cases_test.go

@@ -1,6 +1,7 @@
 package wordcount
 
 // Source: exercism/x-common
+// Commit: f2ab262 word-count: replace underscore with space in description (#483)
 
 var testCases = []struct {
 	description string

data/tracks/java/config.json

@@ -61,7 +61,8 @@
     "clock",
     "diamond",
     "secret-handshake",
-    "flatten-array"
+    "flatten-array",
+    "perfect-numbers"
   ],
   "exercises": [
     {
@@ -353,6 +354,11 @@
       "slug": "flatten-array",
       "difficulty": 1,
       "topics": []
+    },
+    {
+      "slug": "perfect-numbers",
+      "difficulty": 1,
+      "topics": []
     }
   ],
   "deprecated": [

data/tracks/java/exercises/perfect-numbers/build.gradle

@@ -0,0 +1,17 @@
+apply plugin: "java"
+apply plugin: "eclipse"
+apply plugin: "idea"
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  testCompile "junit:junit:4.12"
+}
+test {
+  testLogging {
+    exceptionFormat = 'full'
+    events = ["passed", "failed", "skipped"]
+  }
+}

data/tracks/java/exercises/perfect-numbers/src/example/java/Classification.java

@@ -0,0 +1 @@
+tracks/java/exercises/perfect-numbers/src/example/java/../../main/java/Classification.java

data/tracks/java/exercises/perfect-numbers/src/example/java/NaturalNumber.java

@@ -0,0 +1,30 @@
+import java.util.stream.IntStream;
+
+final class NaturalNumber {
+
+    private final int naturalNumber;
+
+    NaturalNumber(int naturalNumber) {
+        if (naturalNumber <= 0) throw new IllegalStateException("Natural numbers are all positive.");
+        this.naturalNumber = naturalNumber;
+    }
+
+    Classification getClassification() {
+        final int aliquotSum = computeAliquotSum();
+
+        if (aliquotSum == naturalNumber) {
+            return Classification.PERFECT;
+        } else if (aliquotSum > naturalNumber) {
+            return Classification.ABUNDANT;
+        } else {
+            return Classification.DEFICIENT;
+        }
+    }
+
+    private int computeAliquotSum() {
+        return IntStream.range(1, naturalNumber)
+                .filter(it -> naturalNumber % it == 0)
+                .sum();
+    }
+
+}

data/tracks/java/exercises/perfect-numbers/src/main/java/Classification.java

@@ -0,0 +1,5 @@
+enum Classification {
+
+    DEFICIENT, PERFECT, ABUNDANT
+
+}

data/tracks/java/exercises/perfect-numbers/src/main/java/NaturalNumber.java

@@ -0,0 +1,5 @@
+final class NaturalNumber {
+
+
+
+}

data/tracks/java/exercises/perfect-numbers/src/test/java/NaturalNumberTest.java

@@ -0,0 +1,61 @@
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public final class NaturalNumberTest {
+
+    @Test
+    public void testSmallPerfectNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.PERFECT, new NaturalNumber(6).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testMediumPerfectNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.PERFECT, new NaturalNumber(28).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testLargePerfectNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.PERFECT, new NaturalNumber(33550336).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testSmallAbundantNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.ABUNDANT, new NaturalNumber(12).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testMediumAbundantNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.ABUNDANT, new NaturalNumber(24).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testLargeAbundantNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.ABUNDANT, new NaturalNumber(33550335).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testSmallDeficientNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.DEFICIENT, new NaturalNumber(8).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testMediumNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.DEFICIENT, new NaturalNumber(31).getClassification());
+    }
+
+    @Ignore
+    @Test
+    public void testLargeDeficientNumberIsClassifiedCorrectly() {
+        assertEquals(Classification.DEFICIENT, new NaturalNumber(33550337).getClassification());
+    }
+
+}

data/tracks/java/exercises/settings.gradle

@@ -34,6 +34,7 @@ include 'octal'
 include 'palindrome-products'
 include 'pangram'
 include 'pascals-triangle'
+include 'perfect-numbers'
 include 'phone-number'
 include 'pig-latin'
 include 'prime-factors'

data/tracks/lua/docs/INSTALLATION.md

@@ -1,15 +1,79 @@
-First install lua using [homebrew][1]
+## Installing Lua
 
-    $ brew install lua
+-   [MacOS](#mac)
+-   [Ubuntu](#ubuntu)
+-   [Windows](#windows)
 
-Then install [luarocks][2] to install packages for lua
+#### [MacOS](#mac)
 
-    $ brew install luarocks
+First install Lua and [Luarocks][2] using [Homebrew][1]:
 
-Then install [busted][3] testing framework for lua
+```shell
+$ brew install lua
+```
 
-    $ luarocks install busted
+Then install the [Busted][3] testing framework for Lua:
+
+```shell
+$ luarocks install busted
+```
+
+Then run your tests:
+
+```shell
+$ busted .
+```
+
+#### [Ubuntu](#ubuntu)
+
+First install Lua and [Luarocks][2] using [Apt][6]:
+
+```shell
+$ sudo apt-get install lua5.3 luarocks
+```
+
+Then install the [Busted][3] testing framework for Lua:
+
+```shell
+$ luarocks install busted
+```
+
+If this fails, you may need to use `sudo`:
+
+```shell
+$ sudo luarocks install busted
+```
+
+Then run your tests:
+
+```shell
+$ busted .
+```
+
+#### [Windows](#windows)
+
+First install Lua and [Luarocks][2] using [Chocolatey][7]:
+
+    C:\> choco install lua
+
+Then install the [Busted][3] testing framework for Lua:
+
+    C:\> luarocks install busted
+
+Then run your tests:
+
+    C:\> busted .
 
 [1]: http://brew.sh/
+
 [2]: http://luarocks.org/
+
 [3]: http://olivinelabs.com/busted/
+
+[4]: https://github.com/Olivine-Labs/lua-style-guide
+
+[5]: http://tylerneylon.com/a/learn-lua/
+
+[6]: https://help.ubuntu.com/lts/serverguide/apt.html
+
+[7]: http://chocolatey.org/

data/tracks/lua/docs/LEARNING.md

@@ -1 +1,5 @@
-Lua is a very small language and you can [learn the basics of the language in 15 minutes](tylerneylon.com/a/learn-lua/). For an exhaustive look at the language, written by the authors of Lua, you can read [Programming in Lua](https://www.lua.org/pil/) (the first edition which covers Lua 5.1 [is available online for free](https://www.lua.org/pil/contents.html)).
+Lua is a very small language and you can [learn the basics of the language in 15 minutes][1]. For an exhaustive look at the language, written by the authors of Lua, you can read [Programming in Lua][2] (the first edition which covers Lua 5.1 [is available online for free][3]).
+
+[1]: http://tylerneylon.com/a/learn-lua/
+[2]: http://www.lua.org/pil/
+[3]: https://www.lua.org/pil/contents.html

data/tracks/lua/docs/RESOURCES.md

@@ -1,11 +1,11 @@
 There are many great free online resources for Lua including:
 
-  1. [lua.org][8]
-  2. A highly recommended detailed and authoritative introduction to all aspects of Lua programming by Lua's chief architect: [Programming in Lua, by Roberto Ierusalimschy][6]
-  3. For an official definition of the Lua language, consult the [Lua 5.1 Reference Manual][7], by R. Ierusalimschy, L. H. de Figueiredo, W. Celes.
-  4. [Lua Style Guide][4]
-  5. [Learn Lua in 15 minutes][5]
-  6. [Some][9] [options][10] [for][11] [linting][12]
+1.  [lua.org][8]
+2.  A highly recommended detailed and authoritative introduction to all aspects of Lua programming by Lua's chief architect: [Programming in Lua, by Roberto Ierusalimschy][6]
+3.  For an official definition of the Lua language, consult the [Lua 5.1 Reference Manual][7], by R. Ierusalimschy, L. H. de Figueiredo, W. Celes.
+4.  [Lua Style Guide][4]
+5.  [Learn Lua in 15 minutes][5]
+6.  [Some][9] [options][10] [for][11] [linting][12]
 
 [4]: https://github.com/Olivine-Labs/lua-style-guide
 [5]: http://tylerneylon.com/a/learn-lua/

data/tracks/lua/exercises/minesweeper/example.lua

@@ -53,10 +53,6 @@ function board:empty_spaces()
   end)
 end
 
-function board:__tostring()
-  return self.rep
-end
-
 local function transform(board)
   local board = Board(board)
 
@@ -68,7 +64,7 @@ local function transform(board)
     if mines > 0 then board:set(x, y, tostring(mines)) end
   end
 
-  return tostring(board)
+  return board.rep
 end
 
 return {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.6.32
+  version: 2.0.6.33
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -3955,6 +3955,12 @@ files:
 - tracks/java/exercises/pascals-triangle/src/example/java/PascalsTriangle.java
 - tracks/java/exercises/pascals-triangle/src/main/java/.keep
 - tracks/java/exercises/pascals-triangle/src/test/java/PascalsTriangleTest.java
+- tracks/java/exercises/perfect-numbers/build.gradle
+- tracks/java/exercises/perfect-numbers/src/example/java/Classification.java
+- tracks/java/exercises/perfect-numbers/src/example/java/NaturalNumber.java
+- tracks/java/exercises/perfect-numbers/src/main/java/Classification.java
+- tracks/java/exercises/perfect-numbers/src/main/java/NaturalNumber.java
+- tracks/java/exercises/perfect-numbers/src/test/java/NaturalNumberTest.java
 - tracks/java/exercises/phone-number/build.gradle
 - tracks/java/exercises/phone-number/src/example/java/PhoneNumber.java
 - tracks/java/exercises/phone-number/src/main/java/.keep