trackler 2.2.1.51 → 2.2.1.52

data/tracks/ruby/exercises/two-bucket/.meta/solutions/two_bucket.rb

@@ -1,5 +1,5 @@
 module BookKeeping
-  VERSION = 3
+  VERSION = 4
 end
 
 class TwoBucket
@@ -15,11 +15,15 @@ class TwoBucket
   def moves
     if @start_bucket == 'one'
       @levels = [@first_size, 0]
-      solve method(:start_from_first)
+      strategy = method(:start_from_first)
     else
       @levels = [0, @second_size]
-      solve method(:start_from_second)
+      strategy = method(:start_from_second)
     end
+    if other_bucket_matches_goal
+      strategy = method(:fill_other_bucket)
+    end
+    solve strategy
   end
 
   private
@@ -68,6 +72,22 @@ class TwoBucket
     end
   end
 
+  def fill_other_bucket
+    if first_bucket_empty?
+      fill_first_bucket
+    else
+      fill_second_bucket
+    end
+  end
+
+  def other_bucket_matches_goal
+    if @start_bucket == 'one'
+      @second_size == @goal
+    else
+      @first_size == @goal
+    end
+  end
+
   def first_bucket_empty?
     @levels.first == 0
   end

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

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'two_bucket'
 
-# Common test data version: 1.1.0 531486a
+# Common test data version: 1.2.0 8aa11e8
 class TwoBucketTest < Minitest::Test
   def test_bucket_one_size_3_bucket_two_size_5_goal_1_start_with_bucket_one
     # skip
@@ -46,9 +46,9 @@ class TwoBucketTest < Minitest::Test
   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 2, two_bucket.moves
     assert_equal 'two', two_bucket.goal_bucket
-    assert_equal 1, two_bucket.other_bucket
+    assert_equal 2, two_bucket.other_bucket
   end
 
   # Problems in exercism evolve over time, as we find better ways to ask
@@ -70,6 +70,6 @@ class TwoBucketTest < Minitest::Test
 
   def test_bookkeeping
     skip
-    assert_equal 3, BookKeeping::VERSION
+    assert_equal 4, BookKeeping::VERSION
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.2.1.51
+  version: 2.2.1.52
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1032,6 +1032,7 @@ files:
 - tracks/ceylon/exercises/sieve/source/sieve/module.ceylon
 - tracks/ceylon/img/icon.png
 - tracks/cfml/.git
+- tracks/cfml/.gitattributes
 - tracks/cfml/.gitignore
 - tracks/cfml/.travis.yml
 - tracks/cfml/CONTRIBUTING.md
@@ -1299,6 +1300,7 @@ files:
 - tracks/cfml/exercises/word-count/box.json
 - tracks/cfml/exercises/word-count/index.cfm
 - tracks/cfml/img/icon.png
+- tracks/cfml/tasks/FormatConfig.cfc
 - tracks/cfml/tasks/GenerateTests.cfc
 - tracks/cfml/tasks/ScaffoldExercise.cfc
 - tracks/cfml/tasks/TestAllSolutions.cfc
@@ -1700,6 +1702,10 @@ files:
 - tracks/common-lisp/docs/RESOURCES.md
 - tracks/common-lisp/docs/SNIPPET.txt
 - tracks/common-lisp/docs/TESTS.md
+- tracks/common-lisp/exercises/acronym/README.md
+- tracks/common-lisp/exercises/acronym/acronym-test.lisp
+- tracks/common-lisp/exercises/acronym/acronym.lisp
+- tracks/common-lisp/exercises/acronym/example.lisp
 - tracks/common-lisp/exercises/allergies/README.md
 - tracks/common-lisp/exercises/allergies/allergies-test.lisp
 - tracks/common-lisp/exercises/allergies/allergies.lisp
@@ -1759,6 +1765,10 @@ files:
 - tracks/common-lisp/exercises/hello-world/example.lisp
 - tracks/common-lisp/exercises/hello-world/hello-world-test.lisp
 - tracks/common-lisp/exercises/hello-world/hello-world.lisp
+- tracks/common-lisp/exercises/isogram/README.md
+- tracks/common-lisp/exercises/isogram/example.lisp
+- tracks/common-lisp/exercises/isogram/isogram-test.lisp
+- tracks/common-lisp/exercises/isogram/isogram.lisp
 - tracks/common-lisp/exercises/leap/README.md
 - tracks/common-lisp/exercises/leap/example.lisp
 - tracks/common-lisp/exercises/leap/leap-test.lisp
@@ -7675,6 +7685,10 @@ files:
 - tracks/julia/exercises/rotational-cipher/example.jl
 - tracks/julia/exercises/rotational-cipher/rotational-cipher.jl
 - tracks/julia/exercises/rotational-cipher/runtests.jl
+- tracks/julia/exercises/run-length-encoding/README.md
+- tracks/julia/exercises/run-length-encoding/example.jl
+- tracks/julia/exercises/run-length-encoding/run-length-encoding.jl
+- tracks/julia/exercises/run-length-encoding/runtests.jl
 - tracks/julia/exercises/scrabble-score/README.md
 - tracks/julia/exercises/scrabble-score/example.jl
 - tracks/julia/exercises/scrabble-score/runtests.jl
@@ -9683,6 +9697,9 @@ files:
 - tracks/php/exercises/acronym/README.md
 - tracks/php/exercises/acronym/acronym_test.php
 - tracks/php/exercises/acronym/example.php
+- tracks/php/exercises/all-your-base/README.md
+- tracks/php/exercises/all-your-base/all-your-base_test.php
+- tracks/php/exercises/all-your-base/example.php
 - tracks/php/exercises/allergies/README.md
 - tracks/php/exercises/allergies/allergies_test.php
 - tracks/php/exercises/allergies/example.php
@@ -9818,6 +9835,9 @@ files:
 - tracks/php/exercises/scrabble-score/README.md
 - tracks/php/exercises/scrabble-score/example.php
 - tracks/php/exercises/scrabble-score/scrabble-score_test.php
+- tracks/php/exercises/series/README.md
+- tracks/php/exercises/series/example.php
+- tracks/php/exercises/series/series_test.php
 - tracks/php/exercises/sieve/README.md
 - tracks/php/exercises/sieve/example.php
 - tracks/php/exercises/sieve/sieve_test.php