acpc_dealer_data 0.3.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a1b82be7131e77192adfdf5cc580289a1f85facf
+  data.tar.gz: 97cd0e6a637586fd999c83e47d27c7516386fdde
+SHA512:
+  metadata.gz: 74054e4d315506f413864776bdf18df98e27093c1e401ce536971a6977672ddaa0b9e4272b2de09ff9cdacd09ef53326de18266d60994fe65955e45bc6d48f55
+  data.tar.gz: 84fb2b82c348817ae76794e5864e1339af37dea0794bb25493de65fcfc29613c7a146ddc7f55dc287b05946a7ee27241f08f474fa2081fb3ec4757996b1b4aff

data/Rakefile

@@ -7,6 +7,6 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << "lib" << 'spec/support'
   t.test_files = FileList['spec/**/*_spec.rb']
-  t.verbose = true
-  t.warning = true
+  t.verbose = false
+  t.warning = false # pry-rescue has a lot of warnings
 end

data/acpc_dealer_data.gemspec

@@ -8,15 +8,17 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Gem to parse, manipulate, and use data from the ACPC Dealer program.}
   gem.homepage      = "https://github.com/dmorrill10/acpc_dealer_data"
 
-  gem.add_dependency 'acpc_dealer'
-  gem.add_dependency 'acpc_poker_types'
-  gem.add_dependency 'celluloid'
-  gem.add_dependency 'dmorrill10-utils', '>=1.0.0'
+  gem.add_dependency 'acpc_dealer', '~> 0.0'
+  gem.add_dependency 'acpc_poker_types', '~> 0.0'
+  gem.add_dependency 'celluloid', '~> 0.13'
+  gem.add_dependency 'dmorrill10-utils', '~> 1.0'
 
-  
-  gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'turn'
+  gem.add_development_dependency 'minitest', '~> 4.7'
+  gem.add_development_dependency 'mocha', '~> 0.13'
+  gem.add_development_dependency 'simplecov', '~> 0.7'
+  gem.add_development_dependency 'turn', '~> 0.9'
+  gem.add_development_dependency 'pry-rescue', '~> 1.1'
+  gem.add_development_dependency 'awesome_print', '~> 1.1'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/acpc_dealer_data.rb

@@ -5,6 +5,7 @@ require 'acpc_dealer_data/hand_data'
 require 'acpc_dealer_data/hand_results'
 require 'acpc_dealer_data/poker_match_data'
 require 'acpc_dealer_data/match_definition'
+require 'acpc_dealer_data/log_file'
 
 module AcpcDealerData
 end

data/lib/acpc_dealer_data/action_messages.rb

@@ -2,14 +2,14 @@
 require 'acpc_poker_types/match_state'
 require 'acpc_poker_types/poker_action'
 
-require_relative 'match_definition'
-
-class ActionMessages
+require 'acpc_dealer_data/match_definition'
+require 'acpc_dealer_data/log_file'
 
+class AcpcDealerData::ActionMessages
   attr_reader(
     :data, :final_score, :match_def
   )
-    
+
   ToMessage = Struct.new(
     # @returns [Integer] Seat of the player receiving the message
     :seat,
@@ -40,14 +40,16 @@ class ActionMessages
     end
   end
 
+  CONCATONATED_ACTIONS = PokerAction::LEGAL_ACPC_CHARACTERS.to_a.join('')
+
   # @param [String] from_message FROM message (message from player)
   def self.parse_from_message(from_message)
     if from_message.strip.match(
-/^FROM\s*(\d+)\s*at\s*[\d\.]+\s*(#{MatchState::LABEL}\S+):([#{PokerAction::LEGAL_ACPC_CHARACTERS.to_a.join('')}]\s*\d*)$/
+/^FROM\s*(\d+)\s*at\s*[\d\.]+\s*(#{MatchState::LABEL}\S+):([#{CONCATONATED_ACTIONS}]\s*\d*)$/
     )
       FromMessage.new(
-        $1.to_i - 1, 
-        MatchState.parse($2), 
+        $1.to_i - 1,
+        MatchState.parse($2),
         PokerAction.new($3)
       )
     else
@@ -59,10 +61,10 @@ class ActionMessages
     if score_string.strip.match(
       /^SCORE:([\d\-\.|]+):([\w|]+)$/
       )
-       
+
       stack_changes = $1.split '|'
       players = $2.split '|'
-         
+
       players.each_index.inject({}) do |player_results, j|
          player_results[players[j].to_sym] = stack_changes[j].to_r
          player_results
@@ -73,45 +75,53 @@ class ActionMessages
   end
 
   def self.parse_to_or_from_message(message)
-    parsed_message = ActionMessages.parse_to_message(message)
+    parsed_message = AcpcDealerData::ActionMessages.parse_to_message(message)
     if parsed_message.nil?
-      ActionMessages.parse_from_message(message)
+      AcpcDealerData::ActionMessages.parse_from_message(message)
     else
       parsed_message
     end
   end
 
-  class LogFile < File
-  end
-
-  def self.parse_file(acpc_log_file_path, player_names, game_def_directory, num_hands=nil)
-    LogFile.open(acpc_log_file_path, 'r') do |file| 
-      ActionMessages.parse file, player_names, game_def_directory, num_hands
+  def self.parse_file(
+    acpc_log_file_path,
+    player_names,
+    game_def_directory,
+    num_hands=nil
+  )
+    AcpcDealerData::LogFile.open(acpc_log_file_path, 'r') do |file|
+      AcpcDealerData::ActionMessages.parse file, player_names, game_def_directory, num_hands
     end
   end
 
   alias_new :parse
 
-  def initialize(acpc_log_statements, player_names, game_def_directory, num_hands=nil)
+  def initialize(
+    acpc_log_statements,
+    player_names,
+    game_def_directory,
+    num_hands=nil
+  )
     @final_score = nil
     @match_def = nil
     @data = acpc_log_statements.inject([]) do |accumulating_data, log_line|
       if @match_def.nil?
-        @match_def = MatchDefinition.parse(log_line, player_names, game_def_directory)
+        @match_def = AcpcDealerData::MatchDefinition.parse(log_line, player_names, game_def_directory)
       else
-        parsed_message = ActionMessages.parse_to_or_from_message(log_line)
+        parsed_message = AcpcDealerData::ActionMessages.parse_to_or_from_message(log_line)
         if parsed_message
           if (
-            accumulating_data.empty? || 
+            accumulating_data.empty? ||
             accumulating_data.last.first[:state].hand_number != parsed_message[:state].hand_number
           )
             break accumulating_data if accumulating_data.length == num_hands
+
             accumulating_data << []
           end
 
           accumulating_data.last << parsed_message
         else
-          @final_score = ActionMessages.parse_score(log_line) unless @final_score
+          @final_score = AcpcDealerData::ActionMessages.parse_score(log_line) unless @final_score
         end
       end
 

data/lib/acpc_dealer_data/hand_data.rb

@@ -1,7 +1,7 @@
 
 require 'dmorrill10-utils/class'
 
-require_relative 'match_definition'
+require 'acpc_dealer_data/match_definition'
 
 # Monkey patch for easy boundary checking
 class Array
@@ -10,15 +10,15 @@ class Array
   end
 end
 
-class HandData
+class AcpcDealerData::HandData
 
   exceptions :match_definitions_do_not_match, :invalid_data
 
-  attr_reader(
+  attr_accessor(
     # @returns [Array<Numeric>] Chip distribution at the end of the hand
     :chip_distribution,
     # @returns [MatchDefinition] Game definition and match parameters
-    :match_def, 
+    :match_def,
     # @returns [Integer] Zero-index turn number within the hand
     :turn_number,
     # @returns [Turn] Turn data
@@ -37,7 +37,7 @@ class HandData
 
   def initialize(match_def, action_data, result)
     @match_def = match_def
-    
+
     set_chip_distribution! result
 
     set_data! action_data
@@ -134,7 +134,7 @@ class HandData
 
       message_number += number_of_state_messages
 
-      action_message = if action_data.in_bounds?(message_number) && 
+      action_message = if action_data.in_bounds?(message_number) &&
         action_data[message_number].respond_to?(:action)
 
         message_number += 1
@@ -160,7 +160,7 @@ class HandData
 
   def assert_messages_have_no_actions(state_messages)
     if state_messages.any? { |message| message.respond_to?(:action) }
-      raise InvalidData, state_messages.find do |message| 
+      raise InvalidData, state_messages.find do |message|
         !message.action.nil?
       end.inspect
     end
@@ -173,7 +173,7 @@ class HandData
   end
 
   def assert_message_is_from_final_turn(action_data, message_number, state_messages)
-    if action_data.in_bounds?(message_number+1) && 
+    if action_data.in_bounds?(message_number+1) &&
       state_messages.last.round == action_data[message_number+1].state.round
       raise InvalidData, action_data[message_number].inspect
     end

data/lib/acpc_dealer_data/hand_results.rb

@@ -1,20 +1,20 @@
 
 require 'dmorrill10-utils/class'
 
-require_relative 'match_definition'
-
-class HandResults
+require 'acpc_dealer_data/match_definition'
+require 'acpc_dealer_data/log_file'
 
+class AcpcDealerData::HandResults
   attr_reader :data, :final_score, :match_def
 
   def self.parse_state(state_string)
     if state_string.strip.match(
       /^STATE:\d+:[cfr\d\/]+:[^:]+:([\d\-\.|]+):([\w|]+)$/
       )
-       
+
       stack_changes = $1.split '|'
       players = $2.split '|'
-         
+
       players.each_index.inject({}) do |player_results, j|
          player_results[players[j].to_sym] = stack_changes[j].to_r
          player_results
@@ -28,10 +28,10 @@ class HandResults
     if score_string.strip.match(
       /^SCORE:([\d\-\.|]+):([\w|]+)$/
       )
-       
+
       stack_changes = $1.split '|'
       players = $2.split '|'
-         
+
       players.each_index.inject({}) do |player_results, j|
          player_results[players[j].to_sym] = stack_changes[j].to_r
          player_results
@@ -41,12 +41,14 @@ class HandResults
     end
   end
 
-  class LogFile < File
-  end
-
-  def self.parse_file(acpc_log_file_path, player_names, game_def_directory, num_hands=nil)
-    LogFile.open(acpc_log_file_path, 'r') do |file| 
-      HandResults.parse file, player_names, game_def_directory, num_hands
+  def self.parse_file(
+    acpc_log_file_path,
+    player_names,
+    game_def_directory,
+    num_hands=nil
+  )
+    AcpcDealerData::LogFile.open(acpc_log_file_path, 'r') do |file|
+      AcpcDealerData::HandResults.parse file, player_names, game_def_directory, num_hands
     end
   end
 
@@ -55,20 +57,20 @@ class HandResults
   def initialize(acpc_log_statements, player_names, game_def_directory, num_hands=nil)
     @final_score = nil
     @match_def = nil
-    
+
     @data = acpc_log_statements.inject([]) do |accumulating_data, log_line|
       if @match_def.nil?
-        @match_def = MatchDefinition.parse(log_line, player_names, game_def_directory)
+        @match_def = AcpcDealerData::MatchDefinition.parse(log_line, player_names, game_def_directory)
       else
-        parsed_message = HandResults.parse_state(log_line)
+        parsed_message = AcpcDealerData::HandResults.parse_state(log_line)
         if parsed_message
           accumulating_data << parsed_message
           break accumulating_data if accumulating_data.length == num_hands
         else
-          @final_score = HandResults.parse_score(log_line) unless @final_score
+          @final_score = AcpcDealerData::HandResults.parse_score(log_line) unless @final_score
         end
       end
-      
+
       accumulating_data
     end
   end

data/lib/acpc_dealer_data/log_file.rb

@@ -0,0 +1,3 @@
+# Wrapper class to enable mocking log files in tests
+class AcpcDealerData::LogFile < File
+end

data/lib/acpc_dealer_data/match_definition.rb

@@ -5,7 +5,7 @@ require 'acpc_poker_types/game_definition'
 
 require 'dmorrill10-utils/class'
 
-class MatchDefinition
+class AcpcDealerData::MatchDefinition
 
   exceptions :unable_to_parse, :incorrect_number_of_player_names
 
@@ -14,19 +14,15 @@ class MatchDefinition
   def self.parse(acpc_log_string, player_names, game_def_directory)
     if acpc_log_string.strip.match(
       '^\s*#\s*name/game/hands/seed\s+(\S+)\s+(\S+)\s+(\d+)\s+(\d+)\s*$'
-      )
+    )
       name = $1
-      game_def = GameDefinition.parse_file(File.join(game_def_directory, File.basename($2)))
+      game_def = GameDefinition.parse_file(
+        File.join(game_def_directory, File.basename($2))
+      )
       number_of_hands = $3
       random_seed = $4
 
-      MatchDefinition.new(
-        name,
-        game_def, 
-        number_of_hands, 
-        random_seed, 
-        player_names
-      )
+      new(name, game_def, number_of_hands, random_seed, player_names)
     else
       nil
     end

data/lib/acpc_dealer_data/poker_match_data.rb

@@ -1,67 +1,77 @@
 
 require 'acpc_poker_types/player'
 
-require 'celluloid'
+require 'celluloid/autostart'
 
 require 'dmorrill10-utils/class'
 
-require_relative 'action_messages'
-require_relative 'hand_data'
-require_relative 'hand_results'
-require_relative 'match_definition'
+require 'acpc_dealer_data/action_messages'
+require 'acpc_dealer_data/hand_data'
+require 'acpc_dealer_data/hand_results'
+require 'acpc_dealer_data/match_definition'
 
-class PokerMatchData
+class AcpcDealerData::PokerMatchData
 
   exceptions :match_definitions_do_not_match, :final_scores_do_not_match, :player_data_inconsistent
 
-  attr_reader(
+  attr_accessor(
     # @returns [Array<Numeric>] Chip distribution at the end of the match
     :chip_distribution,
     # @returns [MatchDefinition] Game definition and match parameters
     :match_def,
     # @returns [Integer] Zero-index turn number within the hand
     :hand_number,
-    # @returns [HandData] Data from each hand
+    # @returns [AcpcDealerData::HandData] Data from each hand
     :data,
     # @returns [Array<Player>] Player information
-    :players
-  )
-  attr_accessor(
+    :players,
     # @returns [Integer] Seat of the active player
     :seat
   )
 
-  # @returns [PokerMatchData]
-  def self.parse_files(action_messages_file, result_messages_file, player_names, dealer_directory, num_hands=nil)
+  # @returns [AcpcDealerData::PokerMatchData]
+  def self.parse_files(
+    action_messages_file,
+    result_messages_file,
+    player_names,
+    dealer_directory,
+    num_hands=nil
+  )
     parsed_action_messages = Celluloid::Future.new do
-      ActionMessages.parse_file(
-        action_messages_file, 
-        player_names, 
+      AcpcDealerData::ActionMessages.parse_file(
+        action_messages_file,
+        player_names,
         dealer_directory,
         num_hands
       )
     end
-    parsed_hand_results = Celluloid::Future.new do 
-      HandResults.parse_file(
-        result_messages_file, 
-        player_names, 
+    parsed_hand_results = Celluloid::Future.new do
+      AcpcDealerData::HandResults.parse_file(
+        result_messages_file,
+        player_names,
         dealer_directory,
         num_hands
       )
     end
 
-    PokerMatchData.new(
-      parsed_action_messages.value, 
-      parsed_hand_results.value, 
-      player_names, 
+    new(
+      parsed_action_messages.value,
+      parsed_hand_results.value,
+      player_names,
       dealer_directory
     )
   end
 
-  # @returns [PokerMatchData]
-  def self.parse(action_messages, result_messages, player_names, dealer_directory, num_hands=nil)
+  # @returns [AcpcDealerData::PokerMatchData]
+  def self.parse(
+    action_messages,
+    result_messages,
+    player_names,
+    dealer_directory,
+    num_hands=nil
+  )
     parsed_action_messages = Celluloid::Future.new do
-      ActionMessages.parse(
+      AcpcDealerData::ActionMessages.parse(
         action_messages,
         player_names,
         dealer_directory,
@@ -69,7 +79,7 @@ class PokerMatchData
       )
     end
     parsed_hand_results = Celluloid::Future.new do
-      HandResults.parse(
+      AcpcDealerData::HandResults.parse(
         result_messages,
         player_names,
         dealer_directory,
@@ -77,7 +87,7 @@ class PokerMatchData
       )
     end
 
-    PokerMatchData.new(
+    new(
       parsed_action_messages.value,
       parsed_hand_results.value,
       player_names,
@@ -85,7 +95,12 @@ class PokerMatchData
     )
   end
 
-  def initialize(parsed_action_messages, parsed_hand_results, player_names, dealer_directory)
+  def initialize(
+    parsed_action_messages,
+    parsed_hand_results,
+    player_names,
+    dealer_directory
+  )
     if (
       parsed_action_messages.match_def.nil? ||
       parsed_hand_results.match_def.nil? ||
@@ -127,7 +142,7 @@ class PokerMatchData
   end
 
   def player(seat=@seat) @players[seat] end
-  
+
   def for_every_hand!
     initialize_players!
 
@@ -166,7 +181,7 @@ class PokerMatchData
 
         if (
           player.active? &&
-          !match_state.first_state_of_first_round? && 
+          !match_state.first_state_of_first_round? &&
           match_state.round > last_match_state.round
         )
           player.start_new_round!
@@ -185,27 +200,28 @@ class PokerMatchData
     self
   end
 
+  def match_has_another_round?(current_round, turn_index, turns_taken)
+    new_round?(current_round, turn_index) ||
+    players_all_in?(current_round, turn_index, turns_taken)
+  end
+
+  def hand_started?
+    @hand_number &&
+    current_hand.turn_number &&
+    current_hand.turn_number > 0
+  end
+
   def player_acting_sequence
     sequence = [[]]
-    
-    if (
-      @hand_number.nil? || 
-      current_hand.turn_number.nil? || 
-      current_hand.turn_number < 1
-    )
-      return sequence
-    end
-      
+
+    return sequence unless hand_started?
+
     turns_taken = current_hand.data[0..current_hand.turn_number-1]
     turns_taken.each_with_index do |turn, turn_index|
       next unless turn.action_message
 
       sequence[turn.action_message.state.round] << turn.action_message.seat
-
-      if (
-        new_round?(sequence.length - 1 , turn_index) ||
-        players_all_in?(sequence.length - 1, turn_index, turns_taken)
-      )
+      if match_has_another_round?(sequence.length - 1, turn_index, turns_taken)
         sequence << []
       end
     end
@@ -247,7 +263,7 @@ class PokerMatchData
   end
   def opponents_cards_visible?
     return false unless current_hand
-    
+
     current_hand.current_match_state.list_of_hole_card_hands.reject_empty_elements.length > 1
   end
   def player_with_dealer_button
@@ -278,15 +294,15 @@ class PokerMatchData
   end
   def betting_sequence
     sequence = [[]]
-    
+
     if (
-      @hand_number.nil? || 
-      current_hand.turn_number.nil? || 
+      @hand_number.nil? ||
+      current_hand.turn_number.nil? ||
       current_hand.turn_number < 1
     )
       return sequence
     end
-      
+
     turns_taken = current_hand.data[0..current_hand.turn_number-1]
     turns_taken.each_with_index do |turn, turn_index|
       next unless turn.action_message
@@ -315,13 +331,13 @@ class PokerMatchData
   #   @match_def.game_def.min_wagers[current_hand.next_state.round]
   #   ChipStack.new [@min_wager.to_i, action_with_context.amount_to_put_in_pot.to_i].max
   # end
-  
+
   protected
 
   def initialize_players!
     @players = @match_def.player_names.length.times.map do |seat|
       Player.join_match(
-        @match_def.player_names[seat], 
+        @match_def.player_names[seat],
         seat,
         @match_def.game_def.chip_stacks[seat]
       )
@@ -346,7 +362,7 @@ class PokerMatchData
   def set_data!(parsed_action_messages, parsed_hand_results)
     @data = []
     parsed_action_messages.data.zip(parsed_hand_results.data).each do |action_messages_by_hand, hand_result|
-      @data << HandData.new(
+      @data << AcpcDealerData::HandData.new(
         @match_def,
         action_messages_by_hand,
         hand_result
@@ -361,8 +377,9 @@ class PokerMatchData
   def players_all_in?(current_round, turn_index, turns_taken)
     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| 
-      t.action_message.action.to_sym == :fold 
+    (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'
     end) != @players.length - 1
   end