trackler 2.1.0.24 → 2.1.0.25

data/tracks/racket/exercises/grep/paradise-lost.txt

@@ -0,0 +1,8 @@
+Of Mans First Disobedience, and the Fruit
+Of that Forbidden Tree, whose mortal tast
+Brought Death into the World, and all our woe,
+With loss of Eden, till one greater Man
+Restore us, and regain the blissful Seat,
+Sing Heav'nly Muse, that on the secret top
+Of Oreb, or of Sinai, didst inspire
+That Shepherd, who first taught the chosen Seed

data/tracks/ruby/README.md

@@ -56,7 +56,7 @@ rake test:clock -- -p
 ```
 
 To run a subset of the tests, use a regular expression. For example, if tests
-exist taht are named identical_to_4_places, and identical, then we can run both
+exist that are named identical_to_4_places, and identical, then we can run both
 tests with
 
 ```sh
@@ -71,6 +71,9 @@ Note that flags which have an attached value, like above, must take the form
 
 Generated test suites use the `bin/generator` cli.
 
+Before using the cli it is recommended you run `bundle install` from within
+the xruby directory to install/update any required gems.
+
 While many of the exercises which have canonical data already have generators,
 some do not. To find out whether an exercise has a generator, run
 

data/tracks/ruby/exercises/acronym/.meta/.version

@@ -1 +1 @@
-3
+4

data/tracks/ruby/exercises/acronym/.meta/solutions/acronym.rb

@@ -1,5 +1,5 @@
 module BookKeeping
-  VERSION = 3
+  VERSION = 4
 end
 
 class Acronym

data/tracks/ruby/exercises/acronym/acronym_test.rb

@@ -2,7 +2,7 @@
 require 'minitest/autorun'
 require_relative 'acronym'
 
-# Common test data version: 1.0.0 dcfe476
+# Common test data version: 1.1.0 cae7ae1
 class AcronymTest < Minitest::Test
   def test_basic
     # skip
@@ -14,11 +14,6 @@ class AcronymTest < Minitest::Test
     assert_equal "ROR", Acronym.abbreviate('Ruby on Rails')
   end
 
-  def test_camelcase
-    skip
-    assert_equal "HTML", Acronym.abbreviate('HyperText Markup Language')
-  end
-
   def test_punctuation
     skip
     assert_equal "FIFO", Acronym.abbreviate('First In, First Out')
@@ -58,6 +53,6 @@ class AcronymTest < Minitest::Test
 
   def test_bookkeeping
     skip
-    assert_equal 3, BookKeeping::VERSION
+    assert_equal 4, BookKeeping::VERSION
   end
 end

data/tracks/ruby/exercises/anagram/.meta/generator/anagram_case.rb

@@ -13,7 +13,7 @@ class AnagramCase < Generator::ExerciseCase
   end
 
   def show_comment
-    "# #{comment}" unless comment.nil?
+    "# #{comment}" if respond_to?(:comment)
   end
 
   def detector

data/tracks/ruby/exercises/beer-song/.meta/generator/beer_song_case.rb

@@ -17,7 +17,7 @@ class BeerSongCase < Generator::ExerciseCase
     if property == 'verse'
       number
     else
-      "%s, %s" % [self["beginning"], self["end"]]
+      "%s, %s" % [self.beginning, self.end]
     end
   end
 end

data/tracks/ruby/exercises/clock/.meta/generator/clock_case.rb

@@ -29,7 +29,7 @@ class ClockCase < Generator::ExerciseCase
   end
 
   def add_to_clock
-    " + #{add}" if add
+    " + #{add}" if respond_to?(:add)
   end
 
 end

data/tracks/ruby/exercises/connect/.meta/generator/connect_case.rb

@@ -19,7 +19,4 @@ class ConnectCase < Generator::ExerciseCase
     string.inspect.tr('"', "'")
   end
 
-  def ignore_method_length
-    "# rubocop:disable MethodLength\n  " if board.length > 8
-  end
 end

data/tracks/ruby/exercises/connect/.meta/generator/test_template.erb

@@ -5,7 +5,7 @@ require_relative 'connect'
 # Common test data version: <%= canonical_data_version %> <%= abbreviated_commit_hash %>
 class ConnectTest < Minitest::Test
 <% test_cases.each_with_index do |test_case, idx| %>
-  <%= test_case.ignore_method_length%>def <%= test_case.name %>
+  def <%= test_case.name %>
     <%= test_case.skipped(idx) %><% test_case.test_body.each do |line| %>
     <%= line %><% end %>
   end

data/tracks/ruby/exercises/difference-of-squares/.meta/.version

@@ -1 +1 @@
-3
+4

data/tracks/ruby/exercises/difference-of-squares/.meta/solutions/difference_of_squares.rb

@@ -1,5 +1,5 @@
 module BookKeeping
-  VERSION = 3
+  VERSION = 4
 end
 
 class Squares

data/tracks/ruby/exercises/difference-of-squares/difference_of_squares_test.rb

@@ -2,16 +2,16 @@
 require 'minitest/autorun'
 require_relative 'difference_of_squares'
 
-# Common test data version: 1.0.0 1eb9535
+# Common test data version: 1.1.0 7a1108b
 class DifferenceOfSquaresTest < Minitest::Test
-  def test_square_of_sum_5
+  def test_square_of_sum_1
     # skip
-    assert_equal 225, Squares.new(5).square_of_sum
+    assert_equal 1, Squares.new(1).square_of_sum
   end
 
-  def test_square_of_sum_10
+  def test_square_of_sum_5
     skip
-    assert_equal 3_025, Squares.new(10).square_of_sum
+    assert_equal 225, Squares.new(5).square_of_sum
   end
 
   def test_square_of_sum_100
@@ -19,14 +19,14 @@ class DifferenceOfSquaresTest < Minitest::Test
     assert_equal 25_502_500, Squares.new(100).square_of_sum
   end
 
-  def test_sum_of_squares_5
+  def test_sum_of_squares_1
     skip
-    assert_equal 55, Squares.new(5).sum_of_squares
+    assert_equal 1, Squares.new(1).sum_of_squares
   end
 
-  def test_sum_of_squares_10
+  def test_sum_of_squares_5
     skip
-    assert_equal 385, Squares.new(10).sum_of_squares
+    assert_equal 55, Squares.new(5).sum_of_squares
   end
 
   def test_sum_of_squares_100
@@ -34,9 +34,9 @@ class DifferenceOfSquaresTest < Minitest::Test
     assert_equal 338_350, Squares.new(100).sum_of_squares
   end
 
-  def test_difference_of_squares_0
+  def test_difference_of_squares_1
     skip
-    assert_equal 0, Squares.new(0).difference
+    assert_equal 0, Squares.new(1).difference
   end
 
   def test_difference_of_squares_5
@@ -44,11 +44,6 @@ class DifferenceOfSquaresTest < Minitest::Test
     assert_equal 170, Squares.new(5).difference
   end
 
-  def test_difference_of_squares_10
-    skip
-    assert_equal 2_640, Squares.new(10).difference
-  end
-
   def test_difference_of_squares_100
     skip
     assert_equal 25_164_150, Squares.new(100).difference
@@ -73,6 +68,6 @@ class DifferenceOfSquaresTest < Minitest::Test
 
   def test_bookkeeping
     skip
-    assert_equal 3, BookKeeping::VERSION
+    assert_equal 4, BookKeeping::VERSION
   end
 end

data/tracks/ruby/exercises/triangle/.meta/generator/triangle_case.rb

@@ -24,11 +24,19 @@ class TriangleCase < Generator::ExerciseCase
   end
 
   def failure_message
-    %Q("Expected '#{expected}', #{expected_type}.")
+    %Q("Expected '#{expected}', #{expected_triangle}.")
   end
 
   def expected_type
-    "triangle is #{expected ? '' : 'not '}#{property}"
+    "triangle is #{type}"
+  end
+
+  def expected_triangle
+    "triangle #{sides} is #{type}"
+  end
+
+  def type
+    "#{expected ? '' : 'not ' }#{property}"
   end
 
 end

data/tracks/ruby/exercises/triangle/triangle_test.rb

@@ -7,103 +7,103 @@ class TriangleTest < Minitest::Test
   def test_triangle_is_equilateral_if_all_sides_are_equal
     # skip
     triangle = Triangle.new([2, 2, 2])
-    assert triangle.equilateral?, "Expected 'true', triangle is equilateral."
+    assert triangle.equilateral?, "Expected 'true', triangle [2, 2, 2] is equilateral."
   end
 
   def test_triangle_is_not_equilateral_if_any_side_is_unequal
     skip
     triangle = Triangle.new([2, 3, 2])
-    refute triangle.equilateral?, "Expected 'false', triangle is not equilateral."
+    refute triangle.equilateral?, "Expected 'false', triangle [2, 3, 2] is not equilateral."
   end
 
   def test_triangle_is_not_equilateral_if_no_sides_are_equal
     skip
     triangle = Triangle.new([5, 4, 6])
-    refute triangle.equilateral?, "Expected 'false', triangle is not equilateral."
+    refute triangle.equilateral?, "Expected 'false', triangle [5, 4, 6] is not equilateral."
   end
 
   def test_all_zero_sides_are_illegal_so_the_triangle_is_not_equilateral
     skip
     triangle = Triangle.new([0, 0, 0])
-    refute triangle.equilateral?, "Expected 'false', triangle is not equilateral."
+    refute triangle.equilateral?, "Expected 'false', triangle [0, 0, 0] is not equilateral."
   end
 
   def test_equilateral_triangle_sides_may_be_floats
     skip
     triangle = Triangle.new([0.5, 0.5, 0.5])
-    assert triangle.equilateral?, "Expected 'true', triangle is equilateral."
+    assert triangle.equilateral?, "Expected 'true', triangle [0.5, 0.5, 0.5] is equilateral."
   end
 
   def test_triangle_is_isosceles_if_last_two_sides_are_equal
     skip
     triangle = Triangle.new([3, 4, 4])
-    assert triangle.isosceles?, "Expected 'true', triangle is isosceles."
+    assert triangle.isosceles?, "Expected 'true', triangle [3, 4, 4] is isosceles."
   end
 
   def test_triangle_is_isosceles_if_first_two_sides_are_equal
     skip
     triangle = Triangle.new([4, 4, 3])
-    assert triangle.isosceles?, "Expected 'true', triangle is isosceles."
+    assert triangle.isosceles?, "Expected 'true', triangle [4, 4, 3] is isosceles."
   end
 
   def test_triangle_is_isosceles_if_first_and_last_sides_are_equal
     skip
     triangle = Triangle.new([4, 3, 4])
-    assert triangle.isosceles?, "Expected 'true', triangle is isosceles."
+    assert triangle.isosceles?, "Expected 'true', triangle [4, 3, 4] is isosceles."
   end
 
   def test_equilateral_triangles_are_also_isosceles
     skip
     triangle = Triangle.new([4, 4, 4])
-    assert triangle.isosceles?, "Expected 'true', triangle is isosceles."
+    assert triangle.isosceles?, "Expected 'true', triangle [4, 4, 4] is isosceles."
   end
 
   def test_triangle_is_not_isosceles_if_no_sides_are_equal
     skip
     triangle = Triangle.new([2, 3, 4])
-    refute triangle.isosceles?, "Expected 'false', triangle is not isosceles."
+    refute triangle.isosceles?, "Expected 'false', triangle [2, 3, 4] is not isosceles."
   end
 
   def test_sides_that_violate_triangle_inequality_are_not_isosceles_even_if_two_are_equal
     skip
     triangle = Triangle.new([1, 1, 3])
-    refute triangle.isosceles?, "Expected 'false', triangle is not isosceles."
+    refute triangle.isosceles?, "Expected 'false', triangle [1, 1, 3] is not isosceles."
   end
 
   def test_isosceles_triangle_sides_may_be_floats
     skip
     triangle = Triangle.new([0.5, 0.4, 0.5])
-    assert triangle.isosceles?, "Expected 'true', triangle is isosceles."
+    assert triangle.isosceles?, "Expected 'true', triangle [0.5, 0.4, 0.5] is isosceles."
   end
 
   def test_triangle_is_scalene_if_no_sides_are_equal
     skip
     triangle = Triangle.new([5, 4, 6])
-    assert triangle.scalene?, "Expected 'true', triangle is scalene."
+    assert triangle.scalene?, "Expected 'true', triangle [5, 4, 6] is scalene."
   end
 
   def test_triangle_is_not_scalene_if_all_sides_are_equal
     skip
     triangle = Triangle.new([4, 4, 4])
-    refute triangle.scalene?, "Expected 'false', triangle is not scalene."
+    refute triangle.scalene?, "Expected 'false', triangle [4, 4, 4] is not scalene."
   end
 
   def test_triangle_is_not_scalene_if_two_sides_are_equal
     skip
     triangle = Triangle.new([4, 4, 3])
-    refute triangle.scalene?, "Expected 'false', triangle is not scalene."
+    refute triangle.scalene?, "Expected 'false', triangle [4, 4, 3] is not scalene."
   end
 
   def test_sides_that_violate_triangle_inequality_are_not_scalene_even_if_they_are_all_different
     skip
     triangle = Triangle.new([7, 3, 2])
-    refute triangle.scalene?, "Expected 'false', triangle is not scalene."
+    refute triangle.scalene?, "Expected 'false', triangle [7, 3, 2] is not scalene."
   end
 
   def test_scalene_triangle_sides_may_be_floats
     skip
     triangle = Triangle.new([0.5, 0.4, 0.6])
-    assert triangle.scalene?, "Expected 'true', triangle is scalene."
+    assert triangle.scalene?, "Expected 'true', triangle [0.5, 0.4, 0.6] is scalene."
   end
 
   # Problems in exercism evolve over time, as we find better ways to ask

data/tracks/ruby/exercises/wordy/.meta/generator/wordy_case.rb

@@ -16,7 +16,7 @@ class WordyCase < Generator::ExerciseCase
   end
 
   def assertion
-    return error_assertion unless expected
+    return error_assertion if expected == false
     return message_assertion if message
 
     "assert_equal(#{expected}, WordProblem.new(question).answer)"

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

@@ -7,7 +7,7 @@ module Generator
 
       def cases(exercise_data)
         extract_test_cases(data: JSON.parse(exercise_data)['cases'])
-          .map { |test| @case_class.new(test) }
+          .map { |case_properties| @case_class.new(canonical: OpenStruct.new(case_properties)) }
       end
 
       private

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

@@ -1,17 +1,31 @@
 require 'ostruct'
 
 module Generator
-  class ExerciseCase < OpenStruct
+  class ExerciseCase
     using Generator::Underscore
     include CaseHelpers
     include Assertion
 
+    attr_reader :canonical
+    def initialize(canonical:)
+      @canonical = canonical
+    end
+
     def name
-      'test_%s' % description.underscore
+      'test_%s' % canonical.description.underscore
     end
 
     def skipped(index)
       index.zero? ? '# skip' : 'skip'
     end
+
+    def method_missing(sym, *args, &block)
+      return canonical.send(sym) if canonical.respond_to?(sym)
+      super(sym, *args, &block)
+    end
+
+    def respond_to?(sym, include_private = false)
+      canonical.respond_to?(sym) || super
+    end
   end
 end

data/tracks/ruby/lib/generator/exercise_case/assertion.rb

@@ -14,7 +14,7 @@ module Generator
       #  "#{assert} Luhn.valid?(#{input.inspect})"
       #
       def assert
-        expected ? 'assert' : 'refute'
+        canonical.expected ? 'assert' : 'refute'
       end
 
       # generates assertions of the form
@@ -29,8 +29,8 @@ module Generator
       #   assert_equal { "PigLatin.translate(#{input.inspect})" }
       #
       def assert_equal
-        assertion = expected.nil? ? 'assert_nil' :
-                      "assert_equal #{expected.inspect},"
+        assertion = canonical.expected.nil? ? 'assert_nil' :
+                      "assert_equal #{canonical.expected.inspect},"
         "#{assertion} #{yield}"
       end
 
@@ -43,7 +43,7 @@ module Generator
       #   end
       #
       def raises_error?
-        expected.to_i == -1
+        canonical.expected.to_i == -1
       end
 
       # generates assertions of the form

data/tracks/ruby/test/fixtures/xruby/exercises/alpha/.meta/generator/alpha_case.rb

@@ -1,6 +1,6 @@
 class AlphaCase < Generator::ExerciseCase
   def name
-    format('test_%s', description.downcase.gsub(/[ -]/, '_'))
+    format('test_%s', canonical.description.downcase.gsub(/[ -]/, '_'))
   end
 
   def workload

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

@@ -16,14 +16,35 @@ module Generator
         ).cases(canonical_data)
 
         expected = [
-          ComplexCase.new(description: 'first generic verse', property: 'verse', number: 99,
-                          expected: '99 bottles of beer on the wall, YAAAR'),
-          ComplexCase.new(description: 'last generic verse', property: 'verse', number: 3,
-                          expected: '3 bottles of beer on the wall, YAAAR'),
-          ComplexCase.new(description: 'first two verses', property: 'verses', beginning: 99, end: 98,
-                          expected: "99 bottles of beer on the wall, YAR, PIRATES CAN'T COUNT")
+          ComplexCase.new(
+            canonical: {
+              'description' => 'first generic verse',
+              'property' => 'verse',
+              'number' => 99,
+              'expected' => '99 bottles of beer on the wall, YAAAR'
+            }
+          ),
+          ComplexCase.new(
+            canonical: {
+              'description' => 'last generic verse',
+              'property' => 'verse',
+              'number' => 3,
+              'expected' => '3 bottles of beer on the wall, YAAAR'
+            }
+          ),
+          ComplexCase.new(
+            canonical: {
+              'description' => 'first two verses',
+              'property' => 'verses',
+              'beginning' => 99,
+              'end' => 98,
+              'expected' => "99 bottles of beer on the wall, YAR, PIRATES CAN'T COUNT"
+            }
+          )
         ]
-        assert_equal expected, cases
+        assert expected.zip(cases).all? do |exp, cs|
+          assert_equal exp.canonical, cs.canonical
+        end
       end
     end
   end