From 67fa57373ae6594ddedc8e50445399ce45ecf6e2 Mon Sep 17 00:00:00 2001 From: Geoff Hubbard Date: Sat, 14 Jan 2017 16:44:43 +0000 Subject: [PATCH 1/2] Don't update version within templates The responsibility for maintaining the template version belongs with the generator, not the template. --- exercises/acronym/example.tt | 2 +- exercises/all-your-base/example.tt | 2 +- exercises/alphametics/example.tt | 2 +- exercises/anagram/example.tt | 2 +- exercises/binary/example.tt | 2 +- exercises/bowling/example.tt | 2 +- exercises/bracket-push/example.tt | 2 +- exercises/clock/example.tt | 2 +- exercises/custom-set/example.tt | 2 +- exercises/difference-of-squares/example.tt | 2 +- exercises/dominoes/example.tt | 2 +- exercises/gigasecond/example.tt | 2 +- exercises/grains/example.tt | 2 +- exercises/hamming/example.tt | 2 +- exercises/isogram/example.tt | 2 +- exercises/largest-series-product/example.tt | 2 +- exercises/leap/example.tt | 2 +- exercises/nth-prime/example.tt | 2 +- exercises/pangram/example.tt | 2 +- exercises/queen-attack/example.tt | 2 +- exercises/raindrops/example.tt | 2 +- exercises/rna-transcription/example.tt | 2 +- exercises/roman-numerals/example.tt | 2 +- exercises/run-length-encoding/example.tt | 2 +- exercises/sieve/example.tt | 2 +- exercises/tournament/example.tt | 2 +- exercises/transpose/example.tt | 2 +- exercises/triangle/example.tt | 2 +- exercises/two-bucket/example.tt | 2 +- exercises/word-count/example.tt | 2 +- exercises/wordy/example.tt | 2 +- test/fixtures/xruby/exercises/alpha/example.tt | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/exercises/acronym/example.tt b/exercises/acronym/example.tt index 69cc770a31..84829b8a9d 100644 --- a/exercises/acronym/example.tt +++ b/exercises/acronym/example.tt @@ -14,6 +14,6 @@ class AcronymTest < 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 diff --git a/exercises/all-your-base/example.tt b/exercises/all-your-base/example.tt index 064b38a372..594e4ea7db 100644 --- a/exercises/all-your-base/example.tt +++ b/exercises/all-your-base/example.tt @@ -12,6 +12,6 @@ class AllYourBaseTest < 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 diff --git a/exercises/alphametics/example.tt b/exercises/alphametics/example.tt index 48cf2eabf7..dbf1da1e5f 100644 --- a/exercises/alphametics/example.tt +++ b/exercises/alphametics/example.tt @@ -17,6 +17,6 @@ class AlphameticsTest < Minitest::Test <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping skip - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end end diff --git a/exercises/anagram/example.tt b/exercises/anagram/example.tt index 26b66ba78c..329d4e83cb 100644 --- a/exercises/anagram/example.tt +++ b/exercises/anagram/example.tt @@ -14,6 +14,6 @@ class AnagramTest < 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 diff --git a/exercises/binary/example.tt b/exercises/binary/example.tt index 4cab53b528..913dd4d116 100644 --- a/exercises/binary/example.tt +++ b/exercises/binary/example.tt @@ -15,6 +15,6 @@ class BinaryTest < 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 diff --git a/exercises/bowling/example.tt b/exercises/bowling/example.tt index f034b6f991..83e7e73a84 100644 --- a/exercises/bowling/example.tt +++ b/exercises/bowling/example.tt @@ -24,6 +24,6 @@ class BowlingTest < Minitest::Test <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping skip - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end end diff --git a/exercises/bracket-push/example.tt b/exercises/bracket-push/example.tt index f70ffa6281..0b7d263684 100644 --- a/exercises/bracket-push/example.tt +++ b/exercises/bracket-push/example.tt @@ -14,6 +14,6 @@ class BracketsTest < 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 diff --git a/exercises/clock/example.tt b/exercises/clock/example.tt index ad39bc071e..3e184d9bad 100644 --- a/exercises/clock/example.tt +++ b/exercises/clock/example.tt @@ -14,6 +14,6 @@ class ClockTest < 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 diff --git a/exercises/custom-set/example.tt b/exercises/custom-set/example.tt index 2c2e3e6065..3bf3eed231 100644 --- a/exercises/custom-set/example.tt +++ b/exercises/custom-set/example.tt @@ -14,6 +14,6 @@ class CustomSetTest < 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 diff --git a/exercises/difference-of-squares/example.tt b/exercises/difference-of-squares/example.tt index 9f7e2e834b..060e426ae6 100644 --- a/exercises/difference-of-squares/example.tt +++ b/exercises/difference-of-squares/example.tt @@ -19,6 +19,6 @@ class DifferenceOfSquaresTest < 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 diff --git a/exercises/dominoes/example.tt b/exercises/dominoes/example.tt index 086203bd6f..fb58faecd2 100644 --- a/exercises/dominoes/example.tt +++ b/exercises/dominoes/example.tt @@ -15,7 +15,7 @@ class DominoesTest < Minitest::Test <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping skip - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end # It's infeasible to use example-based tests for this exercise, diff --git a/exercises/gigasecond/example.tt b/exercises/gigasecond/example.tt index 86ebd8c89d..b83caac288 100644 --- a/exercises/gigasecond/example.tt +++ b/exercises/gigasecond/example.tt @@ -17,6 +17,6 @@ class GigasecondTest < Minitest::Test<% test_cases.each do |test_case| %> <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end end diff --git a/exercises/grains/example.tt b/exercises/grains/example.tt index 6aa03653e2..789b2cc546 100644 --- a/exercises/grains/example.tt +++ b/exercises/grains/example.tt @@ -12,6 +12,6 @@ class GrainsTest < 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 diff --git a/exercises/hamming/example.tt b/exercises/hamming/example.tt index 5f4dea5e56..90bd5e2ac4 100644 --- a/exercises/hamming/example.tt +++ b/exercises/hamming/example.tt @@ -15,6 +15,6 @@ class HammingTest < 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 diff --git a/exercises/isogram/example.tt b/exercises/isogram/example.tt index acdd7a80d7..aa4b5a3876 100644 --- a/exercises/isogram/example.tt +++ b/exercises/isogram/example.tt @@ -15,6 +15,6 @@ class IsogramTest < 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 diff --git a/exercises/largest-series-product/example.tt b/exercises/largest-series-product/example.tt index e3d54438c2..48c5fb43da 100644 --- a/exercises/largest-series-product/example.tt +++ b/exercises/largest-series-product/example.tt @@ -15,6 +15,6 @@ class Seriestest < Minitest::Test<% test_cases.each do |test_case| %> <% end %> <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end end diff --git a/exercises/leap/example.tt b/exercises/leap/example.tt index 57fa323049..cc4628e556 100644 --- a/exercises/leap/example.tt +++ b/exercises/leap/example.tt @@ -24,6 +24,6 @@ class YearTest < 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 diff --git a/exercises/nth-prime/example.tt b/exercises/nth-prime/example.tt index 8b4a62595f..cbd96c95c0 100644 --- a/exercises/nth-prime/example.tt +++ b/exercises/nth-prime/example.tt @@ -16,6 +16,6 @@ class NthPrimeTest < 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 diff --git a/exercises/pangram/example.tt b/exercises/pangram/example.tt index 8bd214e729..4189ac28f7 100644 --- a/exercises/pangram/example.tt +++ b/exercises/pangram/example.tt @@ -15,6 +15,6 @@ class PangramTest < 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 diff --git a/exercises/queen-attack/example.tt b/exercises/queen-attack/example.tt index e10ba6858f..6214cc5c98 100644 --- a/exercises/queen-attack/example.tt +++ b/exercises/queen-attack/example.tt @@ -17,6 +17,6 @@ class QueenTest < Minitest::Test <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping skip - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end end diff --git a/exercises/raindrops/example.tt b/exercises/raindrops/example.tt index 8bacf242a9..f3026b4583 100644 --- a/exercises/raindrops/example.tt +++ b/exercises/raindrops/example.tt @@ -14,6 +14,6 @@ class RaindropsTest < 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 diff --git a/exercises/rna-transcription/example.tt b/exercises/rna-transcription/example.tt index 52ab06426b..74392da166 100644 --- a/exercises/rna-transcription/example.tt +++ b/exercises/rna-transcription/example.tt @@ -14,6 +14,6 @@ class ComplementTest < 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 diff --git a/exercises/roman-numerals/example.tt b/exercises/roman-numerals/example.tt index c946c6a154..f03af48559 100644 --- a/exercises/roman-numerals/example.tt +++ b/exercises/roman-numerals/example.tt @@ -14,6 +14,6 @@ class RomanNumeralsTest < 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 diff --git a/exercises/run-length-encoding/example.tt b/exercises/run-length-encoding/example.tt index e2ec280b1b..22849b252c 100644 --- a/exercises/run-length-encoding/example.tt +++ b/exercises/run-length-encoding/example.tt @@ -17,6 +17,6 @@ class RunLengthEncodingTest < 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 diff --git a/exercises/sieve/example.tt b/exercises/sieve/example.tt index 80e1848262..41be076404 100644 --- a/exercises/sieve/example.tt +++ b/exercises/sieve/example.tt @@ -16,6 +16,6 @@ class SieveTest < 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 diff --git a/exercises/tournament/example.tt b/exercises/tournament/example.tt index 10e84d436a..a2621fa0d8 100644 --- a/exercises/tournament/example.tt +++ b/exercises/tournament/example.tt @@ -18,6 +18,6 @@ class TournamentTest < Minitest::Test <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %> def test_bookkeeping skip - assert_equal <%= version.next %>, BookKeeping::VERSION + assert_equal <%= version %>, BookKeeping::VERSION end end diff --git a/exercises/transpose/example.tt b/exercises/transpose/example.tt index bd4b23e3c3..950f90f274 100644 --- a/exercises/transpose/example.tt +++ b/exercises/transpose/example.tt @@ -17,6 +17,6 @@ class TransposeTest < 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 diff --git a/exercises/triangle/example.tt b/exercises/triangle/example.tt index 7a4cac18a9..9e3ccdf20d 100644 --- a/exercises/triangle/example.tt +++ b/exercises/triangle/example.tt @@ -14,7 +14,7 @@ class TriangleTest < 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 diff --git a/exercises/two-bucket/example.tt b/exercises/two-bucket/example.tt index 06c9eb6caf..681d9757a6 100644 --- a/exercises/two-bucket/example.tt +++ b/exercises/two-bucket/example.tt @@ -14,6 +14,6 @@ class TwoBucketTest < 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 diff --git a/exercises/word-count/example.tt b/exercises/word-count/example.tt index e5ca51b921..098e11caae 100644 --- a/exercises/word-count/example.tt +++ b/exercises/word-count/example.tt @@ -16,7 +16,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 diff --git a/exercises/wordy/example.tt b/exercises/wordy/example.tt index c109ab9814..7ba55b4a7f 100644 --- a/exercises/wordy/example.tt +++ b/exercises/wordy/example.tt @@ -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 diff --git a/test/fixtures/xruby/exercises/alpha/example.tt b/test/fixtures/xruby/exercises/alpha/example.tt index d8f73965f3..34d1b97138 100644 --- a/test/fixtures/xruby/exercises/alpha/example.tt +++ b/test/fixtures/xruby/exercises/alpha/example.tt @@ -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 From ce963356cbc0a5ec99fe22caacab795e9a20c114 Mon Sep 17 00:00:00 2001 From: Geoff Hubbard Date: Sat, 14 Jan 2017 16:48:55 +0000 Subject: [PATCH 2/2] Remove compensation for version increment. Once the templates have been updated, we no longer need to compensate for their version incrementing. --- lib/generator/template_values.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/generator/template_values.rb b/lib/generator/template_values.rb index b085fbacad..363fac26d7 100644 --- a/lib/generator/template_values.rb +++ b/lib/generator/template_values.rb @@ -22,14 +22,10 @@ def template_values 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, + version: version, test_cases: test_cases_proc.call(canonical_data.to_s) ) end