pull prints out of game

lib/game.ik

@@ -6,8 +6,9 @@ use("lib/machine_player")
 
 Game = Origin mimic
 
-Game initialize = method(game_type,
+Game initialize = method(game_type, illustrator,
     self board = Board mimic(3)
+    self illustrator = illustrator
     self player1 = nil
     self player2 = nil
     cond(
@@ -37,13 +38,13 @@ Game play = method(
     until(Rules game_over?(board),
       take_turn
       )
-    display_board
-    print_game_over_message
+    self illustrator display_board(self board)
+    self illustrator game_over_message(self board)
     )
 
 Game take_turn = method(
-    display_board
-    move = player_by_turn get_move(board)
+    self illustrator display_board(self board)
+    move = player_by_turn get_move(self board)
     make_move(move[0], move[1])
     )
 
@@ -57,10 +58,3 @@ Game player_by_turn = method(
 Game make_move = method(row, column,
     if(self board get_space(row, column) == 0,
       self board set_space(row, column, player_by_turn marker_value)))
-
-Game display_board = method(
-    Illustrator draw(self board) print)
-
-Game print_game_over_message = method(
-    Illustrator game_over_message(self board) println
-    )

lib/game_runner.ik

@@ -1,4 +1,5 @@
 use("lib/game")
+use("lib/illustrator")
 
 GameRunner = Origin mimic
 
@@ -7,7 +8,7 @@ GameRunner get_game_type = method(
     game_type = System in read asText
     if(game_type == "0",
       System exit,
-      Game mimic(game_type)
+      Game mimic(game_type, Illustrator mimic)
       )
     )
 

lib/illustrator.ik

@@ -1,3 +1,5 @@
+use("lib/rules")
+
 Illustrator = Origin mimic
 
 Illustrator draw = method(board,
@@ -6,7 +8,8 @@ Illustrator draw = method(board,
       row each(space,
         illustration += "[" + space_marker(space) + "]")
       illustration += "\n")
-    illustration += "\n")
+    illustration += "\n"
+    )
 
 Illustrator space_marker = method(space_value,
     cond(
@@ -22,3 +25,7 @@ Illustrator game_over_message = method(board,
       Rules winner(board) == 0, "Cat's Game...\n"
       )
     )
+
+Illustrator display_board = method(board,
+    draw(board) print
+    )

lib/machine_player.ik

@@ -1,4 +1,5 @@
 use("lib/board")
+use("lib/rules")
 
 MachinePlayer = Origin mimic
 

spec/game_spec.ik

@@ -3,7 +3,7 @@ use("lib/game")
 
 describe("Game",
 
-    before(game = Game mimic("1"))
+    before(game = Game mimic("1", Illustrator mimic))
 
     it("initializes a game with a board",
       game board should not be nil
@@ -14,7 +14,7 @@ describe("Game",
       )
 
     it("draws the board when game is started",
-      Game should receive display_board
+      game illustrator should receive display_board(game board)
       game player1 should receive get_move(game board) andReturn([2,1])
       game take_turn
       )
@@ -36,13 +36,13 @@ describe("Game",
       )
 
     it("creates 1 machine player and 1 human player for game type 2",
-      game1 = Game mimic("2")
+      game1 = Game mimic("2", Illustrator mimic)
       game1 player1 kind should == "MachinePlayer"
       game1 player2 kind should == "HumanPlayer"
       )
 
     it("creates 1 human player and 1 machine player for game type 3",
-      game2 = Game mimic("3")
+      game2 = Game mimic("3", Illustrator mimic)
       game2 player1 kind should == "HumanPlayer"
       game2 player2 kind should == "MachinePlayer"
       )
@@ -54,8 +54,8 @@ describe("Game",
       game board set_space(1,0,-1)
       game board set_space(2,0,-1)
 
-      game should receive(display_board)
-      game should receive(print_game_over_message)
+      game illustrator should receive display_board(game board)
+      game illustrator should receive game_over_message(game board)
 
       game play
       )

spec/human_player_spec.ik

@@ -1,5 +1,6 @@
 use("ispec")
 use("lib/human_player")
+use("lib/board")
 
 describe("HumanPlayer",
 

spec/illustrator_spec.ik

@@ -1,5 +1,6 @@
 use("ispec")
 use("lib/illustrator")
+use("lib/board")
 
 describe("Illustrator",