acpc_poker_player_proxy 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d4acd91b92cb9198ae109a1cc655a9f98b3ac0
-  data.tar.gz: f6c3e6741485a5b247c4195efd6e6d5b607c6b64
+  metadata.gz: 28c7fe64970dadc53c1be54bb537c41ed4ea88b8
+  data.tar.gz: 6c6c7cacd9a0ace29552cc7aaba9015b44dd664d
 SHA512:
-  metadata.gz: 34b5fe01458eeac7ab19f913fcdc082125982e2b9b4f8f23327575ef84ef8df7a1d7e47eb539aa9bc481c6eaa19d1e9b4c5b452485f04c634f13bf35492bc3a2
-  data.tar.gz: a4fb104df3b97cff04ac84b83bc559d7c2e0462ca17306165fd06af315fd7960f9d87453f9ab694ab28d9daacee255944d8a03567f40f5569a1a6973fa00b088
+  metadata.gz: c457fcdd2b66938335689b1bb09ab3c0e7e8619101f013174b6b6cc07036988aed2313de39de97b5d3a2a47fe9b58c6510d758a781fa1be78ffbbe12fae50f28
+  data.tar.gz: f7bc6000a7e58cb0bed053d322c5ea33ed492ba6ed10148c3b9b4de2d3857fb0e54cec2ffc1604716238ad6b05e3285e567e18deb8418d44bf81d906a177d827

data/acpc_poker_player_proxy.gemspec

@@ -11,9 +11,8 @@ Gem::Specification.new do |s|
   s.summary     = %q{ACPC Poker Player Proxy}
   s.description = %q{A smart proxy for a poker player that connects to the ACPC Dealer and manages match state data}
 
-  s.add_dependency 'acpc_poker_match_state', '~> 2.0'
   s.add_dependency 'acpc_poker_basic_proxy', '~> 3.0'
-  s.add_dependency 'acpc_poker_types', '~> 5.0'
+  s.add_dependency 'acpc_poker_types', '~> 7.0'
   s.add_dependency 'contextual_exceptions', '~> 0.0'
   s.add_dependency 'methadone', '~> 1.2'
   s.add_dependency 'acpc_dealer', '~> 2.0'
@@ -25,10 +24,9 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'turn', '~> 0.9'
-  s.add_development_dependency 'minitest', '~> 4.7'
+  s.add_development_dependency 'minitest', '~> 5.0.6'
+  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'
-  s.add_development_dependency 'mocha', '~> 0.13'
 end

data/lib/acpc_poker_player_proxy/player_proxy.rb

@@ -1,4 +1,6 @@
-require 'acpc_poker_match_state/players_at_the_table'
+require 'delegate'
+
+require 'acpc_poker_types/players_at_the_table'
 require 'acpc_poker_types/player'
 require 'acpc_poker_types/game_definition'
 require 'acpc_poker_basic_proxy/basic_proxy'
@@ -7,101 +9,98 @@ require 'contextual_exceptions'
 using ContextualExceptions::ClassRefinement
 
 module AcpcPokerPlayerProxy
-  class PlayerProxy
-    include AcpcPokerTypes
-    include AcpcPokerMatchState
-    include AcpcPokerBasicProxy
 
-    exceptions :match_ended
+class PlayerProxy < DelegateClass(AcpcPokerTypes::PlayersAtTheTable)
+  include AcpcPokerTypes
+  include AcpcPokerBasicProxy
 
-    # @return [PlayersAtTheTable] Summary of the progression of the match
-    #  in which, this player is participating, since this object's instantiation.
-    attr_reader :players_at_the_table
+  exceptions :match_ended
 
-    attr_reader :game_def
+  # @return [PlayersAtTheTable] Summary of the progression of the match
+  #  in which, this player is participating, since this object's instantiation.
+  attr_reader :players_at_the_table
 
-    attr_reader :users_seat
+  attr_reader :match_has_ended
 
-    attr_reader :player_names
+  attr_reader :game_def
 
-    attr_reader :number_of_hands
+  # @param [DealerInformation] dealer_information Information about the dealer to which this bot should connect.
+  # @param [GameDefinition, #to_s] game_definition_argument A game definition; either a +GameDefinition+ or the name of the file containing a game definition.
 
-    # @param [DealerInformation] dealer_information Information about the dealer to which this bot should connect.
-    # @param [GameDefinition, #to_s] game_definition_argument A game definition; either a +GameDefinition+ or the name of the file containing a game definition.
-    # @param [String] player_names The names of the players in this match.
-    # @param [Integer] number_of_hands The number of hands in this match.
-    def initialize(
-      dealer_information,
-      users_seat,
-      game_definition_argument,
-      player_names='user p2',
-      number_of_hands=1
+  def initialize(
+    dealer_information,
+    game_definition_argument,
+    users_seat = nil
+  )
+    game_def = if game_definition_argument.kind_of?(
+      GameDefinition
     )
-      @game_def = if game_definition_argument.kind_of?(
-        GameDefinition
-      )
-        game_definition_argument
-      else
-        GameDefinition.parse_file(game_definition_argument)
-      end
-      @basic_proxy = BasicProxy.new dealer_information
-
-      @player_names = player_names.split(/,?\s+/)
-
-      @users_seat = users_seat
+      game_definition_argument
+    else
+      GameDefinition.parse_file(game_definition_argument)
+    end
+    @basic_proxy = BasicProxy.new dealer_information
 
-      @number_of_hands = number_of_hands
+    @players_at_the_table = if users_seat
+      PlayersAtTheTable.seat_players game_def, users_seat
+    else
+      PlayersAtTheTable.seat_players game_def
+    end
 
-      @players_at_the_table = create_players_at_the_table
+    @match_has_ended = false
 
-      yield @players_at_the_table if block_given?
+    yield @players_at_the_table if block_given?
 
-      update_match_state_if_necessary! do |players_at_the_table|
-        yield players_at_the_table if block_given?
-      end
+    update_match_state_if_necessary! do |players_at_the_table|
+      yield players_at_the_table if block_given?
     end
 
-    # Player action interface
-    # @param [PokerAction] action The action to take.
-    def play!(action)
-      if @players_at_the_table.match_ended?
-        raise MatchEnded, "Cannot take action #{action} because the match has ended!"
-      end
+    super @players_at_the_table
+  end
 
+  # Player action interface
+  # @param [PokerAction] action The action to take.
+  def play!(action)
+    begin
       @basic_proxy.send_action action
-
-      update_match_state! do |players_at_the_table|
-        yield @players_at_the_table = players_at_the_table
-      end
+    rescue AcpcPokerBasicProxy::DealerStream::UnableToWriteToDealer => e
+      raise MatchEnded.new.with_context(
+        "Cannot take action #{action} because the match has ended!",
+        e
+      )
     end
 
-    private
+    update_match_state! do |players_at_the_table|
+      __setobj__ @players_at_the_table = players_at_the_table
 
-    def update_match_state_if_necessary!
-      return self if @players_at_the_table.users_turn_to_act? || @players_at_the_table.match_ended?
-
-      update_match_state! do |players_at_the_table|
-        yield players_at_the_table
-      end
+      yield @players_at_the_table if block_given?
     end
+  end
+
+  def match_ended?
+    @match_has_ended
+  end
 
-    def update_match_state!
-      @players_at_the_table.update!(@basic_proxy.receive_match_state!)
+  private
 
-      yield @players_at_the_table
+  def update_match_state_if_necessary!
+    return self if @players_at_the_table.users_turn_to_act? || match_ended?
 
-      update_match_state_if_necessary! do |players_at_the_table|
-        yield players_at_the_table
-      end
+    update_match_state! do |players_at_the_table|
+      yield players_at_the_table if block_given?
     end
+  end
 
-    def create_players_at_the_table
-      PlayersAtTheTable.seat_players(
-        @game_def,
-        @player_names,
-        @users_seat,
-        @number_of_hands
-      )
+  def update_match_state!
+    begin
+      yield @players_at_the_table.update!(@basic_proxy.receive_match_state!) if block_given?
+    rescue AcpcPokerBasicProxy::DealerStream::UnableToGetFromDealer
+      @match_has_ended = true
+    end
+
+    update_match_state_if_necessary! do |players_at_the_table|
+      yield players_at_the_table if block_given?
     end
   end
+end
 end

data/lib/acpc_poker_player_proxy/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerPlayerProxy
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/player_proxy_spec.rb

@@ -9,14 +9,14 @@ require 'acpc_dealer'
 require 'acpc_poker_player_proxy/player_proxy'
 
 include AcpcPokerTypes
-include AcpcDealerData
+include DealerData
 include AcpcPokerBasicProxy
 include AcpcPokerPlayerProxy
 
 describe PlayerProxy do
   PORT_NUMBER = 9001
   HOST_NAME = 'localhost'
-  DEALER_INFO = AcpcDealer::ConnectionInformation.new HOST_NAME, PORT_NUMBER
+  DEALER_INFO = AcpcDealer::ConnectionInformation.new PORT_NUMBER, HOST_NAME
 
   describe '#update!' do
     describe "keeps track of state for a sequence of match states and actions in Doyle's game" do
@@ -25,28 +25,23 @@ describe PlayerProxy do
         # Some interesting three player hands occur after 120
         # Careful though, even 10 hands takes about 7 seconds,
         # and it scales more than linearly
-        num_hands = 10
+        num_hands = 200
         each_match(num_hands) do |match|
           @match = match
           @match.for_every_seat! do |users_seat|
 
             @basic_proxy = init_basic_proxy
 
-            @patient = PlayerProxy.new(
-              DEALER_INFO,
-              users_seat,
-              @match.match_def.game_def,
-              @match.players.map { |player| player.name }.join(' '),
-              num_hands
-            ) do |patt|
-
+            @patient = PlayerProxy.new(DEALER_INFO, @match.match_def.game_def, users_seat) do |patt|
               check_players_at_the_table patt
 
               @match.next_hand! unless @match.hand_number
 
               if @match.current_hand.final_turn?
                 @match.current_hand.end_hand!
+
                 break if @match.final_hand?
+
                 @match.next_hand!
               end
               @match.next_turn!
@@ -104,87 +99,67 @@ describe PlayerProxy do
   def check_players_at_the_table(patient)
     patient.player_acting_sequence.must_equal @match.player_acting_sequence
     patient.players.length.must_equal @match.players.length
-    check_last_action patient
     check_next_to_act patient
     check_last_turn patient
-    patient.opponents_cards_visible?.must_equal @match.opponents_cards_visible?
-    patient.reached_showdown?.must_equal @match.opponents_cards_visible?
-    patient.less_than_two_non_folded_players?.must_equal @match.non_folded_players.length < 2
+    patient.player_acting_sequence_string.must_equal @match.player_acting_sequence_string
+    patient.users_turn_to_act?.must_equal @match.users_turn_to_act?
+    check_betting_sequence patient
 
     if @match.current_hand
       patient.hand_ended?.must_equal @match.current_hand.final_turn?
-      patient.match_ended?.must_equal (@match.final_hand? && @match.current_hand.final_turn?)
-    end
-    patient.last_hand?.must_equal (
-      if @match.final_hand?.nil?
-        false
-      else
-        @match.final_hand?
+      unless @match.current_hand.final_turn?
+        patient.match_state.all_hands.each do |hand|
+          hand.each do |card|
+            card.must_be_kind_of AcpcPokerTypes::Card
+          end
+        end
       end
-    )
-    patient.player_acting_sequence_string.must_equal @match.player_acting_sequence_string
-    patient.users_turn_to_act?.must_equal @match.users_turn_to_act?
-    check_betting_sequence patient
+    end
     # @todo Test this eventually
     # patient.min_wager.to_i.must_equal @min_wager.to_i
   end
+
   def check_player_blind_relation(patient)
-    expected_player_blind_relation = @match.player_blind_relation
-    patient.player_blind_relation.each do |player, blind|
-      expected_player_and_blind = expected_player_blind_relation.to_a.find do |player_and_blind|
-        player_and_blind.first.seat == player.seat
+    patient.position_relative_to_dealer(patient.big_blind_payer).must_equal(
+      @match.match_def.game_def.blinds.index(@match.match_def.game_def.blinds.max)
+    )
+    patient.position_relative_to_dealer(patient.small_blind_payer).must_equal(
+      @match.match_def.game_def.blinds.index do |blind|
+        blind < @match.match_def.game_def.blinds.max && blind > 0
       end
-
-      expected_player = expected_player_and_blind.first
-      expected_blind = expected_player_and_blind.last
-
-      player.close_enough?(expected_player).must_equal true
-      blind.must_equal expected_blind
-    end
+    )
   end
   def check_betting_sequence(patient)
-    patient_betting_sequence = patient.betting_sequence.map do |actions|
-        actions.map { |action| PokerAction.new(action.to_s).to_s }
-    end
-    expected_betting_sequence = @match.betting_sequence.map do |actions|
-      actions.map { |action| action.to_s }
+    x_betting_sequence = @match.betting_sequence.map do |actions|
+      actions.map { |action| AcpcPokerTypes::PokerAction.new(action).to_s }
     end
-    patient_betting_sequence.must_equal expected_betting_sequence
 
-    patient.betting_sequence_string.scan(/([a-z]\d*|\/)/).flatten.map do |action|
+    return x_betting_sequence.flatten.empty?.must_equal(true) unless patient.match_state
+
+    patient.match_state.betting_sequence.map do |actions|
+      actions.map { |action| AcpcPokerTypes::PokerAction.new(action).to_s }
+    end.must_equal x_betting_sequence
+
+    patient.match_state.betting_sequence_string.scan(/([a-z]\d*|\/)/).flatten.map do |action|
       if action.match(/\//)
         action
       else
-        PokerAction.new(action).to_s
+        AcpcPokerTypes::PokerAction.new(action).to_s
       end
     end.join('').must_equal @match.betting_sequence_string
   end
-  def check_last_action(patient)
-    if @match.current_hand && @match.current_hand.last_action
-      patient.player_who_acted_last.seat.must_equal @match.current_hand.last_action.seat
-    else
-      patient.player_who_acted_last.must_be_nil
-    end
-  end
   def check_next_to_act(patient)
     if @match.current_hand && @match.current_hand.next_action
       patient.next_player_to_act.seat.must_equal @match.current_hand.next_action.seat
     else
-      patient.next_player_to_act.must_be_nil
+      patient.next_player_to_act.seat.must_be_nil
     end
   end
   def check_last_turn(patient)
     return unless @match.current_hand && @match.current_hand.final_turn?
+
     patient.players.players_close_enough?(@match.players).must_equal true
-    patient.user_player.close_enough?(@match.player).must_equal true
-    patient.opponents.players_close_enough?(@match.opponents).must_equal true
-    patient.non_folded_players.players_close_enough?(@match.non_folded_players).must_equal true
-    patient.active_players.players_close_enough?(@match.active_players).must_equal true
-    patient.player_with_dealer_button.close_enough?(@match.player_with_dealer_button).must_equal true
-    check_player_blind_relation patient
-    patient.chip_stacks.must_equal @match.chip_stacks
-    patient.chip_balances.must_equal @match.chip_balances
-    patient.chip_contributions.flatten.inject(:+).must_equal @match.chip_contributions.flatten.inject(:+)
+    check_player_blind_relation(patient)
   end
 end
 
@@ -204,22 +179,8 @@ class Array
 end
 
 class AcpcPokerTypes::Player
-  def acpc_actions_taken_this_hand
-    acpc_actions = @actions_taken_this_hand.map do |actions_per_turn|
-      actions_per_turn.map { |action| AcpcPokerTypes::PokerAction.new(action).to_s }
-    end
-    if acpc_actions.first.empty?
-      acpc_actions
-    else
-      acpc_actions.reject_empty_elements
-    end
-  end
-
   def close_enough?(other)
-    @name == other.name &&
     @seat == other.seat &&
-    @chip_stack == other.chip_stack &&
-    @chip_balance == other.chip_balance &&
-    acpc_actions_taken_this_hand == other.acpc_actions_taken_this_hand
+    balance == other.balance
   end
-end
+end

data/spec/support/spec_helper.rb

@@ -1,24 +1,10 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'minitest/autorun'
 require 'minitest/spec'
-require 'minitest/pride'
 require 'minitest/mock'
 
-require 'turn'
-Turn.config do |c|
-  # use one of output formats:
-  # :outline  - turn's original case/test outline mode [default]
-  # :progress - indicates progress with progress bar
-  # :dotted   - test/unit's traditional dot-progress mode
-  # :pretty   - new pretty reporter
-  # :marshal  - dump output as YAML (normal run mode only)
-  # :cue      - interactive testing
-  c.format  = :dotted
-  # use humanized test names (works only with :outline format)
-  c.natural = true
-end
-
 require 'awesome_print'
 module Minitest::Assertions
   def mu_pp(obj)
@@ -27,7 +13,6 @@ module Minitest::Assertions
 end
 
 require 'mocha/setup'
-require 'pry-rescue/minitest'
 
 # Match log information in dealer_logs
 class MatchLog

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_player_proxy
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: acpc_poker_match_state
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: acpc_poker_basic_proxy
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: contextual_exceptions
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 5.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 5.0.6
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +150,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.13'
 description: A smart proxy for a poker player that connects to the ACPC Dealer and
   manages match state data
 email:
@@ -227,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: acpc_poker_player_proxy
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: ACPC Poker Player Proxy
@@ -242,3 +214,4 @@ test_files:
 - spec/support/dealer_logs/3p.nolimit.h1000.r0.actions.log
 - spec/support/dealer_logs/3p.nolimit.h1000.r0.log
 - spec/support/spec_helper.rb
+has_rdoc: