tubesocks 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d8d58f1cc18308fea86d7b4bab45828b7ee8e4
-  data.tar.gz: cd5f926872a29b6b1364fb7cabd5c7c457cde346
+  metadata.gz: 8ed9ad50120b0ed6993c4b2fa44b501e2e5af035
+  data.tar.gz: 713ab82e869a2adb3948a8a537e6ae33dd045480
 SHA512:
-  metadata.gz: 8976c81f9e39fd0669e17c2420f9f889639391c3a97e7481e1dbb86772002cd7bb66b5d015549df2c785d47ea18efcce3e95e68774938b6860819759f2269081
-  data.tar.gz: 98734e4745c28247de9de440e7b601a50c597363f514e08f1c0e218e432f81c6ec4fe85c7d4b8ee09b519194baa88f038a3a499d2e79e8ed444f7ea2cc83df7f
+  metadata.gz: d6fc021c7d54e53f550038139696488935cfa9cf85878097fa1d0f747b7b47b3fea5626b39bfd80a0bdec04245813d70710f56186ce407b7c8918f22a23cdbc6
+  data.tar.gz: 87e3b494bc6a5b319e73f7b8b5cc8df94c58c58b873fa33e0ee0e88ec59af4c3484c2f84851d8cc4ba13eef5dc4d2cf55bf2a41d304127b2facc24bbe50cb2aa

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Jesse Saletan
+Copyright (c) 2017 Jesse Saletan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README

@@ -2,4 +2,4 @@ This is a simple game written while following the ruby programming course develo
 
   https://pragmaticstudio.com/ruby
 
-This code is copyright (c) 2015 Jesse Saletan.  For license details see the accompanying LICENSE file.
+This code is copyright (c) 2017 Jesse Saletan.  For license details see the accompanying LICENSE file.

data/bin/studio_game

@@ -1,43 +1,32 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/studio_game/player'
 require_relative '../lib/studio_game/game'
 require_relative '../lib/studio_game/clumsy_player'
 require_relative '../lib/studio_game/berserk_player'
 
-#player1 = Player.new("moe")
-#player2 = Player.new("larry", 60)
-#player3 = Player.new("curly", 125)
-    
 knuckleheads = StudioGame::Game.new("Knuckleheads")
-#knuckleheads.add_player(player1)
-#knuckleheads.add_player(player2)
-#knuckleheads.add_player(player3)
-
 default_player_file = File.join(File.dirname(__FILE__), 'players.csv')
 knuckleheads.load_players(ARGV.shift || default_player_file)
 
-klutz = StudioGame::ClumsyPlayer.new("klutz", 105, 3)
+klutz = StudioGame::ClumsyPlayer.new('klutz', 105)
 knuckleheads.add_player(klutz)
-berserker = StudioGame::BerserkPlayer.new("berserker", 50)
+
+berserker = StudioGame::BerserkPlayer.new('berserker', 50)
 knuckleheads.add_player(berserker)
 
 loop do
-  puts "\nHow many game rounds? ('quit' to exit)"
+  puts "How 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
-    knuckleheads.save_high_scores
     break
   else
     puts "Please enter a number or 'quit'"
   end
 end
 
-#knuckleheads.play(10) do
-#  knuckleheads.total_points >= 2000
-#end
+knuckleheads.print_stats
+knuckleheads.save_high_scores

data/lib/studio_game/berserk_player.rb

@@ -2,29 +2,26 @@ require_relative 'player'
 
 module StudioGame
   class BerserkPlayer < Player
+  
     def initialize(name, health=100)
       super(name, health)
-      @woot_count = 0
+      @w00t_count = 0
     end
-
+  
     def berserk?
-      @woot_count > 5
+      @w00t_count > 5
     end
-
+  
     def w00t
       super
-      @woot_count += 1
+      @w00t_count += 1
       puts "#{@name} is berserk!" if berserk?
     end
-
+  
     def blam
       berserk? ? w00t : super
-      #if berserk?
-      #  w00t
-      #else
-      #  super
-      #end
     end
+  
   end
 end
 

data/lib/studio_game/clumsy_player.rb

@@ -2,21 +2,12 @@ require_relative 'player'
 
 module StudioGame
   class ClumsyPlayer < Player
-    attr_reader :boost_factor
-
-    def initialize(name, health=100, boost_factor=1)
-      super(name, health)
-      @boost_factor = boost_factor
-    end
-
+  
     def found_treasure(treasure)
       damaged_treasure = Treasure.new(treasure.name, treasure.points / 2.0)
       super(damaged_treasure)
     end
-
-    def w00t
-      @boost_factor.times { super }
-    end
+  
   end
 end
 

data/lib/studio_game/die.rb

@@ -3,13 +3,13 @@ require_relative 'auditable'
 module StudioGame
   class Die
     include Auditable
-
+  
     attr_reader :number
-
-  #  def initialize
-  #    roll
-  #  end
-
+  
+    def initialize
+      @number = rand(1..6)
+    end
+  
     def roll
       @number = rand(1..6)
       audit

data/lib/studio_game/game.rb

@@ -1,103 +1,90 @@
 require_relative 'player'
 require_relative 'die'
 require_relative 'game_turn'
-require_relative 'treasure_trove.rb'
+require_relative 'treasure_trove'
+require 'csv'
 
 module StudioGame
   class Game
     attr_reader :title
-
+  
     def initialize(title)
       @title = title
       @players = []
     end
-
+  
     def add_player(new_player)
-      @players.push(new_player)
+      @players << new_player
     end
-
+  
     def play(rounds)
       puts "There are #{@players.size} players in the game:"
       @players.each do |player|
-	puts player
+        puts player
       end
-
+  
       treasures = TreasureTrove::TREASURES
       puts "\nThere are #{treasures.size} treasures to be found:"
       treasures.each do |treasure|
-	puts "A #{treasure.name} is worth #{treasure.points} points"
+        puts "A #{treasure.name} is worth #{treasure.points} points"
       end
-
+  
       1.upto(rounds) do |round|
-	if block_given?
-	  break if yield
-	end
-	puts "\nRound #{round}:"
-	@players.each do |player|
-	  GameTurn.take_turn(player)
-	  puts player
-	end
+        puts "\nRound #{round}:"
+        @players.each do |player|
+          GameTurn.take_turn(player)
+          puts player
+        end
       end
     end
-
+  
     def print_stats
-      strong_players, wimpy_players = @players.partition { |player| player.strong? }
+      strong, wimpy = @players.partition { |player| player.strong? }
       puts "\n#{@title} Statistics:"
-
-      puts "\n#{strong_players.size} strong players:"
-      strong_players.each do |player|
-	player.print_name_and_health
+  
+      puts "\n#{strong.size} strong players:"
+      strong.each do |player|
+        puts player.name_and_health
       end
-
-      puts "\n#{wimpy_players.size} wimpy players:"
-      wimpy_players.each do |player|
-	player.print_name_and_health
+  
+      puts "\n#{wimpy.size} wimpy players:"
+      wimpy.each do |player|
+        puts player.name_and_health
       end
-
-      puts "\n#{title} High Scores:"
+  
+      puts "\n#{@title} High Scores:"
       @players.sort.each do |player|
-	puts high_score_entry(player)
+        puts high_score_entry(player)
       end
-
+  
       @players.sort.each do |player|
-	puts "\n#{player.name}'s point totals:"
-	player.each_found_treasure do |treasure|
-	  puts "#{treasure.points} total #{treasure.name} points"
-	end
-	puts "#{player.points} grand total points"
+        puts "\n#{player.name}'s point totals:"
+  
+        player.each_found_treasure do |treasure|
+          puts "#{treasure.points} total #{treasure.name} points"
+        end
+  
+        puts "#{player.points} grand total points"
       end
     end
-
-    def total_points
-      @players.reduce(0) {|sum, player| sum + player.points}
-    end
-
+  
     def load_players(from_file)
-      File.readlines(from_file).each do |line|
-	add_player(Player.from_csv(line))
+      CSV.foreach(from_file) do |player_data|
+        add_player(Player.from_array(player_data))
       end
     end
-
+  
+    def high_score_entry(player)
+      "#{player.name.ljust(20, '.')} #{player.score}"
+    end
+  
     def save_high_scores(to_file="high_scores.txt")
       File.open(to_file, "w") do |file|
-	file.puts "#{@title} High Scores:"
-	@players.sort.each do |player|
-	  file.puts high_score_entry(player)
-	end
+        file.puts "#{@title} High Scores:"
+        @players.sort.each do |player|
+          file.puts high_score_entry(player)
+        end
       end
     end
-
-    def high_score_entry(player)
-      "#{player.name.ljust(20, '.')} #{player.score}"
-    end
-
   end
 end
-
-if __FILE__ == $0
-  my_game = Game.new("Test Game")
-  puts my_game.title
-  player1 = Player.new("Joe")
-  my_game.add_player(player1)
-  my_game.play
-end

data/lib/studio_game/game_turn.rb

@@ -1,21 +1,20 @@
-require_relative 'loaded_die'
-
+require_relative 'player'
+require_relative 'die'
+require_relative 'treasure_trove'
 
 module StudioGame
   module GameTurn
-
     def self.take_turn(player)
-      die=Die.new
-      number_rolled = die.roll
-      case number_rolled
-	when 1..2
-	  player.blam
-	when 3..4
-	  puts "#{player.name} was skipped."
-	else
-	  player.w00t
+      die = Die.new
+      case die.roll
+        when 1..2
+          player.blam
+        when 5..6 
+          player.w00t
+        else
+          puts "#{player.name} was skipped."
       end
-
+  
       treasure = TreasureTrove.random
       player.found_treasure(treasure)
     end

data/lib/studio_game/loaded_die.rb

@@ -3,7 +3,7 @@ require_relative 'auditable'
 module StudioGame
   class LoadedDie
     include Auditable
-
+  
     attr_reader :number
     
     def roll

data/lib/studio_game/playable.rb

@@ -1,15 +1,15 @@
 module StudioGame
   module Playable
-    def w00t
-      self.health += 15
-      puts "#{name} got w00ted!"
-    end
-
     def blam
       self.health -= 10
       puts "#{name} got blammed!"
     end
-
+  
+    def w00t
+      self.health += 15
+      puts "#{name} got w00ted!"
+    end
+  
     def strong?
       health > 100
     end

data/lib/studio_game/player.rb

@@ -1,56 +1,54 @@
 require_relative 'treasure_trove'
 require_relative 'playable'
+require 'csv'
 
 module StudioGame
   class Player
     include Playable
-    attr_accessor :name
-    attr_accessor :health
-
+  
+    attr_accessor :name, :health
+  
     def initialize(name, health=100)
       @name = name.capitalize
       @health = health
       @found_treasures = Hash.new(0)
     end
-
-    def name=(new_name)
-      @name = new_name.capitalize
-    end
-
+  
     def to_s
-      "I'm #{@name} with health = #{@health}, points = #{points}, and score = #{score}."
+    "I'm #{@name} with health = #{@health}, points = #{points}, and score = #{score}."
     end
-
+  
     def score
       @health + points
     end
-
-    def <=>(other)
-      other.score <=> score
+  
+    def <=>(other_player)
+      other_player.score <=> score
     end
-
-    def print_name_and_health
-      puts "#{@name} (#{@health})"
+  
+    def name_and_health
+      "#{@name} (#{@health})"
     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}"
+      puts "#{@name} found a #{treasure.name} worth #{treasure.points} points."
+      puts "#{@name}'s treasures: #{@found_treasures}"
     end
-
+  
     def points
-      @found_treasures.values.reduce(0, :+)
+      @found_treasures.values.reduce(0) { |sum, x| sum + x }
     end
-
+  
     def each_found_treasure
       @found_treasures.each do |name, points|
-	yield Treasure.new(name, points)
+        treasure = Treasure.new(name, points)
+        yield treasure
       end
     end
-
-    def self.from_csv(string)
-      name, health = string.split(',')
+  
+    def self.from_array(player_data)
+      name, health = player_data
       Player.new(name, Integer(health))
     end
   end

data/lib/studio_game/treasure_trove.rb

@@ -1,7 +1,8 @@
 module StudioGame
   Treasure = Struct.new(:name, :points)
-
+  
   module TreasureTrove
+  
     TREASURES = [
       Treasure.new(:pie, 5),
       Treasure.new(:bottle, 25),
@@ -10,9 +11,10 @@ module StudioGame
       Treasure.new(:broomstick, 200),
       Treasure.new(:crowbar, 400)
     ]
-
+  
     def self.random
       TREASURES.sample
     end
+  
   end
 end

data/spec/studio_game/berserk_player_spec.rb

@@ -1,9 +1,8 @@
-require_relative 'spec_helper'
 require 'studio_game/berserk_player'
 
 module StudioGame
   describe BerserkPlayer do
-
+    
     before do
       $stdout = StringIO.new
       @initial_health = 50 
@@ -14,18 +13,12 @@ module StudioGame
       1.upto(5) { @player.w00t }
       
       expect(@player.berserk?).to be_falsey
-      
-      # or if using Rspec 3.0:
-      # @player.berserk?.should be_falsey
     end
     
     it "goes berserk when w00ted more than 5 times" do
       1.upto(6) { @player.w00t }
       
       expect(@player.berserk?).to be_truthy
-
-      # or if using Rspec 3.0:
-      # @player.berserk?.should be_truthy
     end
     
     it "gets w00ted instead of blammed when it's gone berserk" do  
@@ -34,5 +27,6 @@ module StudioGame
       
       expect(@player.health).to eq(@initial_health + (8 * 15))
     end
+  
   end
 end

data/spec/studio_game/clumsy_player_spec.rb

@@ -1,4 +1,3 @@
-require_relative 'spec_helper'
 require 'studio_game/clumsy_player'
 
 module StudioGame
@@ -10,43 +9,26 @@ module StudioGame
     
     it "only gets half the point value for each treasure" do
       expect(@player.points).to eq(0)
-
+  
       hammer = Treasure.new(:hammer, 50)
       @player.found_treasure(hammer)
       @player.found_treasure(hammer)
       @player.found_treasure(hammer)
-
+  
       expect(@player.points).to eq(75)
-
+  
       crowbar = Treasure.new(:crowbar, 400)
       @player.found_treasure(crowbar)
       
-      expect(@player.points).to eq(275) 
+      expect(@player.points).to eq(275)
       
       yielded = []
       @player.each_found_treasure do |treasure|
-	yielded << treasure
+        yielded << treasure
       end
-
+  
       expect(yielded).to eq([Treasure.new(:hammer, 75), Treasure.new(:crowbar, 200)])
     end
-
-    context "with a boost factor" do
-      before do
-	@initial_health = 100
-	@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)
-      end
-
-      it "gets boost factor number of w00ts when w00ted" do
-	@player.w00t
-
-	expect(@player.health).to eq(@initial_health + (15 * @boost_factor))
-      end
-    end
+  
   end
 end

data/spec/studio_game/game_spec.rb

@@ -1,57 +1,48 @@
-require_relative 'spec_helper'
 require 'studio_game/game'
+require 'studio_game/game_turn'
 
 module StudioGame
   describe Game do
-
+  
     before do
       $stdout = StringIO.new
       @game = Game.new("Knuckleheads")
+      @rounds = 2
+  
       @initial_health = 100
       @player = Player.new("moe", @initial_health)
+      
       @game.add_player(@player)
     end
-
-    it "w00ts the player when a high number is rolled" do
+  
+    it "w00ts the player if a high 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)) 
-    end
-    
-    it "skips the player when a medium number is rolled" do
+  
+      @game.play(@rounds)
+      expect(@player.health).to eq(@initial_health + (15 * @rounds))
+    end  
+  
+    it "skips the player if a medium number is rolled" do
       allow_any_instance_of(Die).to receive(:roll).and_return(3)
-
-      @game.play(2)
-      expect(@player.health).to eq(@initial_health) 
-    end
-    
-    it "blams the player when a low number is rolled" do
+  
+      @game.play(@rounds)
+      expect(@player.health).to eq(@initial_health)
+    end  
+  
+    it "blams the player if a low 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
-
-    it "assigns a treasure for points during a player's turn" do     
-      @game.play(1)
-      expect(@player.points).not_to be_zero
-    end
-
-    it "computes total points as the sum of all player points" do
+  
+      @game.play(@rounds)
+      expect(@player.health).to eq(@initial_health - (10 * @rounds))
+    end  
+  
+    it "assigns a treasure for points during a player's turn" do
       game = Game.new("Knuckleheads")
-      
-      player1 = Player.new("moe")
-      player2 = Player.new("larry")
-      
-      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))
-      
-      expect(game.total_points).to eq(500)
+      player = Player.new("moe")
+      game.add_player(player)
+      game.play(1)
+      expect(player.points).not_to be_zero
     end
+  
   end
 end

data/spec/studio_game/player_spec.rb

@@ -1,91 +1,92 @@
-require_relative 'spec_helper'
 require 'studio_game/player'
-require 'studio_game/treasure_trove'
 
 module StudioGame
   describe Player do
-
+  
     before do
       $stdout = StringIO.new
-      @initial_health = 150
-      @player = Player.new("larry", @initial_health)
+      @name="larry"
+      @health = 125
+      @player = Player.new(@name, @health)
     end
-
+  
     it "has a capitalized name" do
-      expect(@player.name).to eq("Larry")
+      expect(@player.name).to eq(@name.capitalize)
     end
-
+  
     it "has an initial health" do
-      expect(@player.health).to eq(150)
+      expect(@player.health).to eq(@health)
     end
-
-    it "has a string representation" do  
-      @player.found_treasure(Treasure.new(:hammer, 50))
-      @player.found_treasure(Treasure.new(:hammer, 50))
-
-      @player.to_s.should == "I'm Larry with health = 150, points = 100, and score = 250."
+    
+    it "has a string representation" do
+      score = @health + @player.points
+      expect(@player.to_s).to eq("I'm #{@name.capitalize} with health = #{@health}, points = #{@player.points}, and score = #{score}.")
     end
-
+  
     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(@health + 100)
     end
-
+    
     it "increases health by 15 when w00ted" do
       @player.w00t
-      expect(@player.health).to eq(150 + 15)
+      expect(@player.health).to eq(@health + 15)
     end
-
+    
     it "decreases health by 10 when blammed" do
       @player.blam
-      expect(@player.health).to eq(150 - 10)
+      expect(@player.health).to eq(@health - 10)
     end
-
-    it "computes points as the sum of all treasure points" do
-      @player.points.should == 0
-
-      @player.found_treasure(Treasure.new(:hammer, 50))
-
-      @player.points.should == 50
-
-      @player.found_treasure(Treasure.new(:crowbar, 400))
-      
-      @player.points.should == 450
-      
-      @player.found_treasure(Treasure.new(:hammer, 50))
-
-      @player.points.should == 500
-    end
-
-    it "can be created from a CSV string" do
-      player = Player.from_csv("larry,150")
-
-      player.name.should == "Larry"
-      player.health.should == 150
-    end
-
+  
     context "with a health greater than 100" do
       before do
-	@player = Player.new("larry", 150)     
+        @player = Player.new("larry", 150)
       end
-
+  
       it "is strong" do
-	expect(@player).to be_strong
+        expect(@player).to be_strong
       end
     end
-
-    context "with a health equal to 100" do
+  
+    context "with a health <= 100" do
       before do
-	@player = Player.new("larry", 100)     
+        @player = Player.new("larry", 100)
       end
-
+  
       it "is not strong" do
-	expect(@player).not_to be_strong
+        expect(@player).not_to be_strong
       end
     end
-
+  
+    context "in a collection of players" do
+      before do
+        @player1 = Player.new("moe", 100)
+        @player2 = Player.new("larry", 200)
+        @player3 = Player.new("curly", 300)
+    
+        @players = [@player1, @player2, @player3]
+      end
+    
+      it "is sorted by decreasing score" do
+        expect(@players.sort).to eq([@player3, @player2, @player1])
+      end
+    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))
+      expect(@player.points).to eq(50)
+    
+      @player.found_treasure(Treasure.new(:crowbar, 400))
+      expect(@player.points).to eq(450)
+    
+      @player.found_treasure(Treasure.new(:hammer, 50))
+      expect(@player.points).to eq(500)
+    end
+  
     it "yields each found treasure and its total points" do
       @player.found_treasure(Treasure.new(:skillet, 100))
       @player.found_treasure(Treasure.new(:skillet, 100))
@@ -95,31 +96,25 @@ module StudioGame
       @player.found_treasure(Treasure.new(:bottle, 5))
       @player.found_treasure(Treasure.new(:bottle, 5))
       @player.found_treasure(Treasure.new(:bottle, 5))
-
+    
       yielded = []
       @player.each_found_treasure do |treasure|
-	yielded << treasure
+        yielded << treasure
       end
-
-      yielded.should == [
-	Treasure.new(:skillet, 200),
-	Treasure.new(:hammer, 50),
-	Treasure.new(:bottle, 25)
-     ]
+    
+      expect(yielded).to eq([
+        Treasure.new(:skillet, 200),
+        Treasure.new(:hammer, 50),
+        Treasure.new(:bottle, 25)
+     ])
     end
-
-    context "in a collection of players" do
-      before do
-	@player1 = Player.new("moe", 100)
-	@player2 = Player.new("larry", 200)
-	@player3 = Player.new("curly", 300)
-
-	@players = [@player1, @player2, @player3]
-      end
-
-      it "is sorted by decreasing score" do
-	expect(@players.sort).to eq([@player3, @player2, @player1])
-      end
+  
+    it "can be created from an array of player data" do
+      player = Player.from_array(['Mozart', 125])
+  
+      expect(player.name).to eq('Mozart')
+      expect(player.health).to eq(125)
     end
+  
   end
 end

data/spec/studio_game/treasure_trove_spec.rb

@@ -1,4 +1,3 @@
-require_relative 'spec_helper'
 require 'studio_game/treasure_trove'
 
 module StudioGame   
@@ -17,7 +16,7 @@ module StudioGame
     end
     
   end
-
+  
   describe TreasureTrove do
     
     it "has six treasures" do
@@ -25,33 +24,40 @@ module StudioGame
     end
     
     it "has a pie worth 5 points" do
-      expect(TreasureTrove::TREASURES[0]).to eq(Treasure.new(:pie, 5))
+      pie = Treasure.new(:pie, 5)
+      expect(TreasureTrove::TREASURES).to include(pie)
     end
     
     it "has a bottle worth 25 points" do
-      expect(TreasureTrove::TREASURES[1]).to eq(Treasure.new(:bottle, 25))
+      bottle = Treasure.new(:bottle, 25)
+      expect(TreasureTrove::TREASURES).to include(bottle)
     end
     
     it "has a hammer worth 50 points" do
-      expect(TreasureTrove::TREASURES[2]).to eq(Treasure.new(:hammer, 50))
+      hammer = Treasure.new(:hammer, 50)
+      expect(TreasureTrove::TREASURES).to include(hammer)
     end
     
     it "has a skillet worth 100 points" do
-      expect(TreasureTrove::TREASURES[3]).to eq(Treasure.new(:skillet, 100))
+      skillet = Treasure.new(:skillet, 100)
+      expect(TreasureTrove::TREASURES).to include(skillet)
     end
-
+  
     it "has a broomstick worth 200 points" do
-      expect(TreasureTrove::TREASURES[4]).to eq(Treasure.new(:broomstick, 200))
+      broomstick = Treasure.new(:broomstick, 200)
+      expect(TreasureTrove::TREASURES).to include(broomstick)
     end
     
     it "has a crowbar worth 400 points" do
-      expect(TreasureTrove::TREASURES[5]).to eq(Treasure.new(:crowbar, 400))
+      crowbar = Treasure.new(:crowbar, 400)
+      expect(TreasureTrove::TREASURES).to include(crowbar)
     end
-
+  
     it "returns a random treasure" do
       treasure = TreasureTrove.random
-
+    
       expect(TreasureTrove::TREASURES).to include(treasure)
     end
+  
   end
 end

metadata

@@ -1,41 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tubesocks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jesse Saletan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: |
   This is a simple game written while following the ruby programming course developed by Pragmatic Studio.  For course details visit:
 
     https://pragmaticstudio.com/ruby
 
-  This code is copyright (c) 2015 Jesse Saletan.  For license details see the accompanying LICENSE file.
+  This code is copyright (c) 2017 Jesse Saletan.  For license details see the accompanying LICENSE file.
 email: rubygems@saletan.com
 executables:
 - studio_game
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README
 - bin/players.csv
 - bin/studio_game
 - lib/studio_game/auditable.rb
@@ -52,10 +54,7 @@ files:
 - spec/studio_game/clumsy_player_spec.rb
 - spec/studio_game/game_spec.rb
 - spec/studio_game/player_spec.rb
-- spec/studio_game/spec_helper.rb
 - spec/studio_game/treasure_trove_spec.rb
-- LICENSE
-- README
 homepage: https://pragmaticstudio.com/ruby
 licenses:
 - MIT
@@ -66,24 +65,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple game created while learning ruby
 test_files:
-- spec/studio_game/berserk_player_spec.rb
-- spec/studio_game/clumsy_player_spec.rb
-- spec/studio_game/game_spec.rb
 - spec/studio_game/player_spec.rb
-- spec/studio_game/spec_helper.rb
 - spec/studio_game/treasure_trove_spec.rb
+- spec/studio_game/clumsy_player_spec.rb
+- spec/studio_game/game_spec.rb
+- spec/studio_game/berserk_player_spec.rb

data/spec/studio_game/spec_helper.rb

@@ -1,8 +0,0 @@
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
-  config.mock_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
-end