liars_dice 0.0.2 → 0.0.3

data/liars_dice.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |gem|
   gem.name = 'liars_dice'
-  gem.version = '0.0.2'
-  gem.date = '2013-07-02'
+  gem.version = '0.0.3'
+  gem.date = '2013-07-09'
   gem.summary = "Liar's Dice game"
   gem.description = "A liar's dice botting environment, developed by Aisle50"
   gem.authors = ['Ben Schmeckpeper', 'Chris Doyle', 'Max Page', 'Molly Struve']

data/lib/liars_dice/command_line_watcher.rb

@@ -8,6 +8,7 @@ module LiarsDice
       append_after_bs lambda{|seat| puts "Seat #{seat} calls BS" }
       append_after_game lambda{|winner| puts "Game over.  Seat #{winner} wins." }
       append_after_round lambda{|loser| puts "Seat #{loser} loses a die" }
+      append_after_invalid_bid lambda{|loser| puts "Seat #{loser} made an invalid bid" }
       append_after_seats_assigned lambda{|assignments| assignments.each{|number, name| puts "Seat #{number}: #{name}" } }
     end
   end

data/lib/liars_dice/engine.rb

@@ -25,11 +25,7 @@ module LiarsDice
     end
 
     def get_bid(seat)
-      bid = seat.player.bid
-      unless valid_bid?(bid)
-        raise StandardError.new("Invalid Bid")
-      end
-      bid
+      seat.player.bid
     end
 
     def next_seat
@@ -63,20 +59,32 @@ module LiarsDice
       while true
         seat = next_seat
         bid = get_bid(seat)
-        aces_wild = false if bid.face_value == 1
 
+        # An invalid bid ends the round and costs the bidder a die
+        unless valid_bid?(bid)
+          self.loser = seat
+          notify_invalid_bid(seat)
+          break
+        end
+
+        # If someone calls BS, figure out the loser and exit the loop
         if bid.bs_called?
           notify_bs(seat)
           self.loser = bid_is_correct?(previous_bid, aces_wild) ? seat : previous_seat
-          notify_loser(loser)
-          loser.lose_die
           break
         end
 
+        # For a valid, non-BS bid, update wilds, record and notify the bid and prepare for the next bid
+        aces_wild = false if bid.face_value == 1
         self.bids << bid
         notify_bid(seat, bid)
         previous_seat = seat
       end
+
+      # It's an error if we get here without having set a loser
+      raise StandardError.new("Unknown loser") unless loser
+      notify_loser(loser)
+      loser.lose_die
     end
 
     def roll_dice
@@ -107,6 +115,12 @@ module LiarsDice
       notify_watcher(event)
     end
 
+    def notify_invalid_bid(seat)
+      event = InvalidBidEvent.new(seat.number)
+      notify_players(event)
+      notify_watcher(event)
+    end
+
     def notify_loser(seat)
       dice = seats.map(&:dice)
       event = LoserEvent.new(seat.number, dice)

data/lib/liars_dice/event.rb

@@ -36,6 +36,15 @@ module LiarsDice
     end
   end
 
+  class InvalidBidEvent < Event
+    attr_accessor :seat_number
+
+    def initialize(seat_number)
+      self.seat_number = seat_number
+      super("Seat #{seat_number} made an invalid bid")
+    end
+  end
+
   class LoserEvent < Event
     attr_accessor :seat_number, :dice
 

data/lib/liars_dice/watcher.rb

@@ -1,6 +1,6 @@
 module LiarsDice
   module Watcher
-    attr_reader :after_roll, :after_bid, :after_round, :after_bs, :after_game, :after_dice_rolled, :after_seats_assigned
+    attr_reader :after_roll, :after_bid, :after_round, :after_bs, :after_game, :after_dice_rolled, :after_seats_assigned, :after_invalid_bid
 
     def append_after_bid(callback)
       append_callback(:after_bid, callback)
@@ -26,6 +26,10 @@ module LiarsDice
       append_callback(:after_seats_assigned, callback)
     end
 
+    def append_after_invalid_bid(callback)
+      append_callback(:after_invalid_bid, callback)
+    end
+
     def handle_event(event)
       if event.is_a? BidMadeEvent
         fire(:after_bid, event.seat_number, event.bid)
@@ -39,12 +43,14 @@ module LiarsDice
         fire(:after_dice_rolled, event.dice)
       elsif event.is_a? SeatsAssignedEvent
         fire(:after_seats_assigned, event.seat_assignments)
+      elsif event.is_a? InvalidBidEvent
+        fire(:after_invalid_bid, event.seat_number)
       end
     end
 
     private
     def allowed_callbacks
-      [:after_bid, :after_bs, :after_dice_rolled, :after_game, :after_round, :after_seats_assigned]
+      [:after_bid, :after_bs, :after_dice_rolled, :after_game, :after_round, :after_seats_assigned, :after_invalid_bid]
     end
 
     def append_callback(callback_name, callback)

data/spec/engine_spec.rb

@@ -69,6 +69,12 @@ describe "Engine" do
         engine.stub_chain(:loser, :lose_die)
       end
 
+      it "picks the bidder if the bid was invalid" do
+        engine.stub(:valid_bid?).and_return(false)
+        engine.should_receive(:loser=).with(seat1)
+        engine.run_round
+      end
+
       it "picks the bidder if the bid was incorrect" do
         engine.stub(:bid_is_correct?).and_return(false)
         engine.should_receive(:loser=).with(seat1)
@@ -164,14 +170,8 @@ describe "Engine" do
     end
 
     it "gets a bid from the seat's user" do
-      engine.stub(:valid_bid?).and_return(true)
       engine.get_bid(seat).should == "bid"
     end
-
-    it "raises an error if given an invalid bid" do
-      engine.stub(:valid_bid?).and_return(false)
-      expect { engine.get_bid(seat) }.to raise_error
-    end
   end
 
   describe "winner?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liars_dice
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000Z
+date: 2013-07-09 00:00:00.000000000Z
 dependencies: []
 description: A liar's dice botting environment, developed by Aisle50
 email: dev@aisle50.com