yard_game 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69219f511fba5afffafec9840a7484b9c54556a5a3df1fc39af384c7a8b0102b
-  data.tar.gz: cbec1186f0eb86e38e8063691375c69eaaa909d220dce1f0cc4505672d003f09
+  metadata.gz: ed398bf730ea6224cd8f115dc7e7393fb43609bdcabef39275154804e1f79da7
+  data.tar.gz: 41f8ca6e8ac779e8da684eeee4b83f5c642c18df3e36544c0a1c6a32183c109c
 SHA512:
-  metadata.gz: 3af1faa7d54f8e96081bda60b20fbe4753e720365b4519704cbbf193a6087203209e72ffba63b87f43e366b591371e9d61edbd3b85a28b3b5914bedfc232dbea
-  data.tar.gz: 9aa1df3f86e426157ed6b69483ed30b3e1201f4c26d12b31f39df74cb146315602a0b3c4a8e0baffd57a55e35c83fc75dc6cbac03925d6f9db0084be08eab8b7
+  metadata.gz: 88e3614537d1a9065d92d1a8bbc6366fc37f0867acbcb579bc1dafa742e4c88a3cfa09b48c259fbcb8b7a04c361de6faa8ae9e810151afc974f5b1536ef55c26
+  data.tar.gz: 9b5e013ccb312066112887ae97db3273f0cbcdb7fb817d995e16fa6aed7a81d2cea75dd454d632548afa7f51086fb8a4a45db50e257941a50c872a35c220a39a

data/README

@@ -19,7 +19,7 @@ added to the player's health to gain higher scores. It involves a random die rol
 ## Setup
 To run this project, install it locally.
 
-$ gem install yard_game_1.0.0.gem
+$ gem install yard_game_1.2.0.gem
 
 You can load players from the command line in a CSV file. You can also run the
 game without specifying a player file. A default players.csv file is packaged

data/bin/my_favorite_players.csv

@@ -1,3 +1,5 @@
-Sky, 500
-Zizy, 650
-Baron, 400
+Jane,70
+Pat,76
+Mary,90
+Gad,95
+Max,100

data/bin/players.csv

@@ -1,3 +1,6 @@
-Alvin, 100
-Simon, 60
-Theo, 125
+Larry,60
+Moe,100
+Curly,125
+Alvin,80
+Simon,70
+Theodore,120

data/bin/yard_game

@@ -1,40 +1,37 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/yard_game/player'
 require_relative '../lib/yard_game/game'
-require_relative '../lib/yard_game/clumsy_player'
+require_relative '../lib/yard_game/treasure_trove'
 require_relative '../lib/yard_game/berserk_player'
+require_relative '../lib/yard_game/clumsy_player'
+require_relative '../lib/yard_game/drunkhead_player'
 
-
-knuckleheads = YardGame::Game.new("knuckleheads")
+knucklehead_game = YardGame::Game.new("Knuckleheads")
 default_player_file = File.join(File.dirname(__FILE__), 'players.csv')
-knuckleheads.load_players(ARGV.shift || default_player_file)
-clumsy = YardGame::ClumsyPlayer.new("klutz", 105)
-knuckleheads.add_player(clumsy)
-berserker = YardGame::BerserkPlayer.new("berserker", 50)
-knuckleheads.add_player(berserker)
+knucklehead_game.load_players(ARGV.shift || default_player_file)
+
+berserker = YardGame::BerserkPlayer.new("jill", 50)
+knucklehead_game.add_player(berserker)
+
+clumsy = YardGame::ClumsyPlayer.new("klutz", 105, 3)
+knucklehead_game.add_player(clumsy)
+
+drunk = YardGame::DrunkheadPlayer.new("jack", 200)
+knucklehead_game.add_player(drunk)
 
 loop do
   puts "\nHow many game rounds? ('quit' to exit)"
   answer = gets.chomp.downcase
   case answer
   when /^\d+$/
-    knuckleheads.play(answer.to_i)
-  when 'quit' || 'exit'
-    knuckleheads.print_stats
+    knucklehead_game.play(answer.to_i)
+  when 'quit', 'exit'
+    knucklehead_game.print_stats
+    knucklehead_game.score_board
     break
-  else puts "Please enter a number or quit"
+  else
+    puts "Please enter a number or 'quit'"
   end
 end
-knuckleheads.save_high_scores
 
-#chipmunks = Game.new("chipmunks")
-#chipmunks.add_player(player4)
-#chipmunks.add_player(player5)
-#chipmunks.add_player(player6)
-#puts "Welcome to Chipmunks Game"
-#puts "\nHow many game rounds? ('quit' to exit)"
-#answer = gets.chomp()
-#chipmunks.play(answer.to_i)
-#puts "Enjoy your game"
-#chipmunks.print_stats
+knucklehead_game.save_high_scores

data/lib/yard_game/auditable.rb

@@ -2,7 +2,7 @@ module YardGame
   module Auditable
 
     def audit
-      puts "Rolled a #{self.number} (#{self.class}) "
+      puts "Rolled a #{self.number} (#{self.class})"
     end
   end
 end

data/lib/yard_game/berserk_player.rb

@@ -6,7 +6,6 @@ module YardGame
     def initialize(name, health=100)
       super(name, health)
       @w00t_count = 0
-
     end
 
     def berserk?
@@ -16,23 +15,22 @@ module YardGame
     def w00t
       super
       @w00t_count += 1
-      puts "#{@name} is berserk!" if berserk?
+      if berserk?
+        puts "#{name} is berserk!"
+      end
     end
 
     def blam
-      if berserk?
-        w00t
-      else super
-      end
-    # Using the ternary operator  instead if ? berserk? w00t else : super
-  #    berserk? ? w00t : super
+      # using tenary operator
+      berserk? ? w00t : super
     end
   end
-end
 
-if __FILE__ == $0
-  berserker = BerserkPlayer.new("berserker", 50)
-  6.times { berserker.w00t }
-  2.times { berserker.blam }
-  puts berserker.health
+
+  if __FILE__ == $0
+    berserker = BerserkPlayer.new("berserker", 50)
+    6.times { berserker.w00t }
+    2.times { berserker.blam }
+    puts berserker.health
+  end
 end

data/lib/yard_game/clumsy_player.rb

@@ -1,43 +1,47 @@
-require_relative 'player'
+require_relative "player"
 
 module YardGame
   class ClumsyPlayer < Player
     attr_reader :boost_factor
 
-    def initialize(name, health=100, boost_factor=1)
+    def initialize(name, health, boost_factor=1)
       super(name, health)
       @boost_factor = boost_factor
     end
 
-    def w00t
-      @boost_factor.times { super }
-    #  @health += @boost_factor
+    def found_treasure(treasure)
+      treasure = Treasure.new(treasure.name, treasure.points / 2.0)
+      super #refactored with super to remove duplication
+    #  half_treasure_points = treasure.points / 2.0
+    #  @found_treasures[treasure.name] += half_treasure_points
+
+    #  puts "#{@name} found a hammer worth #{half_treasure_points}"
     end
 
-    def found_treasure(treasure)
-      damanged_treasure = Treasure.new(treasure.name, treasure.points / 2.0)
-      super(damanged_treasure)
+    def w00t?
+      super
     end
-  end
-end
 
-if __FILE__ == $0
-  clumsy = ClumsyPlayer.new("klutz", 50, 10)
+    def w00t
+      @boost_factor.times { super }
+    end
+  end
 
-  hammer = Treasure.new(:hammer, 50)
-  clumsy.found_treasure(hammer)
-  clumsy.found_treasure(hammer)
-  clumsy.found_treasure(hammer)
+  if __FILE__ == $0
+    clumsy = ClumsyPlayer.new("klutz")
 
-  crowbar = Treasure.new(:crowbar, 400)
-  clumsy.found_treasure(crowbar)
+    hammer = Treasure.new(:hammer, 50)
+    clumsy.found_treasure(hammer)
+    clumsy.found_treasure(hammer)
+    clumsy.found_treasure(hammer)
 
-  clumsy.each_found_treasure do |treasure|
-    puts "#{treasure.points} total #{treasure.name} points"
-  end
-  puts "#{clumsy.points} grand total points"
+    crowbar = Treasure.new(:crowbar, 400)
+    clumsy.found_treasure(crowbar)
 
+    clumsy.each_found_treasure do |treasure|
+      puts "#{treasure.points} total #{treasure.name} points"
+    end
 
-  3.times { clumsy.w00t }
-  puts "#{clumsy.name} has #{clumsy.health}"
+    puts "#{clumsy.points} grand total points"
+  end
 end

data/lib/yard_game/die.rb

@@ -1,10 +1,10 @@
-require_relative 'game'
-require_relative 'auditable'
+require_relative "auditable"
 
 module YardGame
   class Die
     include Auditable
-    attr :number
+
+    attr_reader :number
 
     def initialize
       roll
@@ -13,7 +13,7 @@ module YardGame
     def roll
       @number = rand(1..6)
       audit
-      @number
+      return @number
     end
   end
 end

data/lib/yard_game/drunkhead_player.rb

@@ -0,0 +1,28 @@
+require_relative "player"
+
+module YardGame
+  class DrunkheadPlayer < Player
+    def initialize(name, health)
+      super(name, health)
+      @drunk_points = 10
+    end
+
+    def points
+      super - @drunk_points
+    end
+  end
+
+  if __FILE__ ==$0
+    @initial_health = 90
+    drunk = DrunkheadPlayer.new("Harry", @initial_health)
+
+    hammer = Treasure.new(:hammer, 50)
+    drunk.found_treasure(hammer)
+    skillet = Treasure.new(:skillet, 100)
+    drunk.found_treasure(skillet)
+    broomstick = Treasure.new(:broomstick, 200)
+    drunk.found_treasure(broomstick)
+    drunk.skipped
+    puts "#{drunk.name} has #{drunk.points}"
+  end
+end

data/lib/yard_game/game.rb

@@ -1,114 +1,122 @@
 require_relative 'player'
+require_relative 'die'
 require_relative 'game_turn'
 require_relative 'treasure_trove'
 require 'csv'
 
 module YardGame
   class Game
+
     attr_reader :title
 
     def initialize(title)
-      @g_title = title.capitalize
+      @title = title
       @players = []
     end
 
-  # Using File class method
-  #  def load_players(from_file)
-  #    File.readlines(from_file).each do |line|
-  #      add_player(Player.from_csv(line))
-  #    end
-  #  end
-
-  # Using CSV class method
-    def load_players(from_file)
-      CSV.foreach(from_file) do |row|
-        player = Player.new(row[0], row[1].to_i)
-        add_player(player)
-      end
-    end
-
-    def add_player(a_player)
-      @players.push(a_player) # @players << a_player
+    def add_player(player)
+      @players << player
     end
 
     def play(rounds)
-      puts "*" * 40
-      puts "There are #{@players.size} players in #{@g_title}:"
+      puts "There are #{@players.size} players in #{@title}"
+
       @players.each do |player|
         puts player
       end
 
       treasures = TreasureTrove::TREASURES
-      puts "\nThere are #{treasures.size} treasures to be found:"
+
+      puts "There are #{treasures.size} treasures to be found:"
+
       treasures.each do |treasure|
         puts "A #{treasure.name} is worth #{treasure.points} points"
       end
 
-      1.upto(rounds) do |round|
-        puts "\nRound #{round}:"
+      1.upto(rounds) do |count|
+        if block_given?
+          break if yield
+        end
+        puts "\nRound #{count}:"
         @players.each do |player|
           GameTurn.take_turn(player)
+          puts player
         end
       end
     end
 
-    def print_name_and_health(player)
-      puts "#{player.name} : (#{player.health})"
+    def print_name_health(player)
+      puts "#{player.name} (#{player.health})"
     end
 
     def print_stats
-      strong_players, wimpy_players = @players.partition { |player| player.strong? }
-
-      puts "\n#{@g_title} Statistics:"
+      strong_players, wimpy_players  = @players.partition { |player| player.strong? }
 
-      puts "\n#{strong_players.count} strong players:"
+      puts "\n #{title.upcase} STATISTICS:"
+      puts "\n #{strong_players.size} strong players:"
       strong_players.each do |player|
-        print_name_and_health(player)
+        print_name_health(player)
       end
 
-      puts "\n#{wimpy_players.count} wimpy players:"
-      wimpy_players.each do |player|
-        print_name_and_health(player)
-      end
 
-      puts "#{@g_title} High Scores:"
-      @players.each do |player|
-        puts high_scores_entry(player)
+      puts "\n #{wimpy_players.size} wimpy players:"
+      wimpy_players.each do |player|
+        print_name_health(player)
       end
 
-      puts "\nPoints:"
       @players.each do |player|
-        puts "#{player.name}'s point totals:"
+        puts "\n#{player.name}'s point totals:'"
         puts "#{player.points} grand total points"
       end
-      puts "#{total_points} total points from treasures found"
 
-      @players.sort.each do |player|
+      puts "\nTotal Game Treasure Points: #{total_points}"
+
+      @players.each do |player|
         puts "\n#{player.name}'s point totals:"
         player.each_found_treasure do |treasure|
           puts "#{treasure.points} total #{treasure.name} points"
         end
-        player_total_points = "#{player.points} grand total points"
-        puts player_total_points.upcase
+        puts "#{player.points} grand total points"
       end
+
     end
 
-    def high_scores_entry(player)
-        formatted_name = player.name.ljust(20, '.')
-        "#{formatted_name} #{player.score}"
+
+    def score_board
+      puts "\n#{title} High Scores:"
+      @players.sort.each do |player|
+        puts high_scores_entry(player)
+      end
+      puts "\n\n"
+      puts "*" * 60
     end
 
+
     def total_points
-        @players.reduce(0) { |sum, player| sum + player.points }
+      @players.reduce(0) do |sum, player|
+        sum + player.points
+      end
     end
 
-    def save_high_scores(score_to_file= "high_scores.txt")
-      File.open(score_to_file, 'w') do |file|
-        file.puts "#{@g_title} High Scores:"
+    def load_players(from_file)
+      CSV.foreach(from_file) do |row|
+        player = Player.new(row[0], row[1].to_i)
+        add_player(player)
+      end
+    end
+
+    def save_high_scores(to_file="high_scores.txt")
+      File.open(to_file, 'w') do |file|
+        file.puts "#{@title} High Scores:" # file.puts prints or writes to file
         @players.sort.each do |player|
           file.puts high_scores_entry(player)
         end
       end
     end
+
+    def high_scores_entry(player)
+      "#{player.name.ljust(30, ".")} #{player.score}"
+    end
+
   end
 end

data/lib/yard_game/game_turn.rb

@@ -1,30 +1,26 @@
-require_relative 'die'
-#require_relative 'loaded_die'
 require_relative 'player'
+require_relative 'die'
 require_relative 'treasure_trove'
 
 module YardGame
   module GameTurn
-    # this is referred as a module method. Its defined on the module itself
-    # self refers to the module beight defined. ie. GameTurn. So we need to
-    # define the method with the form self.xxx.
+
     def self.take_turn(player)
-      rolled_die = Die.new
-      #rolled_die = LoadedDie.new
-      number_rolled = rolled_die.roll
+      die = Die.new
+      number_rolled = die.roll
 
       case number_rolled
       when 1..2
         player.blam
       when 3..4
-        puts "#{player.name} was skipped."
+        player.skipped
+        #puts "#{player.name} was skipped!"
       else
         player.w00t
       end
 
       treasure = TreasureTrove.random
       player.found_treasure(treasure)
-
     end
   end
 end

data/lib/yard_game/player.rb

@@ -1,10 +1,12 @@
-require_relative 'treasure_trove'
-require_relative 'playable'
+require_relative "treasure_trove"
+require_relative "scorable"
 
 module YardGame
   class Player
-    include Playable
-    attr_accessor :name, :health
+    include Scorable
+
+    attr_accessor :name
+    attr_accessor :health
 
     def initialize(name, health=100)
       @name = name.capitalize
@@ -12,54 +14,54 @@ module YardGame
       @found_treasures = Hash.new(0)
     end
 
-    def each_found_treasure
-      @found_treasures.each do |name, points|
-        yield Treasure.new(name, points)
-      end
+    def self.from_csv(string)
+      name, health = string.split(',')
+      Player.new(name, Integer(health))
     end
 
 
-    def points
-        @found_treasures.values.reduce(0, :+)
+    def each_found_treasure
+      @found_treasures.each do |name, point|
+        yield Treasure.new(name, point)
+      end
     end
 
     def found_treasure(treasure)
-      @found_treasures[treasure.name ] += treasure.points
-      puts "#{name} found a #{treasure.name} worth #{treasure.points} points."
-      puts "#{name}'s treasures: #{@found_treasures}"#{treasure.name}, #{treasure.points}.
+      @found_treasures[treasure.name] += treasure.points
+      puts "#{@name} found a #{treasure.name} worth #{treasure.points} points."
+      puts "#{@name}'s treasures:#{@found_treasures}'"
     end
 
-    def to_s # changed say_hello method to to_s to allow ruby implement to_s method to render a string
-      "I'm #{@name} with a health = #{@health}, points = #{points}, and score = #{score}."
+    def points
+      @found_treasures.values.reduce(0, :+)
     end
 
 
-    def score # This is a virtual accessor it returns the sum of the player's health and length of the player's name
+    def score
       @health + points
     end
 
-    def name=(new_name)
-      @name = new_name.capitalize
+    def to_s
+      "I'm #{@name} with a health = #{@health}, points = #{points}, and score = #{score}."
     end
 
-
-    def <=> (other)
-      other.score <=> score
+    def skipped
+      puts "#{@name} was skipped!"
     end
 
-    def self.from_csv(string)
-      name, health = string.split(',')
-      new(name, Integer(health))
-    end
+  #  def name=(new_name)
+    #  @name = new_name.capitalize
+  #  end
+
   end
-end
 
-if __FILE__ == $0 # used to enclose and hide sample code from other files requiring player.rb file
-  player = Player.new("moe")
-  puts player.name
-  puts player.health
-  player.w00t
-  puts player.health
-  player.blam
-  puts player.health
+  if __FILE__ == $0
+    player = Player.new("moe")
+    puts player.name
+    puts player.health
+    player.w00t
+    puts player.health
+    player.blam
+    puts player.health
+  end
 end

data/lib/yard_game/{playable.rb → scorable.rb}

@@ -1,18 +1,23 @@
 module YardGame
-  module Playable
+  module Scorable
 
     def blam
-      @health -= 10
+      self.health -= 10
       puts "#{name} got blammed!"
     end
 
     def w00t
-      @health += 15
+      self.health += 15
       puts "#{name} got w00ted!"
     end
 
     def strong?
       health > 100
     end
+
+    def <=>(other_player)
+      other_player.score <=> score
+    end
+
   end
 end

data/lib/yard_game/treasure_trove.rb

@@ -1,9 +1,10 @@
 module YardGame
+
   Treasure = Struct.new(:name, :points)
 
   module TreasureTrove
 
-    TREASURES = [
+    TREASURES =  [
       Treasure.new(:pie, 5),
       Treasure.new(:bottle, 25),
       Treasure.new(:hammer, 50),

data/spec/yard_game/berserk_player_spec.rb

@@ -4,7 +4,6 @@ module YardGame
   describe BerserkPlayer do
 
     before do
-      $stdout = StringIO.new
       @initial_health = 50
       @player = BerserkPlayer.new("berserker", @initial_health)
     end
@@ -15,13 +14,13 @@ module YardGame
       expect(@player.berserk?).to be_falsey
     end
 
-    it "goes berserk when w00ted more than 5 times" do
+    it "goes berserk when w00ted up to 6 times" do
       1.upto(6) { @player.w00t }
 
       expect(@player.berserk?).to be_truthy
     end
 
-    it "get's w00ted instead of blammed when it's gone berserk" do
+    it "gets w00t instead of blammed when its gone bersek" do
       1.upto(6) { @player.w00t }
       1.upto(2) { @player.blam }
 

data/spec/yard_game/clumsy_player_spec.rb

@@ -3,10 +3,10 @@ require 'yard_game/clumsy_player'
 module YardGame
   describe ClumsyPlayer do
     before do
-      @player = ClumsyPlayer.new("klutz")
+      @player = ClumsyPlayer.new("klutz", boost_factor=2)
     end
 
-    it "only gets half the point for each treasure" do
+    it "only gets half the point value for each treasure" do
       expect(@player.points).to eq(0)
 
       hammer = Treasure.new(:hammer, 50)
@@ -22,6 +22,7 @@ module YardGame
       expect(@player.points).to eq(275)
 
       yielded = []
+
       @player.each_found_treasure do |treasure|
         yielded << treasure
       end
@@ -29,22 +30,22 @@ module YardGame
       expect(yielded).to eq([Treasure.new(:hammer, 75), Treasure.new(:crowbar, 200)])
     end
 
-    context "boost a clumsy player's health" do
+    context "with a boost_factor" do
       before do
+        @boost_factor = 2
         @initial_health = 50
-        @boost_factor = 5
         @player = ClumsyPlayer.new("klutz", @initial_health, @boost_factor)
       end
 
       it "has a boost_factor" do
-        expect(@player.boost_factor).to eq(5)
+
+        expect(@player.boost_factor).to eq(2)
       end
 
-      it "gets a boost everytime its w00ted" do
-        @player = ClumsyPlayer.new("klutz", @initial_health, @boost_factor)
 
-        1.upto(3) { @player.w00t }
-        expect(@player.health).to eq(@initial_health + (15 * 15))
+      it "receives a boost in health value when w00ted" do
+        @player.w00t
+        expect(@player.health).to eq(50 + (2 * 15))
       end
     end
   end

data/spec/yard_game/drunkhead_player_spec.rb

@@ -0,0 +1,24 @@
+require 'yard_game/drunkhead_player'
+
+module YardGame
+  describe DrunkheadPlayer do
+    before do
+      @initial_health = 90
+      @player = DrunkheadPlayer.new("Harry", @initial_health)
+    end
+
+    it "gets 10 points deducted from points when skipped" do
+
+      hammer = Treasure.new(:hammer, 50)
+      @player.found_treasure(hammer)
+      skillet = Treasure.new(:skillet, 100)
+      @player.found_treasure(skillet)
+      broomstick = Treasure.new(:broomstick, 200)
+      @player.found_treasure(broomstick)
+
+      @player.skipped
+      expect(@player.points).to eq(350 - 10)
+
+    end
+  end
+end

data/spec/yard_game/game_spec.rb

@@ -8,20 +8,21 @@ module YardGame
       @game = Game.new("Knuckleheads")
 
       @initial_health = 100
-      @player = Player.new("moe", @initial_health)
+      @player = Player.new("larry", @initial_health)
 
       @game.add_player(@player)
     end
 
-    it "increases the player's health when a high number is rolled" do
+    it "increases by 15 when a higher number is rolled" do
+
       allow_any_instance_of(Die).to receive(:roll).and_return(5)
 
       @game.play(2)
 
-      expect(@player.health).to eq(@initial_health + (15 * 2))
+      expect(@player.health).to eq(@initial_health + 15 * 2)
     end
 
-    it "skips the player's health when a medium number is rolled" do
+    it "skips a player when a medium number is rolled" do
       allow_any_instance_of(Die).to receive(:roll).and_return(3)
 
       @game.play(2)
@@ -29,30 +30,12 @@ module YardGame
       expect(@player.health).to eq(@initial_health)
     end
 
-    it "decreases the player's health when a low number is rolled" do
+    it "reduces by 10 when a lower number is rolled" do
       allow_any_instance_of(Die).to receive(:roll).and_return(1)
 
       @game.play(2)
 
-      expect(@player.health).to eq(@initial_health - (10 * 2))
-    end
-
-    context "players that are strong from their statistics" do
-      @game = Game.new("Knuckleheads")
-
-      @initial_health = 100
-      @player = Player.new("moe", @initial_health)
-
-      @game.add_player(@player)
-
-    #  it "shows a strong player" do
-    #    @game.print_stats
-
-    #    expect(@player).to eq( "Moe : #{@initial_health}" )
-    #  end
-
-    #  it "shows a winpy player"
-
+      expect(@player.health).to eq(@initial_health - 10 * 2)
     end
 
     it "assigns a treasure for points during a player's turn" do
@@ -63,23 +46,24 @@ module YardGame
 
       game.play(1)
 
-      expect(player.points).not_to eq(0)
+      expect(player.points).not_to be_zero
     end
 
     it "computes total points as the sum of all player points" do
-      @game = Game.new("Knuckleheads")
+
+      game = Game.new("Knuckleheads")
 
       player1 = Player.new("moe")
       player2 = Player.new("larry")
 
-      @game.add_player(player1)
-      @game.add_player(player2)
+      game.add_player(player1)
+      game.add_player(player2)
 
       player1.found_treasure(Treasure.new(:hammer, 50))
       player1.found_treasure(Treasure.new(:hammer, 50))
-      player2.found_treasure(Treasure.new(:crowbar, 400))
+      player2.found_treasure(Treasure.new(:hammer, 400))
 
-      expect(@game.total_points).to eq(500)
+      expect(game.total_points).to eq(500)
     end
   end
 end

data/spec/yard_game/player_spec.rb

@@ -1,66 +1,68 @@
 require 'yard_game/player'
-require 'yard_game/treasure_trove'
 
 module YardGame
   describe Player do
     before do
-      $stdout = StringIO.new # writes standard output to string instead of console
-      @initial_health = 150
+      $stdout = StringIO.new
+      @initial_health = 60
       @player = Player.new("larry", @initial_health)
-
     end
 
-    it "has a capitalized name" do
+    it "has a name that is a capitalized" do
+
       expect(@player.name).to eq("Larry")
     end
 
     it "has an initial health" do
-      expect(@player.health).to eq(150)
+
+      expect(@player.health).to eq(60)
     end
 
     it "has a string representation" do
       @player.found_treasure(Treasure.new(:hammer, 50))
       @player.found_treasure(Treasure.new(:hammer, 50))
 
-      expect(@player.to_s).to eq("I'm Larry with a health = 150, points = 100, and score = 250.")
+      expect(@player.to_s).to eq("I'm Larry with a health = 60, points = 100, and score = 160.")
     end
 
-    it "computes a score as the sum of its health and length of name" do
+    it "computes a score as the sum of its health and points" do
       @player.found_treasure(Treasure.new(:hammer, 50))
       @player.found_treasure(Treasure.new(:hammer, 50))
 
-      expect(@player.score).to eq(250)
+      expect(@player.score).to eq(160)
     end
 
+
     it "increases health by 15 when w00ted" do
-      @player.w00t
 
-      expect(@player.health).to eq(@initial_health + 15 )
+      @player.w00t
+      expect(@player.health).to eq(@initial_health + 15)
     end
 
-    it "decreasrs health by 10 when blammed" do
-      @player.blam
+    it "decreases health by 10 when blammed" do
 
-      expect(@player.health).to eq(@initial_health - 10 )
+      @player.blam
+      expect(@player.health).to eq(@initial_health - 10)
     end
 
-    context "player's initial health greater than 100" do
+    context "with an initial health greater than 100" do
       before do
         @player = Player.new("larry", 150)
       end
 
-      it "is strong" do
+      it "is a strong player" do
+
         expect(@player).to be_strong
-        #@player.strong?.should be_truthy
       end
     end
 
-    context "player's initial health is 100" do
+    context "with an initial health of 100 of less" do
       before do
-        @player = Player.new("larry", 100)
+        player = Player.new("larry", 100)
       end
 
       it "is wimpy" do
+
         expect(@player).not_to be_strong
       end
     end
@@ -80,6 +82,7 @@ module YardGame
     end
 
     it "computes points as the sum of all treasure points" do
+
       expect(@player.points).to eq(0)
 
       @player.found_treasure(Treasure.new(:hammer, 50))
@@ -105,25 +108,23 @@ module YardGame
       @player.found_treasure(Treasure.new(:bottle, 5))
       @player.found_treasure(Treasure.new(:bottle, 5))
 
-      yielded = []
-
+      yielded  = []
       @player.each_found_treasure do |treasure|
         yielded << treasure
       end
 
       expect(yielded).to eq([
-                            Treasure.new(:skillet, 200),
-                            Treasure.new(:hammer, 50),
-                            Treasure.new(:bottle, 25)
-                          ])
+        Treasure.new(:skillet, 200),
+        Treasure.new(:hammer, 50),
+        Treasure.new(:bottle, 25)
+          ])
     end
 
-    it "has a feature that read csv files" do
-      player = Player.from_csv("Alvin, 100")
+    it "can be created from a CSV string" do
+      @player = Player.from_csv("Larry,60")
 
-      expect(player.name).to eq("Alvin")
-      expect(player.health).to eq(100)
+      expect(@player.name).to eq("Larry")
+      expect(@player.health).to eq(60)
     end
-
   end
 end

data/spec/yard_game/treasure_trove_spec.rb

@@ -4,54 +4,63 @@ module YardGame
   describe Treasure do
 
     before do
-      @treasure = Treasure.new(:hammer, 50)
+      @treasure = Treasure.new(:hammer, 50 )
     end
 
     it "has a name attribute" do
+
       expect(@treasure.name).to eq(:hammer)
     end
 
     it "has a points attribute" do
+
       expect(@treasure.points).to eq(50)
     end
-
   end
 
+
   describe TreasureTrove do
 
     it "has six treasures" do
+
       expect(TreasureTrove::TREASURES.size).to eq(6)
     end
 
     it "has a pie worth 5 points" do
+
       expect(TreasureTrove::TREASURES[0]).to eq(Treasure.new(:pie, 5))
     end
 
     it "has a bottle worth 25 points" do
+
       expect(TreasureTrove::TREASURES[1]).to eq(Treasure.new(:bottle, 25))
     end
 
     it "has a hammer worth 50 points" do
+
       expect(TreasureTrove::TREASURES[2]).to eq(Treasure.new(:hammer, 50))
     end
 
-    it "has a skillset worth 100 points" do
+    it "has a skillet worth 100 points" do
+
       expect(TreasureTrove::TREASURES[3]).to eq(Treasure.new(:skillet, 100))
     end
 
-    it "has a broomstick worth 200 points" do
+    it "has a brownstick worth 200 points" do
+
       expect(TreasureTrove::TREASURES[4]).to eq(Treasure.new(:broomstick, 200))
     end
 
     it "has a crowbar worth 400 points" do
-      expect(TreasureTrove::TREASURES[5]).to eq(Treasure.new(:crowbar, 400))
+
+      expect(TreasureTrove::TREASURES[5]).to eq(Treasure.new(:crowbar, 400 ))
     end
 
-    it "returns a random treasure" do
+    it "retuurns a random treasure" do
+
       treasure = TreasureTrove.random
 
       expect(TreasureTrove::TREASURES).to include(treasure)
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard_game
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Paulette Erijo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,7 +52,7 @@ description: |
   ## Setup
   To run this project, install it locally.
 
-  $ gem install yard_game_1.0.0.gem
+  $ gem install yard_game_1.2.0.gem
 
   You can load players from the command line in a CSV file. You can also run the
   game without specifying a player file. A default players.csv file is packaged
@@ -75,14 +75,16 @@ files:
 - lib/yard_game/berserk_player.rb
 - lib/yard_game/clumsy_player.rb
 - lib/yard_game/die.rb
+- lib/yard_game/drunkhead_player.rb
 - lib/yard_game/game.rb
 - lib/yard_game/game_turn.rb
 - lib/yard_game/loaded_die.rb
-- lib/yard_game/playable.rb
 - lib/yard_game/player.rb
+- lib/yard_game/scorable.rb
 - lib/yard_game/treasure_trove.rb
 - spec/yard_game/berserk_player_spec.rb
 - spec/yard_game/clumsy_player_spec.rb
+- spec/yard_game/drunkhead_player_spec.rb
 - spec/yard_game/game_spec.rb
 - spec/yard_game/player_spec.rb
 - spec/yard_game/treasure_trove_spec.rb
@@ -108,10 +110,12 @@ requirements: []
 rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
-summary: A ruby game where players search for treasures in a yard and earn points.
+summary: An updated version of YardGame 1.0.0, a ruby game where players search for
+  treasures in a yard and earn points.
 test_files:
 - spec/yard_game/berserk_player_spec.rb
 - spec/yard_game/clumsy_player_spec.rb
+- spec/yard_game/drunkhead_player_spec.rb
 - spec/yard_game/game_spec.rb
 - spec/yard_game/player_spec.rb
 - spec/yard_game/treasure_trove_spec.rb