Skip to content

bin/generator: Fix outstanding TODOs #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kotp merged 7 commits into from
Jan 17, 2017
Merged

bin/generator: Fix outstanding TODOs #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d77a0a4
Don't update version within templates
Insti Jan 14, 2017
731e986
Remove compensation for version increment.
Insti Jan 14, 2017
e5fd189
Rename sha1 to abbreviated_commit_hash
Insti Jan 14, 2017
1845e50
Rename sha1 to abbreviated_commit_hash in templates
Insti Jan 14, 2017
1605bac
Make common test data comment consistent.
Insti Jan 14, 2017
88e907d
Remove requires that should be in cases files.
Insti Jan 14, 2017
7c7e32b
Move common requirements to their own file.
Insti Jan 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions exercises/acronym/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'acronym'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class AcronymTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %><% if test_case.skipped? %>
skip<% end %>
Expand All @@ -14,6 +13,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
4 changes: 2 additions & 2 deletions exercises/all-your-base/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'minitest/autorun'
require_relative 'all_your_base'

# Test data version: <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class AllYourBaseTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.test_name %>
<%= test_case.skipped %>
Expand All @@ -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
4 changes: 2 additions & 2 deletions exercises/alphametics/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'alphametics'

# Test data version: <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class AlphameticsTest < Minitest::Test
<% test_cases.each do |test_case| %>

Expand All @@ -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
5 changes: 2 additions & 3 deletions exercises/anagram/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'anagram'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class AnagramTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.test_name %>
<%= test_case.skipped %>
Expand All @@ -14,6 +13,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
5 changes: 2 additions & 3 deletions exercises/binary/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'binary'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class BinaryTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skipped %>
Expand All @@ -15,6 +14,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
5 changes: 2 additions & 3 deletions exercises/bowling/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'bowling'

# Test data version: <%= sha1 %>
#
# Common test data version: <%= abbreviated_commit_hash %>
class BowlingTest < Minitest::Test
def setup
@game = Game.new
Expand All @@ -24,6 +23,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
5 changes: 2 additions & 3 deletions exercises/bracket-push/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'bracket_push'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class BracketsTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skipped %>
Expand All @@ -14,6 +13,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
5 changes: 2 additions & 3 deletions exercises/clock/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'clock'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class ClockTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skipped %>
Expand All @@ -14,6 +13,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
2 changes: 1 addition & 1 deletion exercises/connect/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'connect'

# Test data version commit id: <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class ConnectTest < Minitest::Test<% test_cases.each do |test_case| %>
<%= test_case.ignore_method_length%>def <%= test_case.name %>
<%= test_case.skipped %><% test_case.test_body.each do |line| %>
Expand Down
5 changes: 2 additions & 3 deletions exercises/custom-set/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'custom_set'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class CustomSetTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skipped %>
Expand All @@ -14,6 +13,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
5 changes: 2 additions & 3 deletions exercises/difference-of-squares/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'difference_of_squares'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class DifferenceOfSquaresTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.test_name %><% if test_case.skipped? %>
skip<% end %>
Expand All @@ -19,6 +18,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
4 changes: 2 additions & 2 deletions exercises/dominoes/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'dominoes'

# Test data version: <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class DominoesTest < Minitest::Test
<% test_cases.each do |test_case| %>
def <%= test_case.test_name %>
Expand All @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions exercises/gigasecond/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'minitest/autorun'
require_relative 'gigasecond'

# Test data version: <%= sha1 %>

# Common test data version: <%= abbreviated_commit_hash %>
class GigasecondTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %><% if test_case.skipped? %>
skip<% end %>
Expand All @@ -17,6 +16,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
4 changes: 2 additions & 2 deletions exercises/grains/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'minitest/autorun'
require_relative 'grains'

# Test data version: <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class GrainsTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.test_name %>
<%= test_case.skipped %>
Expand All @@ -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
5 changes: 2 additions & 3 deletions exercises/hamming/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'hamming'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class HammingTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skipped %><% if test_case.raises_error? %>
Expand All @@ -15,6 +14,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
3 changes: 1 addition & 2 deletions exercises/hello-world/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ rescue LoadError => e
exit 1
end

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class HelloWorldTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.test_name %><% if test_case.skipped? %>
skip<% end %>
Expand Down
4 changes: 2 additions & 2 deletions exercises/isogram/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'isogram'

# Common test data version: <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class IsogramTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skip %>
Expand All @@ -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
6 changes: 2 additions & 4 deletions exercises/largest-series-product/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'largest_series_product'

# Test data version:
# <%= sha1 %>
#
# Common test data version: <%= abbreviated_commit_hash %>
class Seriestest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %><% if test_case.skipped? %>
skip<% end %><% if test_case.raises_error? %>
Expand All @@ -15,6 +13,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
5 changes: 2 additions & 3 deletions exercises/leap/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'leap'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class Date
def leap?
raise RuntimeError, "Implement this yourself instead of using Ruby's implementation."
Expand All @@ -24,6 +23,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
6 changes: 2 additions & 4 deletions exercises/nth-prime/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'nth_prime'

# Test data version:
# <%= sha1 %>
#
# Common test data version: <%= abbreviated_commit_hash %>
class NthPrimeTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %><% if test_case.skipped? %>
skip<% end %><% if test_case.raises_error? %>
Expand All @@ -16,6 +14,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
4 changes: 2 additions & 2 deletions exercises/pangram/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'pangram'

# Test data version: # <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class PangramTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %>
<%= test_case.skipped? %>
Expand All @@ -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
5 changes: 2 additions & 3 deletions exercises/queen-attack/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'queen_attack'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class QueenTest < Minitest::Test

<% test_cases.each do |test_case| %>
Expand All @@ -17,6 +16,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
5 changes: 2 additions & 3 deletions exercises/raindrops/example.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
require 'minitest/autorun'
require_relative 'raindrops'

# Test data version:
# <%= sha1 %>
# Common test data version: <%= abbreviated_commit_hash %>
class RaindropsTest < Minitest::Test<% test_cases.each do |test_case| %>
def <%= test_case.name %><% if test_case.skipped? %>
skip<% end %>
Expand All @@ -14,6 +13,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
Loading