software_challenge_client 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7809a3d6d16c4423f55d59c5841e091167492d5c
-  data.tar.gz: cf93fa514e3d59944f5a25b5c4267c86f02a0842
+  metadata.gz: f17d0f5a06ce3da01d2700ea50e20e6f8ccb9d4f
+  data.tar.gz: 85f493205e07e2ec8c4e66b61a51da5b4a2e43dd
 SHA512:
-  metadata.gz: 44aea3599dc16e2b4bc9daba649d1c3079b88b903de986bf4a5db04bdf625b6e6356038725c3e25e0823e1a769819c2e7a3ce1e08bd71327805f4d220f0d71fd
-  data.tar.gz: 278be07a4517f858ced0abdd062e7b22665fffce97bdebdadffe4fcf400deece2dd026946b55644084734e2421c1ae9010200ad3b51ca4e312025748e80ebf0a
+  metadata.gz: ab46b529b1874eecfc1c9a3449d7e0c70734d06247004c473b183054c31e1251fabcd3be7877a4f80b6ecf3412766a0eebcb009dd852d50dcdf27fb68a397ee3
+  data.tar.gz: cb7cd641de2dbdf3caf1b60fb5058a00436ea985b69866938dac4988accc5e833ce1e69fd094b17d00d877e43460757480ae8b103fd104870002dc14eeec23a7

data/README.md

@@ -30,7 +30,7 @@ ruby main.rb
 ```
 
 in a shell (while being in the example directory). Note that the
-software_challenge_client gem needs to be installed for this to work and a
+`software_challenge_client` gem needs to be installed for this to work and a
 server waiting for a manual client has to be running.
 
 ## Documentation
@@ -91,10 +91,12 @@ pass.
 ### Releasing
 
 To release a new version, update the version number in
-`lib/software_challenge_client/version.rb` and update RELEASES.md. Then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+`lib/software_challenge_client/version.rb` and update RELEASES.md.
+
+Then run `bundle exec rake release`, which will create a git tag for the
+version, push git commits and tags, and push the `.gem` file to
+[rubygems.org](https://rubygems.org). You may also use the `release.sh` script
+which executes `bundle exec rake release` in a suitable docker container.
 
 ## Contributing
 

data/RELEASES.md

@@ -1,3 +1,7 @@
+= 1.2.1
+
+- fixed a bug which could lead to an infinite loop in the possible_move method
+
 = 1.2.0
 
 - fixed connection code

data/example/start.bat

@@ -0,0 +1,2 @@
+:: Gedacht zum ausführen des ruby SimpleClients
+ruby main.rb %*

data/lib/software_challenge_client/action.rb

@@ -110,7 +110,7 @@ class Card < Action
         raise "Unknown card type #{card_type.inspect}!"
     end
     gamestate.set_last_action(self)
-    gamestate.current_player.cards.delete(self.type)
+    gamestate.current_player.cards.delete(card_type)
   end
 
   def type

data/lib/software_challenge_client/game_rules.rb

@@ -53,11 +53,11 @@ class GameRules
       when FieldType::SALAD
         return false, 'Ohne Salat darf ein Salatfeld nicht betreten werden.' if player.salads < 1
       when FieldType::HARE
-        state2 = state.deep_clone
-        state2.set_last_action(Advance.new(distance))
-        state2.current_player.index = new_position
-        state2.current_player.carrots -= required_carrots
-        return false, 'Auf ein Hasenfeld darf nur gezogen werden, wenn eine Karte gespielt werden kann' unless can_play_any_card(state2)
+        state_after_advance = state.deep_clone
+        state_after_advance.set_last_action(Advance.new(distance))
+        state_after_advance.current_player.index = new_position
+        state_after_advance.current_player.carrots -= required_carrots
+        return false, 'Auf ein Hasenfeld darf nur gezogen werden, wenn eine Karte gespielt werden kann' unless can_play_any_card(state_after_advance)
       when FieldType::GOAL
         carrotsLeft = player.carrots - required_carrots
         return false, "Auf das Zielfeld darf nur mit maximal 10 Karotten gezogen werden (es sind aber #{carrotsLeft} bei Erreichen des Zielfeldes)." unless carrotsLeft <= 10
@@ -131,9 +131,7 @@ class GameRules
         return true
       elsif (last_action.instance_of? Card)
         # the player has to leave a rabbit field in next turn
-        if (last_action.type == CardType::EAT_SALAD)
-          return true
-        elsif (last_action.type == CardType::TAKE_OR_DROP_CARROTS) # the player has to leave the rabbit field
+        if (last_action.type == CardType::EAT_SALAD || last_action.type == CardType::TAKE_OR_DROP_CARROTS)
           return true
         end
       end
@@ -189,10 +187,10 @@ class GameRules
       when FieldType::SALAD
         return false, 'Spieler käme durch Spielen der FALL_BACK Kart auf ein Salatfeld, hat aber keine Salate.' if player.salads < 1
       when FieldType::HARE
-        state2 = state.deep_clone
-        state2.set_last_action(Card.new(CardType::HURRY_AHEAD))
-        state2.current_player.cards.delete(CardType::FALL_BACK)
-        return false, 'Spieler käme durch Spielen der FALL_BACK Kart auf ein Hasenfeld, kann aber dann keine weitere Karte mehr spielen.' unless can_play_any_card(state2)
+        state_after_card_played = state.deep_clone
+        state_after_card_played.set_last_action(Card.new(CardType::FALL_BACK))
+        state_after_card_played.current_player.cards.delete(CardType::FALL_BACK)
+        return false, 'Spieler käme durch Spielen der FALL_BACK Kart auf ein Hasenfeld, kann aber dann keine weitere Karte mehr spielen.' unless can_play_any_card(state_after_card_played)
       when FieldType::START
       when FieldType::CARROT
       when FieldType::POSITION_1
@@ -227,10 +225,10 @@ class GameRules
       when FieldType::SALAD
         return false, 'Spieler käme durch Spielen der HURRY_AHEAD Kart auf ein Salatfeld, hat aber keine Salate.' if player.salads < 1
       when FieldType::HARE
-        state2 = state.deep_clone
-        state2.set_last_action(Card.new(CardType::HURRY_AHEAD))
-        state2.current_player.cards.delete(CardType::HURRY_AHEAD)
-        return false, 'Spieler käme durch Spielen der HURRY_AHEAD Kart auf ein Hasenfeld, kann aber dann keine weitere Karte mehr spielen.' unless can_play_any_card(state2)
+        state_after_card_played = state.deep_clone
+        state_after_card_played.set_last_action(Card.new(CardType::HURRY_AHEAD))
+        state_after_card_played.current_player.cards.delete(CardType::HURRY_AHEAD)
+        return false, 'Spieler käme durch Spielen der HURRY_AHEAD Kart auf ein Hasenfeld, kann aber dann keine weitere Karte mehr spielen.' unless can_play_any_card(state_after_card_played)
       when FieldType::GOAL
         return false, 'Spieler käme durch Spielen der HURRY_AHEAD Kart ins Ziel, darf es aber nicht betreten (entweder noch Salate oder mehr als 10 Karotten).' unless can_enter_goal(state)
       when FieldType::CARROT

data/lib/software_challenge_client/network.rb

@@ -17,7 +17,6 @@ class Network
   attr_reader :connected
 
   def initialize(host, port, board, client, reservation = nil)
-    logger.debug("New version")
     @host = host
     @port = port
     @board = board

data/lib/software_challenge_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - 'kwollw '
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -247,6 +247,7 @@ files:
 - develop.sh
 - example/client.rb
 - example/main.rb
+- example/start.bat
 - generate-authors.sh
 - lib/software_challenge_client.rb
 - lib/software_challenge_client/action.rb
@@ -291,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: This gem provides functions to build a client for the coding competition