trackler 2.1.0.6 → 2.1.0.7

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

@@ -20,24 +20,10 @@ module Generator
         %r{([^/]*)_cases\.rb$}.match(filename).captures[0].tr('_', '-')
       end
 
-      # temporary, when we've moved everything, move contents of cases_filename
-      # to this method
       def load_filename(track_path, exercise_name)
-        File.exist?(cases_filename(track_path, exercise_name)) ?
-          cases_filename(track_path, exercise_name) :
-          legacy_cases_filename(track_path, exercise_name)
-      end
-
-      # this becomes load_filename
-      def cases_filename(track_path, exercise_name)
         "%s.rb" % File.join(track_path, 'exercises', exercise_name, '.meta', 'generator',
                             filename(exercise_name))
       end
-
-      # this goes away
-      def legacy_cases_filename(track_path, exercise_name)
-        "%s.rb" % File.join(track_path, 'lib', filename(exercise_name))
-      end
     end
   end
 end

data/tracks/ruby/test/fixtures/xruby/exercises/beta/.meta/generator/beta_cases.rb

@@ -1,6 +1,6 @@
 require 'generator/exercise_cases'
 
-class BetaCase < ExerciseCase
+class BetaCase < Generator::ExerciseCase
   def workload
     assert_equal { "Beta.call('#{input}')" }
   end

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

@@ -1,12 +1,12 @@
 require_relative '../test_helper'
 
-class ComplexCase < ExerciseCase
-  def workload
-    assert { Complex.foo(bar) }
+module Generator
+  class ComplexCase < ExerciseCase
+    def workload
+      assert { Complex.foo(bar) }
+    end
   end
-end
 
-module Generator
   module CaseValues
     class ExtractorTest < Minitest::Test
       def test_multi_level_auto_extraction

data/tracks/ruby/test/generator/exercise_case/assertion_test.rb

@@ -0,0 +1,46 @@
+require_relative '../../test_helper'
+
+module Generator
+  class ExerciseCase
+    class AssertionTest < Minitest::Test
+      def test_assert
+        test_case = OpenStruct.new(expected: true)
+        test_case.extend(Assertion)
+        assert_equal 'assert', test_case.assert
+      end
+
+      def test_refute
+        test_case = OpenStruct.new(expected: false)
+        test_case.extend(Assertion)
+        assert_equal 'refute', test_case.assert
+      end
+
+      def test_assert_equal
+        test_case = OpenStruct.new(expected: 2)
+        test_case.extend(Assertion)
+        assert_equal "assert_equal 2, 4", test_case.assert_equal { 1 + 3 }
+      end
+
+      def test_raises_error
+        test_case = OpenStruct.new(expected: -1)
+        test_case.extend(Assertion)
+        assert test_case.raises_error?
+      end
+
+      def test_does_not_raise_error
+        test_case = OpenStruct.new(expected: 'cute kitties')
+        test_case.extend(Assertion)
+        refute test_case.raises_error?
+      end
+
+      def test_assert_raises
+        test_case = OpenStruct.new
+        test_case.extend(Assertion)
+        assert_equal(
+          "assert_raises(ArgumentError) { 4 }",
+          test_case.assert_raises(ArgumentError) { 2 + 2 }
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+require_relative '../test_helper'
+
+module Generator
+  class ExerciseCaseTest < Minitest::Test
+    def test_name
+      assert_equal 'test_foo', ExerciseCase.new(description: 'foo').name
+    end
+
+    def test_skipped_index_zero
+      assert_equal '# skip', ExerciseCase.new(index: 0).skipped
+    end
+
+    def test_skipped_index_nonzero
+      assert_equal 'skip', ExerciseCase.new(index: 12).skipped
+    end
+
+    class MultiLineCase < ExerciseCase
+      def workload
+        indent_lines(['foo', 'bar'], 1)
+      end
+    end
+    def test_indent_multiline_workloads
+      expected = "foo\n bar"
+      assert_equal expected, MultiLineCase.new.workload
+    end
+
+    class BlankLineCase < ExerciseCase
+      def workload
+        indent_text(2, "foo\n\nbar\n")
+      end
+    end
+    def test_indent_multiline_workloads_with_blank_lines
+      expected = "foo\n\n  bar\n"
+      assert_equal expected, BlankLineCase.new.workload
+    end
+
+    class HeredocCase < ExerciseCase
+      def workload
+        indent_heredoc(["foo", "bar"], 'TEXT', 1)
+      end
+    end
+    def test_heredoc
+      expected = "<<-TEXT\n foo\n bar\nTEXT"
+      assert_equal expected, HeredocCase.new.workload
+    end
+  end
+end

data/tracks/ruby/test/generator/files/generate_cases_test.rb

@@ -40,18 +40,6 @@ module Generator
           )
         end
       end
-
-      def test_load_legacy_filename # test the cases_filename alternative
-        track_path = 'test/fixtures/xruby'
-        exercise_name = 'foo'
-        expected_filename = track_path + '/lib/foo_cases.rb'
-        File.stub(:exist?, false) do
-          assert_equal(
-            expected_filename,
-            GeneratorCases.load_filename(track_path, exercise_name)
-          )
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.1.0.6
+  version: 2.1.0.7
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -6218,6 +6218,7 @@ files:
 - tracks/perl6/exercises/all-your-base/AllYourBase.pm6
 - tracks/perl6/exercises/all-your-base/Example.pm
 - tracks/perl6/exercises/all-your-base/all-your-base.t
+- tracks/perl6/exercises/all-your-base/example.yaml
 - tracks/perl6/exercises/allergies/Allergies.pm6
 - tracks/perl6/exercises/allergies/Example.pm
 - tracks/perl6/exercises/allergies/allergies.t
@@ -7108,14 +7109,13 @@ files:
 - tracks/ruby/exercises/all-your-base/.meta/generator/all_your_base_cases.rb
 - tracks/ruby/exercises/all-your-base/all_your_base_test.rb
 - tracks/ruby/exercises/all-your-base/example.rb
-- tracks/ruby/exercises/all-your-base/example.tt
 - tracks/ruby/exercises/allergies/allergies_test.rb
 - tracks/ruby/exercises/allergies/example.rb
 - tracks/ruby/exercises/alphametics/.meta/.version
 - tracks/ruby/exercises/alphametics/.meta/generator/alphametics_cases.rb
+- tracks/ruby/exercises/alphametics/.meta/generator/test_template.erb
 - tracks/ruby/exercises/alphametics/alphametics_test.rb
 - tracks/ruby/exercises/alphametics/example.rb
-- tracks/ruby/exercises/alphametics/example.tt
 - tracks/ruby/exercises/anagram/.meta/.version
 - tracks/ruby/exercises/anagram/.meta/generator/anagram_cases.rb
 - tracks/ruby/exercises/anagram/anagram_test.rb
@@ -7126,7 +7126,6 @@ files:
 - tracks/ruby/exercises/beer-song/.meta/generator/beer_song_cases.rb
 - tracks/ruby/exercises/beer-song/beer_song_test.rb
 - tracks/ruby/exercises/beer-song/example.rb
-- tracks/ruby/exercises/beer-song/example.tt
 - tracks/ruby/exercises/binary-search-tree/binary_search_tree_test.rb
 - tracks/ruby/exercises/binary-search-tree/example.rb
 - tracks/ruby/exercises/binary-search/binary_search_test.rb
@@ -7139,9 +7138,9 @@ files:
 - tracks/ruby/exercises/bob/example.rb
 - tracks/ruby/exercises/bowling/.meta/.version
 - tracks/ruby/exercises/bowling/.meta/generator/bowling_cases.rb
+- tracks/ruby/exercises/bowling/.meta/generator/test_template.erb
 - tracks/ruby/exercises/bowling/bowling_test.rb
 - tracks/ruby/exercises/bowling/example.rb
-- tracks/ruby/exercises/bowling/example.tt
 - tracks/ruby/exercises/bracket-push/.meta/.version
 - tracks/ruby/exercises/bracket-push/.meta/generator/bracket_push_cases.rb
 - tracks/ruby/exercises/bracket-push/bracket_push_test.rb
@@ -7154,9 +7153,9 @@ files:
 - tracks/ruby/exercises/clock/example.rb
 - tracks/ruby/exercises/connect/.meta/.version
 - tracks/ruby/exercises/connect/.meta/generator/connect_cases.rb
+- tracks/ruby/exercises/connect/.meta/generator/test_template.erb
 - tracks/ruby/exercises/connect/connect_test.rb
 - tracks/ruby/exercises/connect/example.rb
-- tracks/ruby/exercises/connect/example.tt
 - tracks/ruby/exercises/crypto-square/crypto_square_test.rb
 - tracks/ruby/exercises/crypto-square/example.rb
 - tracks/ruby/exercises/custom-set/.meta/.version
@@ -7169,12 +7168,11 @@ files:
 - tracks/ruby/exercises/difference-of-squares/.meta/generator/difference_of_squares_cases.rb
 - tracks/ruby/exercises/difference-of-squares/difference_of_squares_test.rb
 - tracks/ruby/exercises/difference-of-squares/example.rb
-- tracks/ruby/exercises/difference-of-squares/example.tt
 - tracks/ruby/exercises/dominoes/.meta/.version
 - tracks/ruby/exercises/dominoes/.meta/generator/dominoes_cases.rb
+- tracks/ruby/exercises/dominoes/.meta/generator/test_template.erb
 - tracks/ruby/exercises/dominoes/dominoes_test.rb
 - tracks/ruby/exercises/dominoes/example.rb
-- tracks/ruby/exercises/dominoes/example.tt
 - tracks/ruby/exercises/etl/.meta/.version
 - tracks/ruby/exercises/etl/.meta/generator/etl_cases.rb
 - tracks/ruby/exercises/etl/etl_test.rb
@@ -7187,7 +7185,6 @@ files:
 - tracks/ruby/exercises/gigasecond/.meta/.version
 - tracks/ruby/exercises/gigasecond/.meta/generator/gigasecond_cases.rb
 - tracks/ruby/exercises/gigasecond/example.rb
-- tracks/ruby/exercises/gigasecond/example.tt
 - tracks/ruby/exercises/gigasecond/gigasecond_test.rb
 - tracks/ruby/exercises/grade-school/example.rb
 - tracks/ruby/exercises/grade-school/grade_school_test.rb
@@ -7201,9 +7198,9 @@ files:
 - tracks/ruby/exercises/hamming/hamming_test.rb
 - tracks/ruby/exercises/hello-world/.meta/.version
 - tracks/ruby/exercises/hello-world/.meta/generator/hello_world_cases.rb
+- tracks/ruby/exercises/hello-world/.meta/generator/test_template.erb
 - tracks/ruby/exercises/hello-world/GETTING_STARTED.md
 - tracks/ruby/exercises/hello-world/example.rb
-- tracks/ruby/exercises/hello-world/example.tt
 - tracks/ruby/exercises/hello-world/hello_world_test.rb
 - tracks/ruby/exercises/hexadecimal/example.rb
 - tracks/ruby/exercises/hexadecimal/hexadecimal_test.rb
@@ -7221,8 +7218,8 @@ files:
 - tracks/ruby/exercises/largest-series-product/largest_series_product_test.rb
 - tracks/ruby/exercises/leap/.meta/.version
 - tracks/ruby/exercises/leap/.meta/generator/leap_cases.rb
+- tracks/ruby/exercises/leap/.meta/generator/test_template.erb
 - tracks/ruby/exercises/leap/example.rb
-- tracks/ruby/exercises/leap/example.tt
 - tracks/ruby/exercises/leap/leap_test.rb
 - tracks/ruby/exercises/linked-list/example.rb
 - tracks/ruby/exercises/linked-list/linked_list_test.rb
@@ -7336,12 +7333,10 @@ files:
 - tracks/ruby/exercises/tournament/.meta/.version
 - tracks/ruby/exercises/tournament/.meta/generator/tournament_cases.rb
 - tracks/ruby/exercises/tournament/example.rb
-- tracks/ruby/exercises/tournament/example.tt
 - tracks/ruby/exercises/tournament/tournament_test.rb
 - tracks/ruby/exercises/transpose/.meta/.version
 - tracks/ruby/exercises/transpose/.meta/generator/transpose_cases.rb
 - tracks/ruby/exercises/transpose/example.rb
-- tracks/ruby/exercises/transpose/example.tt
 - tracks/ruby/exercises/transpose/transpose_test.rb
 - tracks/ruby/exercises/triangle/.meta/.version
 - tracks/ruby/exercises/triangle/.meta/generator/triangle_cases.rb
@@ -7370,6 +7365,7 @@ files:
 - tracks/ruby/lib/generator.rb
 - tracks/ruby/lib/generator/case_values.rb
 - tracks/ruby/lib/generator/command_line.rb
+- tracks/ruby/lib/generator/exercise_case/assertion.rb
 - tracks/ruby/lib/generator/exercise_cases.rb
 - tracks/ruby/lib/generator/files.rb
 - tracks/ruby/lib/generator/files/generator_cases.rb
@@ -7387,16 +7383,18 @@ files:
 - tracks/ruby/test/fixtures/metadata/exercises/alpha/canonical-data.json
 - tracks/ruby/test/fixtures/metadata/exercises/complex/canonical-data.json
 - tracks/ruby/test/fixtures/xruby/exercises/alpha/.meta/.version
+- tracks/ruby/test/fixtures/xruby/exercises/alpha/.meta/generator/alpha_cases.rb
 - tracks/ruby/test/fixtures/xruby/exercises/alpha/.meta/generator/test_template.erb
 - tracks/ruby/test/fixtures/xruby/exercises/alpha/example.rb
 - tracks/ruby/test/fixtures/xruby/exercises/beta/.meta/.version
 - tracks/ruby/test/fixtures/xruby/exercises/beta/.meta/generator/beta_cases.rb
 - tracks/ruby/test/fixtures/xruby/exercises/beta/example.rb
 - tracks/ruby/test/fixtures/xruby/exercises/beta/example.tt
-- tracks/ruby/test/fixtures/xruby/lib/alpha_cases.rb
 - tracks/ruby/test/fixtures/xruby/lib/generator/test_template.erb
 - tracks/ruby/test/generator/case_values_test.rb
 - tracks/ruby/test/generator/command_line_test.rb
+- tracks/ruby/test/generator/exercise_case/assertion_test.rb
+- tracks/ruby/test/generator/exercise_cases_test.rb
 - tracks/ruby/test/generator/files/generate_cases_test.rb
 - tracks/ruby/test/generator/files/metadata_files_test.rb
 - tracks/ruby/test/generator/files/track_files_test.rb

data/tracks/ruby/exercises/all-your-base/example.tt

@@ -1,18 +0,0 @@
-require 'minitest/autorun'
-require_relative 'all_your_base'
-
-# Common test data version: <%= abbreviated_commit_hash %>
-class AllYourBaseTest < Minitest::Test
-<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
-    <%= test_case.skipped %>
-<%= test_case.workload %>
-  end
-
-<% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
-  def test_bookkeeping
-    skip
-    assert_equal <%= version %>, BookKeeping::VERSION
-  end
-end

data/tracks/ruby/exercises/beer-song/example.tt

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-gem 'minitest', '>= 5.0.0'
-require 'minitest/autorun'
-require_relative 'beer_song'
-
-# Common test data version: <%= abbreviated_commit_hash %>
-class BeerSongTest < Minitest::Test
-<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
-    <%= test_case.skipped %>
-    expected = <<-TEXT
-<%= test_case.expected %>
-TEXT
-    <%= test_case.workload %>
-  end
-
-<% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
-  def test_bookkeeping
-    skip
-    assert_equal <%= version %>, BookKeeping::VERSION
-  end
-end

data/tracks/ruby/exercises/difference-of-squares/example.tt

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
-require 'minitest/autorun'
-require_relative 'difference_of_squares'
-
-# Common test data version: <%= abbreviated_commit_hash %>
-class DifferenceOfSquaresTest < Minitest::Test
-<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
-    <%= test_case.skipped %>
-    <%= test_case.workload %>
-  end
-
-<% end %>
-  def test_consistent_difference
-    skip
-    squares = Squares.new(10)
-    assert_equal squares.difference, squares.difference
-  end
-
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
-
-  def test_bookkeeping
-    skip
-    assert_equal <%= version %>, BookKeeping::VERSION
-  end
-end

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

@@ -1,23 +0,0 @@
-require 'minitest/autorun'
-require_relative 'gigasecond'
-
-# Common test data version: <%= abbreviated_commit_hash %>
-class GigasecondTest < Minitest::Test
-<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
-    <%= test_case.skipped %>
-    <%= test_case.workload %>
-  end
-
-<% end %>
-  # Test your 1Gs anniversary
-  def test_with_your_birthday
-    skip
-  end
-
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
-
-  def test_bookkeeping
-    assert_equal <%= version %>, BookKeeping::VERSION
-  end
-end

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

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
-require 'minitest/autorun'
-require_relative 'tournament'
-
-# Common test data version: <%= abbreviated_commit_hash %>
-class TournamentTest < Minitest::Test
-
-<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
-    <%= test_case.skipped %>
-    input = <%= test_case.input_text %>
-    actual = <%= test_case.workload %>
-    expected = <%= test_case.expect %>
-    assert_equal expected, actual
-  end
-
-<% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
-
-  def test_bookkeeping
-    skip
-    assert_equal <%= version %>, BookKeeping::VERSION
-  end
-end