acpc_poker_basic_proxy 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a4ee0ad518308c5f8c6afeb5abba9dfeabc82e
-  data.tar.gz: 011e125a088c577e4b9160e067080b91aa9fca18
+  metadata.gz: 8d6dff95db6eef3d31825a87fc46bf7aec6090c5
+  data.tar.gz: 4a80071d3e101764f00c8e0a1812881825a09d3e
 SHA512:
-  metadata.gz: 89af9c8eff08c6c2141cd8267d7b953201d3097a579f919c8fd91042c18f36255620e99f246393c308264a94cdf3c47584f48f3c2756a7badd807dc570cb1c40
-  data.tar.gz: 33ba7dc3ab6de100f51b5bcf6a440bbb7fb89b9cba1d0584dfb28f30edd1aae6651eb5d8de34351974a53855ab094683d03bcb40111224d6ffb221ac0dcabffa
+  metadata.gz: 04bd293fcb8daa161acd57ee2250596ea934dc604db45440f06a2e03ddfdc3b823311d61b1ffae02aeaaa5637106693792f62c659b9d2e406795955d6cf90d9d
+  data.tar.gz: 432b48c811b643e16dc13aec3fe674ff556837a833c5cd265f615e9546d71f002b8fe89dc2ecfb7b6b028dbf01773b2222b844d1d3d788e2d4c85df8a0841581

data/acpc_poker_basic_proxy.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   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'

data/lib/acpc_poker_basic_proxy/basic_proxy.rb

@@ -11,12 +11,14 @@ module AcpcPokerBasicProxy
   class BasicProxy
     exceptions :initial_match_state_not_yet_received, :illegal_action_format
 
-    CONCATENATED_MODIFIABLE_ACTIONS = AcpcPokerTypes::PokerAction::MODIFIABLE_ACTIONS.to_a.join
+    CONCATENATED_MODIFIABLE_ACTIONS = (
+      AcpcPokerTypes::PokerAction::MODIFIABLE_ACTIONS.to_a.join
+    )
 
     # Sends the given +action+ to through the given +connection+ in the ACPC
     # format.
-    # @param [#write, #ready_to_write?] connection The connection through which the +action+
-    #  should send.
+    # @param [#write, #ready_to_write?] connection The connection through
+    #   which the +action+ should send.
     # @param [#to_s] match_state The current match state.
     # @param [#to_s] action The action to send through the +connection+.
     # @return [Integer] The number of bytes written.
@@ -25,17 +27,27 @@ module AcpcPokerBasicProxy
     def self.send_action(connection, match_state, action)
       validate_action action
 
-      full_action = "#{AcpcPokerTypes::MatchState.parse(match_state.to_s)}:#{action.to_s}"
+      full_action = (
+        "#{AcpcPokerTypes::MatchState.parse(match_state.to_s)}:#{action.to_s}"
+      )
       connection.write full_action
     end
 
     # Sends a comment the given +connection+.
-    # @param [#write, #ready_to_write?] connection The connection through which the +action+
-    #  should send.
+    # @param [#write, #ready_to_write?] connection The connection through
+    #   which the +comment+ should send.
     # @param [#to_s] comment The comment to send through the +connection+.
     # @return [Integer] The number of bytes written.
     def self.send_comment(connection, comment)
-      connection.write comment
+      connection.write "##{comment}"
+    end
+
+    # Sends a ready message to the given +connection+.
+    # @param [#write, #ready_to_write?] connection The connection through
+    #   which the message should send.
+    # @return [Integer] The number of bytes written.
+    def self.send_ready(connection)
+      connection.write DealerStream::READY_MESSAGE
     end
 
     # @raise IllegalActionFormat
@@ -66,11 +78,16 @@ module AcpcPokerBasicProxy
     end
 
     # @param [#to_s] comment The comment to send.
-    # @return (see BasicProxy#send_action)
+    # @return (see BasicProxy#send_comment)
     def send_comment(comment)
       BasicProxy.send_comment @dealer_communicator, comment
     end
 
+    # @return (see BasicProxy#send_ready)
+    def send_ready
+      BasicProxy.send_ready @dealer_communicator
+    end
+
     # @see MatchStateReceiver#receive_match_state
     def receive_match_state!
       @match_state = AcpcPokerTypes::MatchState.receive @dealer_communicator

data/lib/acpc_poker_basic_proxy/dealer_stream.rb

@@ -57,6 +57,8 @@ module AcpcPokerBasicProxy
     # @return [String] Dealer specified string terminator.
     TERMINATION_STRING = "\r\n"
 
+    READY_MESSAGE = '#READY'
+
     # @param [Integer] port The port on which to connect to the dealer.
     # @param [String] host_name The host on which the dealer is running. Defaults to 'localhost'
     # @raise AcpcDealerConnectionError, UnableToWriteToDealer
@@ -136,4 +138,4 @@ module AcpcPokerBasicProxy
       @dealer_socket.gets.chomp
     end
   end
-end
+end

data/lib/acpc_poker_basic_proxy/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerBasicProxy
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/spec/basic_proxy_spec.rb

@@ -13,19 +13,27 @@ include AcpcPokerTypes
 include DealerData
 
 describe BasicProxy do
-  before(:each) do
-    port_number = 9001
-    host_name = 'localhost'
-    millisecond_response_timeout = 0
-    delaer_info = AcpcDealer::ConnectionInformation.new port_number, host_name
-    @dealer_communicator = mock 'DealerStream'
-
-    DealerStream.expects(:new).once.with(port_number, host_name).returns(@dealer_communicator)
+  let(:port_number) { 9001 }
+  let(:host_name) { 'localhost' }
+  let(:millisecond_response_timeout) { 0 }
+  let(:delaer_info) do
+    AcpcDealer::ConnectionInformation.new port_number, host_name
+  end
+  let(:dealer_communicator) { MiniTest::Mock.new 'DealerStream' }
 
-    @patient = BasicProxy.new delaer_info
+  let(:patient) do
+    fussy = ->(port, host) do
+      host.must_equal host_name
+      port.must_equal port_number
+      dealer_communicator
+    end
+    DealerStream.stub :new, fussy do
+      BasicProxy.new delaer_info
+    end
+  end
 
-    @connection = MiniTest::Mock.new
-    @match_state = PokerMatchData.parse_files(
+  let(:match_state) do
+    PokerMatchData.parse_files(
       MatchLog.all[0].actions_file_path,
       MatchLog.all[0].results_file_path,
       MatchLog.all[0].player_names,
@@ -53,55 +61,91 @@ describe BasicProxy do
             end
             match_state = match.current_hand.current_match_state
 
-            @dealer_communicator.stubs(:gets).returns(match_state.to_s)
-
-            @patient.receive_match_state!.must_equal match_state
-
-            if action && match_state == match.current_hand.next_action.state && match.current_hand.next_action.seat == seat
-
-              BasicProxy.expects(:send_action).once.with(@dealer_communicator, match_state.to_s, action)
+            dealer_communicator.stub :gets, match_state.to_s do
+              patient.receive_match_state!.must_equal match_state
+            end
 
-              @patient.send_action(action)
+            if (
+              action &&
+              match_state == match.current_hand.next_action.state &&
+              match.current_hand.next_action.seat == seat
+            )
+              fussy = ->(dealer_communicator_, match_state_, action_) do
+                dealer_communicator_.must_equal dealer_communicator
+                match_state_.must_equal match_state.to_s
+                action_.must_equal action
+              end
+              BasicProxy.stub :send_action, fussy do
+                patient.send_action(action)
+              end
             end
           end
         end
       end
     end
   end
+  describe '::send_comment' do
+    it 'works' do
+      comment = 'this is a comment'
+      dealer_communicator.expect :write, nil, ["##{comment}"]
+      BasicProxy.send_comment(dealer_communicator, comment)
+    end
+  end
+  describe '::send_ready' do
+    it 'works' do
+      dealer_communicator.expect :write, nil, [DealerStream::READY_MESSAGE]
+      BasicProxy.send_ready(dealer_communicator)
+    end
+  end
+  describe '#send_comment' do
+    it 'works' do
+      comment = 'this is a comment'
+      dealer_communicator.expect :write, nil, ["##{comment}"]
+      patient.send_comment(comment)
+    end
+  end
+  describe '#send_ready' do
+    it 'works' do
+      dealer_communicator.expect :write, nil, [DealerStream::READY_MESSAGE]
+      patient.send_ready
+    end
+  end
   describe '#send_action' do
     it 'raises an exception if a match state was not received before an action was sent' do
-      -> {@patient.send_action(mock('PokerAction'))}.must_raise BasicProxy::InitialMatchStateNotYetReceived
+      -> {patient.send_action(MiniTest::Mock.new('PokerAction'))}.must_raise(
+        BasicProxy::InitialMatchStateNotYetReceived
+      )
     end
   end
-  describe "#send_action" do
+  describe "::send_action" do
     it 'does not send an illegal action and raises an exception' do
       -> do
-        BasicProxy.send_action(@connection, @match_state, 'illegal action format')
+        BasicProxy.send_action(dealer_communicator, match_state, 'illegal action format')
       end.must_raise BasicProxy::IllegalActionFormat
     end
-    it 'can send all legal actions through the provided connection without a modifier' do
+    it 'can send all legal actions through the provided dealer_communicator without a modifier' do
       PokerAction::ACTIONS.each do |action|
-        action_that_should_be_sent = @match_state.to_s + ":#{action}"
-        @connection.expect :write, nil, [action_that_should_be_sent]
+        action_that_should_be_sent = match_state.to_s + ":#{action}"
+        dealer_communicator.expect :write, nil, [action_that_should_be_sent]
 
-        BasicProxy.send_action @connection, @match_state, action
+        BasicProxy.send_action dealer_communicator, match_state, action
       end
     end
     it 'does not send legal unmodifiable actions that have a modifier and raises an exception' do
       (PokerAction::ACTIONS - PokerAction::MODIFIABLE_ACTIONS).each do |unmodifiable_action|
         -> do
-          BasicProxy.send_action(@connection, @match_state, unmodifiable_action + 9001.to_s)
+          BasicProxy.send_action(dealer_communicator, match_state, unmodifiable_action + 9001.to_s)
         end.must_raise BasicProxy::IllegalActionFormat
       end
     end
-    it 'can send all legal modifiable actions through the provided connection with a modifier' do
+    it 'can send all legal modifiable actions through the provided dealer_communicator with a modifier' do
       PokerAction::MODIFIABLE_ACTIONS.each do |action|
         arbitrary_modifier = 9001
         action_string = action + arbitrary_modifier.to_s
-        action_that_should_be_sent = @match_state.to_s + ":#{action_string}"
-        @connection.expect :write, nil, [action_that_should_be_sent]
+        action_that_should_be_sent = match_state.to_s + ":#{action_string}"
+        dealer_communicator.expect :write, nil, [action_that_should_be_sent]
 
-        BasicProxy.send_action @connection, @match_state, action_string
+        BasicProxy.send_action dealer_communicator, match_state, action_string
       end
     end
     it 'works for all test data examples' do
@@ -124,9 +168,9 @@ describe BasicProxy do
 
               action_that_should_be_sent = "#{from_player_message.to_s}:#{action.to_acpc}"
 
-              @connection.expect :write, nil, [action_that_should_be_sent]
+              dealer_communicator.expect :write, nil, [action_that_should_be_sent]
 
-              BasicProxy.send_action @connection, from_player_message, action
+              BasicProxy.send_action dealer_communicator, from_player_message, action
             end
           end
         end

data/spec/support/spec_helper.rb

@@ -5,8 +5,6 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'minitest/mock'
 
-require 'mocha/setup'
-
 begin
   require 'awesome_print'
   module Minitest::Assertions
@@ -61,4 +59,4 @@ class MatchLog
   def results_file_path
     "#{DEALER_LOG_DIRECTORY}/#{@results_file_name}"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_basic_proxy
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Dustin Morrill
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.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'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement