Changeset 187

Timestamp:

11/18/04 10:12:13 (4 years ago)

Author:

ged

Message:

-- Made epic3 code pass its tests again.

Location:

branches/simplest-thing/acceptance

Files:

• epic3.tests.rb (modified) (3 diffs)
• lib/game.rb (modified) (3 diffs)

branches/simplest-thing/acceptance/epic3.tests.rb

@@ -1 +1 @@
 #!/usr/bin/env ruby -w
 
+BEGIN {
+    $basedir = File::dirname( File::dirname(__FILE__) )
+    %w{acceptance/lib lib}.each do |dir|
+        $LOAD_PATH.unshift File::join( $basedir, dir )
+    end
+}
+
 require 'test/unit'
-$: << File.dirname(__FILE__)
 require 'game'
 
@@ -8 +14 @@
 
     def setup 
-        Game.reset
         @game = Game.preset
     end
 
     def teardown 
-        @game.close
+        @game = nil
     end
 
@@ -23 +28 @@
     def test_010_hit 
         data = ""
-        data = @game.gets until data.include?( PROMPT )
+        @game.play {|player|
+            data = player.gets until data.include?( PROMPT )
 
-        #    - if i type "hit Punchbag", "hit orc", or "hit punchbag", i am told
-        #      "You smack the orc."
-        @game.puts( HIT1 )
-        assert                            @game.gets.include?( SMACK ),
-                                          "Hitting Punchbag did not work."
-        @game.gets # prompt
-        @game.puts( HIT2 )
-        assert                            @game.gets.include?( SMACK ),
-                                          "Hitting Punchbag did not work."
-        @game.gets # prompt
-        @game.puts( HIT3 )
-        assert                            @game.gets.include?( SMACK ),
-                                          "Hitting Punchbag did not work."
-        @game.gets # prompt
-        
+            #    - if i type "hit Punchbag", "hit orc", or "hit punchbag", i am told
+            #      "You smack the orc."
+            player.puts( HIT1 )
+            assert                            player.gets.include?( SMACK ),
+                                              "Hitting Punchbag did not work."
+            player.gets # prompt
+            player.puts( HIT2 )
+            assert                            player.gets.include?( SMACK ),
+                                              "Hitting Punchbag did not work."
+            player.gets # prompt
+            player.puts( HIT3 )
+            assert                            player.gets.include?( SMACK ),
+                                              "Hitting Punchbag did not work."
+            player.gets # prompt
 
-        #    - after typing 'hit orc' over and over, i eventually want to be
-        #      told "The orc collapses into unconsciousness."
-        limit = 10
-        unconscious = false
-        limit.times do
-            @game.puts( HIT1 )
-            if @game.gets.include?( UNCONSCIOUS )
-                unconscious = true
-                break
-            end
-            @game.gets # prompt
-        end
-        assert                            unconscious,
-                                          "The orc did not fall unconscious, even after #{limit} hits."
+
+            #    - after typing 'hit orc' over and over, i eventually want to be
+            #      told "The orc collapses into unconsciousness."
+            limit = 10
+            unconscious = false
+            limit.times do
+                player.puts( HIT1 )
+                if player.gets.include?( UNCONSCIOUS )
+                    unconscious = true
+                    break
+                end
+                player.gets # prompt
+            end
+            assert                            unconscious,
+                                              "The orc did not fall unconscious, even after #{limit} hits."
+        }
     end
 

branches/simplest-thing/acceptance/lib/game.rb

@@ -10 +10 @@
 require "textui"
 require "character"
+require "forwardable"
 
 DESCRIPTION = <<END
@@ -51 +52 @@
     include TextUI
 
-    def initialize 
-        IO::popen("-", IO::NONBLOCK | IO::RDWR) {|io|
+    class Player
+        extend Forwardable
 
-            if io # Parent
-                @io = io
-            else # Child
-                Game.play
-            end
-        }
-    end
+        def initialize( io )
+            @io = io
+        end
 
-    attr :io
+        def_delegators :@io, :puts, :gets, :read, :close, :closed?
 
-    def puts(line)
-        @io.puts(line)
-    end
+    end # class Game::Player
 
-    def gets 
-        @io.gets
-    end
-
-    def read 
-        @io.read
-    end
-
-    def close 
-        if select([],[@io],[],1)
-            self.puts(RACE)
-        end
-        if select([],[@io],[],1)
-            self.puts(NAME)
-        end
-        if select([],[@io],[],1)
-            self.puts(QUIT)
-        end
-        if select([@io],[],[],1)
-            self.read
-        end
-        @io.close
-    end
 
     def Game.preset 
-        Game.reset
-        game = Game.new
-        game.close
-        return Game.new
+        Character.reset
+        character = Character.new(RACE, NAME)
+        character.save
+        Game.new
     end
 
@@ -104 +76 @@
     end
 
-    def Game.play
-        message <<END
+
+    def initialize
+        @character = Character::load
+    end
+
+    attr_accessor :character
+
+    def play
+        IO::popen("-", IO::RDWR) {|io|
+            if io # Parent
+                player = Game::Player::new(io)
+                yield( player )
+            else # Child
+                self.run
+            end
+        }
+    end
+
+    def run
+        message <<-END
         You are in the formless void known as FaerieMUD 1.0.