trackler 2.1.0.23 → 2.1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5a1f4bc1094d7cab6ba4f22a20e28874665bbb9
-  data.tar.gz: 66cd048370d77f78ffdfef48b573fe302129e99a
+  metadata.gz: f709e319865d19a3edd18d5e20ff5f0fabcd438b
+  data.tar.gz: 9a9e667cc9ef535f6cb3fd28270f4a09f8a4acf9
 SHA512:
-  metadata.gz: d0632cd9d571b3d6f1a604b748380d1b6ba4b3f6501970f4bac7c84361a0ef0ede21d9e0b118968e9daa04dde82fd11619a6edf9cee61e18f0234ea691b9935e
-  data.tar.gz: 3cd5cc5489046c92b192e7955f0c0a18be47eecf3b3c88735a5ba483fc2675027d52f2fca726f51253cdec7fe3c30951e6a10e63baadb47c0d11caef7117db45
+  metadata.gz: ae5e1c6d35bcbe9879f021fe2130ecfa6cf7a365e40d56271c7b04d66fc367fa80c768ebfb8d466a8ef6208a1e26bbd5cc2a9e0a61d6d8763cd945392afd7ed7
+  data.tar.gz: 946c99dd215e5e1f0d74089a72280e33e7ce035743381878fd8f363c960e63685a1e52ed2307a94098fbb1f047229e127030bd97783e6e09d6235f64d0319218

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.1.0.23"
+  VERSION = "2.1.0.24"
 end

data/tracks/ceylon/LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2016 Katrina Owen, _@kytrinyx.com
+Copyright (c) 2017 Exercism, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/tracks/ceylon/README.md

@@ -149,11 +149,6 @@ The Travis CI run would need to uncomment the cases as well (without uncommentin
 
 The current maintainer does not have a good solution to this, so ideas here are welcome.
 
-## License
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Katrina Owen, _@kytrinyx.com
 
 ### Ceylon icon 
 The Ceylon icon is assumed to be owned by Red Hat, Inc. It appears to be released under the [Creative Commons Attribution Share-Alike 3.0 license](https://creativecommons.org/licenses/by-sa/3.0/). We have modified its colour scheme for use on Exercism.

data/tracks/ecmascript/.editorconfig

@@ -17,6 +17,13 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 2
 
+###########################################################
+; bash
+###########################################################
+
+[{bin/*,*.sh}]
+indent_size = 4
+
 ###########################################################
 ; make
 ###########################################################

data/tracks/ecmascript/Makefile

@@ -11,6 +11,13 @@ FILEEXT := "js"
 EXAMPLE := "example.$(FILEEXT)"
 TSTFILE := "$(subst _,-,$(ASSIGNMENT)).spec.$(FILEEXT)"
 
+# package.json MD5 hash
+SOURCE_PKG_MD5 ?= "`./bin/md5-hash ./package.json`"
+PKG_FILES= $(shell find ./exercises/*/* -name package.json)
+
+test-package-files:
+	@for pkg in $(PKG_FILES); do ! ./bin/md5-hash $$pkg | grep -qv $(SOURCE_PKG_MD5) || exit 1; done
+
 test-assignment:
 	@cp package.json exercises/$(ASSIGNMENT)
 	@echo "running tests for: $(ASSIGNMENT)"
@@ -24,4 +31,5 @@ test-assignment:
 	@rmdir $(OUTDIR)
 
 test:
+	@$(MAKE) -s test-package-files
 	@for assignment in $(ASSIGNMENTS); do ASSIGNMENT=$$assignment $(MAKE) -s test-assignment || exit 1; done

data/tracks/ecmascript/bin/md5-hash

@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Calculates the MD5 hash of a given file. It uses hashing utilities powered by
+# operating systems, but wraps them into a consistent interface.
+
+OS=$(
+    case $(uname) in
+        (Darwin*)  echo "mac";;
+        (Linux*)   echo "linux";;
+        # TODO: implement MD5 hashing on Windows
+        # (Windows*) echo "windows";;
+        (*)        echo "linux";;
+    esac
+)
+
+case $OS in
+    mac )
+        md5 -q $@;;
+    linux )
+        md5sum $@ | sed -E 's/([a-z0-9]{32}).+$/\1/';;
+esac

data/tracks/ecmascript/exercises/connect/package.json

@@ -9,10 +9,10 @@
     "url": "https://github.com/exercism/xecmascript"
   },
   "devDependencies": {
-    "babel-jest": "^19.0.0",
-    "babel-preset-env": "^1.3.3",
+    "babel-jest": "^20.0.1",
+    "babel-preset-env": "^1.4.0",
     "eslint": "^3.19.0",
-    "jest": "^19.0.2"
+    "jest": "^20.0.1"
   },
   "jest": {
     "modulePathIgnorePatterns": [

data/tracks/elixir/exercises/atbash-cipher/{atbash.exs → atbash_cipher.exs}

@@ -10,4 +10,8 @@ defmodule Atbash do
   @spec encode(String.t) :: String.t
   def encode(plaintext) do
   end
+
+  @spec decode(String.t) :: String.t
+  def decode(cipher) do
+  end
 end

data/tracks/elixir/exercises/atbash-cipher/atbash_cipher_test.exs

@@ -1,5 +1,5 @@
 if !System.get_env("EXERCISM_TEST_EXAMPLES") do
-  Code.load_file("atbash.exs", __DIR__)
+  Code.load_file("atbash_cipher.exs", __DIR__)
 end
 
 ExUnit.start
@@ -49,4 +49,32 @@ defmodule AtbashTest do
     cipher = "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt"
     assert Atbash.encode(plaintext) == cipher
   end
+
+  @tag :pending
+  test "decode exercism" do
+    cipher = "vcvix rhn"
+    plaintext = "exercism"
+    assert Atbash.decode(cipher) == plaintext
+  end
+
+  @tag :pending
+  test "decode a sentence" do
+    cipher = "zmlyh gzxov rhlug vmzhg vkkrm thglm v"
+    plaintext = "anobstacleisoftenasteppingstone"
+    assert Atbash.decode(cipher) == plaintext
+  end
+
+  @tag :pending
+  test "decode numbers" do
+    cipher = "gvhgr mt123 gvhgr mt"
+    plaintext = "testing123testing"
+    assert Atbash.decode(cipher) == plaintext
+  end
+
+  @tag :pending
+  test "decode all the letters" do
+    cipher = "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt"
+    plaintext = "thequickbrownfoxjumpsoverthelazydog"
+    assert Atbash.decode(cipher) == plaintext
+  end
 end

data/tracks/elixir/exercises/atbash-cipher/example.exs

@@ -9,19 +9,25 @@ defmodule Atbash do
   iex> Atbash.encode("completely insecure")
   "xlnko vgvob rmhvx fiv"
   """
+  @spec encode(String.t) :: String.t
   def encode(plaintext) do
-    plaintext |> normalize |> cipher |> chunk |> Enum.join(" ")
+    plaintext |> normalize |> transpose |> chunk |> Enum.join(" ")
+  end
+
+  @spec decode(String.t) :: String.t
+  def decode(cipher) do
+    cipher |> normalize |> transpose
   end
 
   defp normalize(input) do
     Regex.replace(~r{\W}, String.downcase(input), "")
   end
 
-  defp cipher(plaintext) do
-    plaintext
-      |> String.to_char_list
-      |> Enum.map(&convert/1)
-      |> List.to_string
+  defp transpose(text) do
+    text
+    |> String.to_char_list
+    |> Enum.map(&convert/1)
+    |> List.to_string
   end
 
   defp convert(character) do

data/tracks/elixir/exercises/phone-number/example.exs

@@ -2,55 +2,97 @@ defmodule Phone do
   @moduledoc """
   Utilities to work with phone numbers.
   """
+  @invalid "0000000000"
 
   @doc """
-  Clean up a phone number.
+  Remove formatting from a phone number.
 
-  Returns 0000000000 if the phone number is bad.
+  Returns "0000000000" if phone number is not valid
+  (10 digits or "1" followed by 10 digits)
+
+  ## Examples
+
+  iex> Phone.number("212-555-0100")
+  "2125550100"
+
+  iex> Phone.number("+1 (212) 555-0100")
+  "2125550100"
+
+  iex> Phone.number("+1 (212) 055-0100")
+  "0000000000"
+
+  iex> Phone.number("(212) 555-0100")
+  "2125550100"
+
+  iex> Phone.number("867.5309")
+  "0000000000"
   """
   @spec number(String.t) :: String.t
   def number(raw) do
     raw
-    |> to_parts
-    |> to_string
+    |> String.replace(~r/[\s+.()-]/, "") # remove decorations
+    |> valid?
+    |> (fn false -> @invalid; num -> String.replace(num, ~r/^1/, "") end).()
   end
 
-  @spec to_parts(String.t) :: [String.t]
-  defp to_parts(raw) do
-    Regex.run(~r/^\D*?1?\D*?(\d{3})\D*(\d{3})\D*(\d{4})$/, raw, [capture: :all_but_first]) || ["000", "000", "0000"]
+  defp valid?(num) do
+    Regex.match?(~r/^1?(?:[2-9][0-9]{2}){2}\d{4}$/, num)
+    |> (fn true -> num; false -> false end).()
   end
 
   @doc """
-  Get the area code of a phone number.
+  Extract the area code from a phone number
+
+  Returns the first three digits from a phone number,
+  ignoring long distance indicator
+
+  ## Examples
+
+  iex> Phone.area_code("212-555-0100")
+  "212"
+
+  iex> Phone.area_code("+1 (212) 555-0100")
+  "212"
+
+  iex> Phone.area_code("+1 (012) 555-0100")
+  "000"
 
-  The area code is the first three digits of a cleaned up phone number.
+  iex> Phone.area_code("867.5309")
+  "000"
   """
   @spec area_code(String.t) :: String.t
-  def area_code(str) do
-    str
-    |> to_parts
-    |> List.first
+  def area_code(raw) do
+    raw
+    |> __MODULE__.number
+    |> String.slice(0, 3)      # the first three digits are area_code
   end
 
-  @spec prefix(String.t) :: String.t
-  def prefix(str) do
-    str
-    |> to_parts
-    |> Enum.at(1)
-  end
+  @doc """
+  Pretty print a phone number
 
-  @spec line(String.t) :: String.t
-  def line(str) do
-    str
-    |> to_parts
-    |> List.last
-  end
+  Wraps the area code in parentheses and separates
+  exchange and subscriber number with a dash.
 
-  @doc """
-  Pretty print a phone number.
+  ## Examples
+
+  iex> Phone.pretty("212-555-0100")
+  "(212) 555-0100"
+
+  iex> Phone.pretty("212-155-0100")
+  "(000) 000-0000"
+
+  iex> Phone.pretty("+1 (303) 555-1212")
+  "(303) 555-1212"
+
+  iex> Phone.pretty("867.5309")
+  "(000) 000-0000"
   """
   @spec pretty(String.t) :: String.t
-  def pretty(str) do
-    "(#{area_code(str)}) #{prefix(str)}-#{line(str)}"
+  def pretty(raw) do
+    raw
+    |> __MODULE__.number
+    |> (fn <<area_code::binary-size(3), exchange_code::binary-size(3), rest::binary>> ->
+      "(#{area_code}) #{exchange_code}-#{rest}"
+    end).()
   end
 end

data/tracks/elixir/exercises/phone-number/phone_number.exs

@@ -7,11 +7,17 @@ defmodule Phone do
 
   ## Examples
 
-  iex> Phone.number("123-456-7890")
-  "1234567890"
+  iex> Phone.number("212-555-0100")
+  "2125550100"
 
-  iex> Phone.number("+1 (303) 555-1212")
-  "3035551212"
+  iex> Phone.number("+1 (212) 555-0100")
+  "2125550100"
+
+  iex> Phone.number("+1 (212) 055-0100")
+  "0000000000"
+
+  iex> Phone.number("(212) 555-0100")
+  "2125550100"
 
   iex> Phone.number("867.5309")
   "0000000000"
@@ -28,11 +34,14 @@ defmodule Phone do
 
   ## Examples
 
-  iex> Phone.area_code("123-456-7890")
-  "123"
+  iex> Phone.area_code("212-555-0100")
+  "212"
 
-  iex> Phone.area_code("+1 (303) 555-1212")
-  "303"
+  iex> Phone.area_code("+1 (212) 555-0100")
+  "212"
+
+  iex> Phone.area_code("+1 (012) 555-0100")
+  "000"
 
   iex> Phone.area_code("867.5309")
   "000"
@@ -49,8 +58,11 @@ defmodule Phone do
 
   ## Examples
 
-  iex> Phone.pretty("123-456-7890")
-  "(123) 456-7890"
+  iex> Phone.pretty("212-555-0100")
+  "(212) 555-0100"
+
+  iex> Phone.pretty("212-155-0100")
+  "(000) 000-0000"
 
   iex> Phone.pretty("+1 (303) 555-1212")
   "(303) 555-1212"

data/tracks/elixir/exercises/phone-number/phone_number_test.exs

@@ -9,56 +9,81 @@ defmodule PhoneTest do
   use ExUnit.Case
 
   test "cleans number" do
-    assert Phone.number("(123) 456-7890") == "1234567890"
+    assert Phone.number("(212) 555-0100") == "2125550100"
   end
 
   @tag :pending
   test "cleans number with dots" do
-    assert Phone.number("123.456.7890") == "1234567890"
+    assert Phone.number("212.555.0100") == "2125550100"
   end
 
   @tag :pending
   test "valid when 11 digits and first is 1" do
-    assert Phone.number("11234567890") == "1234567890"
+    assert Phone.number("12125550100") == "2125550100"
   end
 
   @tag :pending
-  test "invalid when 11 digits" do
-    assert Phone.number("21234567890") == "0000000000"
+  test "valid when 11 digits and some decorations" do
+    assert Phone.number("+1 (212) 555-0100") == "2125550100"
+  end
+
+  @tag :pending
+  test "invalid when country calling code is not 1" do
+    assert Phone.number("22125550100") == "0000000000"
   end
 
   @tag :pending
   test "invalid when 9 digits" do
-    assert Phone.number("123456789") == "0000000000"
+    assert Phone.number("212555010") == "0000000000"
   end
 
   @tag :pending
   test "invalid when proper number of digits but letters mixed in" do
-    assert Phone.number("1a2a3a4a5a6a7a8a9a0a") == "0000000000"
+    assert Phone.number("2a1a2a5a5a5a0a1a0a0a") == "0000000000"
   end
 
   @tag :pending
   test "invalid with correct number of characters but some are letters" do
-    assert Phone.number("1a2a3a4a5a") == "0000000000"
+    assert Phone.number("2a1a2a5a5a") == "0000000000"
+  end
+
+  @tag :pending
+  test "invalid when area code begins with 1" do
+    assert Phone.number("1125550100") == "0000000000"
+  end
+
+  @tag :pending
+  test "invalid when area code begins with 0" do
+    assert Phone.number("0125550100") == "0000000000"
+  end
+
+  @tag :pending
+  test "invalid when exchange code begins with 1" do
+    assert Phone.number("2121550100") == "0000000000"
+  end
+
+  @tag :pending
+  test "invalid when exchange code begins with 0" do
+    assert Phone.number("2120550100") == "0000000000"
   end
 
   @tag :pending
   test "area code" do
-    assert Phone.area_code("1234567890") == "123"
+    assert Phone.area_code("2125550100") == "212"
   end
 
   @tag :pending
   test "area code with full US phone number" do
-    assert Phone.area_code("11234567890") == "123"
+    assert Phone.area_code("12125550100") == "212"
   end
 
   @tag :pending
   test "pretty print" do
-    assert Phone.pretty("1234567890") == "(123) 456-7890"
+    assert Phone.pretty("2125550100") == "(212) 555-0100"
   end
 
   @tag :pending
   test "pretty print with full US phone number" do
-    assert Phone.pretty("11234567890") == "(123) 456-7890"
+    assert Phone.pretty("12125550100") == "(212) 555-0100"
   end
 end