liars_dice 0.0.5 → 0.0.6

data/liars_dice.gemspec

@@ -1,14 +1,15 @@
 Gem::Specification.new do |gem|
   gem.name = 'liars_dice'
-  gem.version = '0.0.5'
-  gem.date = '2013-07-10'
+  gem.version = '0.0.6'
+  gem.date = '2013-07-12'
   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']
   gem.email = 'dev@aisle50.com'
 
-  exclusions = [".rvmrc"]
-  gem.files               = `git ls-files`.split($\) - exclusions
+  exclusions = %w{ .rvmrc }
+  included_bots = %w{ lib/liars_dice/bots/human_bot.rb lib/liars_dice/bots/random_bot.rb }
+  gem.files               = `git ls-files`.split($\) + included_bots - exclusions
   gem.test_files          = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths       = ["lib"]
 end

data/lib/liars_dice.rb

@@ -5,5 +5,4 @@ require 'liars_dice/event'
 require 'liars_dice/game'
 require 'liars_dice/seat'
 require 'liars_dice/command_line_watcher'
-require 'liars_dice/random_bot'
-require 'liars_dice/human_bot'
+Dir[File.dirname(__FILE__) + '/liars_dice/bots/*.rb'].each {|file| require file }

data/lib/liars_dice/bots/human_bot.rb

@@ -0,0 +1,61 @@
+module LiarsDice
+  module Bots
+    class HumanBot
+      attr_accessor :prev_bid, :dice, :seat_number, :name
+
+      def initialize(seat_number, number_of_players, number_of_dice)
+        self.seat_number = seat_number
+        self.name = "HumanBot"
+        puts "You're playing as HumanBot in seat #{seat_number}"
+        puts "When asked for a bid, either enter <TOTAL> <FACE_VALUE> or BS"
+      end
+
+      def handle_event(event)
+        if event.is_a? LiarsDice::BidMadeEvent
+          self.prev_bid = event.bid
+          return if event.seat_number.to_i == self.seat_number.to_i
+          puts event.message
+        elsif event.is_a? LiarsDice::BSCalledEvent
+          return if event.seat_number.to_i == self.seat_number.to_i
+          puts event.message
+        elsif event.is_a? LiarsDice::LoserEvent
+          puts "There were #{event.dice.flatten.select{|i| i == prev_bid.face_value or i == 1}.length} #{prev_bid.face_value}s"
+          if event.seat_number == self.seat_number
+            puts "You lose a die"
+          else
+            puts event.message
+          end
+          puts
+          self.prev_bid = nil
+        end
+      end
+
+      def format_event(event)
+        return if event.seat_number.to_i == seat_number.to_i
+        event.message
+      end
+
+      def dice=(dice)
+        @dice = dice
+        puts "Your dice are #{dice.inspect.to_s}"
+      end
+
+      def bid
+        puts "You're bidding first" unless prev_bid
+
+        print "What do you bid? "
+        bid_string = gets.chomp
+        if bid_string.downcase == "bs"
+          return BS.new
+        end
+        parts = bid_string.split(" ").map(&:to_i)
+        if parts.length == 2
+          ret = Bid.new(*parts)
+          return ret if ret.valid?
+        end
+        print "Invalid bid"
+        return bid
+      end
+    end
+  end
+end

data/lib/liars_dice/bots/random_bot.rb

@@ -0,0 +1,46 @@
+module LiarsDice
+  module Bots
+    class RandomBot
+      attr_accessor :prev_bid, :name
+
+      def initialize(seat_number, number_of_players, number_of_dice)
+        self.name = "RandomBot#{seat_number}"
+      end
+
+
+      def handle_event(event)
+        if event.is_a? LiarsDice::BidMadeEvent
+          self.prev_bid = event.bid
+        elsif event.is_a? LiarsDice::LoserEvent
+          self.prev_bid = nil
+        end
+      end
+
+      def dice=(dice); end
+
+      def bid
+        if prev_bid
+          choice = (0...10).to_a.sample
+
+          if choice == 0
+            # Call BS 10% of the time
+            LiarsDice::BS.new
+          elsif choice <= 6
+            # Up the total 50% of the time
+            LiarsDice::Bid.new(prev_bid.total + 1, prev_bid.face_value)
+          else
+            # Up the number 40% of the time
+            r = LiarsDice::Bid.new(prev_bid.total, prev_bid.face_value + 1)
+            if r.face_value > 6
+              r.total += 1
+              r.face_value = 2
+            end
+            r
+          end
+        else
+          LiarsDice::Bid.new(1, 2)
+        end
+      end
+    end
+  end
+end

data/lib/liars_dice/command_line_watcher.rb

@@ -6,13 +6,13 @@ module LiarsDice
 
     def initialize
       self.names = {}
-      append_after_dice_rolled method(:print_dice)
-      append_after_bid lambda{|seat, bid| puts "#{name(seat, true)} bids #{bid}" }
-      append_after_bs lambda{|seat| puts "#{name(seat)} calls BS" }
-      append_after_game lambda{|winner| puts "Game over.  #{name(winner)} wins." }
-      append_after_round lambda{|loser| puts "#{name(loser)} loses a die" }
-      append_after_invalid_bid lambda{|seat| puts "#{name(seat)} made an invalid bid" }
-      append_after_seats_assigned lambda{|assignments| self.names = assignments }
+      after_dice_rolled :print_dice
+      after_bid lambda{|seat, bid| puts "#{name(seat, true)} bids #{bid}" }
+      after_bs lambda{|seat| puts "#{name(seat)} calls BS" }
+      after_game lambda{|winner| puts "Game over.  #{name(winner)} wins." }
+      after_round lambda{|loser| puts "#{name(loser)} loses a die" }
+      after_invalid_bid lambda{|seat| puts "#{name(seat)} made an invalid bid" }
+      after_seats_assigned lambda{|assignments| self.names = assignments }
     end
 
     def name(seat_number, justified=false)

data/lib/liars_dice/game.rb

@@ -6,7 +6,7 @@ module LiarsDice
 
     def play(bot_classes)
       w = LiarsDice::CommandLineWatcher.new
-      w.append_after_round lambda { |*args| gets }
+      w.after_round lambda { |*args| gets }
       e = LiarsDice::Engine.new(bot_classes, 5, w)
       e.run
     end

data/lib/liars_dice/watcher.rb

@@ -1,32 +1,31 @@
 module LiarsDice
   module Watcher
-    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)
+    def after_bid(callback)
       append_callback(:after_bid, callback)
     end
 
-    def append_after_round(callback)
+    def after_round(callback)
       append_callback(:after_round, callback)
     end
 
-    def append_after_bs(callback)
+    def after_bs(callback)
       append_callback(:after_bs, callback)
     end
 
-    def append_after_game(callback)
+    def after_game(callback)
       append_callback(:after_game, callback)
     end
 
-    def append_after_dice_rolled(callback)
+    def after_dice_rolled(callback)
       append_callback(:after_dice_rolled, callback)
     end
 
-    def append_after_seats_assigned(callback)
+    def after_seats_assigned(callback)
       append_callback(:after_seats_assigned, callback)
     end
 
-    def append_after_invalid_bid(callback)
+    def after_invalid_bid(callback)
       append_callback(:after_invalid_bid, callback)
     end
 
@@ -54,15 +53,19 @@ module LiarsDice
     end
 
     def append_callback(callback_name, callback)
-      raise ArgumentError.new("Callback does not respond to call") unless callback.respond_to? :call
       raise ArgumentError.new("Unsupported callback #{callback_name}") unless allowed_callbacks.include? callback_name
+      raise ArgumentError.new("Callback does not respond to call") unless callback.respond_to?(:call) or callback.is_a? Symbol
       watcher_callbacks[callback_name] << callback
     end
 
     def fire(callback_name, *args)
       raise ArgumentError.new("Unsupported callback #{callback_name}") unless allowed_callbacks.include? callback_name
       watcher_callbacks[callback_name].each do |callback|
-        callback.call(*args)
+        if callback.is_a? Symbol
+          send(callback, *args)
+        else
+          callback.call(*args)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liars_dice
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000Z
+date: 2013-07-12 00:00:00.000000000Z
 dependencies: []
 description: A liar's dice botting environment, developed by Aisle50
 email: dev@aisle50.com
@@ -25,12 +25,12 @@ files:
 - liars_dice.gemspec
 - lib/liars_dice.rb
 - lib/liars_dice/bid.rb
+- lib/liars_dice/bots/human_bot.rb
+- lib/liars_dice/bots/random_bot.rb
 - lib/liars_dice/command_line_watcher.rb
 - lib/liars_dice/engine.rb
 - lib/liars_dice/event.rb
 - lib/liars_dice/game.rb
-- lib/liars_dice/human_bot.rb
-- lib/liars_dice/random_bot.rb
 - lib/liars_dice/seat.rb
 - lib/liars_dice/watcher.rb
 - spec/bid_spec.rb

data/lib/liars_dice/human_bot.rb

@@ -1,58 +0,0 @@
-module LiarsDice
-  class HumanBot
-    attr_accessor :prev_bid, :dice, :seat_number
-
-    def initialize(seat_number, number_of_players, number_of_dice)
-      self.seat_number = seat_number
-      puts "You're playing as HumanBot in seat #{seat_number}"
-      puts "When asked for a bid, either enter <TOTAL> <FACE_VALUE> or BS"
-    end
-
-    def handle_event(event)
-      if event.is_a? LiarsDice::BidMadeEvent
-        self.prev_bid = event.bid
-        return if event.seat_number.to_i == self.seat_number.to_i
-        puts event.message
-      elsif event.is_a? LiarsDice::BSCalledEvent
-        return if event.seat_number.to_i == self.seat_number.to_i
-        puts event.message
-      elsif event.is_a? LiarsDice::LoserEvent
-        puts "There were #{event.dice.flatten.select{|i| i == prev_bid.face_value or i == 1}.length} #{prev_bid.face_value}s"
-        if event.seat_number == self.seat_number
-          puts "You lose a die"
-        else
-          puts event.message
-        end
-        puts
-        self.prev_bid = nil
-      end
-    end
-
-    def format_event(event)
-      return if event.seat_number.to_i == seat_number.to_i
-      event.message
-    end
-
-    def dice=(dice)
-      @dice = dice
-      puts "Your dice are #{dice.inspect.to_s}"
-    end
-
-    def bid
-      puts "You're bidding first" unless prev_bid
-
-      print "What do you bid? "
-      bid_string = gets.chomp
-      if bid_string.downcase == "bs"
-        return BS.new
-      end
-      parts = bid_string.split(" ").map(&:to_i)
-      if parts.length == 2
-        ret = Bid.new(*parts)
-        return ret if ret.valid?
-      end
-      print "Invalid bid"
-      return bid
-    end
-  end
-end

data/lib/liars_dice/random_bot.rb

@@ -1,42 +0,0 @@
-module LiarsDice
-  class RandomBot
-    attr_accessor :prev_bid
-
-    def initialize(seat_number, number_of_players, number_of_dice); end
-
-
-    def handle_event(event)
-      if event.is_a? LiarsDice::BidMadeEvent
-        self.prev_bid = event.bid
-      elsif event.is_a? LiarsDice::LoserEvent
-        self.prev_bid = nil
-      end
-    end
-
-    def dice=(dice); end
-
-    def bid
-      if prev_bid
-        choice = (0...10).to_a.sample
-
-        if choice == 0
-          # Call BS 10% of the time
-          LiarsDice::BS.new
-        elsif choice <= 6
-          # Up the total 50% of the time
-          LiarsDice::Bid.new(prev_bid.total + 1, prev_bid.face_value)
-        else
-          # Up the number 40% of the time
-          r = LiarsDice::Bid.new(prev_bid.total, prev_bid.face_value + 1)
-          if r.face_value > 6
-            r.total += 1
-            r.face_value = 2
-          end
-          r
-        end
-      else
-        LiarsDice::Bid.new(1, 2)
-      end
-    end
-  end
-end