software_challenge_client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6e73a26e7e73031e6e8753b4530a3a97d7c6d4
-  data.tar.gz: 94b865f5a9919c92fdd383c7ee130b5a8444cc2a
+  metadata.gz: c4074b13fd465d18b7149f6900ebc838c8339c1a
+  data.tar.gz: b906a5f6a650d5a166552973622da994b9939ffc
 SHA512:
-  metadata.gz: 2af181e53250e162c328d70512f12e98c01535f5cea29570dd787c34a2627575d73bd8ee832e4b72ffd33e390d15b064014b0f6d6019269cccd73c4d21d50a9a
-  data.tar.gz: 57434f1b54bd0723e8d1af763780cc3ad25cb79ec0476eeb924d1b812d4862e05451a1b88baf98a9816860e0c4b8c9d18c0b7ffb348e129a93f917aac8d32922
+  metadata.gz: 6f99030db786cba8ef7689faacae933e9b12d9f913548290a7c10f9605017eff041621773b94dbf4116a9512cc1169539c127cdafa36a6dd8f18287f34643a33
+  data.tar.gz: 66c02fbccbb2f00b699b83b3e8f61a3aec7a6c8cb3fd3c51048182f3d4a3b1e2c8e621243bc7615473c4e2613ee19fa673afd84ae5b85791d3e40754c2112af7

data/RELEASES.md

@@ -1,3 +1,9 @@
+= 0.3.0
+
+- Fixed bug where wrong (old) method getMove was called, the new name is
+  move_requested
+- Improved end game handling
+
 = 0.2.0
 
 - First working version for Mississippi Queen

data/lib/software_challenge_client/network.rb

@@ -82,7 +82,7 @@ class Network
 
     line =''
     char = ''
-    while line != "</room>" && !(char = @socket.getc).nil?
+    while (line != "</room>" && line != "</protocol>") && !(char = @socket.getc).nil?
       line+=char
       if char=='\n' || char==' '
 
@@ -97,11 +97,12 @@ class Network
 
       # Remove <protocol> tag
       @receiveBuffer = @receiveBuffer.gsub('<protocol>', '')
+      @receiveBuffer = @receiveBuffer.gsub('</protocol>', '')
 
       logger.debug "Received XML from server: #{@receiveBuffer}"
 
       # Process text
-      @protocol.process_string("<msg>#{@receiveBuffer}</msg>");
+      @protocol.process_string(@receiveBuffer);
       self.emptyReceiveBuffer
     end
     return true

data/lib/software_challenge_client/protocol.rb

@@ -50,9 +50,11 @@ class Protocol
     case name
     when 'board'
       logger.debug @gamestate.board.to_s
-    when 'condition'
-      logger.info 'Game ended'
-      @network.disconnect
+    when 'data'
+      if @context[:data_class] == 'result'
+        logger.info 'Got game result'
+        @network.disconnect
+      end
     end
   end
 
@@ -69,9 +71,10 @@ class Protocol
       logger.info 'roomId : ' + @roomId
     when 'data'
       logger.debug "data(class) : #{attrs['class']}"
+      @context[:data_class] = attrs['class']
       if attrs['class'] == 'sc.framework.plugins.protocol.MoveRequest'
         @client.gamestate = gamestate
-        move = @client.getMove
+        move = @client.move_requested
         sendString(move_to_xml(move))
       end
       if attrs['class'] == 'error'
@@ -122,6 +125,9 @@ class Protocol
       @gamestate.lastMove.add_action_with_order(Push.new(Direction.find_by_key(attrs['direction'].to_sym)), attrs['order'].to_i)
     when 'condition'
       @gamestate.condition = Condition.new(attrs['winner'], attrs['reason'])
+    when 'left'
+      logger.debug 'got left event, terminating'
+      @network.disconnect
     end
   end
 

data/lib/software_challenge_client/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module SoftwareChallengeClient
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - 'kwollw '
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: This gem provides functions to build a client for the coding competition