software_challenge_client 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a644a842b10f9a526189f270555be151a047d65
-  data.tar.gz: b4ec3d2bd0e31946d6b3209c5499147d81daa341
+  metadata.gz: 2e078c2ea342feb8da789442c4ad6cdd3706ff15
+  data.tar.gz: 90bcc5974f4a1388655101874062157a4f817dcd
 SHA512:
-  metadata.gz: 9cb30c1e255d7dff22c42a43ee432a0de7fb03509f99ac722971e647484225d38773a5932261e8cdee8796c5038352a53e7eb1e5d35b490a44ccd824b020c520
-  data.tar.gz: abac043218602d2b25e0cbfa1b0fc79d5fd931037f535edc46a215482f67594aa84d34c7b8543324ea971f3df5c354415debadcdb4c87393189729fc03d6f304
+  metadata.gz: d673b541408a816e100fe286d370d661ac7991235049d610ecf855426c22f2548a425f0f77f82214db1c790e5b089b35bacdc5a3c083bbd85b91b0f2180d5182
+  data.tar.gz: ff79a54d09798ce8222711ace8b15db2e8e09ece78d27b4f7278ee21e4b4274a735819ee55677ed8266881b3894f327f8f2134222c4f71f0211b63816117e0c7

data/RELEASES.md

@@ -1,3 +1,8 @@
+= 0.3.4
+
+- Renamed Turn#direction to Turn#turn_steps to make clearer that a number should be given, not a Direction instance.
+- Corrected generation of XML for Push-actions
+
 = 0.3.3
 
 - Corrected checking/updating of coal for decelerations.

data/lib/software_challenge_client/action.rb

@@ -75,38 +75,38 @@ class Acceleration < Action
   end
 end
 
-# Turn by {#direction}.
+# Turn by {#turn_steps}.
 class Turn < Action
   # Number of steps to turn. Negative values for turning clockwise, positive for
   # counterclockwise.
-  attr_reader :direction
+  attr_reader :turn_steps
 
-  def initialize(direction)
-    @direction = direction
+  def initialize(turn_steps)
+    @turn_steps = turn_steps
   end
 
   # (see Acceleration#perform!)
   def perform!(gamestate, current_player)
-    invalid 'Drehung um 0 ist ungültig' if direction.zero?
+    invalid 'Drehung um 0 ist ungültig' if turn_steps.zero?
     if gamestate
        .board
        .field(current_player.x, current_player.y)
        .type == FieldType::SANDBANK
       invalid 'Drehung auf Sandbank nicht erlaubt'
     end
-    needed_coal = direction.abs
+    needed_coal = turn_steps.abs
     needed_coal -= 1 if gamestate.free_turn?
     if needed_coal > 0 && gamestate.additional_free_turn_after_push?
       needed_coal -= 1
       gamestate.additional_free_turn_after_push = false
     end
     if needed_coal > current_player.coal
-      invalid "Nicht genug Kohle für Drehung um #{direction}. "\
+      invalid "Nicht genug Kohle für Drehung um #{turn_steps}. "\
               "Habe #{current_player.coal}, brauche #{needed_coal}."
     end
 
     current_player.direction =
-      Direction.get_turn_direction(current_player.direction, direction)
+      Direction.get_turn_direction(current_player.direction, turn_steps)
     current_player.coal -= [0, needed_coal].max
     gamestate.free_turn = false
   end
@@ -116,7 +116,7 @@ class Turn < Action
   end
 
   def ==(other)
-    other.type == type && other.direction == direction
+    other.type == type && other.turn_steps == turn_steps
   end
 end
 

data/lib/software_challenge_client/condition.rb

@@ -6,15 +6,10 @@ class Condition
   # @!attribute [r] winner
   # @return [Player] winning player
   attr_reader :winner
-  # @!attribute [r] reason
-  # @return [String] winning reason
-  attr_reader :reason
 
-  # Initializes the winning Condition with a player and a reason
+  # Initializes the winning Condition with a player
   # @param winer [Player] winning player
-  # @param reason [String] winning reason
-  def initialize(winner, reason)
+  def initialize(winner)
     @winner = winner
-    @reason = reason
   end
 end

data/lib/software_challenge_client/protocol.rb

@@ -50,11 +50,9 @@ class Protocol
     case name
     when 'board'
       logger.debug @gamestate.board.to_s
-    when 'data'
-      if @context[:data_class] == 'result'
-        logger.info 'Got game result'
-        @network.disconnect
-      end
+    when 'result'
+      logger.info 'Got game result'
+      @network.disconnect
     end
   end
 
@@ -91,10 +89,18 @@ class Protocol
       logger.debug "Turn: #{@gamestate.turn}"
     when 'red'
       logger.debug 'new red player'
-      @gamestate.add_player(parsePlayer(PlayerColor::RED, attrs))
+      player = parsePlayer(attrs)
+      if player.color != PlayerColor::RED
+        throw new IllegalArgumentException("expected #{PlayerColor::RED} Player but got #{player.color}")
+      end
+      @gamestate.add_player(player)
     when 'blue'
       logger.debug 'new blue player'
-      @gamestate.add_player(parsePlayer(PlayerColor::BLUE, attrs))
+      player = parsePlayer(attrs)
+      if player.color != PlayerColor::BLUE
+        throw new IllegalArgumentException("expected #{PlayerColor::BLUE} Player but got #{player.color}")
+      end
+      @gamestate.add_player(player)
     when 'board'
       logger.debug 'new board'
       @gamestate.board = Board.new
@@ -123,8 +129,8 @@ class Protocol
       @gamestate.lastMove.add_action_with_order(Turn.new(attrs['direction'].to_i), attrs['order'].to_i)
     when 'push'
       @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 'winner'
+      @gamestate.condition = Condition.new(parsePlayer(attrs))
     when 'left'
       logger.debug 'got left event, terminating'
       @network.disconnect
@@ -133,18 +139,13 @@ class Protocol
 
   # Converts XML attributes for a Player to a new Player object
   #
-  # @param expectedColor [PlayerColor] Color the player should have. Method will
-  # throw an exception when expectedColor and color in attributes don't match.
   # @param attributes [Hash] Attributes for the new Player.
   # @return [Player] The created Player object.
-  def parsePlayer(expectedColor, attributes)
+  def parsePlayer(attributes)
     player = Player.new(
       PlayerColor.find_by_key(attributes['color'].to_sym),
       attributes['displayName']
     )
-    if player.color != expectedColor
-      throw new IllegalArgumentException("expected #{expectedColor} Player but got #{attributes['color']}")
-    end
     player.points = attributes['points'].to_i
     player.direction = Direction.find_by_key(attributes['direction'].to_sym)
     player.x = attributes['x'].to_i
@@ -184,8 +185,10 @@ class Protocol
         attribute = case action.type
                     when :acceleration
                       { acc: action.acceleration }
-                    when :push, :turn
-                      { direction: action.direction }
+                    when :push
+                      { direction: action.direction.key }
+                    when :turn
+                      { direction: action.turn_steps }
                     when :advance
                       { distance: action.distance }
                     when default

data/lib/software_challenge_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - 'kwollw '