trackler 2.1.0.53 → 2.1.0.54

data/tracks/ceylon/.travis.yml

@@ -6,6 +6,6 @@ install:
   - source $HOME/.sdkman/bin/sdkman-init.sh
   - sdk install ceylon
 script:
-  - bin/configlet .
+  - bin/configlet lint .
   - bin/compile-all-stubs
   - bin/test-all-exercises

data/tracks/clojure/.travis.yml

@@ -5,5 +5,5 @@ lein: lein2
 jdk: oraclejdk8
 script:
 - bin/fetch-configlet
-- bin/configlet .
+- bin/configlet lint .
 - lein test

data/tracks/clojure/exercises/rotational-cipher/src/example.clj

@@ -1,21 +1,27 @@
 (ns rotational-cipher)
 
-(def ^:private string (partial apply str))
+(defn ^:private spinner [s a]
+  (let [a (int a)
+        spin (fn [c] (mod (+ c s) 26))]
+    (fn [c]
+      (let [c (- (int c) a)]
+        (char (+ (spin c) a))))))
 
-(def ^:private lower-case "abcdefghijklmnopqrstuvwxyz")
+(defn ^:private upper-spinner [s]
+  (spinner s \A))
 
-(def ^:private upper-case (->> lower-case (map clojure.string/upper-case) string))
+(defn ^:private lower-spinner [s]
+  (spinner s \a))
 
-(def ^:private letters (into #{} (concat lower-case upper-case)))
+(defn ^:private cipher [spin]
+  (let [upper-spin (upper-spinner spin)
+        lower-spin (lower-spinner spin)]
+    (fn [c]
+      (cond
+        (Character/isUpperCase c) (upper-spin c)
+        (Character/isLowerCase c) (lower-spin c)
+        :default c))))
 
-(defn- rotater [shift]
-  (let [encoding (->> (cycle letters)
-                      (drop (* shift 2))
-                      (take 52)
-                      (zipmap letters))]
-    (fn [char] (get encoding char char))))
-
-(defn rotate [message shift]
-  (->> message
-       (map (rotater shift))
-       string))
+(defn rotate [text spin]
+  (let [cipher (cipher spin)]
+    (apply str (map cipher text)) ))

data/tracks/clojure/exercises/rotational-cipher/test/rotational_cipher_test.clj

@@ -23,12 +23,25 @@
 
   (testing "rotate spaces"
     (is (= (rotational-cipher/rotate "O M G" 5) "T R L")))
-  
+
   (testing "rotate numbers"
     (is (= (rotational-cipher/rotate "Testing 1 2 3 testing" 4) "Xiwxmrk 1 2 3 xiwxmrk")))
 
   (testing "rotate punctuation"
     (is (= (rotational-cipher/rotate "Let's eat, Grandma!" 21) "Gzo'n zvo, Bmviyhv!")))
 
+  (testing "rotate in the opposite direction"
+    (is (= (rotational-cipher/rotate "b" -1) "a")))
+
+  (testing "rotate in the opposite direction past first letter"
+    (is (= (rotational-cipher/rotate "B" -2) "Z")))
+
+  (testing "rotate in the opposite direction past letter count"
+    (is (= (rotational-cipher/rotate "B" -28) "Z")))
+
+  (testing "rotate forward then backwards the same number of steps"
+    (is (=  (rotational-cipher/rotate
+              (rotational-cipher/rotate "B" 28) -28) "B")))
+
   (testing "rotate all letters"
     (is (= (rotational-cipher/rotate "The quick brown fox jumps over the lazy dog." 13) "Gur dhvpx oebja sbk whzcf bire gur ynml qbt."))))

data/tracks/cpp/.travis.yml

@@ -14,6 +14,6 @@ install:
 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
 script:
 - bin/fetch-configlet
-- bin/configlet .
+- bin/configlet lint .
 - cmake -G "Unix Makefiles"
 - make

data/tracks/crystal/.gitignore

@@ -7,8 +7,9 @@
 !bin/fetch-configlet
 !LICENSE
 !Makefile
+!generator/
 
-# make sure to ignore others
+# double ignore others
 *.swp
 .crystal/
 .DS_Store
@@ -16,4 +17,8 @@ bin/configlet
 bin/configlet.exe
 CHECKLIST
 tmp/
-bin/generate
+bin/generator
+cache/
+generator/lib
+generator/.shards
+generator/bin/generator

data/tracks/crystal/.travis.yml

@@ -1,5 +1,5 @@
 language: crystal
 script:
   - bin/fetch-configlet
-  - bin/configlet .
+  - bin/configlet lint .
   - make test

data/tracks/crystal/Makefile

@@ -1,34 +1,51 @@
 EXERCISE ?= ""
 IGNOREDIRS := "^(\.git|.crystal|docs|bin|img|script)$$"
 EXERCISESDIR ?= "exercises"
-GENERATORDIR ?= "src/generator"
 EXERCISES = $(shell find exercises -maxdepth 1 -mindepth 1 -type d | cut -d'/' -f2 | sort | grep -Ev $(IGNOREDIRS))
 
 FILEEXT = "cr"
 SPECDIR = "spec"
 EXERCISENAME := "$(subst -,_,$(EXERCISE))"
-EXERCISEDIR := $(EXERCISESDIR)/$(EXERCISE)
-EXERCISESPECDIR := $(EXERCISEDIR)/$(SPECDIR)
+EXERCISESPECDIR := $(EXERCISESDIR)/$(EXERCISE)/$(SPECDIR)
 SPECFILE := "$(EXERCISENAME)_spec.$(FILEEXT)"
-SUPERTMPSPECFILE := "$(SPECFILE).super.tmp"
+SUPERSPECFILE := "$(SPECFILE).super"
 TMPSPECFILE := "$(SPECFILE).tmp"
 
+GENERATORDIR ?= "generator"
+GENERATORSDIR := $(GENERATORDIR)/src/generators
+GENERATORS = $(shell find $(GENERATORSDIR) -type f | cut -d '/' -f 4 | cut -d '.' -f 1 | sed 's/_/-/g')
+
 test-exercise:
 	@echo "running formatting check for: $(EXERCISE)"
 	@crystal tool format --check $(EXERCISESDIR)/$(EXERCISE)
+	@echo "moving files around"
 	@sed 's/pending/it/g' $(EXERCISESPECDIR)/$(SPECFILE) > $(EXERCISESPECDIR)/$(TMPSPECFILE)
-	@mv $(EXERCISESPECDIR)/$(SPECFILE) $(EXERCISESPECDIR)/$(SUPERTMPSPECFILE)
+	@mv $(EXERCISESPECDIR)/$(SPECFILE) $(EXERCISESPECDIR)/$(SUPERSPECFILE)
 	@mv $(EXERCISESPECDIR)/$(TMPSPECFILE) $(EXERCISESPECDIR)/$(SPECFILE)
 	@echo "running tests for: $(EXERCISE)"
 	@cd $(EXERCISESDIR)/$(EXERCISE) && crystal spec
 	@rm $(EXERCISESPECDIR)/$(SPECFILE)
-	@mv $(EXERCISESPECDIR)/$(SUPERTMPSPECFILE) $(EXERCISESPECDIR)/$(SPECFILE)
+	@mv $(EXERCISESPECDIR)/$(SUPERSPECFILE) $(EXERCISESPECDIR)/$(SPECFILE)
 	@printf "\n"
 
-test:
+test-exercises:
 	@for exercise in $(EXERCISES); do EXERCISE=$$exercise $(MAKE) -s test-exercise || exit 1; done
+
+build-generator:
+	@crystal build $(GENERATORDIR)/generator.$(FILEEXT) -o generator/bin/generator
+
+generate-exercise:
+	@echo "generating spec file for generator: $(GENERATOR)"
+	@generator/bin/generator $(GENERATOR)
+
+generate-exercises:
+	@for generator in $(GENERATORS); do GENERATOR=$$generator $(MAKE) -s generate-exercise || exit 1; done
+
+test-generator:
 	@echo "running generator tests"
-	@cd $(GENERATORDIR) && crystal spec
+	@cd $(GENERATORDIR) && crystal deps && crystal spec
 
-build_generator:
-	@crystal build $(GENERATORDIR)/generate.$(FILEEXT) -o bin/generate
+test:
+	@echo "running all the tests"
+	@$(MAKE) -s test-exercises
+	@$(MAKE) -s test-generator

data/tracks/crystal/README.md

@@ -1,4 +1,4 @@
-# xCrystal [![Build Status](https://travis-ci.org/exercism/xcrystal.svg?branch=master)](https://travis-ci.org/exercism/xcrystal)
+# xCrystal [![Build Status](https://travis-ci.org/exercism/crystal.svg?branch=master)](https://travis-ci.org/exercism/crystal)
 
 Exercism problems in Crystal.
 
@@ -22,7 +22,7 @@ $ make test-exercise EXERCISE=exercise-name
 
 ### Creating a New Generator
 
-Navigate to `src/generator/exercises` and create a new generator file (i.e. `hello_world.cr`).
+Navigate to `generator/src/generators` and create a new generator file (i.e. `hello_world.cr`).
 
 This file should contain 2 classes:
 * An exercise generator which must inherit from the ExerciseGenerator class.
@@ -32,15 +32,15 @@ The x-common repo must reside at the same level as the developer's crystal direc
 
 ### Running the Generator
 
-From within the xcrystal directory:
+From within the crystal directory:
 ```bash
-$ crystal src/generator/generate.cr hello-world
+$ crystal generator/generate.cr hello-world
 ```
 
 Or build a binary:
 ```bash
-$ make build_generator
-$ bin/generate hello-world
+$ make build-generator
+$ bin/generate-exercise hello-world
 ```
 
 ## Contributing Guide

data/tracks/crystal/config.json

@@ -160,6 +160,13 @@
       "difficulty": 3,
       "topics": [
 
+      ]
+    },
+    {
+      "slug": "flatten-array",
+      "difficulty": 1,
+      "topics": [
+
       ]
     }
   ],

data/tracks/crystal/exercises/flatten-array/spec/flatten_array_spec.cr

@@ -0,0 +1,28 @@
+require "spec"
+require "../src/*"
+
+describe "FlattenArray" do
+  it "no nesting" do
+    FlattenArray.flatten([0, 1, 2]).should eq([0, 1, 2])
+  end
+
+  pending "flattens array with just integers present" do
+    FlattenArray.flatten([1, [2, 3, 4, 5, 6, 7], 8]).should eq([1, 2, 3, 4, 5, 6, 7, 8])
+  end
+
+  pending "5 level nesting" do
+    FlattenArray.flatten([0, 2, [[2, 3], 8, 100, 4, [[[50]]]], -2]).should eq([0, 2, 2, 3, 8, 100, 4, 50, -2])
+  end
+
+  pending "6 level nesting" do
+    FlattenArray.flatten([1, [2, [[3]], [4, [[5]]], 6, 7], 8]).should eq([1, 2, 3, 4, 5, 6, 7, 8])
+  end
+
+  pending "6 level nest list with null values" do
+    FlattenArray.flatten([0, 2, [[2, 3], 8, [[100]], nil, [[nil]]], -2]).should eq([0, 2, 2, 3, 8, 100, -2])
+  end
+
+  pending "all values in nested list are null" do
+    FlattenArray.flatten([nil, [[[nil]]], nil, nil, [[nil, nil], nil], nil]).should eq([] of Nil)
+  end
+end

data/tracks/crystal/exercises/flatten-array/src/example.cr

@@ -0,0 +1,7 @@
+module FlattenArray
+  extend self
+
+  def flatten(arr)
+    arr.flatten.compact
+  end
+end

data/tracks/crystal/generator/generator.cr

@@ -0,0 +1,20 @@
+require "./src/exercise_generator"
+require "./src/generators/*"
+
+if ARGV.empty?
+  STDERR.puts "Exercise name required!\n"
+  exit
+end
+
+exercise = ARGV[0]
+
+begin
+  klass = {{ExerciseGenerator.subclasses}}.find do |generator|
+    generator.to_s == "#{exercise.split('-').map(&.capitalize).join}Generator"
+  end
+
+  raise "Undefined Generator" unless klass
+  klass.generate
+rescue ex
+  STDERR.puts ex.message
+end

data/tracks/crystal/generator/shard.lock

@@ -0,0 +1,6 @@
+version: 1.0
+shards:
+  webmock:
+    github: manastech/webmock.cr
+    commit: c673f393a31eac2734c7599897357ef1f3f24011
+

data/tracks/crystal/generator/shard.yml

@@ -0,0 +1,9 @@
+name: generator
+version: 0.0.1
+
+development_dependencies:
+  webmock:
+    github: manastech/webmock.cr
+    branch: master
+
+license: MIT

data/tracks/crystal/{src/generator → generator}/spec/exercise_generator_spec.cr

@@ -1,6 +1,6 @@
 require "spec"
-require "../exercises/exercise_generator"
-require "../exercises/exercise_test_case"
+require "../src/exercise_generator"
+require "../src/exercise_test_case"
 
 class DummyGenerator < ExerciseGenerator
   def exercise_name

data/tracks/crystal/{src/generator → generator}/spec/exercise_test_case_spec.cr

@@ -1,6 +1,6 @@
 require "spec"
 require "json"
-require "../exercises/exercise_test_case"
+require "../src/exercise_test_case"
 
 class DummyTestCase < ExerciseTestCase
   def workload; end

data/tracks/crystal/generator/spec/remote_data_file_spec.cr

@@ -0,0 +1,58 @@
+require "spec"
+require "file_utils"
+require "webmock"
+require "../src/remote_data_file"
+
+TEST_URL = [RemoteDataFile::BASE_URL, "test-exercise", RemoteDataFile::DATA_FILE].join("/")
+TEST_DIR = File.expand_path(File.join("..", "..", "cache", "test-exercise"), __FILE__)
+
+describe "RemoteDataFile" do
+  describe "#path" do
+    context "when successful" do
+      Spec.before_each do
+        clean_test_files
+        WebMock.reset
+      end
+
+      Spec.after_each do
+        clean_test_files
+      end
+
+      it "returns the response body if status is 200" do
+        WebMock.stub(:get, TEST_URL).to_return(status: 200, body: "file body")
+
+        remote_data_file = RemoteDataFile.new("test-exercise")
+
+        File.read(remote_data_file.path).should eq("file body")
+      end
+    end
+
+    context "when successful" do
+      it "raises a not found exception if status is 404" do
+        WebMock.stub(:get, TEST_URL).to_return(status: 404, body: "")
+
+        error_message = "A #{RemoteDataFile::DATA_FILE} doesn't exist for test-exercise in x-common. " +
+                        "Go make one!"
+
+        expect_raises(Exception, error_message) do
+          RemoteDataFile.new("test-exercise").path
+        end
+      end
+
+      it "raises a unexpected exception if status is other than 200 or 404" do
+        WebMock.stub(:get, TEST_URL).to_return(status: 500, body: "")
+
+
+        error_message = "Error while requesting the test-exercise data file from GitHub... " +
+                        "Status was 500"
+        expect_raises(Exception, error_message) do
+          RemoteDataFile.new("test-exercise").path
+        end
+      end
+    end
+  end
+end
+
+def clean_test_files
+  FileUtils.rm_rf(TEST_DIR)
+end

data/tracks/crystal/{src/generator/exercises → generator/src}/exercise_generator.cr

@@ -1,3 +1,5 @@
+require "./remote_data_file"
+
 require "ecr"
 require "json"
 
@@ -21,7 +23,7 @@ abstract class ExerciseGenerator
   abstract def test_cases
 
   private def root
-    File.expand_path(File.join("..", "..", "..", ".."), __FILE__)
+    File.expand_path(File.join("..", "..", ".."), __FILE__)
   end
 
   private def test_file
@@ -33,7 +35,13 @@ abstract class ExerciseGenerator
   end
 
   private def data
-    File.read(File.join(metadata_dir, "canonical-data.json"))
+    local_data_file = File.join(metadata_dir, "canonical-data.json")
+    if File.exists?(local_data_file)
+      File.read(local_data_file)
+    else
+      remote_data_file = RemoteDataFile.new(exercise_name)
+      File.read(remote_data_file.path)
+    end
   end
 
   ECR.def_to_s "#{__DIR__}/templates/example.tt"

data/tracks/crystal/{src/generator/exercises → generator/src/generators}/acronym.cr

@@ -1,5 +1,5 @@
-require "./exercise_generator"
-require "./exercise_test_case"
+require "../exercise_generator"
+require "../exercise_test_case"
 
 class AcronymGenerator < ExerciseGenerator
   def exercise_name

data/tracks/crystal/{src/generator/exercises → generator/src/generators}/binary.cr

@@ -1,5 +1,5 @@
-require "./exercise_generator"
-require "./exercise_test_case"
+require "../exercise_generator"
+require "../exercise_test_case"
 
 class BinaryGenerator < ExerciseGenerator
   def exercise_name