trackler 2.0.6.10 → 2.0.6.11

data/tracks/ruby/lib/generator/repository.rb

@@ -33,30 +33,30 @@ module Generator
     end
   end
 
+  # This exists to give us a clue as to what we are delegating to.
+  class RepositoryDelegator < SimpleDelegator
+  end
+
   # A repository that also logs its progress.
-  class LoggingRepository < Repository
-    def initialize(paths:, exercise_name:, logger:)
-      super(paths: paths, exercise_name: exercise_name)
+  class LoggingRepository < RepositoryDelegator
+    def initialize(repository:, logger:)
+      __setobj__ @repository = repository
       @logger = logger
     end
 
     def update_tests_version
-      super
-      @logger.info "Incremented tests version to #{version}"
+      @repository.update_tests_version
+      @logger.debug "Incremented tests version to #{version}"
     end
 
     def update_example_solution
-      super
-      @logger.info "Updated version in example solution to #{version}"
+      @repository.update_example_solution
+      @logger.debug "Updated version in example solution to #{version}"
     end
 
     def create_tests_file
-      super
-      @logger.info "Generated tests for #{exercise_name}"
+      @repository.create_tests_file
+      @logger.info "Generated #{exercise_name} tests version #{version}"
     end
   end
-
-  # This exists to give us a clue as to what we are delegating to.
-  class RepositoryDelegator < SimpleDelegator
-  end
 end

data/tracks/ruby/lib/tasks/exercise_test_tasks.rb

@@ -21,10 +21,8 @@ class ExerciseTestTasks
 
   private
 
-  attr_reader :options, :test_runner
-
   def exercises
-    @_exercises ||= Exercise.all
+    @exercises ||= Exercise.all
   end
 
   def define_task_for_all_exercises
@@ -34,7 +32,7 @@ class ExerciseTestTasks
 
   def define_task_for(exercise)
     task exercise do
-      test_runner.new(exercise: exercise, test_options: options).run
+      @test_runner.new(exercise: exercise, test_options: @options).run
     end
   end
 end

data/tracks/ruby/lib/tasks/exercise_tests_runner.rb

@@ -1,4 +1,4 @@
-require "rake/file_utils_ext"
+require 'rake/file_utils_ext'
 require 'tmpdir'
 
 class ExerciseTestsRunner
@@ -10,9 +10,9 @@ class ExerciseTestsRunner
   end
 
   def run
-    puts "\n\n#{'-'*64}\nrunning tests for: #{exercise}"
+    puts "\n\n#{'-' * 64}\nrunning tests for: #{@exercise}"
 
-    Dir.mktmpdir(exercise.name) do |dir|
+    Dir.mktmpdir(@exercise.name) do |dir|
       setup_exercise_files_in(dir)
       run_exercise_tests_in(dir)
     end
@@ -20,14 +20,12 @@ class ExerciseTestsRunner
 
   private
 
-  attr_reader :exercise, :test_options
-
   def setup_exercise_files_in(dir)
-    FileUtils.cp_r exercise.directory, dir
-    FileUtils.mv "#{dir}/#{exercise.example_file}", "#{dir}/#{exercise.testable_example_file}"
+    FileUtils.cp_r @exercise.directory, dir
+    FileUtils.mv "#{dir}/#{@exercise.example_file}", "#{dir}/#{@exercise.testable_example_file}"
   end
 
   def run_exercise_tests_in(dir)
-    ruby "-I lib -r disable_skip.rb #{dir}/#{exercise.test_file} #{test_options}"
+    ruby "-I lib -r disable_skip.rb #{dir}/#{@exercise.test_file} #{@test_options}"
   end
 end

data/tracks/ruby/test/generator/repository_test.rb

@@ -47,52 +47,44 @@ module Generator
   end
 
   class LoggingRepositoryTest < Minitest::Test
-    FixturePaths = Paths.new(
-      metadata: 'test/fixtures/metadata',
-      track: 'test/fixtures/xruby'
-    )
+    def test_create_tests_file
+      mock_repository = Minitest::Mock.new
+      mock_repository.expect :create_tests_file, nil
+      mock_repository.expect :exercise_name, 'alpha'
+      mock_repository.expect :version, 2
+      mock_logger = Minitest::Mock.new
+      mock_logger.expect :info, nil, ['Generated alpha tests version 2']
 
-    def test_update_tests_version
-      fake_version = 2
+      subject = LoggingRepository.new(repository: mock_repository, logger: mock_logger)
+      subject.create_tests_file
+
+      mock_repository.verify
+    end
 
+    def test_update_tests_version
+      mock_repository = Minitest::Mock.new
+      mock_repository.expect :update_tests_version, nil
+      mock_repository.expect :version, 2
       mock_logger = Minitest::Mock.new
-      mock_logger.expect :info, nil, ["Incremented tests version to #{fake_version}"]
+      mock_logger.expect :debug, nil, ['Incremented tests version to 2']
 
-      mock_tests_version = Minitest::Mock.new.expect :increment, fake_version
-      subject = LoggingRepository.new(paths: FixturePaths, exercise_name: 'alpha', logger: mock_logger)
-      subject.define_singleton_method(:tests_version) { mock_tests_version }
-      subject.define_singleton_method(:version) { fake_version }
+      subject = LoggingRepository.new(repository: mock_repository, logger: mock_logger)
       subject.update_tests_version
-      mock_logger.verify
+
+      mock_repository.verify
     end
 
     def test_update_example_solution
-      fake_version = 2
+      mock_repository = Minitest::Mock.new
+      mock_repository.expect :update_example_solution, nil
+      mock_repository.expect :version, 2
       mock_logger = Minitest::Mock.new
-      mock_logger.expect :info, nil, ["Updated version in example solution to #{fake_version}"]
-
-      mock_example_solution = Minitest::Mock.new.expect :update_version, nil, [2]
-      subject = LoggingRepository.new(paths: FixturePaths, exercise_name: 'alpha', logger: mock_logger)
-      subject.define_singleton_method(:example_solution) { mock_example_solution }
-      subject.define_singleton_method(:version) { fake_version }
+      mock_logger.expect :debug, nil, ['Updated version in example solution to 2']
 
+      subject = LoggingRepository.new(repository: mock_repository, logger: mock_logger)
       subject.update_example_solution
-      mock_logger.verify
-    end
 
-    # Too much to set up here :(
-    def test_create_tests_file
-      mock_logger = Minitest::Mock.new.expect :info, nil, ['Generated tests for alpha']
-
-      mock_tests_template = Minitest::Mock.new.expect :to_s, 'template'
-      mock_template_values = Minitest::Mock.new
-      mock_minitest_tests = Minitest::Mock.new.expect :generate, nil, [{ template: 'template', values: mock_template_values }]
-      subject = LoggingRepository.new(paths: FixturePaths, exercise_name: 'alpha', logger: mock_logger)
-      subject.define_singleton_method(:minitest_tests) { mock_minitest_tests }
-      subject.define_singleton_method(:tests_template) { mock_tests_template }
-      subject.define_singleton_method(:template_values) { mock_template_values }
-      subject.create_tests_file
-      mock_logger.verify
+      mock_repository.verify
     end
   end
 end

data/tracks/rust/README.md

@@ -6,7 +6,7 @@ Exercism exercises in Rust
 
 ## Contributing Guide
 
-Please see the [contributing guide](https://github.com/exercism/x-api/blob/master/CONTRIBUTING.md#the-exercise-data)
+Please see the [contributing guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md)
 
 ## License
 

data/tracks/scheme/config.json

@@ -68,6 +68,11 @@
       "slug": "list-ops",
       "difficulty": 1,
       "topics": []
+    },
+    {
+      "slug": "scrabble-score",
+      "difficulty": 1,
+      "topics": []
     }
 
   ],

data/tracks/scheme/docs/ABOUT.md

@@ -0,0 +1,7 @@
+Scheme is a tail-recursive and statically scoped dialect of the Lisp programming language.
+It was built to have uncomplicated semantics and several different ways to form
+expressions. Multiple programming paradigms, including functional, message,
+and imperative, find easy expression in Scheme. 
+
+Scheme was invented by Guy Lewis Steele Jr. and Gerald Jay Sussman.
+To learn more about Scheme, take a look at [MIT's Scheme page](https://groups.csail.mit.edu/mac/projects/scheme/index.html).

data/tracks/scheme/exercises/scrabble-score/example.scm

@@ -0,0 +1,16 @@
+(define-module (scrabble-score)
+  #:export (score))
+
+(define (letter-score letter)
+  (case (char-downcase letter)
+    [(#\a #\e #\i #\o #\u #\l #\n #\r #\s #\t) 1]
+    [(#\d #\g)                                 2]
+    [(#\b #\c #\m #\p)                         3]
+    [(#\f #\h #\v #\w #\y)                     4]
+    [(#\k)                                     5]
+    [(#\j #\x)                                 8]
+    [(#\q #\z)                                10]
+    [else                                      0]))
+
+(define (score word)
+  (string-fold (lambda (letter acc) (+ acc (letter-score letter))) 0 word))

data/tracks/scheme/exercises/scrabble-score/scrabble-score-test.scm

@@ -0,0 +1,57 @@
+;; Load SRFI-64 lightweight testing specification
+(use-modules (srfi srfi-64))
+
+;; Suppress log file output. To write logs, comment out the following line:
+(module-define! (resolve-module '(srfi srfi-64)) 'test-log-to-file #f)
+
+;; Require module
+(add-to-load-path (dirname (current-filename)))
+(use-modules (scrabble-score))
+
+(test-begin "hello-world")
+
+(test-assert "a is worth one point"
+             (equal? (score "a")
+                     1))
+
+(test-assert "scoring is case insensitive"
+             (equal? (score "A")
+                     1))
+
+(test-assert "f is worth four"
+             (equal? (score "f")
+                     4))
+
+(test-assert "two one point letters make a two point word"
+             (equal? (score "at")
+                     2))
+
+(test-assert "three letter word"
+             (equal? (score "zoo")
+                     12))
+
+(test-assert "medium word"
+             (equal? (score "street")
+                     6))
+
+(test-assert "longer words with valuable letters"
+             (equal? (score "quirky")
+                     22))
+
+(test-assert "long mixed case word"
+             (equal? (score "OxyphenButazone")
+                     41))
+
+(test-assert "english scrabble letters score"
+             (equal? (score "pinata")
+                     8))
+
+(test-assert "non english scrabble letters do not score"
+             (equal? (score "piñata")
+                     7))
+
+(test-assert "empty words are worth zero"
+             (equal? (score "")
+                     0))
+
+(test-end "hello-world")

data/tracks/scheme/exercises/scrabble-score/scrabble-score.scm

@@ -0,0 +1,2 @@
+(define-module (scrabble-score)
+  #:export (score))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.6.10
+  version: 2.0.6.11
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -160,6 +160,7 @@ files:
 - common/exercises/change/canonical-data.json
 - common/exercises/change/description.md
 - common/exercises/change/metadata.yml
+- common/exercises/circular-buffer/canonical-data.json
 - common/exercises/circular-buffer/description.md
 - common/exercises/circular-buffer/metadata.yml
 - common/exercises/clock/canonical-data.json
@@ -347,6 +348,7 @@ files:
 - common/exercises/scrabble-score/canonical-data.json
 - common/exercises/scrabble-score/description.md
 - common/exercises/scrabble-score/metadata.yml
+- common/exercises/secret-handshake/canonical-data.json
 - common/exercises/secret-handshake/description.md
 - common/exercises/secret-handshake/metadata.yml
 - common/exercises/series/description.md
@@ -389,6 +391,7 @@ files:
 - common/exercises/two-bucket/canonical-data.json
 - common/exercises/two-bucket/description.md
 - common/exercises/two-bucket/metadata.yml
+- common/exercises/variable-length-quantity/canonical-data.json
 - common/exercises/variable-length-quantity/description.md
 - common/exercises/variable-length-quantity/metadata.yml
 - common/exercises/word-count/canonical-data.json
@@ -729,16 +732,34 @@ files:
 - tracks/ceylon/.travis.yml
 - tracks/ceylon/LICENSE
 - tracks/ceylon/README.md
-- tracks/ceylon/SETUP.md
 - tracks/ceylon/bin/fetch-configlet
+- tracks/ceylon/bin/test-all-exercises
+- tracks/ceylon/bin/test-exercise
 - tracks/ceylon/config.json
 - tracks/ceylon/docs/ABOUT.md
 - tracks/ceylon/docs/INSTALLATION.md
 - tracks/ceylon/docs/LEARNING.md
 - tracks/ceylon/docs/RESOURCES.md
 - tracks/ceylon/docs/TESTS.md
-- tracks/ceylon/exercises/.keep
-- tracks/ceylon/img/.keep
+- tracks/ceylon/exercises/TRACK_HINTS.md
+- tracks/ceylon/exercises/anagram/example/Anagram.ceylon
+- tracks/ceylon/exercises/anagram/source/anagram/Anagram.ceylon
+- tracks/ceylon/exercises/anagram/source/anagram/AnagramTest.ceylon
+- tracks/ceylon/exercises/anagram/source/anagram/module.ceylon
+- tracks/ceylon/exercises/bracket-push/example/Brackets.ceylon
+- tracks/ceylon/exercises/bracket-push/example/module.ceylon
+- tracks/ceylon/exercises/bracket-push/source/bracketpush/Brackets.ceylon
+- tracks/ceylon/exercises/bracket-push/source/bracketpush/BracketsTest.ceylon
+- tracks/ceylon/exercises/bracket-push/source/bracketpush/module.ceylon
+- tracks/ceylon/exercises/leap/example/Leap.ceylon
+- tracks/ceylon/exercises/leap/source/leap/Leap.ceylon
+- tracks/ceylon/exercises/leap/source/leap/LeapTest.ceylon
+- tracks/ceylon/exercises/leap/source/leap/module.ceylon
+- tracks/ceylon/exercises/sieve/example/Sieve.ceylon
+- tracks/ceylon/exercises/sieve/example/module.ceylon
+- tracks/ceylon/exercises/sieve/source/sieve/Sieve.ceylon
+- tracks/ceylon/exercises/sieve/source/sieve/SieveTest.ceylon
+- tracks/ceylon/exercises/sieve/source/sieve/module.ceylon
 - tracks/ceylon/img/icon.png
 - tracks/clojure/.git
 - tracks/clojure/.gitignore
@@ -4496,6 +4517,7 @@ files:
 - tracks/lua/config.json
 - tracks/lua/docs/ABOUT.md
 - tracks/lua/docs/INSTALLATION.md
+- tracks/lua/docs/LEARNING.md
 - tracks/lua/docs/RESOURCES.md
 - tracks/lua/docs/TESTS.md
 - tracks/lua/exercises/accumulate/accumulate_spec.lua
@@ -5416,6 +5438,8 @@ files:
 - tracks/php/exercises/etl/example.php
 - tracks/php/exercises/gigasecond/example.php
 - tracks/php/exercises/gigasecond/gigasecond_test.php
+- tracks/php/exercises/grains/example.php
+- tracks/php/exercises/grains/grains_test.php
 - tracks/php/exercises/hamming/example.php
 - tracks/php/exercises/hamming/hamming.php
 - tracks/php/exercises/hamming/hamming_test.php
@@ -6894,6 +6918,7 @@ files:
 - tracks/scheme/bin/fetch-configlet
 - tracks/scheme/bin/stub.sh
 - tracks/scheme/config.json
+- tracks/scheme/docs/ABOUT.md
 - tracks/scheme/docs/INSTALLATION.md
 - tracks/scheme/docs/RESOURCES.md
 - tracks/scheme/docs/TESTS.md
@@ -6936,6 +6961,9 @@ files:
 - tracks/scheme/exercises/robot-name/example.scm
 - tracks/scheme/exercises/robot-name/robot-name-test.scm
 - tracks/scheme/exercises/robot-name/robot.scm
+- tracks/scheme/exercises/scrabble-score/example.scm
+- tracks/scheme/exercises/scrabble-score/scrabble-score-test.scm
+- tracks/scheme/exercises/scrabble-score/scrabble-score.scm
 - tracks/scheme/img/icon.png
 - tracks/sml/.git
 - tracks/sml/.gitignore