trackler 2.1.0.13 → 2.1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134537e7fe21dbf68cd5b2263485e4bf38e18e67
-  data.tar.gz: dfdbe0f776c7893ad23be2cb7dd7ff585f7357a0
+  metadata.gz: 4133c47757d7a255d9a21636f63b479e766488b1
+  data.tar.gz: 54b3438d332c5590e545bccb26376e435c27bcef
 SHA512:
-  metadata.gz: 6fdaa82e575fbe3508a780be97f97d369aad75696a3d7cacbf6fd86dd4ad5cb9b0c26893513263633e3b79aad931f4c9d577484cc6cfd28f66ea0cfab777c21a
-  data.tar.gz: 03a9912fb641544b4f495bf186c4118c68241c5b7a7f0e47e09d6ce9af6ffc64c3e12d9a64d405d22e387f1389a64ad403865e9578e5b66b925cadf36131464a
+  metadata.gz: 87f951253be363fa194a43de8f2fd4b68bdc1e41d08f71e0e7a514d3bfabc8948b452768090215954a1b73e293e28f863cccce2d0a3cce4d149beacc1b2bb8fa
+  data.tar.gz: e669c4d8420d092bf9e5ce12dabc7ed89bc67a7cdb8ba3537af6895b31e6a1fe71c1a125b723d1a1365bfc93589efb1cf47d5895d7172028c257870ae55a82cd

data/lib/trackler/implementation.rb

@@ -11,7 +11,6 @@ module Trackler
     ]
 
     attr_reader :track, :problem
-    attr_writer :files
     def initialize(track, problem)
       @track = track
       @problem = problem
@@ -31,6 +30,15 @@ module Trackler
       }].merge("README.md" => readme)
     end
 
+    def files=(value)
+      warn "DEPRECATION WARNING: 'Implementation#files=' is no longer public, please use 'implementation.merge_files' instead."
+      @files = value
+    end
+
+    def merge_files(new_files)
+      files.merge!(new_files)
+    end
+
     def zip
       @zip ||= file_bundle.zip do |io|
         io.put_next_entry('README.md')

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.1.0.13"
+  VERSION = "2.1.0.14"
 end

data/tracks/haskell/exercises/matrix/package.yaml

@@ -1,5 +1,5 @@
 name: matrix
-version: 0.1.0.2
+version: 0.1.0.3
 
 dependencies:
   - base

data/tracks/haskell/exercises/matrix/test/Tests.hs

@@ -69,16 +69,3 @@ specs = do
 
     it "flatten" $
       flatten (intMatrix "1 2\n3 4") `shouldBe` vector [1, 2, 3, 4]
-
-    it "matrix of chars" $
-      fromString "'f' 'o' 'o'\n'b' 'a' 'r'" `shouldBe` fromList ["foo", "bar"]
-
-    it "matrix of strings" $ 
-       fromString "\"this one\"\n\"may be tricky!\""
-       `shouldBe` fromList [ ["this one"      ]
-                           , ["may be tricky!"] ]
-
-    it "matrix of strings 2" $ 
-       fromString "\"this one\" \"one\" \n\"may be tricky!\" \"really tricky\""
-       `shouldBe` fromList [ ["this one"      , "one"          ]
-                           , ["may be tricky!", "really tricky"] ]

data/tracks/java/.gitattributes

@@ -0,0 +1,10 @@
+# Autodetect text files
+* text=auto
+
+# Force the following filetypes to have unix eols, so Windows does not break them
+*.* text eol=lf
+
+# Force images/fonts to be handled as binaries
+*.jpg binary
+*.jpeg binary
+*.png binary

data/tracks/java/config.json

@@ -324,6 +324,11 @@
       "slug": "run-length-encoding",
       "difficulty": 1,
       "topics": []
+    },
+    {
+      "slug": "kindergarten-garden",
+      "difficulty": 1,
+      "topics": []
     }
   ],
   "deprecated": [

data/tracks/java/exercises/difference-of-squares/src/test/java/DifferenceOfSquaresCalculatorTest.java

@@ -4,7 +4,11 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
+/*
+ * version: 1.1.0
+ */
 public final class DifferenceOfSquaresCalculatorTest {
+
     private DifferenceOfSquaresCalculator calculator;
 
     @Before
@@ -13,17 +17,17 @@ public final class DifferenceOfSquaresCalculatorTest {
     }
 
     @Test
-    public void testSquareOfSum5() {
-        final int expected = 225;
-        final int actual = calculator.computeSquareOfSumTo(5);
+    public void testSquareOfSum1() {
+        final int expected = 1;
+        final int actual = calculator.computeSquareOfSumTo(1);
         assertEquals(expected, actual);
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void testSquareOfSum10() {
-        final int expected = 3025;
-        final int actual = calculator.computeSquareOfSumTo(10);
+    public void testSquareOfSum5() {
+        final int expected = 225;
+        final int actual = calculator.computeSquareOfSumTo(5);
         assertEquals(expected, actual);
     }
 
@@ -37,17 +41,17 @@ public final class DifferenceOfSquaresCalculatorTest {
 
     @Ignore("Remove to run test")
     @Test
-    public void testSumOfSquares5() {
-        final int expected = 55;
-        final int actual = calculator.computeSumOfSquaresTo(5);
+    public void testSumOfSquares1() {
+        final int expected = 1;
+        final int actual = calculator.computeSumOfSquaresTo(1);
         assertEquals(expected, actual);
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void testSumOfSquares10() {
-        final int expected = 385;
-        final int actual = calculator.computeSumOfSquaresTo(10);
+    public void testSumOfSquares5() {
+        final int expected = 55;
+        final int actual = calculator.computeSumOfSquaresTo(5);
         assertEquals(expected, actual);
     }
 
@@ -61,9 +65,9 @@ public final class DifferenceOfSquaresCalculatorTest {
 
     @Ignore("Remove to run test")
     @Test
-    public void testDifferenceOfSquares0() {
+    public void testDifferenceOfSquares1() {
         final int expected = 0;
-        final int actual = calculator.computeDifferenceOfSquares(0);
+        final int actual = calculator.computeDifferenceOfSquares(1);
         assertEquals(expected, actual);
     }
 
@@ -75,14 +79,6 @@ public final class DifferenceOfSquaresCalculatorTest {
         assertEquals(expected, actual);
     }
 
-    @Ignore("Remove to run test")
-    @Test
-    public void testDifferenceOfSquares10() {
-        final int expected = 2640;
-        final int actual = calculator.computeDifferenceOfSquares(10);
-        assertEquals(expected, actual);
-    }
-
     @Ignore("Remove to run test")
     @Test
     public void testDifferenceOfSquares100() {

data/tracks/java/exercises/kindergarten-garden/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/kindergarten-garden/src/example/java/KindergartenGarden.java

@@ -0,0 +1,44 @@
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
+
+public class KindergartenGarden {
+    private String[] students;
+    private String garden;
+    private static final int PLANTS_PER_STUDENT_PER_ROW = 2;
+    private final int newRowLocation;
+
+    private static final String[] DEFAULT_STUDENTS = {
+            "Alice", "Bob", "Charlie", "David",
+            "Eve", "Fred", "Ginny", "Harriet",
+            "Ileana", "Joseph", "Kincaid", "Larry"
+    };
+
+    public KindergartenGarden(String garden, String[] students) {
+        this.garden = garden;
+        Arrays.sort(students);
+        this.students = students;
+        newRowLocation = garden.indexOf('\n') + 1;
+    }
+
+    public KindergartenGarden(String garden) {
+        this(garden, DEFAULT_STUDENTS);
+    }
+
+    public List<Plant> getPlantsOfStudent(String student) {
+        List<Plant> plants = new ArrayList<Plant>();
+        int studentPlantsIndex = Arrays.binarySearch(students, student) * PLANTS_PER_STUDENT_PER_ROW;
+
+        for (int i = studentPlantsIndex; i < studentPlantsIndex + PLANTS_PER_STUDENT_PER_ROW; i++) {
+            plants.add(Plant.getPlant(garden.charAt(i)));
+        }
+
+        for (int i = newRowLocation + studentPlantsIndex;
+             i < newRowLocation + studentPlantsIndex + PLANTS_PER_STUDENT_PER_ROW; i++) {
+            plants.add(Plant.getPlant(garden.charAt(i)));
+        }
+
+        return plants;
+    }
+}

data/tracks/java/exercises/kindergarten-garden/src/example/java/Plant.java

@@ -0,0 +1,21 @@
+public enum Plant {
+    VIOLETS,
+    RADISHES,
+    CLOVER,
+    GRASS;
+
+    public static Plant getPlant(char plantCode) {
+        switch (plantCode) {
+            case 'G':
+                return GRASS;
+            case 'C':
+                return CLOVER;
+            case 'R':
+                return RADISHES;
+            case 'V':
+                return VIOLETS;
+        }
+
+        return null;
+    }
+}

data/tracks/java/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java

@@ -0,0 +1,15 @@
+import java.util.List;
+
+public class KindergartenGarden {
+    public KindergartenGarden(String garden, String[] students) {
+        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
+    }
+
+    public KindergartenGarden(String garden) {
+        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
+    }
+
+    public List<Plant> getPlantsOfStudent(String student) {
+        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
+    }
+}

data/tracks/java/exercises/kindergarten-garden/src/main/java/Plant.java

@@ -0,0 +1,21 @@
+public enum Plant {
+    VIOLETS,
+    RADISHES,
+    CLOVER,
+    GRASS;
+
+    public static Plant getPlant(char plantCode) {
+        switch (plantCode) {
+            case 'G':
+                return GRASS;
+            case 'C':
+                return CLOVER;
+            case 'R':
+                return RADISHES;
+            case 'V':
+                return VIOLETS;
+        }
+
+        return null;
+    }
+}

data/tracks/java/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java

@@ -0,0 +1,182 @@
+import java.util.List;
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.junit.Ignore;
+
+import static org.junit.Assert.assertEquals;
+
+public class KindergartenGardenTest {
+
+    @Test
+    public void singleStudent() {
+        String student = "Alice";
+        String plants = "RC\nGG";
+        List<Plant> expected = Arrays.asList(Plant.RADISHES, Plant.CLOVER, Plant.GRASS, Plant.GRASS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void singleStudent2() {
+        String student = "Alice";
+        String plants = "VC\nRC";
+        List<Plant> expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.CLOVER);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void twoStudents() {
+        String student = "Bob";
+        String plants = "VVCG\nVVRC";
+        List<Plant> expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.RADISHES, Plant.CLOVER);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void oneGardenSecondStudent() {
+        String student = "Bob";
+        String plants = "VVCCGG\nVVCCGG";
+        List<Plant> expected = Arrays.asList(Plant.CLOVER, Plant.CLOVER, Plant.CLOVER, Plant.CLOVER);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void oneGardenThirdStudent() {
+        String student = "Charlie";
+        String plants = "VVCCGG\nVVCCGG";
+        List<Plant> expected = Arrays.asList(Plant.GRASS, Plant.GRASS, Plant.GRASS, Plant.GRASS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void fullGardenFirstStudent() {
+        String student = "Alice";
+        String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV";
+        List<Plant> expected = Arrays.asList(Plant.VIOLETS, Plant.RADISHES, Plant.VIOLETS, Plant.RADISHES);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void fullGardenSecondStudent() {
+        String student = "Bob";
+        String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV";
+        List<Plant> expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.CLOVER, Plant.CLOVER);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void fullGardenSecondToLastStudent() {
+        String student = "Kincaid";
+        String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV";
+        List<Plant> expected = Arrays.asList(Plant.GRASS, Plant.CLOVER, Plant.CLOVER, Plant.GRASS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void fullGardenLastStudent() {
+        String student = "Larry";
+        String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV";
+        List<Plant> expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.VIOLETS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void customStudentGardenFirstStudent() {
+        String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"};
+        String student = "Patricia";
+        String plants = "VCRRGVRG\nRVGCCGCV";
+        List<Plant> expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.VIOLETS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void customStudentGardenSecondStudent() {
+        String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"};
+        String student = "Roger";
+        String plants = "VCRRGVRG\nRVGCCGCV";
+        List<Plant> expected = Arrays.asList(Plant.RADISHES, Plant.RADISHES, Plant.GRASS, Plant.CLOVER);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void customStudentGardenThirdStudent() {
+        String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"};
+        String student = "Samantha";
+        String plants = "VCRRGVRG\nRVGCCGCV";
+        List<Plant> expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.GRASS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student)
+        );
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void customStudentGardenFourthStudent() {
+        String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"};
+        String student = "Xander";
+        String plants = "VCRRGVRG\nRVGCCGCV";
+        List<Plant> expected = Arrays.asList(Plant.RADISHES, Plant.GRASS, Plant.CLOVER, Plant.VIOLETS);
+
+        assertEquals(
+            expected,
+            new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student)
+        );
+    }
+}

data/tracks/java/exercises/sum-of-multiples/src/example/java/SumOfMultiples.java

@@ -1,34 +1,34 @@
-public class SumOfMultiples {
-    private final int sum;
-
-    public SumOfMultiples(int number, int[] set) {
-        sum = calculateSum(number, set);
-    }
-
-    public int getSum() {
-        return sum;
-    }
-
-    private int calculateSum(int number, int[] set) {
-
-        int sum = 0;
-        int count = 0;
-
-        for (int i = 1; i < number; i++) {
-
-            for (int j = 0; j < set.length; j++) {
-                if (i % set[j] == 0) {
-                    count++;
-                }
-            }
-
-            if (count > 0) {
-                sum = sum + i;
-                count = 0;
-            }
-        }
-
-        return sum;
-    }
-
-}
+public class SumOfMultiples {
+    private final int sum;
+
+    public SumOfMultiples(int number, int[] set) {
+        sum = calculateSum(number, set);
+    }
+
+    public int getSum() {
+        return sum;
+    }
+
+    private int calculateSum(int number, int[] set) {
+
+        int sum = 0;
+        int count = 0;
+
+        for (int i = 1; i < number; i++) {
+
+            for (int j = 0; j < set.length; j++) {
+                if (i % set[j] == 0) {
+                    count++;
+                }
+            }
+
+            if (count > 0) {
+                sum = sum + i;
+                count = 0;
+            }
+        }
+
+        return sum;
+    }
+
+}

data/tracks/java/exercises/sum-of-multiples/src/main/java/SumOfMultiples.java

@@ -1,3 +1,3 @@
-public class SumOfMultiples {
-    
-}
+public class SumOfMultiples {
+    
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.1.0.13
+  version: 2.1.0.14
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -4263,6 +4263,7 @@ files:
 - tracks/idris/img/icon.png
 - tracks/java/.Rhistory
 - tracks/java/.git
+- tracks/java/.gitattributes
 - tracks/java/.github/PULL_REQUEST_TEMPLATE.md
 - tracks/java/.github/stale.yml
 - tracks/java/.gitignore
@@ -4407,6 +4408,12 @@ files:
 - tracks/java/exercises/isogram/src/example/java/IsogramChecker.java
 - tracks/java/exercises/isogram/src/main/java/.keep
 - tracks/java/exercises/isogram/src/test/java/IsogramCheckerTest.java
+- tracks/java/exercises/kindergarten-garden/build.gradle
+- tracks/java/exercises/kindergarten-garden/src/example/java/KindergartenGarden.java
+- tracks/java/exercises/kindergarten-garden/src/example/java/Plant.java
+- tracks/java/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java
+- tracks/java/exercises/kindergarten-garden/src/main/java/Plant.java
+- tracks/java/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java
 - tracks/java/exercises/largest-series-product/build.gradle
 - tracks/java/exercises/largest-series-product/src/example/java/LargestSeriesProductCalculator.java
 - tracks/java/exercises/largest-series-product/src/main/java/LargestSeriesProductCalculator.java