trackler 2.0.6.0 → 2.0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9790736cb76031c439b02a7ca4d77d543506267
-  data.tar.gz: 84dabbea80eaef2ac6744e45c6adfac75a5d84e3
+  metadata.gz: e0a5ee73b9501fd6101f3faf9913c4634acd6cf8
+  data.tar.gz: 4c49bfef6fa06b4a9b9fed119dd455a7a2dd6859
 SHA512:
-  metadata.gz: 7c18b8ab1aa1f1a04e99b9fec8cfe15e4e2ba7bbfa0350bcb8d06fbde2d369388dccca26cd48ed61e3d6306e897883456b04aacd865b36e8246a64eae77f13ad
-  data.tar.gz: e9359d9665d6e91f3156fe4f32a3dc146c4ad32d97031d68dc46e8828f63a9e9afc642fa3b5aa33cd155e87ac088130963091bc1d0ecaa9a63a2e49e50d46a46
+  metadata.gz: 240744071c995385c5f96242c76a12c41ae1d60f4bc82194771c9feb90d9b0d2ee2efe97925a11a57ebb0969927572f6ecec12e721a7eb303111e5bde0d021ee
+  data.tar.gz: 76be73161db9c3d6114e2b2f2f7409c59ad09de0b79d56515b52e2df3d4a03b7909e9b0229ad84d4e0e88976ba37dae44f394a09a17d5512851cb83d7149fa7f

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.0.6.0"
+  VERSION = "2.0.6.1"
 end

data/tracks/csharp/.gitignore

@@ -9,4 +9,6 @@ bin/configlet.exe
 tools/
 build/
 packages/
-TestResult.xml
+paket-files
+TestResult.xml
+junit-results.xml

data/tracks/csharp/README.md

@@ -1,6 +1,6 @@
 # xCSharp
 
-[![Build Status](https://travis-ci.org/exercism/xcsharp.svg?branch=master)](https://travis-ci.org/exercism/xcsharp) [![Build status](https://ci.appveyor.com/api/projects/status/r7o9t6gjoc09jpmn/branch/master?svg=true)](https://ci.appveyor.com/project/ErikSchierboom/xcsharp-c03a2/branch/master)
+[![Build Status](https://travis-ci.org/exercism/xcsharp.svg?branch=master)](https://travis-ci.org/exercism/xcsharp) [![Build status](https://ci.appveyor.com/api/projects/status/r7o9t6gjoc09jpmn/branch/master?svg=true)](https://ci.appveyor.com/project/ErikSchierboom/xcsharp-c03a2/branch/master) [![CircleCI](https://circleci.com/gh/exercism/xcsharp.svg?style=svg)](https://circleci.com/gh/exercism/xcsharp)
 
 Exercism exercises in C#
 

data/tracks/csharp/build.fsx

@@ -11,6 +11,7 @@ let sourceDir  = "./exercises/"
 // Files
 let solutionFile = buildDir @@ "/exercises.csproj"
 let compiledOutput = buildDir @@ "xcsharp.dll"
+let nunitToJunitTransformFile = "./paket-files" @@ "nunit" @@ "nunit-transforms" @@ "nunit3-junit" @@ "nunit3-junit.xslt"
 
 // Targets
 Target "PrepareUnchanged" (fun _ -> 
@@ -44,6 +45,11 @@ Target "Test" (fun _ ->
         |> NUnit3 (fun p -> { p with 
                                 ShadowCopy = false
                                 ToolPath = "nunit3-console.exe" })
+    else if getEnvironmentVarAsBool "CIRCLECI" then
+        [compiledOutput]
+        |> NUnit3 (fun p -> { p with 
+                                ShadowCopy = false
+                                ResultSpecs = [sprintf "junit-results.xml;transform=%s" nunitToJunitTransformFile] })
     else
         [compiledOutput]
         |> NUnit3 (fun p -> { p with ShadowCopy = false })

data/tracks/csharp/circle.yml

@@ -0,0 +1,16 @@
+machine:
+  environment:
+    TERM: xterm-256color
+dependencies:
+  pre:
+    - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+    - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
+    - sudo apt-get update
+    - sudo apt-get install mono-complete
+test:
+  override:
+    - ./build.sh
+  post:
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - sed -i '1 s/^\xef\xbb\xbf//' .*/junit-results.xml
+    - find . -type f -regex ".*/junit-results.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

data/tracks/csharp/paket.dependencies

@@ -2,4 +2,5 @@ source https://www.nuget.org/api/v2/
 nuget FAKE
 nuget NUnit
 nuget NUnit.ConsoleRunner
-nuget Sprache
+nuget Sprache
+github nunit/nunit-transforms nunit3-junit/nunit3-junit.xslt

data/tracks/csharp/paket.lock

@@ -75,3 +75,6 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
       Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
       System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
+GITHUB
+  remote: nunit/nunit-transforms
+    nunit3-junit/nunit3-junit.xslt (2a7c74198375b4b280ff3e79033c3d44e3083850)

data/tracks/ecmascript/exercises/phone-number/example.js

@@ -2,40 +2,27 @@ export default class PhoneNumber {
 
   constructor(number) {
     this.rawNumber = number;
-    this.cleanedNumber = cleanNumber(number);
   }
 
-  number() { return this.cleanedNumber; }
+  number() {
+    if(/[a-zA-Z]/.test(this.rawNumber)) {
+      return null;
+    }
 
-  areaCode() { return this.cleanedNumber.substr(0, 3); }
-
-  toString() {
-    return '(' + this.areaCode() + ')' +
-           ' ' +
-           exchangeCode(this.cleanedNumber) + '-' +
-           subscriberNumber(this.cleanedNumber);
-  }
-}
-
-function cleanNumber(number) {
-  const num = number.replace(/\D/g,'');
-
-  if (num.length === 10) {
-    return num;
+    return this._cleanedNumber();
   }
 
-  if (num.length === 11 && num[0] === '1') {
-    return num.substr(1);
-  }
+  _cleanedNumber() {
+    let num = this.rawNumber.replace(/\D/g,'');
 
-  return '0000000000';
-}
+    if (num.length === 10) {
+      return num;
+    }
 
-function exchangeCode(number) {
-  return number.substr(3, 3);
-}
+    if (num.length === 11 && num[0] === '1') {
+      return num.substr(1);
+    }
 
-function subscriberNumber(number) {
-  return number.substr(6);
+    return null;
+  }
 }
-

data/tracks/ecmascript/exercises/phone-number/phone-number.spec.js

@@ -2,7 +2,7 @@ import PhoneNumber from './phone-number';
 
 describe('PhoneNumber()', () => {
 
-  it('cleans the number (123) 456-7890', () => {
+  it('cleans the number', () => {
     const phone = new PhoneNumber('(123) 456-7890');
     expect(phone.number()).toEqual('1234567890');
   });
@@ -12,29 +12,44 @@ describe('PhoneNumber()', () => {
     expect(phone.number()).toEqual('1234567890');
   });
 
-  xit('valid when 11 digits and first digit is 1', () => {
-    const phone = new PhoneNumber('11234567890');
+  xit('cleans numbers with multiple spaces', () => {
+    const phone = new PhoneNumber('123 456   7890   ');
     expect(phone.number()).toEqual('1234567890');
   });
 
+  xit('invalid when 9 digits', () => {
+    const phone = new PhoneNumber('123456789');
+    expect(phone.number()).toEqual(null);
+  });
+
   xit('invalid when 11 digits', () => {
     const phone = new PhoneNumber('21234567890');
-    expect(phone.number()).toEqual('0000000000');
+    expect(phone.number()).toEqual(null);
   });
 
-  xit('invalid when 9 digits', () => {
-    const phone = new PhoneNumber('123456789');
-    expect(phone.number()).toEqual('0000000000');
+  xit('valid when 11 digits and starting with 1', () => {
+    const phone = new PhoneNumber('11234567890');
+    expect(phone.number()).toEqual('1234567890');
+  });
+
+  xit('invalid when 12 digits', () => {
+    const phone = new PhoneNumber('321234567890');
+    expect(phone.number()).toEqual(null);
+  });
+
+  xit('invalid with letters', () => {
+    const phone = new PhoneNumber('123-abc-7890');
+    expect(phone.number()).toEqual(null);
   });
 
-  xit('has an area code', () => {
-    const phone = new PhoneNumber('1234567890');
-    expect(phone.areaCode()).toEqual('123');
+  xit('invalid with punctuations', () => {
+    const phone = new PhoneNumber('123-@:!-7890');
+    expect(phone.number()).toEqual(null);
   });
 
-  xit('formats a number', () => {
-    const phone = new PhoneNumber('1234567890');
-    expect(phone.toString()).toEqual('(123) 456-7890');
+  xit('invalid with right number of digits but letters mixed in', () => {
+    const phone = new PhoneNumber('1a2b3c4d5e6f7g8h9i0j');
+    expect(phone.number()).toEqual(null);
   });
 
 });

data/tracks/fsharp/.gitignore

@@ -6,4 +6,6 @@ packages/
 tools/
 .fake/
 .paket/paket.exe
-TestResult.xml
+paket-files
+TestResult.xml
+junit-results.xml

data/tracks/fsharp/README.md

@@ -1,6 +1,6 @@
 # xFSharp
 
-[![Build Status](https://travis-ci.org/exercism/xfsharp.svg?branch=master)](https://travis-ci.org/exercism/xfsharp) [![Build status](https://ci.appveyor.com/api/projects/status/7r5bbsonqonf7d8t/branch/master?svg=true)](https://ci.appveyor.com/project/ErikSchierboom/xfsharp-8gbdd/branch/master)
+[![Build Status](https://travis-ci.org/exercism/xfsharp.svg?branch=master)](https://travis-ci.org/exercism/xfsharp) [![Build status](https://ci.appveyor.com/api/projects/status/7r5bbsonqonf7d8t/branch/master?svg=true)](https://ci.appveyor.com/project/ErikSchierboom/xfsharp-8gbdd/branch/master) [![CircleCI](https://circleci.com/gh/exercism/xfsharp.svg?style=svg)](https://circleci.com/gh/exercism/xfsharp)
 
 Exercism exercises in F#
 

data/tracks/fsharp/build.fsx

@@ -6,11 +6,12 @@ open Fake.Testing.NUnit3
 
 // Directories
 let buildDir  = "./build/"
-let sourceDir  = "./exercises/"
+let sourceDir = "./exercises/"
 
 // Files
 let solutionFile = buildDir @@ "/exercises.fsproj"
 let compiledOutput = buildDir @@ "xfsharp.dll"
+let nunitToJunitTransformFile = "./paket-files" @@ "nunit" @@ "nunit-transforms" @@ "nunit3-junit" @@ "nunit3-junit.xslt"
 
 // Targets
 Target "Clean" (fun _ ->
@@ -42,6 +43,11 @@ Target "Test" (fun _ ->
         |> NUnit3 (fun p -> { p with 
                                 ShadowCopy = false
                                 ToolPath = "nunit3-console.exe" })
+    else if getEnvironmentVarAsBool "CIRCLECI" then
+        [compiledOutput]
+        |> NUnit3 (fun p -> { p with 
+                                ShadowCopy = false
+                                ResultSpecs = [sprintf "junit-results.xml;transform=%s" nunitToJunitTransformFile] })
     else
         [compiledOutput]
         |> NUnit3 (fun p -> { p with ShadowCopy = false })

data/tracks/fsharp/circle.yml

@@ -0,0 +1,16 @@
+machine:
+  environment:
+    TERM: xterm-256color
+dependencies:
+  pre:
+    - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+    - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
+    - sudo apt-get update
+    - sudo apt-get install mono-complete fsharp
+test:
+  override:
+    - ./build.sh
+  post:
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - sed -i '1 s/^\xef\xbb\xbf//' .*/junit-results.xml
+    - find . -type f -regex ".*/junit-results.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

data/tracks/fsharp/paket.dependencies

@@ -3,4 +3,5 @@ nuget FAKE
 nuget FParsec
 nuget FSharp.Core
 nuget NUnit
-nuget NUnit.ConsoleRunner
+nuget NUnit.ConsoleRunner
+github nunit/nunit-transforms nunit3-junit/nunit3-junit.xslt

data/tracks/fsharp/paket.lock

@@ -5,3 +5,6 @@ NUGET
     FSharp.Core (4.0.0.1)
     NUnit (3.5)
     NUnit.ConsoleRunner (3.5)
+GITHUB
+  remote: nunit/nunit-transforms
+    nunit3-junit/nunit3-junit.xslt (2a7c74198375b4b280ff3e79033c3d44e3083850)

data/tracks/ocaml/tools/test-generator/src/controller.ml

@@ -10,9 +10,9 @@ type content = string
 
 let find_nested_files (name: string) (base: string): (string * content) list =
   Sys.ls_dir base
-    |> List.filter ~f:(fun slug -> Sys.is_directory_exn (base ^ "/" ^ slug))
-    |> List.filter ~f:(fun slug -> Sys.file_exists_exn (base ^ "/" ^ slug ^ "/" ^ name))
-    |> List.map ~f:(fun slug -> (slug, In_channel.read_all (base ^ "/" ^ slug ^ "/" ^ name)))
+  |> List.filter ~f:(fun slug -> Sys.is_directory_exn (base ^ "/" ^ slug))
+  |> List.filter ~f:(fun slug -> Sys.file_exists_exn (base ^ "/" ^ slug ^ "/" ^ name))
+  |> List.map ~f:(fun slug -> (slug, In_channel.read_all (base ^ "/" ^ slug ^ "/" ^ name)))
 
 let find_template_files = find_nested_files "template.ml"
 
@@ -28,7 +28,7 @@ let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_fil
   let fill_in_template = fill_in_template edit_expected edit_parameters in
   let open Result.Monad_infix in
   Result.of_option template ("cannot recognize file for " ^ slug ^ " as a template") >>= fun template ->
-  parse_json_text canonical_data_file
+  parse_json_text canonical_data_file (expected_key_name slug)
   |> Result.map_error ~f:show_error >>= (function
       | Single cases ->
         fill_in_template template.template slug cases
@@ -60,7 +60,7 @@ let check_canonical_data canonical_data_folder =
   let canonical_data_files = List.sort canonical_data_files ~cmp:(fun (s1, _) (s2, _) -> String.compare s1 s2) in
   let total_count = List.length canonical_data_files in
   List.iter canonical_data_files ~f:(fun (slug, text) ->
-    match parse_json_text text with
+    match parse_json_text text (expected_key_name slug) with
     | Error e -> print_endline @@ slug ^ ": " ^ (show_error e)
     | _ -> ok_count := !ok_count + 1
   );

data/tracks/ocaml/tools/test-generator/src/model.ml

@@ -10,6 +10,7 @@ type parameter =
   | Bool of bool
   | StringList of (string list)
   | IntList of (int list)
+  | IntTupleList of ((int * int) list)
   | IntStringMap of ((string * int) list) [@@deriving eq, show]
 
 type 'a elements = (string * 'a) list [@@deriving eq, show]
@@ -37,5 +38,6 @@ let parameter_to_string = function
   | Bool b -> Bool.to_string b
   | StringList xs -> "[" ^ String.concat ~sep:"; " (List.map ~f:(surround '\"' >> String.escaped) xs) ^ "]"
   | IntList xs -> "[" ^ String.concat ~sep:"; " (List.map ~f:Int.to_string xs) ^ "]"
+  | IntTupleList xs -> "[" ^ String.concat ~sep:"; " (List.map xs ~f:(fun (x,y) -> sprintf "(%d,%d)" x y)) ^ "]"
   | IntStringMap xs -> "[" ^ String.concat ~sep:"; "
                          (List.map xs ~f:(fun (k,v) -> "(\"" ^ String.escaped k ^ "\", " ^ Int.to_string v ^ ")")) ^ "]"

data/tracks/ocaml/tools/test-generator/src/parser.ml

@@ -1,7 +1,7 @@
 open Core.Std
 open Utils
-open Yojson.Safe
-open Yojson.Safe.Util
+open Yojson.Basic
+open Yojson.Basic.Util
 open Model
 
 type error =
@@ -9,46 +9,50 @@ type error =
     NoDescription | BadDescription | NoExpected of string | BadExpected | UnrecognizedJson [@@deriving eq, show]
 
 let to_int_safe = function
-  | `Int x -> Some x
-  | _ -> None
+| `Int x -> Some x
+| _ -> None
 
-let to_list_safe xs = let open Option.Monad_infix in match xs with
-  | [] -> Some (StringList [])
-  | `String x :: _ -> Some (StringList (List.map xs ~f:to_string))
-  | `Int x :: _ -> List.map xs ~f:to_int_safe |> sequence_option >>= (fun xs -> Some (IntList xs))
-  | _ -> None
+let to_tuple_safe xs = match xs with
+| `List [`Int x; `Int y] -> Some (x,y)
+| _ -> None
+
+let rec to_list_safe xs: parameter option = let open Option.Monad_infix in match xs with
+| [] -> Some (StringList [])
+| `String x :: _ -> Some (StringList (List.map xs ~f:to_string))
+| `Int x :: _ -> List.map xs ~f:to_int_safe |> sequence_option >>= (fun xs -> Some (IntList xs))
+| `List x :: _ -> List.map xs ~f:to_tuple_safe |> sequence_option >>= (fun xs -> Some (IntTupleList xs))
+| _ -> None
 
 let q xs = let open Option.Monad_infix in
   List.map xs ~f:(fun (k,v) -> (to_int_safe v |> Option.map ~f:(fun v -> (k,v))))
 
 let to_parameter (s: json) = match s with
-  | `Null -> Some (Null)
-  | `String x -> Some (String x)
-  | `Float x -> Some (Float x)
-  | `Int x -> Some (Int x)
-  | `Bool x -> Some (Bool x)
-  | `List x -> to_list_safe  x
-  | `Assoc xs -> let open Option.Monad_infix in
-      let xs = List.map xs ~f:(fun (k,v) -> (to_int_safe v |> Option.map ~f:(fun v -> (k,v)))) in
-      sequence_option xs >>= fun xs -> Some (IntStringMap xs)
-  | _ -> None
+| `Null -> Some (Null)
+| `String x -> Some (String x)
+| `Float x -> Some (Float x)
+| `Int x -> Some (Int x)
+| `Bool x -> Some (Bool x)
+| `List x -> to_list_safe x
+| `Assoc xs -> let open Option.Monad_infix in
+    let xs = List.map xs ~f:(fun (k,v) -> (to_int_safe v |> Option.map ~f:(fun v -> (k,v)))) in
+    sequence_option xs >>= fun xs -> Some (IntStringMap xs)
 
 let parse_parameters (parameters: (string * json) list): parameter elements =
   List.filter_map parameters ~f:(fun (k, v) -> Option.map ~f:(fun v -> (k, v)) (to_parameter v))
 
-let parse_case_assoc (parameters: (string * json) list): (case, error) Result.t =
+let parse_case_assoc (parameters: (string * json) list) (expected_key: string): (case, error) Result.t =
   let find name e = List.Assoc.find parameters name |> Result.of_option ~error:e in
   let test_parameters = List.Assoc.remove parameters "description" in
-  let test_parameters = List.Assoc.remove test_parameters "expected" in
+  let test_parameters = List.Assoc.remove test_parameters expected_key in
   let open Result.Monad_infix in
   find "description" NoDescription >>=
   to_string_note BadDescription >>= fun description ->
-  find "expected" (NoExpected description) >>= fun expectedJson ->
+  find expected_key (NoExpected description) >>= fun expectedJson ->
   to_parameter expectedJson |> Result.of_option ~error:BadExpected >>= fun expected ->
   Ok {description = description; parameters = parse_parameters test_parameters; expected = expected}
 
-let parse_case (s: json): (case, error) Result.t = match s with
-  | `Assoc assoc -> parse_case_assoc assoc
+let parse_case (expected_key: string) (s: json): (case, error) Result.t = match s with
+  | `Assoc assoc -> parse_case_assoc assoc expected_key
   | _ -> Error ExpectingMapForCase
 
 let parse_cases (text: string): (json, error) Result.t =
@@ -56,11 +60,11 @@ let parse_cases (text: string): (json, error) Result.t =
     | `Null -> Error (TestMustHaveKeyCalledCases "xx")
     | json -> Ok json
 
-let parse_single (text: string): (tests, error) Result.t =
+let parse_single (text: string) (expected_key: string): (tests, error) Result.t =
   let open Result.Monad_infix in
   parse_cases text >>=
   to_list_note ExpectingListOfCases >>=
-  (sequence >> (List.map ~f:parse_case)) >>= fun ts ->
+  (sequence >> (List.map ~f:(parse_case expected_key))) >>= fun ts ->
   Result.return (Single ts)
 
 let is_suite (json: json) =
@@ -72,24 +76,24 @@ let merge_result = function
   | (_, Error x) -> Error x
   | (n, Ok c) -> Ok {name = n; cases = c}
 
-let parse_cases_from_suite name suite =
+let parse_cases_from_suite name suite expected_key =
   let open Result.Monad_infix in
   member_note (TestMustHaveKeyCalledCases name) "cases" suite >>=
   to_list_note ExpectingListOfCases >>= fun tests ->
-  List.map tests ~f:parse_case |> sequence
+  List.map tests ~f:(parse_case expected_key) |> sequence
 
-let parse_json_text (text: string): (tests, error) Result.t =
+let parse_json_text (text: string) (expected_key: string): (tests, error) Result.t =
   let open Result.Monad_infix in
   let json = from_string text in
   if is_suite json
   then
     to_assoc_note UnrecognizedJson json >>= fun tests ->
     let tests = List.filter tests ~f:(fun (n, _) -> n <> "#") in
-    let tests = List.map tests ~f:(fun (name, suite) -> merge_result (name, parse_cases_from_suite name suite)) in
+    let tests = List.map tests ~f:(fun (name, suite) -> merge_result (name, parse_cases_from_suite name suite expected_key)) in
     sequence tests >>= fun tests ->
     Ok (Suite tests)
   else
-    parse_single text
+    parse_single text expected_key
 
 let show_error = function
   | TestMustHaveKeyCalledCases name -> "Test named '" ^ name ^ "' is expected to have an object with a key: 'cases'"