acpc_poker_types 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4486cbb027fcef016f2c31f6cb33360b618a17e0
-  data.tar.gz: c06bc66f83a1609b25e7a8f30b577cb99c121454
+  metadata.gz: 360776ad7098c8fdb25bb82e62ada4ae80ae65ae
+  data.tar.gz: 8fb88c8dad1c962c95aca4926cb927b53d4570cc
 SHA512:
-  metadata.gz: 7f10ec42bac803bd7a134d1fa3686ce45462fab47f56672050704c249fb48c3b4c0aa942ed911e8083805143992b0a39f41d3041e718aef984bcb8ca379794ce
-  data.tar.gz: fd175bdd332b8cdad9ad26baff8663364cfdadc8db1f65bc320864d5b409193c833c4045f21d21632e8f9b217423751ceaa86e92ffcbfd7a97cb67ab8c886c16
+  metadata.gz: 31d5a12377b31af437d306e48735a66131beb7f4b435ad874e37cbf539a10a722e273ca50aacf22774d470b5b0dc994120d0157417688c1510dfa778643ca35a
+  data.tar.gz: 12516ae9be8561af5b8bbcdab9a36119756008f5af961530edbd6ed85336c52a39b51d646051913bea96fe86e4359194b09ab8d0d4f349ad1af15f3175a7999f

data/acpc_poker_types.gemspec

@@ -11,17 +11,18 @@ Gem::Specification.new do |s|
   s.description = %q{Poker classes and constants that conform to the standards of the Annual Computer Poker Competition.}
 
   s.add_dependency 'dmorrill10-utils', '~> 1.0'
-  s.add_dependency 'acpc_dealer', '~> 0.0'
-  s.add_dependency 'celluloid', '~> 0.13'
-
-  s.add_development_dependency 'awesome_print'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'turn'
-  s.add_development_dependency 'pry-rescue'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'simplecov'
+  s.add_dependency 'acpc_dealer', '~> 1.0'
+  s.add_dependency 'celluloid', '~> 0.14'
+  s.add_dependency 'contextual_exceptions', '~> 0.0'
 
   s.files         = Dir.glob("lib/**/*") + %w(Rakefile acpc_poker_types.gemspec README.md)
   s.test_files    = Dir.glob "spec/**/*"
   s.require_paths = ["lib"]
+
+  s.add_development_dependency 'turn', '~> 0.9'
+  s.add_development_dependency 'minitest', '~> 4.7'
+  s.add_development_dependency 'mocha', '~> 0.13'
+  s.add_development_dependency 'awesome_print', '~> 1.0'
+  s.add_development_dependency 'pry-rescue', '~> 1.0'
+  s.add_development_dependency 'simplecov', '~> 0.7'
 end

data/lib/acpc_poker_types/acpc_dealer_data/hand_data.rb

@@ -1,18 +1,23 @@
-
-require 'dmorrill10-utils/class'
-
 require 'acpc_poker_types/acpc_dealer_data/match_definition'
 
-# Monkey patch for easy boundary checking
-class Array
-  def in_bounds?(i)
-    i < length
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
+# Refinement for easy boundary checking
+module AcpcPokerTypes::AcpcDealerData
+  module BoundaryCheckingRefinement
+    refine Array do
+      def in_bounds?(i)
+        i < length
+      end
+    end
   end
 end
+using AcpcPokerTypes::AcpcDealerData::BoundaryCheckingRefinement
 
 module AcpcPokerTypes::AcpcDealerData
   class HandData
-    exceptions :match_definitions_do_not_match, :invalid_data
+    exceptions :invalid_data, :names_do_not_match
 
     attr_accessor(
       # @returns [Array<Numeric>] Chip distribution at the end of the hand
@@ -43,7 +48,9 @@ module AcpcPokerTypes::AcpcDealerData
       set_data! action_data
 
       @turn_number = nil
-      @seat = nil
+
+      # Zero-indexed seat
+      @seat = 0
     end
 
     def ==(other)
@@ -52,18 +59,30 @@ module AcpcPokerTypes::AcpcDealerData
       @data == other.data
     end
 
-    def for_every_turn!(seat=0)
+    def start_hand!(seat=@seat)
       @seat = seat
-      @data.each_index do |i|
-        @turn_number = i
+    end
 
-        yield @turn_number
-      end
+    def next_turn!
+      init_or_increment_turn_num!
+    end
 
+    def end_hand!
       @turn_number = nil
       self
     end
 
+    def for_every_turn!(seat=@seat)
+      start_hand! seat
+
+      while @turn_number.nil? || (@turn_number < @data.length - 1) do
+        next_turn!
+        yield @turn_number
+      end
+
+      end_hand!
+    end
+
     def current_match_state(seat=@seat)
       if @turn_number
         @data[@turn_number].state_messages[seat]
@@ -112,8 +131,11 @@ module AcpcPokerTypes::AcpcDealerData
       result.each do |player_name, amount|
         begin
           @chip_distribution[@match_def.player_names.index(player_name.to_s)] = amount
-        rescue TypeError
-          raise PlayerNamesDoNotMatch
+        rescue TypeError => e
+          raise NamesDoNotMatch.with_context(
+            "Player name \"#{player_name.to_s}\" in match definition is not listed in final chip distribution",
+            e
+          )
         end
       end
     end
@@ -178,5 +200,13 @@ module AcpcPokerTypes::AcpcDealerData
         raise InvalidData, action_data[message_number].inspect
       end
     end
+    def init_or_increment_turn_num!
+      if @turn_number
+        @turn_number += 1
+      else
+        @turn_number = 0
+      end
+      self
+    end
   end
 end

data/lib/acpc_poker_types/acpc_dealer_data/hand_results.rb

@@ -1,5 +1,4 @@
-
-require 'dmorrill10-utils/class'
+require 'dmorrill10-utils/class' # For alias_new
 
 require 'acpc_poker_types/acpc_dealer_data/match_definition'
 require 'acpc_poker_types/acpc_dealer_data/log_file'

data/lib/acpc_poker_types/acpc_dealer_data/match_definition.rb

@@ -1,14 +1,14 @@
-
 require 'set'
 
 require 'acpc_poker_types/game_definition'
 
-require 'dmorrill10-utils/class'
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
 
 module AcpcPokerTypes::AcpcDealerData
   class MatchDefinition
 
-    exceptions :unable_to_parse, :incorrect_number_of_player_names
+    exceptions :incorrect_number_of_player_names
 
     attr_reader :name, :game_def, :number_of_hands, :random_seed, :player_names
 

data/lib/acpc_poker_types/acpc_dealer_data/poker_match_data.rb

@@ -3,17 +3,18 @@ require 'acpc_poker_types/player'
 
 require 'celluloid/autostart'
 
-require 'dmorrill10-utils/class'
-
 require 'acpc_poker_types/acpc_dealer_data/action_messages'
 require 'acpc_poker_types/acpc_dealer_data/hand_data'
 require 'acpc_poker_types/acpc_dealer_data/hand_results'
 require 'acpc_poker_types/acpc_dealer_data/match_definition'
 
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
 module AcpcPokerTypes::AcpcDealerData
   class PokerMatchData
 
-    exceptions :match_definitions_do_not_match, :final_scores_do_not_match, :player_data_inconsistent
+    exceptions :match_definitions_do_not_match, :final_scores_do_not_match, :data_inconsistent, :names_do_not_match
 
     attr_accessor(
       # @returns [Array<Numeric>] Chip distribution at the end of the match
@@ -144,58 +145,64 @@ module AcpcPokerTypes::AcpcDealerData
 
     def player(seat=@seat) @players[seat] end
 
-    def for_every_hand!
-      initialize_players!
-
-      @data.each_index do |i|
-        @hand_number = i
-
-        @players.each_with_index do |player, seat|
-          player.start_new_hand!(
-            @match_def.game_def.blinds[current_hand.data.first.state_messages[seat].position_relative_to_dealer],
-            @match_def.game_def.chip_stacks[current_hand.data.first.state_messages[seat].position_relative_to_dealer],
-            current_hand.data.first.state_messages[seat].users_hole_cards
-          )
-        end
-
-        yield @hand_number
-      end
+    def next_hand!
+      init_or_increment_hand_num!
+      provide_players_with_new_hand!
+      current_hand.start_hand! @seat
+    end
 
+    def end_match!
       if @chip_distribution && @chip_distribution != @players.map { |p| p.chip_balance }
-        raise AcpcPokerTypes::DataInconsistent, "chip distribution: #{@chip_distribution}, player balances: #{@players.map { |p| p.chip_balance }}"
+        raise DataInconsistent, "chip distribution: #{@chip_distribution}, player balances: #{@players.map { |p| p.chip_balance }}"
       end
 
       @hand_number = nil
       self
     end
 
-    def for_every_turn!
-      current_hand.for_every_turn!(@seat) do |turn_number|
-        @players.each_with_index do |player, seat|
-          last_match_state = current_hand.last_match_state(seat)
-          match_state = current_hand.current_match_state(seat)
+    def for_every_hand!
+      while @hand_number.nil? || (@hand_number < @data.length - 1) do
+        next_hand!
+        yield @hand_number
+        current_hand.end_hand!
+      end
 
-          if current_hand.last_action && player.seat == current_hand.last_action.seat
+      end_match!
+    end
+
+    def next_turn!
+      current_hand.next_turn!
+
+      @players.each_with_index do |player, seat|
+        last_match_state = current_hand.last_match_state(seat)
+        match_state = current_hand.current_match_state(seat)
 
-            player.take_action!(current_hand.last_action.action)
-          end
+        if current_hand.last_action && player.seat == current_hand.last_action.seat
+
+          player.take_action!(current_hand.last_action.action)
+        end
 
-          if (
-            player.active? &&
-            !match_state.first_state_of_first_round? &&
-            match_state.round > last_match_state.round
+        if (
+          player.active? &&
+          !match_state.first_state_of_first_round? &&
+          match_state.round > last_match_state.round
+        )
+          player.start_new_round!
+        end
+
+        if current_hand.final_turn?
+          player.take_winnings!(
+            current_hand.chip_distribution[seat] + @match_def.game_def.blinds[current_hand.current_match_state(seat).position_relative_to_dealer]
           )
-            player.start_new_round!
-          end
-
-          if current_hand.final_turn?
-            player.take_winnings!(
-              current_hand.chip_distribution[seat] + @match_def.game_def.blinds[current_hand.current_match_state(seat).position_relative_to_dealer]
-            )
-          end
         end
+      end
+      self
+    end
 
-        yield turn_number
+    def for_every_turn!
+      while current_hand.turn_number.nil? || (current_hand.turn_number < current_hand.data.length - 1) do
+        next_turn!
+        yield current_hand.turn_number
       end
 
       self
@@ -343,7 +350,6 @@ module AcpcPokerTypes::AcpcDealerData
           @match_def.game_def.chip_stacks[seat]
         )
       end
-
       self
     end
 
@@ -352,11 +358,13 @@ module AcpcPokerTypes::AcpcDealerData
       final_score.each do |player_name, amount|
         begin
           @chip_distribution[@match_def.player_names.index(player_name.to_s)] = amount
-        rescue TypeError
-          raise AcpcPokerTypes::NamesDoNotMatch
+        rescue TypeError => e
+          raise NamesDoNotMatch.with_context(
+            "Player name \"#{player_name.to_s}\" in match definition is not listed in final chip distribution",
+            e
+          )
         end
       end
-
       self
     end
 
@@ -369,7 +377,6 @@ module AcpcPokerTypes::AcpcDealerData
           hand_result
         )
       end
-
       self
     end
 
@@ -379,15 +386,31 @@ module AcpcPokerTypes::AcpcDealerData
       current_hand.data.length == turn_index + 2 &&
       current_round < (@match_def.game_def.number_of_rounds - 1) &&
       (turns_taken[0..turn_index].count do |t|
-        # @todo Use FOLD constant instead once poker action has one
-        t.action_message.action.to_acpc_character == 'f'
+        t.action_message.action.to_acpc_character == AcpcPokerTypes::PokerAction::FOLD
       end) != @players.length - 1
     end
-
     def new_round?(current_round, turn_index)
       current_hand.data.length > turn_index + 1 &&
       current_hand.data[turn_index + 1].action_message &&
       current_hand.data[turn_index + 1].action_message.state.round > current_round
     end
+    def provide_players_with_new_hand!
+      @players.each_with_index do |player, seat|
+        player.start_new_hand!(
+          @match_def.game_def.blinds[current_hand.data.first.state_messages[seat].position_relative_to_dealer],
+          @match_def.game_def.chip_stacks[current_hand.data.first.state_messages[seat].position_relative_to_dealer],
+          current_hand.data.first.state_messages[seat].users_hole_cards
+        )
+      end
+      self
+    end
+    def init_or_increment_hand_num!
+      if @hand_number
+        @hand_number += 1
+      else
+        @hand_number = 0
+      end
+      self
+    end
   end
 end

data/lib/acpc_poker_types/card.rb

@@ -1,5 +1,5 @@
 
-require 'dmorrill10-utils'
+require 'dmorrill10-utils' # For alias_new
 
 require 'acpc_poker_types/rank'
 require 'acpc_poker_types/suit'
@@ -8,7 +8,7 @@ module AcpcPokerTypes
   class Card
     CONCATONATED_RANKS = (AcpcPokerTypes::Rank::DOMAIN.map { |rank, properties| properties[:acpc_character] }).join
     CONCATONATED_SUITS = (AcpcPokerTypes::Suit::DOMAIN.map { |suit, properties| properties[:acpc_character] }).join
-    CONCATONATED_CARDS = CONCATONATED_RANKS + CONCATONATED_SUITS
+    CONCATONATED_CARDS = "#{CONCATONATED_RANKS}#{CONCATONATED_SUITS}"
 
     # @param [String] acpc_string_of_cards A string of cards in ACPC format
     # @return [Array<AcpcPokerTypes::Card>]
@@ -45,13 +45,13 @@ module AcpcPokerTypes
     end
 
     def to_str
-      @rank.to_s + @suit.to_s
+      "#{@rank}#{@suit}"
     end
 
     alias_method :to_s, :to_str
 
     def to_acpc
-      @rank.to_acpc + @suit.to_acpc
+      "#{@rank.to_acpc}#{@suit.to_acpc}"
     end
   end
 end

data/lib/acpc_poker_types/chip_stack.rb

@@ -1,6 +1,8 @@
-require 'dmorrill10-utils/class'
 require 'delegate'
 
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
 module AcpcPokerTypes
   class ChipStack < DelegateClass(Rational)
     exceptions :illegal_number_of_chips
@@ -32,7 +34,7 @@ module AcpcPokerTypes
 
     # @raise IllegalNumberOfChips
     def assert_valid_value
-      raise IllegalNumberOfChips if @value < 0
+      raise IllegalNumberOfChips, "\"#{@value.to_s}\" is an invalid value of chips (cannot be negative)" if @value < 0
     end
   end
 end

data/lib/acpc_poker_types/match_state.rb

@@ -56,10 +56,8 @@ module AcpcPokerTypes
       all_hole_cards,
       board_cards
     )
-      string = LABEL +
-        ":#{position_relative_to_dealer}:#{hand_number}:#{betting_sequence}:#{all_hole_cards}"
-
-        string += board_cards.to_acpc if board_cards && !board_cards.empty?
+      string = "#{LABEL}:#{position_relative_to_dealer}:#{hand_number}:#{betting_sequence}:#{all_hole_cards}"
+      string << board_cards.to_acpc if board_cards && !board_cards.empty?
       string
     end
 
@@ -160,8 +158,8 @@ module AcpcPokerTypes
     #  +betting_sequence+.
     def betting_sequence_string(betting_sequence=@betting_sequence)
       (round + 1).times.inject('') do |string, i|
-        string += (betting_sequence[i].map { |action| action.to_s }).join('')
-        string += '/' unless i == round
+        string << (betting_sequence[i].map { |action| action.to_s }).join('')
+        string << '/' unless i == round
         string
       end
     end

data/lib/acpc_poker_types/poker_action.rb

@@ -1,9 +1,10 @@
-
 require 'set'
-require 'dmorrill10-utils/class'
 
 require 'acpc_poker_types/chip_stack'
 
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
 module AcpcPokerTypes
   class PokerAction
     exceptions :illegal_action, :illegal_modification
@@ -76,7 +77,7 @@ module AcpcPokerTypes
     private
 
     def combine_action_and_modifier(action=@action, modifier=@modifier)
-      action + modifier.to_s
+      "#{action}#{modifier}"
     end
 
     def validate_action!(action, given_modifier)