trackler 2.1.0.7 → 2.1.0.8

data/tracks/ruby/exercises/transpose/.meta/generator/transpose_cases.rb

@@ -1,4 +1,4 @@
-require 'generator/exercise_cases'
+require 'generator/exercise_case'
 
 class TransposeCase < Generator::ExerciseCase
 

data/tracks/ruby/exercises/transpose/transpose_test.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'transpose'
 
-# Common test data version: 6dba022
+# Common test data version: 1.0.0 6dba022
 class TransposeTest < Minitest::Test
   def test_empty_string
     # skip

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

@@ -1,4 +1,4 @@
-require 'generator/exercise_cases'
+require 'generator/exercise_case'
 
 class TriangleCase < Generator::ExerciseCase
   def name

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

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'triangle'
 
-# Common test data version: fa90b35
+# Common test data version: 1.0.0 fa90b35
 class TriangleTest < Minitest::Test
   def test_triangle_is_equilateral_if_all_sides_are_equal
     # skip

data/tracks/ruby/exercises/trinary/trinary_test.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'trinary'
 

data/tracks/ruby/exercises/twelve-days/twelve_days_test.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'twelve_days'
 

data/tracks/ruby/exercises/two-bucket/.meta/.version

@@ -1 +1 @@
-2
+3

data/tracks/ruby/exercises/two-bucket/.meta/generator/two_bucket_cases.rb

@@ -1,4 +1,4 @@
-require 'generator/exercise_cases'
+require 'generator/exercise_case'
 
 class TwoBucketCase < Generator::ExerciseCase
   def name

data/tracks/ruby/exercises/two-bucket/example.rb

@@ -1,5 +1,5 @@
 module BookKeeping
-  VERSION = 2
+  VERSION = 3
 end
 
 class TwoBucket

data/tracks/ruby/exercises/two-bucket/two_bucket_test.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'two_bucket'
 
-# Common test data version: 7aa0b42
+# Common test data version: 1.1.0 531486a
 class TwoBucketTest < Minitest::Test
   def test_bucket_one_size_3_bucket_two_size_5_goal_1_start_with_bucket_one
     # skip
@@ -37,6 +36,22 @@ class TwoBucketTest < Minitest::Test
     assert_equal 7, two_bucket.other_bucket
   end
 
+  def test_bucket_one_size_1_bucket_two_size_3_goal_3_start_with_bucket_two
+    skip
+    two_bucket = TwoBucket.new(1, 3, 3, 'two')
+    assert_equal 1, two_bucket.moves
+    assert_equal 'two', two_bucket.goal_bucket
+    assert_equal 0, two_bucket.other_bucket
+  end
+
+  def test_bucket_one_size_2_bucket_two_size_3_goal_3_start_with_bucket_one
+    skip
+    two_bucket = TwoBucket.new(2, 3, 3, 'one')
+    assert_equal 4, two_bucket.moves
+    assert_equal 'two', two_bucket.goal_bucket
+    assert_equal 1, two_bucket.other_bucket
+  end
+
   # Problems in exercism evolve over time, as we find better ways to ask
   # questions.
   # The version number refers to the version of the problem you solved,
@@ -56,6 +71,6 @@ class TwoBucketTest < Minitest::Test
 
   def test_bookkeeping
     skip
-    assert_equal 2, BookKeeping::VERSION
+    assert_equal 3, BookKeeping::VERSION
   end
 end

data/tracks/ruby/exercises/word-count/.meta/generator/word_count_cases.rb

@@ -1,4 +1,4 @@
-require 'generator/exercise_cases'
+require 'generator/exercise_case'
 
 class WordCountCase < Generator::ExerciseCase
 

data/tracks/ruby/exercises/word-count/word_count_test.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'word_count'
 
-# Common test data version: cd26d49
+# Common test data version: 1.0.0 cd26d49
 class WordCountTest < Minitest::Test
   def test_count_one_word
     # skip

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

@@ -1,4 +1,4 @@
-require 'generator/exercise_cases'
+require 'generator/exercise_case'
 
 class WordyCase < Generator::ExerciseCase
 

data/tracks/ruby/exercises/wordy/wordy_test.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'wordy'
 
-# Common test data version: 5b8ad58
+# Common test data version: 1.0.0 5b8ad58
 class WordyTest < Minitest::Test
   def test_addition
     # skip

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

@@ -10,7 +10,8 @@ module Generator
       # e.g.,
       #   assert_equal { "PigLatin.translate(#{input.inspect})" }
       def assert_equal
-        "assert_equal #{expected.inspect}, #{yield}"
+        assertion = expected.nil? ? 'assert_nil' : "assert_equal #{expected.inspect},"
+        "#{assertion} #{yield}"
       end
 
       # e.g.,

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

@@ -10,7 +10,7 @@ module Generator
       end
 
       def example_solution
-        ExampleSolutionFile.new(filename: File.join(exercise_path, 'example.rb'))
+        ExampleSolutionFile.new(filename: File.join(exercise_path, example_file))
       end
 
       def minitest_tests
@@ -32,11 +32,8 @@ module Generator
       end
 
       def tests_template_absolute_filename
-        case
-        when File.exist?(track_tests_template_filename) then track_tests_template_filename
-        when File.exist?(legacy_tests_template_filename) then legacy_tests_template_filename
-        else default_tests_template_filename
-        end
+        File.exist?(track_tests_template_filename) ? track_tests_template_filename :
+          default_tests_template_filename
       end
 
       def track_tests_template_filename
@@ -47,14 +44,22 @@ module Generator
         File.join(paths.track, 'lib', 'generator', tests_template_filename)
       end
 
-      def legacy_tests_template_filename
-        File.join(exercise_path, 'example.tt')
-      end
-
       def tests_template_filename
         'test_template.erb'
       end
 
+      def example_file
+        File.exist?(File.join(exercise_path, example_filename)) ? example_filename : legacy_example_filename
+      end
+
+      def example_filename
+        File.join('.meta', 'solutions', "#{exercise_name}.rb")
+      end
+
+      def legacy_example_filename
+        'example.rb'
+      end
+
       def minitest_tests_filename
         "#{exercise_name.gsub(/[ -]/, '_')}_test.rb"
       end

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

@@ -1,13 +1,14 @@
 module Generator
   # Contains methods accessible to the ERB template
   class TemplateValues
-    attr_reader :abbreviated_commit_hash, :version, :exercise_name, :test_cases
+    attr_reader :abbreviated_commit_hash, :version, :exercise_name, :test_cases, :canonical_data_version
 
-    def initialize(abbreviated_commit_hash:, version:, exercise_name:, test_cases:)
+    def initialize(abbreviated_commit_hash:, version:, exercise_name:, test_cases:, canonical_data_version: nil)
       @abbreviated_commit_hash = abbreviated_commit_hash
       @version = version
       @exercise_name = exercise_name ? exercise_name.tr('-_', '_') : ''
       @test_cases = test_cases
+      @canonical_data_version = canonical_data_version
     end
 
     def get_binding
@@ -23,6 +24,7 @@ module Generator
     def template_values
       TemplateValues.new(
         abbreviated_commit_hash: canonical_data.abbreviated_commit_hash,
+        canonical_data_version: canonical_data.version,
         version: version,
         exercise_name: exercise_name,
         test_cases: extract

data/tracks/ruby/lib/generator/test_template.erb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative '<%= exercise_name %>'
 
-# Common test data version: <%= abbreviated_commit_hash %>
+# Common test data version: <%= canonical_data_version %> <%= abbreviated_commit_hash %>
 class <%= exercise_name_camel %>Test < Minitest::Test
 <% test_cases.each do |test_case| %>
   def <%= test_case.name %>

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

@@ -23,7 +23,7 @@ class Exercise
   end
 
   def example_file
-    'example.rb'
+    File.exist?(example_filename) ? example_filename : legacy_example_filename
   end
 
   def testable_example_file
@@ -36,6 +36,14 @@ class Exercise
 
   private
 
+  def example_filename
+    File.join('.meta', 'solutions', "#{name}.rb")
+  end
+
+  def legacy_example_filename
+    'example.rb'
+  end
+
   def base_file_name
     @_base_file_name ||= name.tr('-', '_')
   end

data/tracks/ruby/test/fixtures/xruby/exercises/alpha/.meta/generator/test_template.erb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative '<%= exercise_name %>'
 

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

@@ -1,4 +1,4 @@
-require 'generator/exercise_cases'
+require 'generator/exercise_case'
 
 class BetaCase < Generator::ExerciseCase
   def workload

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative '<%= exercise_name %>'
 

data/tracks/ruby/test/fixtures/xruby/lib/generator/test_template.erb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'acronym'
 

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

@@ -21,6 +21,12 @@ module Generator
         assert_equal "assert_equal 2, 4", test_case.assert_equal { 1 + 3 }
       end
 
+      def test_assert_equal_when_nil
+        test_case = OpenStruct.new(expected: nil)
+        test_case.extend(Assertion)
+        assert_equal "assert_nil 4", test_case.assert_equal { 1 + 3 }
+      end
+
       def test_raises_error
         test_case = OpenStruct.new(expected: -1)
         test_case.extend(Assertion)

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

@@ -13,7 +13,7 @@ module Generator
           @paths = FixturePaths
           @exercise_name = 'alpha'
         end
-        attr_reader :paths, :exercise_name
+        attr_accessor :paths, :exercise_name
         include TrackFiles
       end
 
@@ -24,7 +24,15 @@ module Generator
 
       def test_example_solution
         subject = TestTrackFiles.new
-        assert_instance_of ExampleSolutionFile, subject.example_solution
+        expected_filename = FixturePaths.track + '/exercises/alpha/.meta/solutions/alpha.rb'
+        assert_equal expected_filename, subject.example_solution.filename
+      end
+
+      def test_legacy_example_solution
+        subject = TestTrackFiles.new
+        subject.exercise_name = 'beta'
+        expected_filename = FixturePaths.track + '/exercises/beta/example.rb'
+        assert_equal expected_filename, subject.example_solution.filename
       end
 
       def test_minitest_tests
@@ -38,6 +46,7 @@ module Generator
         assert_equal expected_filename, subject.tests_template.filename
       end
 
+
       class TestTrackFilesUseDefault
         def initialize
           @paths = FixturePaths
@@ -52,21 +61,6 @@ module Generator
         expected_filename = FixturePaths.track + '/lib/generator/test_template.erb'
         assert_equal expected_filename, subject.tests_template.filename
       end
-
-      class TestTrackFilesUseLegacy
-        def initialize
-          @paths = FixturePaths
-          @exercise_name = 'beta'
-        end
-        attr_reader :paths, :exercise_name
-        include TrackFiles
-      end
-
-      def test_legacy_tests_template
-        subject = TestTrackFilesUseLegacy.new
-        expected_filename = FixturePaths.track + '/exercises/beta/example.tt'
-        assert_equal expected_filename, subject.tests_template.filename
-      end
     end
 
     class TestsVersionFileTest < Minitest::Test
@@ -90,7 +84,9 @@ module Generator
       end
 
       def test_update_version
-        subject = TestExampleSolutionFile.new(filename: 'test/fixtures/xruby/exercises/alpha/example.rb')
+        subject = TestExampleSolutionFile.new(
+          filename: 'test/fixtures/xruby/exercises/alpha/.meta/solutions/alpha.rb'
+        )
         assert_match(/VERSION = 2/, subject.update_version(2))
       end
     end

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

@@ -57,6 +57,7 @@ module Generator
       def canonical_data
         mock_canonical_data = Minitest::Mock.new
         mock_canonical_data.expect :abbreviated_commit_hash, nil
+        mock_canonical_data.expect :version, '1.2.3'
         mock_canonical_data.expect :to_s, '{"cases":[]}'
         mock_canonical_data
       end
@@ -82,6 +83,7 @@ module Generator
       def canonical_data
         mock_canonical_data = Minitest::Mock.new
         mock_canonical_data.expect :abbreviated_commit_hash, nil
+        mock_canonical_data.expect :version, '1.2.3'
         mock_canonical_data.expect :to_s, '{"cases":[]}'
         mock_canonical_data
       end

data/tracks/ruby/test/tasks/exercise_test.rb

@@ -31,6 +31,12 @@ class ExerciseTest < Minitest::Test
   end
 
   def test_example_file
+    File.stub(:exist?, true) do
+      assert_equal '.meta/solutions/name.rb', Exercise.new('name').example_file
+    end
+  end
+
+  def test_legacy_example_file
     assert_equal 'example.rb', Exercise.new('').example_file
   end
 

data/tracks/ruby/test/tasks/exercise_tests_runner_legacy_test.rb

@@ -0,0 +1,64 @@
+require_relative '../test_helper'
+
+class FakeLegacyExercise
+  def name
+    'test'
+  end
+
+  alias :to_s :name
+
+  def directory
+    'test/.'
+  end
+
+  def example_file
+    'example.rb'
+  end
+
+  def testable_example_file
+    'test.rb'
+  end
+
+  def test_file
+    'test_test.rb'
+  end
+end
+
+class ExerciseTestsRunnerLegacyTest < Minitest::Test
+  def test_run
+    Dir.stub :mktmpdir, nil, 'dir' do
+      cp_mock = Minitest::Mock.new.expect(:call, nil, ['test/.', 'dir'])
+
+      mv_mock = Minitest::Mock.new.expect(
+        :call,
+        nil,
+        ['dir/example.rb', 'dir/test.rb'],
+      )
+
+      ruby_mock = Minitest::Mock.new.expect(
+        :call,
+        nil,
+        ['-I lib -r disable_skip.rb dir/test_test.rb -p'],
+      )
+
+      FileUtils.stub :cp_r, cp_mock do
+        FileUtils.stub :mv, mv_mock do
+          runner = ExerciseTestsRunner.new(
+            exercise: FakeLegacyExercise.new,
+            test_options: '-p',
+          )
+
+          runner.stub :ruby, ruby_mock do
+            assert_output "\n\n#{'-'*64}\nrunning tests for: test\n" do
+              runner.run
+            end
+          end
+
+          cp_mock.verify
+          mv_mock.verify
+          ruby_mock.verify
+        end
+      end
+    end
+  end
+end