From 9e7c508a5bdf7fc1c877f8e87dc5833bab20549b Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 19:57:57 +0100 Subject: [PATCH 1/9] bundle and rspec install --- .rspec | 1 + Gemfile | 7 ++++ Gemfile.lock | 26 ++++++++++++ spec/spec_helper.rb | 98 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 .rspec create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 spec/spec_helper.rb diff --git a/.rspec b/.rspec new file mode 100644 index 00000000..c99d2e73 --- /dev/null +++ b/.rspec @@ -0,0 +1 @@ +--require spec_helper diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..41df210d --- /dev/null +++ b/Gemfile @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +# gem "rails" + +gem "rspec", "~> 3.12" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..f29091b3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,26 @@ +GEM + remote: https://rubygems.org/ + specs: + diff-lcs (1.5.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + rspec (~> 3.12) + +BUNDLED WITH + 2.4.11 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 00000000..c80d44b9 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,98 @@ +# This file was generated by the `rspec --init` command. Conventionally, all +# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. +# The generated `.rspec` file contains `--require spec_helper` which will cause +# this file to always be loaded, without a need to explicitly require it in any +# files. +# +# Given that it is always loaded, you are encouraged to keep this file as +# light-weight as possible. Requiring heavyweight dependencies from this file +# will add to the boot time of your test suite on EVERY test run, even for an +# individual file that may not need all of that loaded. Instead, consider making +# a separate helper file that requires the additional dependencies and performs +# the additional setup, and require it from the spec files that actually need +# it. +# +# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration +RSpec.configure do |config| + # rspec-expectations config goes here. You can use an alternate + # assertion/expectation library such as wrong or the stdlib/minitest + # assertions if you prefer. + config.expect_with :rspec do |expectations| + # This option will default to `true` in RSpec 4. It makes the `description` + # and `failure_message` of custom matchers include text for helper methods + # defined using `chain`, e.g.: + # be_bigger_than(2).and_smaller_than(4).description + # # => "be bigger than 2 and smaller than 4" + # ...rather than: + # # => "be bigger than 2" + expectations.include_chain_clauses_in_custom_matcher_descriptions = true + end + + # rspec-mocks config goes here. You can use an alternate test double + # library (such as bogus or mocha) by changing the `mock_with` option here. + config.mock_with :rspec do |mocks| + # Prevents you from mocking or stubbing a method that does not exist on + # a real object. This is generally recommended, and will default to + # `true` in RSpec 4. + mocks.verify_partial_doubles = true + end + + # This option will default to `:apply_to_host_groups` in RSpec 4 (and will + # have no way to turn it off -- the option exists only for backwards + # compatibility in RSpec 3). It causes shared context metadata to be + # inherited by the metadata hash of host groups and examples, rather than + # triggering implicit auto-inclusion in groups with matching metadata. + config.shared_context_metadata_behavior = :apply_to_host_groups + +# The settings below are suggested to provide a good initial experience +# with RSpec, but feel free to customize to your heart's content. +=begin + # This allows you to limit a spec run to individual examples or groups + # you care about by tagging them with `:focus` metadata. When nothing + # is tagged with `:focus`, all examples get run. RSpec also provides + # aliases for `it`, `describe`, and `context` that include `:focus` + # metadata: `fit`, `fdescribe` and `fcontext`, respectively. + config.filter_run_when_matching :focus + + # Allows RSpec to persist some state between runs in order to support + # the `--only-failures` and `--next-failure` CLI options. We recommend + # you configure your source control system to ignore this file. + config.example_status_persistence_file_path = "spec/examples.txt" + + # Limits the available syntax to the non-monkey patched syntax that is + # recommended. For more details, see: + # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/ + config.disable_monkey_patching! + + # This setting enables warnings. It's recommended, but in some cases may + # be too noisy due to issues in dependencies. + config.warnings = true + + # Many RSpec users commonly either run the entire suite or an individual + # file, and it's useful to allow more verbose output when running an + # individual spec file. + if config.files_to_run.one? + # Use the documentation formatter for detailed output, + # unless a formatter has already been configured + # (e.g. via a command-line flag). + config.default_formatter = "doc" + end + + # Print the 10 slowest examples and example groups at the + # end of the spec run, to help surface which specs are running + # particularly slow. + config.profile_examples = 10 + + # Run specs in random order to surface order dependencies. If you find an + # order dependency and want to debug it, you can fix the order by providing + # the seed, which is printed after each run. + # --seed 1234 + config.order = :random + + # Seed global randomization in this process using the `--seed` CLI option. + # Setting this allows you to use `--seed` to deterministically reproduce + # test failures related to randomization by passing the same `--seed` value + # as the one that triggered the failure. + Kernel.srand config.seed +=end +end From 28b2181fd1ca53560ac9f80d76708b60c3da5b79 Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 21:00:27 +0100 Subject: [PATCH 2/9] initialized game and gutter game tests passed --- lib/bowling_game.rb | 11 +++++++++++ spec/bowling_game_spec.rb | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 lib/bowling_game.rb create mode 100644 spec/bowling_game_spec.rb diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb new file mode 100644 index 00000000..e07f37d9 --- /dev/null +++ b/lib/bowling_game.rb @@ -0,0 +1,11 @@ +class BowlingGame + + def roll (pin) + + end + + def score + 0 + end + +end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb new file mode 100644 index 00000000..715c948f --- /dev/null +++ b/spec/bowling_game_spec.rb @@ -0,0 +1,17 @@ +require 'bowling_game' + +describe BowlingGame do + + context 'creates and plays a bowling game with 1 player' do + it 'creates game' do + game = BowlingGame.new #initializes game/class + end + end + +it 'rolls a gutter game, 20 rolls with no pins knocked over' do + game = BowlingGame.new + 20.times{game.roll 0} + expect(game.score).to eq 0 +end + +end \ No newline at end of file From fc86c4a7a9af86e25686b6d83447416c2fb073e7 Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 21:09:00 +0100 Subject: [PATCH 3/9] roll one pin 20 times - test passed --- lib/bowling_game.rb | 24 ++++++++++++++++++------ spec/bowling_game_spec.rb | 6 ++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb index e07f37d9..8b794ce3 100644 --- a/lib/bowling_game.rb +++ b/lib/bowling_game.rb @@ -1,11 +1,23 @@ class BowlingGame - def roll (pin) +def initialize +@rolls = [] +end - end - - def score - 0 - end + def roll(pins) + @rolls.push pins + end + + + + def score + result = 0 + rolls_count = 0 + 20.times do + result += @rolls[rolls_count] + rolls_count =+ 1 + end + result +end end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index 715c948f..b398f06b 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -14,4 +14,10 @@ expect(game.score).to eq 0 end +it 'can roll and knock just 1 pin 20 times' do +game = BowlingGame.new + 20.times{game.roll 1} + expect(game.score).to eq 20 +end + end \ No newline at end of file From 46aa4031ac5b83be0d0d54a34ebc0d5a55d21109 Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 21:14:59 +0100 Subject: [PATCH 4/9] refactored class initialization in spec file --- lib/bowling_game.rb | 19 ++++++++----------- spec/bowling_game_spec.rb | 35 ++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb index 8b794ce3..571fc3c2 100644 --- a/lib/bowling_game.rb +++ b/lib/bowling_game.rb @@ -1,23 +1,20 @@ class BowlingGame - -def initialize -@rolls = [] -end - + + def initialize + @rolls = [] + end def roll(pins) @rolls.push pins end - - def score result = 0 rolls_count = 0 20.times do - result += @rolls[rolls_count] - rolls_count =+ 1 + result += @rolls[rolls_count] + rolls_count = + 1 + end + result end - result -end end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index b398f06b..06831ba2 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -1,23 +1,28 @@ require 'bowling_game' describe BowlingGame do + + # reafctoring: to avoid initializing 'game' via BowlingGame.new, we can call it with @ via: - context 'creates and plays a bowling game with 1 player' do - it 'creates game' do - game = BowlingGame.new #initializes game/class - end + before do + @game = BowlingGame.new + end + + context 'creates and plays a bowling game with 1 player' do + it 'creates game' do + @game # initializes game/class end - -it 'rolls a gutter game, 20 rolls with no pins knocked over' do + end + + it 'rolls a gutter game, 20 rolls with no pins knocked over' do game = BowlingGame.new - 20.times{game.roll 0} - expect(game.score).to eq 0 -end + 20.times { @game.roll 0 } + expect(@game.score).to eq 0 + end -it 'can roll and knock just 1 pin 20 times' do -game = BowlingGame.new - 20.times{game.roll 1} - expect(game.score).to eq 20 + it 'can roll and knock just 1 pin 20 times' do + game = BowlingGame.new + 20.times { @game.roll 1 } + expect(@game.score).to eq 20 + end end - -end \ No newline at end of file From 4d0db345103f94bda3da64d0ad3d95b74244b9fe Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 21:17:56 +0100 Subject: [PATCH 5/9] refactored class initialization in spec file --- spec/bowling_game_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index 06831ba2..22ea35cd 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -15,14 +15,13 @@ end it 'rolls a gutter game, 20 rolls with no pins knocked over' do - game = BowlingGame.new 20.times { @game.roll 0 } expect(@game.score).to eq 0 end it 'can roll and knock just 1 pin 20 times' do - game = BowlingGame.new 20.times { @game.roll 1 } expect(@game.score).to eq 20 end + end From f66b1be8a806be32252924da059f64b9a63e48ed Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 21:42:12 +0100 Subject: [PATCH 6/9] can add two rolls in a frame if under 10 pins --- lib/bowling_game.rb | 7 ++++--- spec/bowling_game_spec.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb index 571fc3c2..0d1a2ab7 100644 --- a/lib/bowling_game.rb +++ b/lib/bowling_game.rb @@ -1,5 +1,5 @@ class BowlingGame - + def initialize @rolls = [] end @@ -13,8 +13,9 @@ def score rolls_count = 0 20.times do result += @rolls[rolls_count] - rolls_count = + 1 - end + rolls_count += 1 + end result end + end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index 22ea35cd..6493dad5 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -24,4 +24,12 @@ expect(@game.score).to eq 20 end +it 'can roll a spare' do + @game.roll 6 + @game.roll 4 + @game.roll 5 + 17.times { @game.roll 0 } + expect(@game.score).to eq 15 +end + end From d53857212297f1eda7d1b7288f473901cbacdf23 Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Fri, 21 Apr 2023 22:09:55 +0100 Subject: [PATCH 7/9] refactored code, tested for rolling a spare and added comments --- lib/bowling_game.rb | 20 ++++++++++++++------ spec/bowling_game_spec.rb | 23 ++++++++++++++--------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb index 0d1a2ab7..6ad4b554 100644 --- a/lib/bowling_game.rb +++ b/lib/bowling_game.rb @@ -1,5 +1,4 @@ class BowlingGame - def initialize @rolls = [] end @@ -11,11 +10,20 @@ def roll(pins) def score result = 0 rolls_count = 0 - 20.times do - result += @rolls[rolls_count] - rolls_count += 1 - end + + # 20.times do # 20 = no of rolls in 10 frames + # result += @rolls[rolls_count] + # rolls_count += 1 + # the above 3 lines counts the score by roll. to refactor, we will count by frame next as follows: + + 10.times do # no of frames + if @rolls[rolls_count] + @rolls[rolls_count + 1] == 10 #if the fisrt and second roll [+1] is equal to 10 + result = @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count +2] #then add the next roll twice to the result + + elsif result += @rolls[rolls_count] + @rolls[rolls_count + 1] # frame = 2 rolls + end + rolls_count += 2 # add another 2 rolls +end result end - end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index 6493dad5..b6439390 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -1,12 +1,11 @@ require 'bowling_game' describe BowlingGame do + # reafctoring: to avoid initializing 'game' via BowlingGame.new, we can call it with @ via: - # reafctoring: to avoid initializing 'game' via BowlingGame.new, we can call it with @ via: - - before do - @game = BowlingGame.new - end + before do + @game = BowlingGame.new + end context 'creates and plays a bowling game with 1 player' do it 'creates game' do @@ -24,12 +23,18 @@ expect(@game.score).to eq 20 end -it 'can roll a spare' do + it 'add two rolls in a frame if under 10 pins' do + @game.roll 1 + @game.roll 4 + 18.times { @game.roll 0 } + expect(@game.score).to eq 5 + end + + it 'can roll a spare' do @game.roll 6 @game.roll 4 @game.roll 5 17.times { @game.roll 0 } - expect(@game.score).to eq 15 -end - + expect(@game.score).to eq 20 + end end From 4c39b3702f52e82ba5ab0dedd90719f9e0c5421f Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Sat, 22 Apr 2023 20:27:32 +0100 Subject: [PATCH 8/9] added strike behaviour, tests passed --- lib/bowling_game.rb | 15 ++++++++++----- spec/bowling_game_spec.rb | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb index 6ad4b554..68e629ff 100644 --- a/lib/bowling_game.rb +++ b/lib/bowling_game.rb @@ -17,13 +17,18 @@ def score # the above 3 lines counts the score by roll. to refactor, we will count by frame next as follows: 10.times do # no of frames - if @rolls[rolls_count] + @rolls[rolls_count + 1] == 10 #if the fisrt and second roll [+1] is equal to 10 - result = @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count +2] #then add the next roll twice to the result - + if @rolls[rolls_count] == 10 # if strike + result += @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] # add 10 + the next 2 rolls + rolls_count += 1 # 1 roll has been added, move onto next frame + + elsif @rolls[rolls_count] + @rolls[rolls_count + 1] == 10 # if the first and second roll [+1] is equal to 10 + result += @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] # then add the next roll twice to the result + rolls_count += 2 # 2 rolls have been added, move onto next frame + elsif result += @rolls[rolls_count] + @rolls[rolls_count + 1] # frame = 2 rolls + rolls_count += 2 # 2 rolls have been added, move onto next frame + end end - rolls_count += 2 # add another 2 rolls -end result end end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index b6439390..3536fdb7 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -37,4 +37,40 @@ 17.times { @game.roll 0 } expect(@game.score).to eq 20 end + + it 'can roll a strike' do + @game.roll 10 + @game.roll 2 + @game.roll 3 + 16.times { @game.roll 0 } + expect(@game.score).to eq 20 + end + + it 'can roll a perfect game' do + 12.times { @game.roll 10} + expect(@game.score).to eq 300 +end + +it 'creates the example score of the exercise' do + @game.roll 1 + @game.roll 4 + @game.roll 4 + @game.roll 5 + @game.roll 6 + @game.roll 4 + @game.roll 5 + @game.roll 5 + @game.roll 10 + @game.roll 0 + @game.roll 1 + @game.roll 7 + @game.roll 3 + @game.roll 6 + @game.roll 4 + @game.roll 10 + @game.roll 2 + @game.roll 8 + @game.roll 6 + expect(@game.score).to eq 133 +end end From 98930f713a6e82d982a9a20fcc5f14472a398503 Mon Sep 17 00:00:00 2001 From: "oana.pintoiu" Date: Sat, 22 Apr 2023 21:02:15 +0100 Subject: [PATCH 9/9] refactored --- lib/bowling_game.rb | 78 +++++++++++++++++++++++++++++++-------- spec/bowling_game_spec.rb | 10 ++--- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/lib/bowling_game.rb b/lib/bowling_game.rb index 68e629ff..4f9e15a9 100644 --- a/lib/bowling_game.rb +++ b/lib/bowling_game.rb @@ -3,32 +3,78 @@ def initialize @rolls = [] end + def roll(pins) @rolls.push pins end + def score result = 0 rolls_count = 0 - # 20.times do # 20 = no of rolls in 10 frames - # result += @rolls[rolls_count] - # rolls_count += 1 - # the above 3 lines counts the score by roll. to refactor, we will count by frame next as follows: - - 10.times do # no of frames - if @rolls[rolls_count] == 10 # if strike - result += @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] # add 10 + the next 2 rolls - rolls_count += 1 # 1 roll has been added, move onto next frame - - elsif @rolls[rolls_count] + @rolls[rolls_count + 1] == 10 # if the first and second roll [+1] is equal to 10 - result += @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] # then add the next roll twice to the result - rolls_count += 2 # 2 rolls have been added, move onto next frame - - elsif result += @rolls[rolls_count] + @rolls[rolls_count + 1] # frame = 2 rolls - rolls_count += 2 # 2 rolls have been added, move onto next frame + 10.times do + if strike(rolls_count) + result += strikeScore(rolls_count) + rolls_count += 1 + elsif spare(rolls_count) + result += spareScore(rolls_count) + rolls_count += 2 + else + result += frame(rolls_count) + rolls_count += 2 end end result end + + + def frame(rolls_count) + @rolls[rolls_count] + @rolls[rolls_count + 1] + end + + + def spare(rolls_count) + @rolls[rolls_count] + @rolls[rolls_count + 1] == 10 + end + + + def spareScore(rolls_count) + 10 + @rolls[rolls_count + 2] + end + + + def strike(rolls_count) + @rolls[rolls_count] == 10 + end + + + def strikeScore(rolls_count) + 10 + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] + end end + +# def score +# result = 0 +# rolls_count = 0 + +# # 20.times do # 20 = no of rolls in 10 frames +# # result += @rolls[rolls_count] +# # rolls_count += 1 +# # the above 3 lines counts the score by roll. to refactor, we will count by frame next as follows: + +# 10.times do # no of frames +# if @rolls[rolls_count] == 10 # if strike +# result += @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] # add 10 + the next 2 rolls +# rolls_count += 1 # 1 roll has been added, move onto next frame + +# elsif @rolls[rolls_count] + @rolls[rolls_count + 1] == 10 # if the first and second roll [+1] is equal to 10 +# result += @rolls[rolls_count] + @rolls[rolls_count + 1] + @rolls[rolls_count + 2] # then add the next roll twice to the result +# rolls_count += 2 # 2 rolls have been added, move onto next frame + +# elsif result += @rolls[rolls_count] + @rolls[rolls_count + 1] # frame = 2 rolls +# rolls_count += 2 # 2 rolls have been added, move onto next frame +# end +# end +# result +# end diff --git a/spec/bowling_game_spec.rb b/spec/bowling_game_spec.rb index 3536fdb7..816d98fc 100644 --- a/spec/bowling_game_spec.rb +++ b/spec/bowling_game_spec.rb @@ -46,12 +46,12 @@ expect(@game.score).to eq 20 end - it 'can roll a perfect game' do - 12.times { @game.roll 10} + it 'can roll a perfect game' do + 12.times { @game.roll 10 } expect(@game.score).to eq 300 -end + end -it 'creates the example score of the exercise' do + it 'creates the example score of the exercise' do @game.roll 1 @game.roll 4 @game.roll 4 @@ -72,5 +72,5 @@ @game.roll 8 @game.roll 6 expect(@game.score).to eq 133 -end + end end