trackler 2.1.0.36 → 2.1.0.37

data/tracks/java/exercises/build.gradle

@@ -1,41 +1,67 @@
-subprojects { project ->
-  apply plugin: "java"
-
-  sourceSets {
-    // Verify that the tests are working by running them against the example code.
-    // By replacing the "main" sourceSet with the example code we avoid any collisions
-    //   with solution code that may have been included as a "starter" (e.g. etl).
-    main {
-      java.srcDirs = ["src/example/java"]
-    }
-    project["compileJava"].doFirst { compileTask ->
-      println "  (source = ${compileTask.source.asPath})"
-    }
+// This root Gradle project is used for:
+//
+// - Checking that every test suite compiles against its corresponding example implementation;
+// - Checking that every example implementation passes its corresponding test suite;
+// - Checking that every provided starter implementation compiles.
+//
+// This file is never delivered to Exercism users.
 
-    starterSource {
-      java.srcDirs = ["src/main/java"]
-    }
-    project["compileStarterSourceJava"].doFirst { compileTask ->
-      println "  (source = ${compileTask.source.asPath})"
-    }
+def generatedTestSourceDir = "build/gen/test/java"
 
-    // In lieu of being able to disable @Ignore in JUnit tests, we filter
-    // those annotations, placing the edited tests in the path named here.
-    test {
-      java.srcDirs = ["build/gen/test/java"]
-    }
-    project["compileTestJava"].doFirst { compileTask ->
-      println "  (source = ${compileTask.source.asPath})"
-    }
-  }
+subprojects {
 
+  // Add a task that copies test source files into a build directory. All @Ignore annotations
+  // are removed during this copying, so that when we run the copied tests, none are skipped and
+  // all should execute.
+  //
+  // Note that journey-test.sh also strips @Ignore annotations using sed. The
+  // stripping implementations here and in journey-test.sh should be kept
+  // consistent.
   task copyTestsFilteringIgnores(type: Copy) {
     from "src/test/java"
-    into "build/gen/test/java"
+    into generatedTestSourceDir
     filter { line ->
-      line.contains("@Ignore") ? "" : line
+      line.contains("@Ignore") ? null : line
+    }
+  }
+
+  afterEvaluate { project ->
+
+    sourceSets {
+      // Set the directory containing the example implementation as the default source set. Default
+      // compile tasks will now run against this source set.
+      main {
+        java.srcDirs = ["src/example/java"]
+      }
+
+      // Define a custom source set named "starterSource" that points to the starter implementations
+      // delivered to users. We can then use the generated "compileStarterSourceJava" task to verify
+      // that the starter source compiles as-is.
+      starterSource {
+        java.srcDirs = ["src/main/java"]
+      }
+
+      // Set the directory containing the @Ignore-stripped tests as the default test source set.
+      // Default test tasks will now run against this source set.
+      test {
+        java.srcDirs = [generatedTestSourceDir]
+      }
+
+      // Log the source paths associated with each source set to verify they are what we expect.
+      logCompileTaskSourcePath(project, "compileJava") // Corresponds to the "main" source set.
+      logCompileTaskSourcePath(project, "compileStarterSourceJava")
+      logCompileTaskSourcePath(project, "compileTestJava")
     }
+
+    // When running the standard test task, make sure we prepopulate the test source set with the
+    // @Ignore-stripped tests.
+    test.dependsOn(copyTestsFilteringIgnores)
   }
 
-  test.dependsOn(copyTestsFilteringIgnores)
+}
+
+def logCompileTaskSourcePath(Project project, String taskName) {
+  project[taskName].doFirst { compileTask ->
+    println "  (source = ${compileTask.source.asPath})"
+  }
 }

data/tracks/java/exercises/hello-world/GETTING_STARTED.md

@@ -18,6 +18,10 @@ Try writing a solution that passes one test at a time, running Gradle each time:
 $ gradle test
 ```
 
+To help you focus on one test at a time, [@Ignore](http://junit.sourceforge.net/javadoc/org/junit/Ignore.html)
+annotations have been added to every test but the first one. Any test with an `@Ignore` annotation will be skipped
+when you run the tests.
+
 ## Iterate through the tests
 
 After your first test passes, remove the `@Ignore` from the next test, and iterate on your solution,

data/tracks/java/exercises/pythagorean-triplet/src/test/java/PythagoreanTripletTest.java

@@ -14,33 +14,33 @@ public class PythagoreanTripletTest {
 
     @Test
     public void shouldCalculateSum() {
-        PythagoreanTriplet sut = new PythagoreanTriplet(3, 4, 5);
+        PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
         final int expected = 12;
-        final int actual = sut.calculateSum();
+        final int actual = triplet.calculateSum();
         assertEquals(expected, actual);
     }
 
     @Test
     @Ignore("Remove to run test")
     public void shouldCalculateProduct() {
-        PythagoreanTriplet sut = new PythagoreanTriplet(3, 4, 5);
+        PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
         final long expected = 60l;
-        final long actual = sut.calculateProduct();
+        final long actual = triplet.calculateProduct();
         assertEquals(expected, actual);
     }
 
     @Test
     @Ignore("Remove to run test")
     public void testIsPythagoreanOK() {
-        PythagoreanTriplet sut = new PythagoreanTriplet(3, 4, 5);
-        assertTrue(sut.isPythagorean());
+        PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
+        assertTrue(triplet.isPythagorean());
     }
 
     @Test
     @Ignore("Remove to run test")
     public void testIsPythagoreanFail() {
-        PythagoreanTriplet sut = new PythagoreanTriplet(5, 6, 7);
-        assertFalse(sut.isPythagorean());
+        PythagoreanTriplet triplet = new PythagoreanTriplet(5, 6, 7);
+        assertFalse(triplet.isPythagorean());
     }
 
     @Test

data/tracks/java/exercises/scrabble-score/src/example/java/Scrabble.java

@@ -45,7 +45,7 @@ final class Scrabble {
     }
 
     private static int getScore(String input) {
-        if (input == null || input.trim().isEmpty()) {
+        if (input.trim().isEmpty()) {
             return 0;
         }
 

data/tracks/java/exercises/scrabble-score/src/test/java/ScrabbleScoreTest.java

@@ -7,6 +7,9 @@ import java.util.Collection;
 
 import static org.junit.Assert.assertEquals;
 
+/*
+ * version: 1.0.0
+ */
 @RunWith(Parameterized.class)
 public class ScrabbleScoreTest {
 
@@ -16,15 +19,17 @@ public class ScrabbleScoreTest {
     @Parameterized.Parameters(name = "{index}: expected scrabble score for \"{0}\" to be {1}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
-                {"", 0},
-                {" \t\n", 0},
-                {null, 0},
                 {"a", 1},
+                {"A", 1},
                 {"f", 4},
+                {"at", 2},
+                {"zoo", 12},
                 {"street", 6},
                 {"quirky", 22},
-                {"OXYPHENBUTAZONE", 41},
-                {"alacrity", 13},
+                {"OxyphenButazone", 41},
+                {"pinata", 8},
+                {"", 0},
+                {"abcdefghijklmnopqrstuvwxyz", 87},
         });
     }
 

data/tracks/java/exercises/series/src/test/java/SeriesTest.java

@@ -17,9 +17,9 @@ public class SeriesTest {
     
     @Test
     public void hasDigitsShort() {
-        Series sut = new Series("01234");
+        Series series = new Series("01234");
         List<Integer> expected = Arrays.asList(0, 1, 2, 3, 4);
-        List<Integer> actual = sut.getDigits();
+        List<Integer> actual = series.getDigits();
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -28,9 +28,9 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void hasDigitsLong() {
-        Series sut = new Series("0123456789");
+        Series series = new Series("0123456789");
         List<Integer> expected = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-        List<Integer> actual = sut.getDigits();
+        List<Integer> actual = series.getDigits();
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -39,9 +39,9 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void keepsTheDigitOrderIfReversed() {
-        Series sut = new Series("9876543210");
+        Series series = new Series("9876543210");
         List<Integer> expected = Arrays.asList(9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
-        List<Integer> actual = sut.getDigits();
+        List<Integer> actual = series.getDigits();
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -50,9 +50,9 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void keepsArbitraryDigitOrder() {
-        Series sut = new Series("936923468");
+        Series series = new Series("936923468");
         List<Integer> expected = Arrays.asList(9, 3, 6, 9, 2, 3, 4, 6, 8);
-        List<Integer> actual = sut.getDigits();
+        List<Integer> actual = series.getDigits();
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -61,7 +61,7 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void canSliceByOne() {
-        Series sut = new Series("01234");
+        Series series = new Series("01234");
         List<List<Integer>> expected = Arrays.asList(
                 Arrays.asList(0),
                 Arrays.asList(1),
@@ -69,7 +69,7 @@ public class SeriesTest {
                 Arrays.asList(3),
                 Arrays.asList(4)
         );
-        List<List<Integer>> actual = sut.slices(1);
+        List<List<Integer>> actual = series.slices(1);
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -78,7 +78,7 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void canSliceByTwo() {
-        Series sut = new Series("98273463");
+        Series series = new Series("98273463");
         List<List<Integer>> expected = Arrays.asList(
                 Arrays.asList(9, 8),
                 Arrays.asList(8, 2),
@@ -88,7 +88,7 @@ public class SeriesTest {
                 Arrays.asList(4, 6),
                 Arrays.asList(6, 3)
         );
-        List<List<Integer>> actual = sut.slices(2);
+        List<List<Integer>> actual = series.slices(2);
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -97,13 +97,13 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void canSliceByThree() {
-        Series sut = new Series("01234");
+        Series series = new Series("01234");
         List<List<Integer>> expected = Arrays.asList(
                 Arrays.asList(0, 1, 2),
                 Arrays.asList(1, 2, 3),
                 Arrays.asList(2, 3, 4)
         );
-        List<List<Integer>> actual = sut.slices(3);
+        List<List<Integer>> actual = series.slices(3);
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -112,13 +112,13 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void canSliceByThreeWithDuplicateDigits() {
-        Series sut = new Series("31001");
+        Series series = new Series("31001");
         List<List<Integer>> expected = Arrays.asList(
                 Arrays.asList(3, 1, 0),
                 Arrays.asList(1, 0, 0),
                 Arrays.asList(0, 0, 1)
         );
-        List<List<Integer>> actual = sut.slices(3);
+        List<List<Integer>> actual = series.slices(3);
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -127,12 +127,12 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void canSliceByFour() {
-        Series sut = new Series("91274");
+        Series series = new Series("91274");
         List<List<Integer>> expected = Arrays.asList(
                 Arrays.asList(9, 1, 2, 7),
                 Arrays.asList(1, 2, 7, 4)
         );
-        List<List<Integer>> actual = sut.slices(4);
+        List<List<Integer>> actual = series.slices(4);
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);
@@ -141,11 +141,11 @@ public class SeriesTest {
     @Test
     @Ignore("Remove to run test")
     public void canSliceByFive() {
-        Series sut = new Series("81228");
+        Series series = new Series("81228");
         List<List<Integer>> expected = Arrays.asList(
                 Arrays.asList(8, 1, 2, 2, 8)
         );
-        List<List<Integer>> actual = sut.slices(5);
+        List<List<Integer>> actual = series.slices(5);
         assertNotNull(actual);
         assertFalse(actual.isEmpty());
         assertEquals(expected, actual);

data/tracks/java/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 23 10:48:11 BST 2017
+#Wed Jun 14 14:21:29 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

data/tracks/julia/runtests.jl

@@ -31,17 +31,12 @@ for (root, dirs, files) in walkdir("exercises")
 
         try
             # Run the tests
-            result = @testset "$exercise example" begin
+            @testset "$exercise example" begin
                 include(joinpath(temp_path, "runtests.jl"))
             end
         finally
             # Delete the temporary directory
             rm(temp_path, recursive=true)
         end
-
-        # Print test output (this is the default behaviour for older versions of Julia)
-        if VERSION > v"0.6.0-dev"
-            Base.Test.print_test_results(result)
-        end
     end
 end

data/tracks/kotlin/.gitignore

@@ -7,8 +7,3 @@ build
 .gradle
 .idea
 *.iml
-
-gradle/
-gradlew
-gradlew.bat
-

data/tracks/kotlin/.travis.yml

@@ -3,16 +3,36 @@ language: java
 jdk:
   - oraclejdk8
 
+# http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
-cache: bundler
+
 addons:
   apt:
     packages:
       - tree
+
 before_install:
   - rvm install 2.2.5
   - rvm use 2.2.5
+  - bin/build-jq.sh  # we want jq 1.5 features; not avail through pkg repo.
+
+# https://docs.travis-ci.com/user/customizing-the-build#Skipping-the-Installation-Step
+install: true  # if we don't skip install, ./gradlew assemble is invoked, but this task is not available.
+
+before_script:
+  - export PATH=$TRAVIS_BUILD_DIR/bin:$PATH  # ensure our tools are prefered over included ones.
 
 script:
   - bin/unit-tests.sh
   - bin/journey-test.sh
+
+# configure caching (https://docs.travis-ci.com/user/languages/java/#Caching)
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+# format from https://docs.travis-ci.com/user/caching/#Enabling-multiple-caching-features
+cache:
+  bundler: true
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/

data/tracks/kotlin/bin/build-jq.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -ex
+
+pushd bin
+curl --location https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz >jq-1.5.tar.gz
+tar xvf jq-1.5.tar.gz
+cd jq-1.5
+./configure --disable-maintainer-mode && make
+mv jq ..
+popd
+

data/tracks/kotlin/bin/fetch-configlet

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 LATEST=https://github.com/exercism/configlet/releases/latest
 

data/tracks/kotlin/bin/journey-test.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This script is shared between the Java and Kotlin tracks.  If you make an update to this script on
-# on track, please create a companion PR to merge it in to the other.  Thank you!
+# one track, please create a companion PR to merge it in to the other.  Thank you!
 TRACK=kotlin
 TRACK_REPO="x${TRACK}"
 TRACK_SRC_EXT="kt"
@@ -65,7 +65,7 @@ clean() {
     rm -rf "${build_path}"
   fi
   cd exercises
-  gradle clean
+  "$EXECPATH"/gradlew clean
   cd ..
   echo "<<< clean()"
 }
@@ -78,6 +78,8 @@ get_operating_system() {
           echo "linux";;
       (Windows*)
           echo "windows";;
+      (MINGW*)
+          echo "windows";;
       (*)
           echo "linux";;
   esac
@@ -108,10 +110,25 @@ download_exercism_cli() {
   # "curl..." :: HTTP 302 headers, including "Location" -- URL to redirect to.
   # "awk..." :: pluck last path segment from "Location" (i.e. the version number)
   local version="$(curl --head --silent ${latest} | awk -v FS=/ '/Location:/{print $NF}' | tr -d '\r')"
-  local download_url=${CLI_RELEASES}/download/${version}/exercism-${os}-${arch}.tgz
+
+  local download_url_suffix
+  local unzip_command
+  local unzip_from_file_option
+  if [[ ${os} == "windows" ]] ; then
+    download_url_suffix="zip"
+    unzip_command="unzip -d"
+    unzip_from_file_option=""
+  else
+    download_url_suffix="tgz"
+    unzip_command="tar xz -C"
+    unzip_from_file_option="-f"
+  fi
+  local download_url=${CLI_RELEASES}/download/${version}/exercism-${os}-${arch}.${download_url_suffix}
 
   mkdir -p ${exercism_home}
-  curl -s --location ${download_url} | tar xz -C ${exercism_home}
+  local temp=`mktemp`
+  curl -s --location ${download_url} > ${temp}
+  ${unzip_command} ${exercism_home} ${unzip_from_file_option} ${temp}
   echo "<<< download_exercism_cli()"
 }
 
@@ -132,6 +149,11 @@ make_local_trackler() {
 
   local track_root=$( pwd )
   pushd ${trackler}
+
+  # Get the version of Trackler x-api is currently using
+  local version=$( grep -m 1 'trackler' ${xapi_home}/Gemfile.lock | sed 's/.*(//' | sed 's/)//' )
+
+  git checkout v${version}
   git submodule init -- common
   git submodule update
 
@@ -141,10 +163,6 @@ make_local_trackler() {
   cp ${track_root}/config.json tracks/${TRACK}
   cp -r ${track_root}/exercises tracks/${TRACK}
 
-  # Set the version to that expected by x-api
-  version=$( grep -m 1 'trackler' ${xapi_home}/Gemfile.lock | sed 's/.*(//' | sed 's/)//' )
-  echo "module Trackler VERSION = \"${version}\" end" > lib/trackler/version.rb
-
   gem install bundler
   bundle install
   gem build trackler.gemspec
@@ -198,7 +216,7 @@ solve_all_exercises() {
 
   local track_root=$( pwd )
   local exercism_cli="./exercism --config ${exercism_configfile}"
-  local exercises=`cat config.json | jq '.exercises[] .slug' --raw-output`
+  local exercises=`cat config.json | jq '.exercises[].slug + " "' --join-output`
   local total_exercises=`cat config.json | jq '.exercises | length'`
   local current_exercise_number=1
   local tempfile="${TMPDIR:-/tmp}/journey-test.sh-unignore_all_tests.txt"
@@ -215,12 +233,14 @@ solve_all_exercises() {
 
     pushd ${exercism_exercises_dir}/${TRACK}/${exercise}
     # Check that tests compile before we strip @Ignore annotations
-    gradle compileTestJava
-    # Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
+    "$EXECPATH"/gradlew compileTestKotlin
+    # Strip @Ignore annotations to ensure we run the tests (as delivered, all but the first is @Ignore'd).
+    # Note that unit-test.sh also strips @Ignore annotations via the Gradle task copyTestsFilteringIgnores.
+    # The stripping implementations here and in copyTestsFilteringIgnores should be kept consistent.
     for testfile in `find . -name "*Test.${TRACK_SRC_EXT}"`; do
-      sed 's/@Ignore//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
+      sed 's/@Ignore\(\(.*\)\)\{0,1\}//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
     done
-    gradle test
+    "$EXECPATH"/gradlew test
     popd
 
     current_exercise_number=$((current_exercise_number + 1))
@@ -243,7 +263,7 @@ main() {
   local exercism_configfile=".journey-test.exercism.json"
   local xapi_port=9292
 
-  assert_installed "gradle"
+  # fail fast if required binaries are not installed.
   assert_installed "jq"
 
   clean "${build_dir}"

data/tracks/kotlin/bin/unit-tests.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-gradle --version
+./gradlew --version
 
 echo ""
 echo ">>> Running configlet..."
@@ -10,6 +10,6 @@ bin/configlet .
 pushd exercises
 echo ""
 echo ">>> Running tests..."
-TERM=dumb gradle check compileStarterSourceKotlin --continue
+TERM=dumb ../gradlew check compileStarterSourceKotlin --continue
 popd