warcards 0.0.3 → 0.0.5

data/.gitignore

@@ -1,5 +1,6 @@
 .idea/
 .bundle/
+coverage
 
 # Compiled source #
 ###################

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    warcards (0.0.3)
+    warcards (0.0.5)
       bundler (~> 1.1)
       querinator
       rake (~> 0.9.2)
@@ -25,6 +25,9 @@ GEM
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
     minitest (3.3.0)
+    minitest-growl (0.0.3)
+      growl
+      minitest
     minitest-reporters (0.9.0)
       ansi
       builder
@@ -32,6 +35,7 @@ GEM
       powerbar
     minitest-spec (0.0.2.1)
       minitest (>= 3.0)
+    multi_json (1.3.6)
     powerbar (1.0.8)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
@@ -43,6 +47,10 @@ GEM
     rb-fsevent (0.9.1)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     thor (0.15.4)
     turn (0.9.6)
       ansi
@@ -55,8 +63,10 @@ DEPENDENCIES
   growl (~> 1.0.3)
   guard (~> 1.2.3)
   guard-minitest (~> 0.5.0)
+  minitest-growl
   minitest-reporters (~> 0.9.0)
   minitest-spec (~> 0.0.2)
   rb-fsevent (~> 0.9.1)
+  simplecov (~> 0.6)
   turn (~> 0.9.6)
   warcards!

data/lib/warcards.rb

@@ -4,51 +4,22 @@ require 'querinator'
 module Cardgame
   class Game
     def initialize
-      @deck     = Deck.new
-      @player   = Player.new
-      @ai       = Ai.new
-      @gameplay = Gameplay.new(:deck => @deck, :player => @player, :ai => @ai)
+      @deck = Deck.new
+      @player = Player.new
+      @ai = Ai.new
+      @gameplay = gameplay(:deck => @deck, :player => @player, :ai => @ai)
       @gameplay.shuffle
       @gameplay.deal
       @output = Struct.new(:winner, :player_feedback, :ai_feedback, :posed)
-
+      @slow = TRUE
     end
 
-    ##def output
-    ##  @output
-    ##end
-    ##
-    ##def rearm?
-    ##  @gameplay.rearm?
-    ##end
-    ##
-    ##def show_cards
-    ##  @gameplay.show_cards
-    ##end
-    ##
-    ##def war?
-    ##  @gameplay.contest
-    ##end
-    ##
-    ##def contest
-    ##  @gameplay.contest
-    ##end
-    ##
-    ##def discard(result)
-    ##  @gameplay.discard(result)
-    ##end
-    ##
-    ##def game_over?
-    ##  @gameplay.game_over?
-    ##end
-    #
-    #def player
-    #  @player
-    #end
-    #
-    #def ai
-    #  @ai
-    #end
+    def gameplay(args)
+      deck = args[:deck]
+      player = args[:player]
+      ai = args[:ai]
+      Gameplay.new(:deck => deck, :player => player, :ai => ai)
+    end
 
     def run
       filename = get_filename
@@ -57,87 +28,120 @@ module Cardgame
       end
       @questions = Querinator::Game.new.get_questions(filename)
       loop do
-        @gameplay.game_over?
-        @gameplay.rearm?
-        @gameplay.show_cards
-        @gameplay.war?
-        result = @gameplay.contest
-
-        output_cli(result)
-
-        continue?
-        @gameplay.discard(result)
+        begin
+          end_game = @gameplay.game_over?
+
+          if end_game[:over?]
+            puts "Game over #{end_game[:winner]} won!"
+            exit
+          else
+            @gameplay.rearm?
+            @gameplay.show_cards
+            @gameplay.war?
+            result = @gameplay.contest
+            output_cli(result)
+            challenge_participants(result)
+            #continue?
+            @gameplay.discard(result)
+          end
+        rescue SignalException => e
+          puts "\n\nThanks for playing!"
+          exit(status=1)
+        end
       end
     end
 
-    def get_filename
-      puts "What question file?\nfilename: "
-      filename = gets.chomp
-      file     = File.expand_path(filename)
-      p file
-      file
+    def get_filename(input = STDIN, output = STDOUT)
+      output.puts(Dir.glob "**/*.txt")
+      sample_questions = "spec/test_question_file.txt"
+      output.puts "What question file?\n(Just hit enter to use the sample questions.)\nfilename: "
+      filename = input.gets.chomp
+      if File.file?(File.expand_path(filename))
+        File.expand_path(filename)
+      else
+        sample_questions
+      end
     end
 
-    def continue?
-      puts "go again?\n"
-      next_round = gets
-      if next_round.downcase.chomp.include? "n"
-        puts "You ended the game"
-        exit
-      end
+    #def continue?(input = STDIN, output = STDOUT, really_end = :yes)
+    #  output.puts("go again?\n")
+    #  next_round = input.gets
+    #  if next_round.downcase.chomp.include? "n"
+    #    output.puts "You ended the game"
+    #    if really_end == :yes
+    #      exit
+    #    end
+    #  end
+    #end
+
+    def output_cli(result, output = STDOUT)
+      graph = build_graph(player_holdings, ai_holdings)
+      output.puts "\n#{result[:winner].name} has the high card."
+      output.puts "Player has #{player_holdings} cards.\tAI has #{ai_holdings} cards."
+      output.puts graph
+      #challenge_participants(result)
+      # TODO get challenge_participants out of here. No longer belongs. Causing hard tests.
     end
 
-    def output_cli(result)
-      puts "#{result[:winner].name} won"
-      puts "Player has #{player_holdings} cards.\tAI has #{ai_holdings} cards."
-      challenge_participants(result)
+    def build_graph(player_holdings, ai_holdings)
+      graph = ""
+      player_holdings.times { graph << "p" }
+      graph << "|"
+      ai_holdings.times { graph << "a" }
+      graph
     end
 
     def player_holdings
+      # When this is run there is one card from each participant in play.
+      # That is what the +1 compensates for and why the test looks wack.
       (@gameplay.player.stack.length + @gameplay.player.discard.length + 1)
     end
 
     def ai_holdings
-      @gameplay.ai.stack.length + @gameplay.ai.discard.length + 1
+      # When this is run there is one card from each participant in play.
+      # That is what the +1 compensates for and why the test looks wack.
+      (@gameplay.ai.stack.length + @gameplay.ai.discard.length + 1)
     end
 
-    def challenge_participants(result)
-      if result[:winner] == @gameplay.player
-        challenge_player(result)
+    def challenge_participants(result, question = @questions.sample, input = STDIN, output = STDOUT, rnd_src = rand)
+      if result[:winner].class == Player
+        challenge_player(result, question, input, output)
       else
-        challenge_ai(result)
+        challenge_ai(result, output, rnd_src)
       end
     end
 
-    def challenge_ai(result)
-      if test_ai
-        puts "Ai was correct."
+    def challenge_ai(result, output = STDOUT, rnd_src = rand)
+      if test_ai(rnd_src)
+        output.puts "Ai was correct. Ai wins the round."
       else
-        puts "Ai was wrong. #{@gameplay.player.name} became the winner!"
+        output.puts "Ai was wrong. #{@gameplay.player.name} became the winner!"
         result[:winner] = @gameplay.player
+        if @slow
+          sleep 0.75
+        end
       end
     end
 
-    def challenge_player(result)
-      if test_player
-        puts "Correct! Yay!"
+    def challenge_player(result, question = @questions.sample, input = STDIN, output = STDOUT)
+      #question = @questions.sample
+      if test_player(question, input, output)
+        output.puts "Correct! Yay!"
       else
-        puts "Oooh. I'm sorry. The correct answer was 'TODO'. #{@gameplay.ai.name} became the winner."
+        output.puts %Q{Oooh. I'm sorry. The correct answer was "#{question.answer}". #{@gameplay.ai.name} became the winner.}
         result[:winner] = @gameplay.ai
       end
+      #continue?(input, output)
     end
 
-
-    def test_player
-      question = @questions.sample
-      puts question.pose
-      answer = gets
+    def test_player(question, input = STDIN, output = STDOUT)
+      output.puts question.pose
+      answer = input.gets
       question.is_correct?(answer.chomp)
     end
 
-    def test_ai(difficulty)
-      difficulty ||= 0.4
-      @ai.difficulty_check?(rand, difficulty)
+    def test_ai(rand_src = rand, difficulty = 0.4)
+      @ai.difficulty_check?(rand_src, difficulty)
     end
 
   end

data/lib/warcards/ai.rb

@@ -5,8 +5,6 @@ module Cardgame
       @discard = Array.new
       #attr_accessor :name
       @ai_name = "H.E.L.P.E.R."
-       # Set the game difficulty manually for now. Pick a number < 1. Higher is harder. TODO: make this a switch
-
     end
 
     def stack

data/lib/warcards/cardgame.rb

@@ -0,0 +1,43 @@
+#module Cardgame
+=begin
+  def challenge_participants(result)
+      if result[:winner] == @gameplay.player
+        challenge_player(result)
+      else
+        challenge_ai(result)
+      end
+    end
+
+    def challenge_ai(result)
+      if test_ai
+        puts "Ai was correct."
+      else
+        puts "Ai was wrong. #{@gameplay.player.name} became the winner!"
+        result[:winner] = @gameplay.player
+      end
+    end
+
+    def challenge_player(result)
+      if test_player
+        puts "Correct! Yay!"
+      else
+        puts "Oooh. I'm sorry. The correct answer was 'TODO'. #{@gameplay.ai.name} became the winner."
+        result[:winner] = @gameplay.ai
+      end
+    end
+
+
+    def test_player
+      question = @questions.sample
+      puts question.pose
+      answer = gets
+      question.is_correct?(answer.chomp)
+    end
+
+    def test_ai(difficulty)
+      difficulty ||= 0.4
+      @ai.difficulty_check?(rand, difficulty)
+    end
+
+end
+=end

data/lib/warcards/gameplay.rb

@@ -2,6 +2,7 @@ require_relative 'deck'
 require_relative 'card'
 require_relative 'ai'
 require_relative 'player'
+require 'ostruct'
 
 module Cardgame
   class Gameplay
@@ -24,16 +25,18 @@ module Cardgame
     end
 
     def game_over?
-      [@ai, @player].each_with_index do |participant, index|
+      end_game     = Hash.new
+      participants = [@player, @ai]
+      participants.each_with_index do |participant, index|
         if (participant.stack.length + participant.discard.length) < 1
-          participants = [@ai, @player]
           participants.delete_at index
-          puts "Game over #{participants.first.name} won!"
-          exit
+          end_game[:winner] = participants.first.name
+          end_game[:over?]  = TRUE
         else
-          next
+          end_game[:over?] = FALSE
         end
       end
+      end_game
     end
 
     def rearm?
@@ -58,11 +61,11 @@ module Cardgame
       { :winner => winner, :player_cards => @player_cards, :ai_cards => @ai_cards }
     end
 
-    def war?
+    def war?(output = STDOUT)
       while @ai_cards.last.value == @player_cards.last.value
         rearm?
-        #TODO make the folling line a flag or something so the view code can decide to show it or not.
-        puts "WAR!!!"
+        #TODO make the following line a flag or something so the view code can decide to show it or not.
+        output.puts "WAR!!!"
         show_cards
       end
     end

data/lib/warcards/version.rb

@@ -1,5 +1,5 @@
 module Cardgame
 
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'minitest/spec'
 require "minitest/autorun"
 require 'minitest/reporters'
+require 'minitest/growl_notify'
 require 'turn'
 require 'growl'
 

data/spec/warcards/gameplay_spec.rb

@@ -3,9 +3,9 @@ require_relative '../spec_helper'
 module Cardgame
   describe Gameplay do
     def setup
-      @deck     = Deck.new
-      @player   = Player.new
-      @ai       = Ai.new
+      @deck = Deck.new
+      @player = Player.new
+      @ai = Ai.new
       @gameplay = Gameplay.new(:deck => @deck, :player => @player, :ai => @ai)
     end
 
@@ -35,9 +35,9 @@ module Cardgame
 
   describe "dealt deck" do
     def setup
-      @deck     = Deck.new
-      player    = Player.new
-      ai        = Ai.new
+      @deck = Deck.new
+      player = Player.new
+      ai = Ai.new
       @gameplay = Gameplay.new(:deck => @deck, :player => player, :ai => ai)
       @gameplay.shuffle
       @gameplay.deal
@@ -102,9 +102,10 @@ module Cardgame
 
     describe "#war" do
       it "must play war when there is a draw" do
-        card_ai_1     = (Card.new(:suit => :clubs, :value => 5))
-        card_ai_2     = (Card.new(:suit => :spades, :value => 4))
-        card_ai_3     = (Card.new(:suit => :clubs, :value => 4))
+        output = StringIO.new("")
+        card_ai_1 = (Card.new(:suit => :clubs, :value => 5))
+        card_ai_2 = (Card.new(:suit => :spades, :value => 4))
+        card_ai_3 = (Card.new(:suit => :clubs, :value => 4))
         card_player_1 = (Card.new(:suit => :hearts, :value => 4))
         card_player_2 = (Card.new(:suit => :diamonds, :value => 4))
         card_player_3 = (Card.new(:suit => :hearts, :value => 4))
@@ -116,7 +117,7 @@ module Cardgame
         @gameplay.player.stack << card_player_3
 
         @gameplay.show_cards
-        @gameplay.war?
+        @gameplay.war?(output)
         result = @gameplay.contest
 
         result[:ai_cards].must_be_instance_of Array
@@ -160,9 +161,9 @@ module Cardgame
 
     describe "#game_over?" do
       def setup
-        @deck     = Deck.new
-        player    = Player.new
-        ai        = Ai.new
+        @deck = Deck.new
+        player = Player.new
+        ai = Ai.new
         @gameplay = Gameplay.new(:deck => @deck, :player => player, :ai => ai)
         @gameplay.ai.stack.clear << (Card.new(:suit => :clubs, :value => 2))
         @gameplay.ai.stack << (Card.new(:suit => :hearts, :value => 1))
@@ -171,15 +172,15 @@ module Cardgame
       end
 
       it "must end the game when a participant is out of cards" do
-        skip "you'll need to mock stdout and stderr first. Of course you'll have to learn how before doing that."
         2.times do
+          @gameplay.game_over?
           @gameplay.show_cards
           @gameplay.discard(@gameplay.contest)
         end
-        lambda do
-          @gameplay.game_over?
-        end.must_output(STDOUT, STDERR) {"Game Over"; exit}
+        @gameplay.game_over?
+        @gameplay.game_over?[:over?].must_equal true
       end
     end
+
   end
 end

data/spec/warcards_spec.rb

@@ -24,10 +24,241 @@ module Cardgame
         end
       end
       game = Game.new
-      50.times do
+      5.times do
         game.excercise
         game.sum_cards.must_equal 52
       end
     end
+
+
+    describe "#player_holdings" do
+      def setup
+        @game = Game.new
+      end
+
+      it "shows how many cards the player has between stack and discard" do
+        @game.player_holdings.must_equal 27
+      end
+    end
+
+    describe "#ai_holdings" do
+      def setup
+        @game = Game.new
+      end
+
+      it "shows how many cards the AI has between the stack and discard" do
+        @game.ai_holdings.must_equal 27
+      end
+    end
+
+    #describe "#continue?" do
+    #  def setup
+    #    @game = Game.new
+    #  end
+    #
+    #  it "asks if I want to continue" do
+    #    input = StringIO.new("\n")
+    #    output = StringIO.new("")
+    #    @game.continue?(input, output)
+    #    output.string.must_equal "go again?\n"
+    #  end
+    #
+    #  it "tells me I ended the game if I say 'n'" do
+    #    input = StringIO.new("n")
+    #    output = StringIO.new("")
+    #    @game.continue?(input, output, :no)
+    #    output.string.must_match /.*You ended the game.*/
+    #  end
+    #end
+
+    describe "#output_cli" do
+      def setup
+        @game = Game.new
+        @gameplay = @game.gameplay(deck: Deck.new, player: Player.new, ai: Ai.new)
+        @gameplay.ai_cards.clear << (Card.new(:suit => :clubs, :value => 2))
+        @gameplay.player_cards.clear << (Card.new(:suit => :clubs, :value => 13))
+        @result = @gameplay.contest
+        @output = StringIO.new("")
+      end
+
+      it "displays the comparison winner" do
+        @game.output_cli(@result, @output)
+        @output.string.must_match /^Player has the high card\./
+      end
+
+      it "displays the number of cards each participant has" do
+        @game.output_cli(@result, @output)
+        @output.string.must_match /Player has 27 cards.*AI has 27 cards/
+      end
+
+      it "shows a graph representation of the deck" do
+        @game.output_cli(@result, @output)
+        @output.string.must_match /pppppppppppppppppppppppppp|aaaaaaaaaaaaaaaaaaaaaaaaaa/
+      end
+    end
+
+    describe "#build_graph" do
+      def setup
+        @game = Game.new
+        @gameplay = @game.gameplay(deck: Deck.new, player: Player.new, ai: Ai.new)
+        @gameplay.ai_cards.clear << (Card.new(:suit => :clubs, :value => 2))
+        @gameplay.player_cards.clear << (Card.new(:suit => :clubs, :value => 13))
+        @result = @gameplay.contest
+        @output = StringIO.new("")
+      end
+
+      it "shows a graph representation of the deck" do
+        res = @game.build_graph((@game.player_holdings - 1), (@game.ai_holdings - 1))
+        res.must_equal "pppppppppppppppppppppppppp|aaaaaaaaaaaaaaaaaaaaaaaaaa"
+      end
+    end
+
+    describe "#test_ai" do
+      def setup
+        @game = Game.new
+      end
+
+      it "is true if difficulty is lower than random" do
+        @game.test_ai(0.1).must_equal TRUE
+      end
+
+      it "if false if difficulty is higher than random" do
+        @game.test_ai(0.3, 0.2).must_equal FALSE
+      end
+    end
+
+    describe "#test_player" do
+      def setup
+        @questions = Querinator::Game.new.get_questions("spec/test_question_file.txt")
+        @input = StringIO.new("\n")
+        @output = StringIO.new("")
+        @game = Game.new
+      end
+
+      it "asks the player a question" do
+        @game.test_player(@questions.first, @input, @output)
+        @output.string.must_equal "Do you get Tom Servo?\n"
+      end
+
+      it "tells me the given answer is incorrect" do
+        input = StringIO.new("no I do not")
+        @game.test_player(@questions.first, input, @output).must_equal FALSE
+      end
+
+      it "tells me the given answer is correct" do
+        input = StringIO.new("Nobody does. I'm the wind baby.")
+        @game.test_player(@questions.first, input, @output).must_equal TRUE
+      end
+    end
+
+    describe "#challenge_player" do
+      def setup
+        @game = Game.new
+        @questions = Querinator::Game.new.get_questions("spec/test_question_file.txt")
+        @gameplay = @game.gameplay(deck: Deck.new, player: Player.new, ai: Ai.new)
+        @gameplay.ai_cards.clear << (Card.new(:suit => :clubs, :value => 2))
+        @gameplay.player_cards.clear << (Card.new(:suit => :clubs, :value => 13))
+        @result = @gameplay.contest
+        @output = StringIO.new("")
+      end
+
+      it "congratulates me when I get it correct" do
+        input = StringIO.new("Nobody does. I'm the wind baby.\n")
+        @game.challenge_player(@result, @questions.first, input, @output)
+        @output.string.split("\n").last.must_equal "Correct! Yay!"
+      end
+
+      it "consoles me when I get it wrong" do
+        input = StringIO.new("Who's Tom Servo?\n")
+        @game.challenge_player(@result, @questions.first, input, @output)
+        @output.string.split("\n").last.must_match /^Oooh\. I'm sorry/
+      end
+
+      #it "asks me if I want to continue" do
+      #  input = StringIO.new("Who's Tom Servo?\n\n")
+      #  @game.challenge_player(@result, @questions.first, input, @output)
+      #  @output.string.split("\n").last.must_match /go again\?/
+      #end
+    end
+
+    describe "#challenge_ai" do
+      def setup
+        @game = Game.new
+        @gameplay = @game.gameplay(deck: Deck.new, player: Player.new, ai: Ai.new)
+        @gameplay.ai_cards.clear << (Card.new(:suit => :clubs, :value => 12))
+        @gameplay.player_cards.clear << (Card.new(:suit => :clubs, :value => 3))
+        @result = @gameplay.contest
+        @output = StringIO.new("")
+      end
+
+      it "tells me the ai lost" do
+        @game.challenge_ai(@result, @output, 0.9)
+        @output.string.must_equal "Ai was wrong. Player became the winner!\n"
+      end
+
+      it "tells me the ai won" do
+        @game.challenge_ai(@result, @output, 0.1)
+        @output.string.must_equal "Ai was correct. Ai wins the round.\n"
+      end
+    end
+
+    def challenge_partic_setup(args)
+      @game = Game.new
+      @questions = Querinator::Game.new.get_questions("spec/test_question_file.txt")
+      @gameplay = @game.gameplay(deck: Deck.new, player: Player.new, ai: Ai.new)
+      @gameplay.ai_cards.clear << (args[:ai_card])
+      @gameplay.player_cards.clear << (args[:player_card])
+      @result = @gameplay.contest
+      @output = StringIO.new("")
+      @input = StringIO.new("incorrect answer\n")
+    end
+
+    describe "#challenge_participants player" do
+      def setup
+        challenge_partic_setup(:ai_card => Card.new(:suit => :clubs, :value => 2), :player_card => Card.new(:suit => :clubs, :value => 11))
+      end
+
+      it "calls #challenge_player if player has high card" do
+        @game.challenge_participants(@result, @questions.first, @input, @output, 0.1)
+        @output.string.must_match /#{@questions.first.pose}/
+      end
+    end
+
+    describe "#challenge_participants ai" do
+      def setup
+        challenge_partic_setup(:ai_card => Card.new(:suit => :clubs, :value => 12), :player_card => Card.new(:suit => :clubs, :value => 1))
+      end
+
+      it "calls #challenge_ai if ai has high card" do
+        result = @gameplay.contest
+        @game.challenge_participants(result, @questions.first, @input, @output, 0.1)
+        @output.string.must_match /Ai was correct\. Ai wins the round\.\n/
+      end
+    end
+
+    describe "#get_filename" do
+      def setup
+        @output = StringIO.new("")
+        @input = StringIO.new("incorrect answer\n")
+        @game = Game.new
+      end
+
+      it "displays the path of the sample question file" do
+        @game.get_filename(@input, @output)
+        @output.string.must_match "spec/test_question_file.txt"
+      end
+
+      it "returns an absolute path if a path is passed in" do
+        input = StringIO.new("~/.bash_history\n")
+        @game.get_filename(input, @output).must_match ".bash_history"
+      end
+
+      it "returns the path to the sample question if the user hits enter" do
+        input = StringIO.new("\n")
+        @game.get_filename(input, @output).must_equal "spec/test_question_file.txt"
+      end
+    end
   end
+
+
 end

data/warcards.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rb-fsevent', '~>0.9.1'
   gem.add_development_dependency 'minitest-spec', '~>0.0.2'
   gem.add_development_dependency 'minitest-reporters', '~>0.9.0'
+  gem.add_development_dependency 'minitest-growl'
   gem.add_development_dependency 'guard', '~>1.2.3'
   gem.add_development_dependency 'guard-minitest', '~>0.5.0'
   gem.add_development_dependency 'growl', '~>1.0.3'
   gem.add_development_dependency 'turn', '~>0.9.6'
+  gem.add_development_dependency 'simplecov', '~>0.6'
 
   # specify run dependencies here
   gem.add_dependency 'bundler', "~>1.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warcards
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70233000726620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70233000726620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: minitest-spec
-  requirement: &70233000724600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *70233000724600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
-  requirement: &70233000720920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,31 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70233000720920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: minitest-growl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70233000719520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: 1.2.3
   type: :development
   prerelease: false
-  version_requirements: *70233000719520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70233000716640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +101,15 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70233000716640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70233000716040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +117,15 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70233000716040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70233000715340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +133,31 @@ dependencies:
         version: 0.9.6
   type: :development
   prerelease: false
-  version_requirements: *70233000715340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70233000713160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +165,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70233000713160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: querinator
-  requirement: &70233000711940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +181,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233000711940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233000709640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +197,12 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70233000709640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: An addictive game of War! to help slog through flash-card memorization
 email:
 - robie1373@gmail.com
@@ -142,6 +224,7 @@ files:
 - lib/warcards.rb
 - lib/warcards/ai.rb
 - lib/warcards/card.rb
+- lib/warcards/cardgame.rb
 - lib/warcards/deck.rb
 - lib/warcards/gameplay.rb
 - lib/warcards/player.rb
@@ -168,15 +251,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -569622757642697416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -569622757642697416
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Play a game of War! against the computer. If your card is higher, you get