diff --git a/Gemfile b/Gemfile index 2dac66f..af456cf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' -ruby '2.0.0' gem 'rspec', '~> 3.0.0.beta2' \ No newline at end of file diff --git a/lib/deaf_grandma.rb b/lib/deaf_grandma.rb index 83ad52a..fa8a5c3 100644 --- a/lib/deaf_grandma.rb +++ b/lib/deaf_grandma.rb @@ -14,14 +14,30 @@ def run! loop do user_input = get_user_input p speak(user_input) + if @bye_counter == 3 then + exit + end end end def speak(input) - - #Implement your code here <<<<<<<<< - + if input == input.upcase then + if input == "BYE" then + @bye_counter = @bye_counter + 1 + if @bye_counter == 3 then + "SEE YOU LATER SONNY!" + else + "" + end + else + @bye_counter = 0 + "NOT SINCE 1964!" + end + else + @bye_counter = 0 + "SPEAK UP SONNY!" + end end private diff --git a/lib/fizzbuzz.rb b/lib/fizzbuzz.rb index 86f9def..4e3a430 100644 --- a/lib/fizzbuzz.rb +++ b/lib/fizzbuzz.rb @@ -2,12 +2,19 @@ class SuperFizzBuzz def run(input) - #Implement your code here - + if input % 3 == 0 && input % 5 == 0 then + "FizzBuzz" + elsif input % 3 == 0 then + "Fizz" + elsif input % 5 == 0 then + "Buzz" + else + input + end end - end #You don't necessarily need to execute this script to complete this challenge, but how would you "run" this method (pun intended) so that it printed a value to the terminal? # #HINT: it's an instance method. +#p SuperFizzBuzz.new.run(3) diff --git a/spec/deaf_grandma_spec.rb b/spec/deaf_grandma_spec.rb index cf09766..a6ccfc0 100644 --- a/spec/deaf_grandma_spec.rb +++ b/spec/deaf_grandma_spec.rb @@ -9,10 +9,12 @@ end it "says 'NOT SINCE 1964!' when we yell" do - #implement your test here + expect(script.speak("HI")).to eq "NOT SINCE 1964!" end it "EXTRA CREDIT: How would you test yelling BYE?" do - #implement your test here + expect(script.speak("BYE")).to eq "" + expect(script.speak("BYE")).to eq "" + expect(script.speak("BYE")).to eq "SEE YOU LATER SONNY!" end end diff --git a/spec/fizzbuzz_spec.rb b/spec/fizzbuzz_spec.rb index cfda46b..7ac07d1 100644 --- a/spec/fizzbuzz_spec.rb +++ b/spec/fizzbuzz_spec.rb @@ -9,14 +9,14 @@ end it "returns 'Buzz' when my input is divisible by 5" do - #implement your test here + expect(script.run(5)).to eq "Buzz" end it "returns 'FizzBuzz' when input is divisible by 3 & 5" do - #implement your test here + expect(script.run(15)).to eq "FizzBuzz" end it "returns the input number when input isn't divisible by 3, 5, or both" do - #implement your test here + expect(script.run(4)).to eq 4 end end