acpc_poker_types 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360776ad7098c8fdb25bb82e62ada4ae80ae65ae
-  data.tar.gz: 8fb88c8dad1c962c95aca4926cb927b53d4570cc
+  metadata.gz: 1ac1edc74df20ff22ce321770a24c508acf29ad2
+  data.tar.gz: 7efe0248ddd843e586d9941af349282f3e001672
 SHA512:
-  metadata.gz: 31d5a12377b31af437d306e48735a66131beb7f4b435ad874e37cbf539a10a722e273ca50aacf22774d470b5b0dc994120d0157417688c1510dfa778643ca35a
-  data.tar.gz: 12516ae9be8561af5b8bbcdab9a36119756008f5af961530edbd6ed85336c52a39b51d646051913bea96fe86e4359194b09ab8d0d4f349ad1af15f3175a7999f
+  metadata.gz: d50024fe199e9e81ab4200b59937c83e0f24f3864265e1727632d493a865cd7880877e7892137d3e835798f024093e41734306790f9e02282f2fa40445493cfb
+  data.tar.gz: fbac09f6a3e5370e2bb96b9634de30d80b84877acf41b9f9a627f7ba1da5068d6388f0034633fc47043c3b9b263e755203ff5c37b6f5b0502d03a024957f7000

data/acpc_poker_types.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{ACPC Poker Types}
   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 'process_runner', '~> 0.0'
   s.add_dependency 'acpc_dealer', '~> 1.0'
   s.add_dependency 'celluloid', '~> 0.14'
   s.add_dependency 'contextual_exceptions', '~> 0.0'

data/lib/acpc_poker_types.rb

@@ -11,6 +11,7 @@ require "acpc_poker_types/player"
 require "acpc_poker_types/rank"
 require "acpc_poker_types/suit"
 require "acpc_poker_types/acpc_dealer_data"
+require 'acpc_poker_types/integer_as_seat'
 
 module AcpcPokerTypes
 end

data/lib/acpc_poker_types/acpc_dealer_data/action_messages.rb

@@ -1,4 +1,3 @@
-
 require 'acpc_poker_types/match_state'
 require 'acpc_poker_types/poker_action'
 
@@ -93,7 +92,7 @@ module AcpcPokerTypes::AcpcDealerData
       end
     end
 
-    alias_new :parse
+    class << self; alias_method(:parse, :new) end
 
     def initialize(
       acpc_log_statements,
@@ -111,13 +110,14 @@ module AcpcPokerTypes::AcpcDealerData
           if parsed_message
             if (
               accumulating_data.empty? ||
-              accumulating_data.last.first[:state].hand_number != parsed_message[:state].hand_number
+              (
+                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 =  AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_score(log_line) unless @final_score

data/lib/acpc_poker_types/acpc_dealer_data/hand_results.rb

@@ -1,5 +1,3 @@
-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'
 
@@ -52,7 +50,7 @@ module AcpcPokerTypes::AcpcDealerData
       end
     end
 
-    alias_new :parse
+    class << self; alias_method(:parse, :new); end
 
     def initialize(acpc_log_statements, player_names, game_def_directory, num_hands=nil)
       @final_score = nil
@@ -64,8 +62,11 @@ module AcpcPokerTypes::AcpcDealerData
         else
           parsed_message =  AcpcPokerTypes::AcpcDealerData::HandResults.parse_state(log_line)
           if parsed_message
-            accumulating_data << parsed_message
+            # Yes, this causes one more result to be parsed than is saved as long as
+            # the number of hands is less than the total number in the log, but this
+            # keeps behavior consistent between this class and ActionMessages.
             break accumulating_data if accumulating_data.length == num_hands
+            accumulating_data << parsed_message
           else
             @final_score =  AcpcPokerTypes::AcpcDealerData::HandResults.parse_score(log_line) unless @final_score
           end

data/lib/acpc_poker_types/acpc_dealer_data/poker_match_data.rb

@@ -111,9 +111,7 @@ module AcpcPokerTypes::AcpcDealerData
         raise MatchDefinitionsDoNotMatch
       end
 
-      if (
-        parsed_action_messages.final_score != parsed_hand_results.final_score
-      )
+      if parsed_action_messages.final_score != parsed_hand_results.final_score
         raise FinalScoresDoNotMatch
       end
 

data/lib/acpc_poker_types/card.rb

@@ -1,6 +1,3 @@
-
-require 'dmorrill10-utils' # For alias_new
-
 require 'acpc_poker_types/rank'
 require 'acpc_poker_types/suit'
 
@@ -33,7 +30,7 @@ module AcpcPokerTypes
       AcpcPokerTypes::Card.from_components rank, suit
     end
 
-    alias_new :from_components
+    class << self; alias_method(:from_components, :new) end
 
     def initialize(rank, suit)
       @rank = AcpcPokerTypes::Rank.new rank

data/lib/acpc_poker_types/game_definition.rb

@@ -1,12 +1,15 @@
-require 'dmorrill10-utils/class'
-require 'dmorrill10-utils/enumerable'
-require 'dmorrill10-utils/integer'
 require 'set'
 
 require 'acpc_poker_types/chip_stack'
 require 'acpc_poker_types/suit'
 require 'acpc_poker_types/rank'
 
+require 'acpc_poker_types/integer_as_seat'
+using AcpcPokerTypes::IntegerAsSeat
+
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
 # Class that parses and manages game definition information from a game definition file.
 module AcpcPokerTypes
   class GameDefinition
@@ -165,7 +168,7 @@ module AcpcPokerTypes
       File.open(game_definition_file_name, 'r') { |file|  parse file }
     end
 
-    alias_new :parse
+    class << self; alias_method(:parse, :new); end
 
     def initialize(definitions)
       initialize_members!
@@ -317,7 +320,7 @@ module AcpcPokerTypes
         end
       end
 
-      number_of_cards_required = (@number_of_hole_cards * @number_of_players) + @number_of_board_cards.sum
+      number_of_cards_required = (@number_of_hole_cards * @number_of_players) + @number_of_board_cards.inject(:+)
 
       if number_of_cards_required > (@number_of_suits * @number_of_ranks)
         raise(

data/lib/acpc_poker_types/integer_as_seat.rb

@@ -0,0 +1,72 @@
+module AcpcPokerTypes
+  module IntegerAsSeat
+    refine Integer do
+      # @param [Integer] seat The seat to which the relative position is desired.
+      # @param [Integer] number_of_players The number of players at the table.
+      # @return [Integer] The relative position of +self+ to +seat+, given the
+      #  number of players at the table, +number_of_players+, indexed such that
+      #  the seat immediately to the left of +seat+ has a +position_relative_to+ of
+      #  zero.
+      # @example <code>1.position_relative_to 0, 3</code> == 0
+      # @example <code>1.position_relative_to 1, 3</code> == 2
+      def position_relative_to(seat, number_of_players)
+        unless seat.seat_in_bounds?(number_of_players) &&
+          seat_in_bounds?(number_of_players)
+          raise "Seat #{seat} out of bounds for #{number_of_players} players"
+        end
+
+        adjusted_seat = if self > seat
+          self
+        else
+          self + number_of_players
+        end
+        adjusted_seat - seat - 1
+      end
+
+      # Inverse operation of +position_relative_to+.
+      # Given
+      #  <code>relative_position = seat.position_relative_to to_seat, number_of_players</code>
+      # then
+      #  <code>to_seat = seat.seat_from_relative_position relative_position, number_of_players</code>
+      #
+      # @param [Integer] relative_position_of_self_to_result The relative position
+      #  of seat +self+ to the seat that is returned by this function.
+      # @param [Integer] number_of_players The number of players at the table.
+      # @return [Integer] The seat to which the relative position,
+      #  +relative_position_of_self_to_result+, of +self+ was derived, given the
+      #  number of players at the table, +number_of_players+, indexed such that
+      #  the seat immediately to the left of +from_seat+ has a
+      #  +position_relative_to+ of zero.
+      # @example <code>1.seat_from_relative_position 0, 3</code> == 0
+      # @example <code>1.seat_from_relative_position 2, 3</code> == 1
+      def seat_from_relative_position(relative_position_of_self_to_result,
+                                      number_of_players)
+        unless seat_in_bounds?(number_of_players)
+          raise "Seat #{seat} out of bounds for #{number_of_players} players"
+        end
+
+        unless relative_position_of_self_to_result.seat_in_bounds?(
+          number_of_players
+        )
+          raise "Relative position #{relative_position_of_self_to_result} out of bounds for #{number_of_players} players"
+        end
+
+        position_adjustment = relative_position_of_self_to_result + 1
+
+        to_seat = self + number_of_players - position_adjustment
+        if self > to_seat || !to_seat.seat_in_bounds?(number_of_players)
+          self - position_adjustment
+        else
+          to_seat
+        end
+      end
+
+      # @param [Integer] number_of_players The number of players at the table.
+      # @return [Bool] Reports whether or not +self+ represents an out of bounds
+      #  seat.
+      def seat_in_bounds?(number_of_players)
+        self < number_of_players && self >= 0
+      end
+    end
+  end
+end

data/lib/acpc_poker_types/match_state.rb

@@ -1,12 +1,12 @@
-
-require 'dmorrill10-utils'
-
 require 'acpc_poker_types/board_cards'
 require 'acpc_poker_types/hand'
 require 'acpc_poker_types/rank'
 require 'acpc_poker_types/suit'
 require 'acpc_poker_types/poker_action'
 
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
 # Model to parse and manage information from a given match state string.
 module AcpcPokerTypes
   class MatchState
@@ -39,7 +39,7 @@ module AcpcPokerTypes
     # @return [String] Label for match state strings.
     LABEL = 'MATCHSTATE'
 
-    alias_new :parse
+    class << self; alias_method(:parse, :new) end
 
     # Builds a match state string from its given component parts.
     #

data/lib/acpc_poker_types/player.rb

@@ -1,9 +1,9 @@
-
-require 'dmorrill10-utils'
-
 require 'acpc_poker_types/chip_stack'
 require 'acpc_poker_types/hand'
 
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
 # Class to model a player.
 module AcpcPokerTypes
   class Player
@@ -54,7 +54,7 @@ module AcpcPokerTypes
     #  the current hand, separated by round.
     attr_reader :actions_taken_this_hand
 
-    alias_new :join_match
+    class << self; alias_method(:join_match, :new) end
 
     # @todo These comments don't work as expected
     # @param [String] name This players name.

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/spec/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.7.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2013-05-08T18:30:05-06:00">2013-05-08T18:30:05-06:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2013-05-10T16:18:07-06:00">2013-05-10T16:18:07-06:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

data/spec/player_spec.rb

@@ -4,7 +4,6 @@ require_relative 'support/spec_helper'
 
 require 'acpc_dealer'
 require 'acpc_poker_types/acpc_dealer_data/poker_match_data'
-require 'dmorrill10-utils'
 
 require 'acpc_poker_types/player'
 require 'acpc_poker_types/poker_action'
@@ -186,7 +185,7 @@ describe AcpcPokerTypes::Player do
         "#{dealer_log_directory}/#{log_description.results_file_name}",
         log_description.player_names,
         AcpcDealer::DEALER_DIRECTORY,
-        120
+        10
       )
       match.for_every_seat! do |seat|
         @patient = AcpcPokerTypes::Player.join_match(

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dmorrill10-utils
+  name: process_runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: acpc_dealer
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/acpc_poker_types/pile_of_cards.rb
 - lib/acpc_poker_types/game_definition.rb
 - lib/acpc_poker_types/rank.rb
+- lib/acpc_poker_types/integer_as_seat.rb
 - lib/acpc_poker_types/suit.rb
 - lib/acpc_poker_types/chip_stack.rb
 - lib/acpc_poker_types/version.rb