trackler 2.0.6.11 → 2.0.6.12

data/tracks/ruby/exercises/word-count/example.tt

@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'word_count'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -16,7 +15,7 @@ class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
 

data/tracks/ruby/exercises/wordy/example.tt

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'wordy'
 
-# Test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class WordyTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -12,6 +12,6 @@ class WordyTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end

data/tracks/ruby/lib/acronym_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AcronymCase < OpenStruct
   def name
     'test_%s' % description.tr(' ', '_')

data/tracks/ruby/lib/all_your_base_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AllYourBaseCase < OpenStruct
   def test_name
     'test_%s' % description.downcase.tr(' -', '_')
@@ -95,7 +97,7 @@ class AllYourBaseCase::PreProcessor
     end
 
     def handle_special_cases
-      [4,2] if row['input_digits'] == [0, 6, 0]
+      [4, 2] if row['input_digits'] == [0, 6, 0]
     end
   end
 end

data/tracks/ruby/lib/alphametics_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AlphameticsCase < OpenStruct
   def test_name
     "test_#{description.tr(' ', '_')}"
@@ -20,7 +22,7 @@ class AlphameticsCase < OpenStruct
       "input = %s\n" % input,
       "expected = %s\n" % expect,
       "assert_equal expected, Alphametics.solve(input)"
-    indent(body,4)
+    indent(body, 4)
   end
 
   def runtime_comment
@@ -30,7 +32,7 @@ class AlphameticsCase < OpenStruct
         "# The obvious algorithm can take a long time to solve this puzzle,\n",
         "# but an optimised solution can solve it fairly quickly.\n",
         "# (It's OK to submit your solution without getting this test to pass.)\n"
-      indent(comments,2)
+      indent(comments, 2)
     end
   end
 
@@ -41,7 +43,7 @@ class AlphameticsCase < OpenStruct
   end
 
   def expected_values
-    "{ #{indent(expected_values_as_lines,17)} }"
+    "{ #{indent(expected_values_as_lines, 17)} }"
   end
 
   def expected_values_as_lines
@@ -50,7 +52,7 @@ class AlphameticsCase < OpenStruct
   end
 
   def expected_values_as_strings
-    expected.sort.map { |(key,value)| "'#{key}' => #{value}" }
+    expected.sort.map { |(key, value)| "'#{key}' => #{value}" }
   end
 
   def add_trailing_comma_and_newline(lines)

data/tracks/ruby/lib/anagram_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AnagramCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/binary_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class BinaryCase < OpenStruct
   def name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/bowling_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class BowlingCase < OpenStruct
   def test_name
     "test_#{description.downcase.tr(' ', '_')}"

data/tracks/ruby/lib/bracket_push_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class BracketPushCase < OpenStruct
   def name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/clock_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class ClockCase < OpenStruct
   def name
     'test_%s' % description

data/tracks/ruby/lib/connect_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class ConnectCase < OpenStruct
   def name
     'test_%s' % description

data/tracks/ruby/lib/custom_set_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class CustomSetCase < OpenStruct
   def name
     'test_%s' % description.gsub(/ |-/, '_')

data/tracks/ruby/lib/difference_of_squares_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class DifferenceOfSquaresCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/dominoes_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class DominoesCase < OpenStruct
   def test_name
     'test_%s' % description.gsub("can't", 'can not').gsub(/[= -]+/, '_')

data/tracks/ruby/lib/exercise_cases.rb

@@ -0,0 +1,2 @@
+require 'ostruct'
+require 'json'

data/tracks/ruby/lib/generator/files/track_files.rb

@@ -11,7 +11,7 @@ module Generator
       end
 
       def filename(exercise_name)
-        "#{exercise_name.tr('-','_')}_cases"
+        "#{exercise_name.tr('-', '_')}_cases"
       end
 
       def proc_name(exercise_name)
@@ -19,7 +19,7 @@ module Generator
       end
 
       def exercise_name(filename)
-        %r{([^/]*)_cases\.rb$}.match(filename).captures[0].tr('_','-')
+        %r{([^/]*)_cases\.rb$}.match(filename).captures[0].tr('_', '-')
       end
     end
 
@@ -71,7 +71,7 @@ module Generator
     end
 
     class MinitestTestsFile < Writable
-      def generate(template:,values:)
+      def generate(template:, values:)
         content = ERB.new(template, nil, '<>').result values.get_binding
         save(content)
       end

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

@@ -4,7 +4,7 @@ module Generator
   module Files
     class Readable
       attr_reader :filename, :repository_root
-      def initialize(filename:,repository_root: nil)
+      def initialize(filename:, repository_root: nil)
         @filename = filename
         @repository_root = repository_root
       end

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

@@ -1,10 +1,10 @@
 module Generator
   # Contains methods accessible to the ERB template
   class TemplateValues
-    attr_reader :sha1, :version, :test_cases
+    attr_reader :abbreviated_commit_hash, :version, :test_cases
 
-    def initialize(sha1:, version:, test_cases:)
-      @sha1 = sha1
+    def initialize(abbreviated_commit_hash:, version:, test_cases:)
+      @abbreviated_commit_hash = abbreviated_commit_hash
       @version = version
       @test_cases = test_cases
     end
@@ -16,20 +16,11 @@ module Generator
 
   module TemplateValuesFactory
     def template_values
-      # These are needed by the 'ExerciseCases' classes
-      # TODO: move these into the individual classes
-      require 'ostruct'
-      require 'json'
       require cases_require_name
 
-      # Compensate for the version.next that appears in template files.
-      # TODO: remove the .next from the template files and remove compensation
-      compensated_version = version - 1
-
       TemplateValues.new(
-        # TODO: rename sha1 to abbreviated_commit_hash
-        sha1: canonical_data.abbreviated_commit_hash,
-        version: compensated_version,
+        abbreviated_commit_hash: canonical_data.abbreviated_commit_hash,
+        version: version,
         test_cases: test_cases_proc.call(canonical_data.to_s)
       )
     end

data/tracks/ruby/lib/gigasecond_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 require 'time'
 
 class GigasecondCase < OpenStruct

data/tracks/ruby/lib/grains_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class GrainsCase < OpenStruct
   def test_name
     'test_%s' % description.downcase.tr_s(' ', '_')
@@ -14,7 +16,7 @@ class GrainsCase < OpenStruct
   private
 
   def underscore_format(number)
-    number.to_s.reverse.gsub(/...(?=.)/,'\&_').reverse
+    number.to_s.reverse.gsub(/...(?=.)/, '\&_').reverse
   end
 end
 

data/tracks/ruby/lib/hamming_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class HammingCase < OpenStruct
   def name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/hello_world_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class HelloWorldCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/isogram_cases.rb

@@ -1,7 +1,9 @@
+require 'exercise_cases'
+
 class IsogramCase < OpenStruct
 
   def name
-    format('test_%s', description.downcase.gsub(/[ -]/,'_'))
+    format('test_%s', description.downcase.gsub(/[ -]/, '_'))
   end
 
   def assertion

data/tracks/ruby/lib/largest_series_product_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class LargestSeriesProductCase < OpenStruct
   def name
     'test_%s' % description.tr('()', '').tr(' -', '_').downcase

data/tracks/ruby/lib/leap_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class LeapCase < OpenStruct
   def name
     'test_%s' % description.downcase.gsub(/[ -]/, '_')

data/tracks/ruby/lib/nth_prime_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class NthPrimeCase < OpenStruct
   def name
     'test_%s' % description.downcase.gsub(/[ -]/, '_')

data/tracks/ruby/lib/pangram_cases.rb

@@ -1,6 +1,8 @@
+require 'exercise_cases'
+
 class PangramCase < OpenStruct
   def name
-    'test_%s' % description.downcase.tr_s(" -'", '_').sub(/_$/,'')
+    'test_%s' % description.downcase.tr_s(" -'", '_').sub(/_$/, '')
   end
 
   def workload

data/tracks/ruby/lib/queen_attack_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class QueenCase < OpenStruct
   def test_name
     "test_#{description.gsub(/[ ]/, '_')}"

data/tracks/ruby/lib/raindrops_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RaindropsCase < OpenStruct
   def name
     'test_%s' % number

data/tracks/ruby/lib/rna_transcription_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RnaTranscriptionCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')

data/tracks/ruby/lib/roman_numerals_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RomanNumeralsCase < OpenStruct
   def name
     'test_%s' % number.to_s

data/tracks/ruby/lib/run_length_encoding_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RunLengthEncodingCase < OpenStruct
   def name
     'test_%s' % cleaned_description

data/tracks/ruby/lib/sieve_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class SieveCase < OpenStruct
   OPEN_ARRAY = "[\n\s\s\s\s\s\s".freeze
   CLOSE_ARRAY = "\n\s\s\s\s]".freeze

data/tracks/ruby/lib/tournament_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TournamentCase < OpenStruct
   def test_name
     "test_#{description.tr(' ', '_').tr('()', '')}"

data/tracks/ruby/lib/transpose_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TransposeCase < OpenStruct
   def test_name
     "test_#{description.tr(' ', '_')}"

data/tracks/ruby/lib/triangle_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TriangleCase < OpenStruct
   def test_name
     initial = description.downcase

data/tracks/ruby/lib/two_bucket_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TwoBucketCase < OpenStruct
   def test_name
     "test_bucket_one_#{bucket_one}_bucket_two_"\

data/tracks/ruby/lib/word_count_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class WordCountCase < OpenStruct
   def name
     'test_%s' % description.tr(' ', '_')

data/tracks/ruby/lib/wordy_cases.rb

@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class WordyCase < OpenStruct
   def test_name
     'test_%s' % description.downcase.tr(' ', '_')

data/tracks/ruby/test/fixtures/xruby/exercises/alpha/example.tt

@@ -4,7 +4,7 @@
 require 'minitest/autorun'
 require_relative 'alpha'
 
-# Common test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class AlphaTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skip %>
@@ -15,6 +15,6 @@ class AlphaTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end

data/tracks/ruby/test/fixtures/xruby/lib/alpha_cases.rb

@@ -1,7 +1,7 @@
 class AlphaCase < OpenStruct
 
   def name
-    format('test_%s', description.downcase.gsub(/[ -]/,'_'))
+    format('test_%s', description.downcase.gsub(/[ -]/, '_'))
   end
 
   def assertion

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

@@ -16,7 +16,7 @@ module Generator
 
     def test_invalid_metadata_repository_outputs_message_to_stderr
       paths = Paths.new(metadata: 'test/fixtures/nonexistent', track: nil)
-      expected_stderr = <<-MESSAGE.gsub(/^ {6}/,'')
+      expected_stderr = <<-MESSAGE.gsub(/^ {6}/, '')
       'x-common' repository not found.
       Try running the command:
         git clone https://github.com/exercism/x-common.git "test/fixtures/nonexistent"

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

@@ -2,26 +2,26 @@ require_relative '../test_helper'
 
 module Generator
   class TestCasesValuesTest < Minitest::Test
-    def test_sha1
-      expected_sha1 = '1234567'
-      subject = TemplateValues.new(sha1: expected_sha1, version: nil, test_cases: nil)
-      assert_equal expected_sha1, subject.sha1
+    def test_abbreviated_commit_hash
+      expected_abbreviated_commit_hash = '1234567'
+      subject = TemplateValues.new(abbreviated_commit_hash: expected_abbreviated_commit_hash, version: nil, test_cases: nil)
+      assert_equal expected_abbreviated_commit_hash, subject.abbreviated_commit_hash
     end
 
     def test_version
       expected_version = '1234567'
-      subject = TemplateValues.new(version: expected_version, sha1: nil, test_cases: nil)
+      subject = TemplateValues.new(version: expected_version, abbreviated_commit_hash: nil, test_cases: nil)
       assert_equal expected_version, subject.version
     end
 
     def test_test_cases
       expected_test_cases = 'should be TemplateValues class'
-      subject = TemplateValues.new(test_cases: expected_test_cases, sha1: nil, version: nil)
+      subject = TemplateValues.new(test_cases: expected_test_cases, abbreviated_commit_hash: nil, version: nil)
       assert_equal expected_test_cases, subject.test_cases
     end
 
     def test_get_binding
-      subject = TemplateValues.new(sha1: nil,version: nil, test_cases: nil)
+      subject = TemplateValues.new(abbreviated_commit_hash: nil, version: nil, test_cases: nil)
       assert_instance_of Binding, subject.get_binding
     end
   end

data/tracks/rust/.travis.yml

@@ -13,6 +13,10 @@ env:
   - DENYWARNINGS=
   - DENYWARNINGS=1
 matrix:
+  include:
+    - rust: nightly
+      env: BENCHMARK=1
+      script: "./_test/check-exercises.sh"
   allow_failures:
     - rust: nightly
     - rust: beta

data/tracks/rust/_test/check-exercises.sh

@@ -6,6 +6,12 @@ if [ -z "$DENYWARNINGS" ]; then
     set -e
 fi
 
+if [ -n "$BENCHMARK" ]; then
+    files=exercises/*/benches
+else
+    files=exercises/*/tests
+fi
+
 tmp=${TMPDIR:-/tmp/}
 mkdir "${tmp}exercises"
 
@@ -13,7 +19,7 @@ exitcode=0
 
 # An exercise worth testing is defined here as any top level directory with
 # a 'tests' directory
-for exercise in exercises/*/tests; do
+for exercise in $files; do
     # This assumes that exercises are only one directory deep
     # and that the primary module is named the same as the directory
     directory=$(dirname "${exercise}");
@@ -38,7 +44,10 @@ for exercise in exercises/*/tests; do
             sed -i '/\[ignore\]/d' $test
         done
 
-        if [ -n "$DENYWARNINGS" ]; then
+        # Run benchmarks instead of tests when enabled.
+        if [ -n "$BENCHMARK" ]; then
+            cargo bench
+        elif [ -n "$DENYWARNINGS" ]; then
             sed -i -e '1i #![deny(warnings)]' src/lib.rs
 
             # No-run mode so we see no test output.

data/tracks/rust/config.json

@@ -122,6 +122,15 @@
         "match"
       ]
     },
+    {
+      "slug": "luhn",
+      "difficulty": 1,
+      "topics": [
+        "str to digits",
+        "iterators",
+        "higher-order functions"
+      ]
+    },
     {
       "slug": "largest-series-product",
       "difficulty": 1,

data/tracks/rust/exercises/luhn/.gitignore

@@ -0,0 +1,7 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+Cargo.lock

data/tracks/rust/exercises/luhn/Cargo.toml

@@ -0,0 +1,3 @@
+[package]
+name = "luhn"
+version = "0.0.0"

data/tracks/rust/exercises/luhn/example.rs

@@ -0,0 +1,13 @@
+pub fn is_valid(candidate: &str) -> bool {
+    if candidate.chars().any(|c| c.is_alphabetic()) || candidate.chars().count() == 1 {
+        return false;
+    }
+
+    candidate.chars()
+        .filter_map(|c| c.to_digit(10))
+        .rev()
+        .enumerate()
+        .map(|(index, digit)| if index % 2 == 0 { digit } else { digit * 2 })
+        .map(|digit| if digit > 9 { digit - 9 } else { digit })
+        .sum::<u32>() % 10 == 0
+}

data/tracks/rust/exercises/luhn/tests/luhn.rs

@@ -0,0 +1,38 @@
+extern crate luhn;
+
+use luhn::*;
+
+#[test]
+fn single_digit_string_is_invalid() {
+    assert!(!is_valid("1"));
+}
+
+#[test]
+#[ignore]
+fn single_zero_string_is_invalid() {
+    assert!(!is_valid("0"));
+}
+
+#[test]
+#[ignore]
+fn valid_canadian_sin_is_valid() {
+    assert!(is_valid("046 454 286"));
+}
+
+#[test]
+#[ignore]
+fn invalid_canadian_sin_is_invalid() {
+    assert!(!is_valid("046 454 287"));
+}
+
+#[test]
+#[ignore]
+fn invalid_credit_card_is_invalid() {
+    assert!(!is_valid("8273 1232 7352 0569"));
+}
+
+#[test]
+#[ignore]
+fn strings_that_contain_non_digits_are_invalid() {
+    assert!(!is_valid("046a 454 286"));
+}

data/tracks/rust/exercises/parallel-letter-frequency/HINTS.md

@@ -0,0 +1,32 @@
+# Parallel Letter Frequency in Rust
+
+Learn more about concurrency in Rust here:
+
+- [Concurrency](https://doc.rust-lang.org/book/concurrency.html)
+
+## Bonus
+
+This exercise also includes a benchmark, with a sequential implementation as a
+baseline. You can compare your solution to the benchmark. Observe the
+effect different size inputs have on the performance of each. Can you
+surpass the benchmark using concurrent programming techniques?
+
+As of this writing, test::Bencher is unstable and only available on
+*nightly* Rust. Run the benchmarks with Cargo:
+
+```
+cargo bench
+```
+
+If you are using rustup.rs:
+
+```
+rustup run nightly cargo bench
+```
+
+- [Benchmark tests](https://doc.rust-lang.org/book/benchmark-tests.html)
+
+Learn more about nightly Rust:
+
+- [Nightly Rust](https://doc.rust-lang.org/book/nightly-rust.html)
+- [Rustup: Working with nightly](https://github.com/rust-lang-nursery/rustup.rs#working-with-nightly-rust)