trackler 2.2.1.151 → 2.2.1.152

data/tracks/python/exercises/zebra-puzzle/README.md

@@ -44,7 +44,7 @@ raise Exception("Meaningful message indicating the source of the error")
 To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
 
 - Python 2.7: `py.test zebra_puzzle_test.py`
-- Python 3.3+: `pytest zebra_puzzle_test.py`
+- Python 3.4+: `pytest zebra_puzzle_test.py`
 
 Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
 `python -m pytest zebra_puzzle_test.py`

data/tracks/python/exercises/zipper/README.md

@@ -46,7 +46,7 @@ raise Exception("Meaningful message indicating the source of the error")
 To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
 
 - Python 2.7: `py.test zipper_test.py`
-- Python 3.3+: `pytest zipper_test.py`
+- Python 3.4+: `pytest zipper_test.py`
 
 Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
 `python -m pytest zipper_test.py`

data/tracks/python/requirements-travis.txt

@@ -1,3 +1,3 @@
 flake8==3.5.0
 pep8>=1.7,<1.7.99
-pyflakes==1.6.0
+pyflakes==2.0.0

data/tracks/swift/exercises/scale-generator/Tests/ScaleGeneratorTests/ScaleGeneratorTests.swift

@@ -89,7 +89,7 @@ class ScaleGeneratorTests: XCTestCase {
     }
 
     func testEnigmatic() {
-        let enigmatic = ScaleGenerator(tonic: "G", scaleName: "enigma", pattern: "mAMMMmM")
+        let enigmatic = ScaleGenerator(tonic: "G", scaleName: "enigma", pattern: "mAMMMmm")
         XCTAssertEqual(enigmatic.pitches(), ["G", "G#", "B", "C#", "D#", "F", "F#"])
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.2.1.151
+  version: 2.2.1.152
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -3182,19 +3182,24 @@ files:
 - tracks/csharp/generators/Exercises/BookStore.cs
 - tracks/csharp/generators/Exercises/Bowling.cs
 - tracks/csharp/generators/Exercises/BracketPush.cs
+- tracks/csharp/generators/Exercises/Change.cs
+- tracks/csharp/generators/Exercises/CircularBuffer.cs
 - tracks/csharp/generators/Exercises/Clock.cs
 - tracks/csharp/generators/Exercises/CollatzConjecture.cs
 - tracks/csharp/generators/Exercises/ComplexNumbers.cs
 - tracks/csharp/generators/Exercises/Connect.cs
 - tracks/csharp/generators/Exercises/CryptoSquare.cs
+- tracks/csharp/generators/Exercises/CustomSet.cs
 - tracks/csharp/generators/Exercises/Diamond.cs
 - tracks/csharp/generators/Exercises/DifferenceOfSquares.cs
 - tracks/csharp/generators/Exercises/Dominoes.cs
 - tracks/csharp/generators/Exercises/Etl.cs
 - tracks/csharp/generators/Exercises/FlattenArray.cs
 - tracks/csharp/generators/Exercises/FoodChain.cs
+- tracks/csharp/generators/Exercises/Forth.cs
 - tracks/csharp/generators/Exercises/Gigasecond.cs
 - tracks/csharp/generators/Exercises/Grains.cs
+- tracks/csharp/generators/Exercises/Grep.cs
 - tracks/csharp/generators/Exercises/Hamming.cs
 - tracks/csharp/generators/Exercises/HelloWorld.cs
 - tracks/csharp/generators/Exercises/House.cs
@@ -3204,6 +3209,7 @@ files:
 - tracks/csharp/generators/Exercises/LargestSeriesProduct.cs
 - tracks/csharp/generators/Exercises/Leap.cs
 - tracks/csharp/generators/Exercises/Luhn.cs
+- tracks/csharp/generators/Exercises/Markdown.cs
 - tracks/csharp/generators/Exercises/Matrix.cs
 - tracks/csharp/generators/Exercises/Meetup.cs
 - tracks/csharp/generators/Exercises/Minesweeper.cs
@@ -3217,11 +3223,13 @@ files:
 - tracks/csharp/generators/Exercises/PigLatin.cs
 - tracks/csharp/generators/Exercises/Poker.cs
 - tracks/csharp/generators/Exercises/PrimeFactors.cs
+- tracks/csharp/generators/Exercises/ProteinTranslation.cs
 - tracks/csharp/generators/Exercises/Proverb.cs
 - tracks/csharp/generators/Exercises/QueenAttack.cs
 - tracks/csharp/generators/Exercises/RailFenceCipher.cs
 - tracks/csharp/generators/Exercises/Raindrops.cs
 - tracks/csharp/generators/Exercises/RationalNumbers.cs
+- tracks/csharp/generators/Exercises/Rectangles.cs
 - tracks/csharp/generators/Exercises/ReverseString.cs
 - tracks/csharp/generators/Exercises/RnaTranscription.cs
 - tracks/csharp/generators/Exercises/RobotSimulator.cs
@@ -3230,10 +3238,12 @@ files:
 - tracks/csharp/generators/Exercises/RunLengthEncoding.cs
 - tracks/csharp/generators/Exercises/SaddlePoints.cs
 - tracks/csharp/generators/Exercises/Say.cs
+- tracks/csharp/generators/Exercises/ScaleGenerator.cs
 - tracks/csharp/generators/Exercises/ScrabbleScore.cs
 - tracks/csharp/generators/Exercises/SecretHandshake.cs
 - tracks/csharp/generators/Exercises/Sieve.cs
 - tracks/csharp/generators/Exercises/SpaceAge.cs
+- tracks/csharp/generators/Exercises/SpiralMatrix.cs
 - tracks/csharp/generators/Exercises/Sublist.cs
 - tracks/csharp/generators/Exercises/SumOfMultiples.cs
 - tracks/csharp/generators/Exercises/Tournament.cs
@@ -3242,19 +3252,18 @@ files:
 - tracks/csharp/generators/Exercises/TwelveDays.cs
 - tracks/csharp/generators/Exercises/TwoBucket.cs
 - tracks/csharp/generators/Exercises/TwoFer.cs
+- tracks/csharp/generators/Exercises/VariableLengthQuantity.cs
 - tracks/csharp/generators/Exercises/WordCount.cs
 - tracks/csharp/generators/Exercises/Wordy.cs
 - tracks/csharp/generators/Exercises/Yacht.cs
+- tracks/csharp/generators/Exercises/ZebraPuzzle.cs
 - tracks/csharp/generators/GeneratorExercise.cs
 - tracks/csharp/generators/GeneratorStatus.cs
 - tracks/csharp/generators/Generators.csproj
 - tracks/csharp/generators/Generators.sln
 - tracks/csharp/generators/Input/CanonicalData.cs
 - tracks/csharp/generators/Input/CanonicalDataCase.cs
-- tracks/csharp/generators/Input/CanonicalDataCaseJson.cs
-- tracks/csharp/generators/Input/CanonicalDataCaseJsonConverter.cs
-- tracks/csharp/generators/Input/CanonicalDataCasesJson.cs
-- tracks/csharp/generators/Input/CanonicalDataCasesJsonConverter.cs
+- tracks/csharp/generators/Input/CanonicalDataCaseParser.cs
 - tracks/csharp/generators/Input/CanonicalDataFile.cs
 - tracks/csharp/generators/Input/CanonicalDataParser.cs
 - tracks/csharp/generators/Input/ConfigFile.cs
@@ -3274,6 +3283,7 @@ files:
 - tracks/csharp/generators/Output/Templates/_AssertNull.liquid
 - tracks/csharp/generators/Output/Templates/_AssertThrowsException.liquid
 - tracks/csharp/generators/Output/Templates/_TestClass.liquid
+- tracks/csharp/generators/Output/Templates/_TestClassDisposable.liquid
 - tracks/csharp/generators/Output/Templates/_TestMethod.liquid
 - tracks/csharp/generators/Output/Templates/_TestMethodBody.liquid
 - tracks/csharp/generators/Output/TestClass.cs
@@ -3563,6 +3573,10 @@ files:
 - tracks/delphi/exercises/etl/README.md
 - tracks/delphi/exercises/etl/uETLexample.pas
 - tracks/delphi/exercises/etl/uETLtests.pas
+- tracks/delphi/exercises/grade-school/GradeSchool.dpr
+- tracks/delphi/exercises/grade-school/README.md
+- tracks/delphi/exercises/grade-school/uGradeSchoolExample.pas
+- tracks/delphi/exercises/grade-school/uGradeSchoolTest.pas
 - tracks/delphi/exercises/grains/Grains.dpr
 - tracks/delphi/exercises/grains/README.md
 - tracks/delphi/exercises/grains/uGrainsExample.pas
@@ -3608,6 +3622,10 @@ files:
 - tracks/delphi/exercises/poker/README.md
 - tracks/delphi/exercises/poker/uPokerExample.pas
 - tracks/delphi/exercises/poker/uPokerTest.pas
+- tracks/delphi/exercises/proverb/Proverb.dpr
+- tracks/delphi/exercises/proverb/README.md
+- tracks/delphi/exercises/proverb/uProverbExample.pas
+- tracks/delphi/exercises/proverb/uProverbTests.pas
 - tracks/delphi/exercises/raindrops/README.md
 - tracks/delphi/exercises/raindrops/raindrops.dpr
 - tracks/delphi/exercises/raindrops/uRaindropsExample.pas
@@ -7793,7 +7811,6 @@ files:
 - tracks/java/exercises/go-counting/.meta/version
 - tracks/java/exercises/go-counting/README.md
 - tracks/java/exercises/go-counting/build.gradle
-- tracks/java/exercises/go-counting/src/main/java/.keep
 - tracks/java/exercises/go-counting/src/main/java/Player.java
 - tracks/java/exercises/go-counting/src/test/java/GoCountingTest.java
 - tracks/java/exercises/grade-school/.meta/src/reference/java/School.java
@@ -7978,7 +7995,7 @@ files:
 - tracks/java/exercises/poker/.meta/src/reference/java/Card.java
 - tracks/java/exercises/poker/.meta/src/reference/java/Hand.java
 - tracks/java/exercises/poker/.meta/src/reference/java/Poker.java
-- tracks/java/exercises/poker/.meta/version.txt
+- tracks/java/exercises/poker/.meta/version
 - tracks/java/exercises/poker/README.md
 - tracks/java/exercises/poker/build.gradle
 - tracks/java/exercises/poker/src/main/java/.keep
@@ -8015,6 +8032,7 @@ files:
 - tracks/java/exercises/queen-attack/src/main/java/.keep
 - tracks/java/exercises/queen-attack/src/test/java/QueenAttackCalculatorTest.java
 - tracks/java/exercises/rail-fence-cipher/.meta/src/reference/java/RailFenceCipher.java
+- tracks/java/exercises/rail-fence-cipher/.meta/version
 - tracks/java/exercises/rail-fence-cipher/README.md
 - tracks/java/exercises/rail-fence-cipher/build.gradle
 - tracks/java/exercises/rail-fence-cipher/src/main/java/.keep
@@ -9856,6 +9874,9 @@ files:
 - tracks/nim/exercises/anagram/README.md
 - tracks/nim/exercises/anagram/anagram_test.nim
 - tracks/nim/exercises/anagram/example.nim
+- tracks/nim/exercises/armstrong-numbers/README.md
+- tracks/nim/exercises/armstrong-numbers/armstrong_number_test.nim
+- tracks/nim/exercises/armstrong-numbers/example.nim
 - tracks/nim/exercises/binary/README.md
 - tracks/nim/exercises/binary/binary_test.nim
 - tracks/nim/exercises/binary/example.nim
@@ -9913,6 +9934,9 @@ files:
 - tracks/nim/exercises/triangle/README.md
 - tracks/nim/exercises/triangle/example.nim
 - tracks/nim/exercises/triangle/triangle_test.nim
+- tracks/nim/exercises/two-fer/README.md
+- tracks/nim/exercises/two-fer/example.nim
+- tracks/nim/exercises/two-fer/two_fer_test.nim
 - tracks/nim/exercises/word-count/README.md
 - tracks/nim/exercises/word-count/example.nim
 - tracks/nim/exercises/word-count/word_count_test.nim

data/tracks/csharp/generators/Input/CanonicalDataCaseJson.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace Generators.Input
-{
-    public static class CanonicalDataCaseJson
-    {
-        public static IDictionary<string, dynamic> ToDictionary(JToken jToken) => ConvertProperty(jToken);
-        
-        private static dynamic ConvertProperty(dynamic property)
-        {
-            if (property is JArray jArray)
-                return ConvertArrayProperty(property, jArray);
-
-            if (property is JToken jToken)
-                return ConvertTokenProperty(jToken);
-
-            return property;
-        }
-
-        private static dynamic ConvertTokenProperty(JToken jToken)
-        {
-            var properties = jToken.ToObject<IDictionary<string, dynamic>>();
-
-            for (var i = 0; i < properties.Count; i++)
-            {
-                var key = properties.Keys.ElementAt(i);
-                properties[key] = ConvertProperty(properties[key]);
-            }
-
-            return properties;
-        }
-
-        private static dynamic ConvertArrayProperty(dynamic property, JArray jArray)
-        {
-            // We can't determine the type of the array if the array is empty
-            if (!jArray.Any())
-                return property;
-
-            // We can only convert when all values have the same type
-            if (jArray.Select(x => x.Type).Distinct().Count() != 1)
-                return property;
-
-            switch (jArray[0].Type)
-            {
-                case JTokenType.Object:
-                    return jArray.Select(ConvertProperty).ToArray();
-                case JTokenType.Integer:
-                    return jArray.ToObject<int[]>();
-                case JTokenType.Float:
-                    return jArray.ToObject<float[]>();
-                case JTokenType.String:
-                    return jArray.ToObject<string[]>();
-                case JTokenType.Boolean:
-                    return jArray.ToObject<bool[]>();
-                case JTokenType.Date:
-                    return jArray.ToObject<DateTime[]>();
-                case JTokenType.Bytes:
-                    return jArray.ToObject<byte[]>();
-                case JTokenType.Guid:
-                    return jArray.ToObject<Guid[]>();
-                case JTokenType.Uri:
-                    return jArray.ToObject<Uri[]>();
-                case JTokenType.TimeSpan:
-                    return jArray.ToObject<TimeSpan[]>();
-                default:
-                    return property;
-            }
-        }
-    }
-}

data/tracks/csharp/generators/Input/CanonicalDataCaseJsonConverter.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Generators.Input
-{
-    public class CanonicalDataCaseJsonConverter : JsonConverter
-    {
-        private static readonly string[] NonInputProperties = { "description", "property", "expected", "comments" };
-
-        public override bool CanConvert(Type objectType) => typeof(CanonicalDataCase) == objectType;
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var jTokenReader = (JTokenReader) reader;
-
-            var canonicalDataCase = new CanonicalDataCase();
-            serializer.Populate(jTokenReader, canonicalDataCase);
-            
-            canonicalDataCase.Properties = CanonicalDataCaseJson.ToDictionary(jTokenReader.CurrentToken);
-            canonicalDataCase.SetInputParameters(GetInputProperties(canonicalDataCase.Properties));
-            canonicalDataCase.DescriptionPath = GetDescriptionPath(jTokenReader.CurrentToken);
-
-            return canonicalDataCase;
-        }
-
-        private static string[] GetInputProperties(IDictionary<string, dynamic> properties) => properties.Keys.Except(NonInputProperties).ToArray();
-
-        private static string[] GetDescriptionPath(JToken canonicalDataCaseToken)
-        {
-            var descriptionPath = new Stack<string>();
-            var currentToken = canonicalDataCaseToken;
-
-            while (currentToken != null)
-            {
-                if (currentToken.Type == JTokenType.Object)
-                    descriptionPath.Push(currentToken.SelectToken("description").ToObject<string>());
-
-                currentToken = currentToken.Parent;
-            }
-            
-            return descriptionPath.Where(x => !string.IsNullOrEmpty(x)).ToArray();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotImplementedException();
-    }
-}

data/tracks/csharp/generators/Input/CanonicalDataCasesJson.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace Generators.Input
-{
-    public static class CanonicalDataCasesJson
-    {
-        private const string TokensPath = "$..*[?(@.property)]";
-
-        public static CanonicalDataCase[] ToArray(JToken casesToken)
-        {
-            var caseTokens = casesToken.SelectTokens(TokensPath);
-            var canonicalDataCases = caseTokens.Select(x => x.ToObject<CanonicalDataCase>()).ToArray();
-
-            ConvertEmptyJArrayToArray(canonicalDataCases);
-
-            return canonicalDataCases;
-        }
-
-        private static void ConvertEmptyJArrayToArray(CanonicalDataCase[] canonicalDataCases)
-        {
-            foreach (var groupedCanonicalDataCases in canonicalDataCases.ToLookup(c => c.Property))
-            {
-                foreach (var groupedProperties in groupedCanonicalDataCases.SelectMany(x => x.Properties).ToLookup(x => x.Key))
-                {
-                    var arrayType = GetArrayType(groupedProperties);
-                    if (arrayType == null)
-                        continue;
-
-                    foreach (var groupedCanonicalDataCase in GetEmptyJArrays(groupedCanonicalDataCases, groupedProperties))
-                        groupedCanonicalDataCase.Properties[groupedProperties.Key] = Array.CreateInstance(arrayType, 0);
-                }
-            }
-        }
-
-        private static Type GetArrayType(IGrouping<string, KeyValuePair<string, dynamic>> groupedProperties)
-        {
-            if (groupedProperties.Any(x => x.Value is string[]))
-                return typeof(string);
-
-            if (groupedProperties.Any(x => x.Value is int[]))
-                return typeof(int);
-
-            if (groupedProperties.Any(x => x.Value is float[]))
-                return typeof(float);
-
-            return null;
-        }
-
-        private static IEnumerable<CanonicalDataCase> GetEmptyJArrays(IGrouping<string, CanonicalDataCase> groupedCanonicalDataCases, IGrouping<string, KeyValuePair<string, dynamic>> groupedProperties)
-            => groupedCanonicalDataCases.Where(canonicalDataCase => canonicalDataCase.Properties.ContainsKey(groupedProperties.Key) && IsEmptyJArray(canonicalDataCase, groupedProperties));
-
-        private static bool IsEmptyJArray(CanonicalDataCase x, IGrouping<string, KeyValuePair<string, dynamic>> groupedProperties)
-            => x.Properties[groupedProperties.Key] is JArray jArray && jArray.Count == 0;
-    }
-}

data/tracks/csharp/generators/Input/CanonicalDataCasesJsonConverter.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Reflection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Generators.Input
-{
-    public class CanonicalDataCasesJsonConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType) => typeof(CanonicalDataCase[]).GetTypeInfo().IsAssignableFrom(objectType);
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) 
-            => CanonicalDataCasesJson.ToArray(JToken.ReadFrom(reader));
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotImplementedException();
-    }
-}