software_challenge_client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f894ec8a43e2caa45c9773bfe4f8ef966b95583
-  data.tar.gz: 681466cbca4293e50641de66564dbf13379a3e3c
+  metadata.gz: 7809a3d6d16c4423f55d59c5841e091167492d5c
+  data.tar.gz: cf93fa514e3d59944f5a25b5c4267c86f02a0842
 SHA512:
-  metadata.gz: d2b6c4cb186b805758336139e4527994de33e10bcda8389c27a83da9c79abc39aedb82df96b759b26ebcad76c5ba6965d8487e982fdaa187af47bb42794074fb
-  data.tar.gz: 742a795eb16528f7809620c2101af4b636dfaad6b5fb81065c9b60847ad92dc9963b2ae981e2d3ab5b678c0798478a1015c3279be3a4e803ff05025efd55636f
+  metadata.gz: 44aea3599dc16e2b4bc9daba649d1c3079b88b903de986bf4a5db04bdf625b6e6356038725c3e25e0823e1a769819c2e7a3ce1e08bd71327805f4d220f0d71fd
+  data.tar.gz: 278be07a4517f858ced0abdd062e7b22665fffce97bdebdadffe4fcf400deece2dd026946b55644084734e2421c1ae9010200ad3b51ca4e312025748e80ebf0a

data/README.md

@@ -67,14 +67,14 @@ to get a live preview of them at [http://localhost:8808](http://localhost:8808).
 ## Development
 
 After checking out the repo, run `bin/setup` to install
-dependencies. Then, run `rake false` to run the tests. You can also
+dependencies. Then, run `rspec` to run the tests. You can also
 run `bin/console` for an interactive prompt that will allow you to
 experiment.
 
 To install this gem onto your local machine, run `bundle exec rake
 install`.
 
-To develop inside a docker container, use the included `Dockerfile` and
+To develop inside a docker container, make sure you have Docker installed and execute
 `develop.sh`.
 
 ### Specs

data/RELEASES.md

@@ -1,3 +1,8 @@
+= 1.2.0
+
+- fixed connection code
+- fixed bug which lead to a exception when testing for playability of fallback card
+
 = 1.1.0
 
 Added missing perform! methods for actions.

data/lib/software_challenge_client/board.rb

@@ -40,6 +40,7 @@ class Board
   #   exisitert (weil der Index ausserhalb von 0..64 liegt), wird ein neues
   #   Feld vom Typ INVALID zurückgegeben.
   def field(index)
+    return Field.new(FieldType::INVALID, index) if index.negative?
     fields.fetch(index, Field.new(FieldType::INVALID, index))
   end
 end

data/lib/software_challenge_client/network.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require 'socket'
 require 'rexml/document'
 require 'rexml/element'
@@ -9,31 +10,23 @@ require_relative 'client_interface'
 
 # This class handles the socket connection to the server
 class Network
-
   include Logging
 
-  @socket
-  @host
-  @port
-
-  @board
-  @client
-  @protocol
-
-  @receiveBuffer
-  @reservationID
-
   # @!attribute [r] connected
   # @return [Boolean] true, if the client is connected to a server
   attr_reader :connected
 
   def initialize(host, port, board, client, reservation = nil)
-    @host, @port, @connected, @board, @client =
-      host, port, false, board, client
+    logger.debug("New version")
+    @host = host
+    @port = port
+    @board = board
+    @client = client
 
+    @connected = false
     @protocol = Protocol.new(self, @client)
-    @reservationID = reservation || ''
-    @receiveBuffer = ''
+    @reservation_id = reservation || ''
+    @receive_buffer = ''
   end
 
   # connects the client with a given server
@@ -44,28 +37,24 @@ class Network
     logger.info 'Connection to server established.'
     @connected = true
 
-    self.sendString('<protocol>')
-    if @reservationID != ''
-      document = REXML::Document.new
+    sendString('<protocol>')
+    document = REXML::Document.new
+    if @reservation_id != ''
       element = REXML::Element.new('joinPrepared')
-      element.add_attribute('reservationCode', @reservationID)
-      document.add(element)
-      self.sendXML(document)
+      element.add_attribute('reservationCode', @reservation_id)
     else
-      document = REXML::Document.new
       element = REXML::Element.new('join')
-      element.add_attribute('gameType', 'swc_2017_mississippi_queen')
-      document.add(element)
-      self.sendXML(document)
+      element.add_attribute('gameType', 'swc_2018_hase_und_igel')
     end
-    return @connected
+    document.add(element)
+    sendXML(document)
+    @connected
   end
 
   # disconnects the client from a server
   def disconnect
-
     if @connected
-      sendString("</protocol>")
+      sendString('</protocol>')
       @connected = false
       @socket.close
     end
@@ -74,72 +63,65 @@ class Network
 
   # reads from the socket until "</room>" is read
   def readString
-    logger.debug 'reading'
-    sockMsg = ''
-    if(!@connected)
-      return
-    end
-
-    line =''
-    char = ''
-    while (line != "</room>" && line != "</protocol>") && !(char = @socket.getc).nil?
-      line+=char
-      if char=='\n' || char==' '
+    return false unless @connected
+    sock_msg = ''
 
-        line = ''
-      end
-      sockMsg += char
+    line = ''
+    logger.debug 'reading'
+    @socket.each_char do |char|
+      line += char
+      sock_msg += char
+      line = '' if ['\n', ' '].include? char
+      break if ['</room>', '</protocol>'].include? line
     end
     logger.debug 'ended reading'
-    if sockMsg != ''
-
-      @receiveBuffer.concat(sockMsg)
+    if sock_msg != ''
+      @receive_buffer.concat(sock_msg)
 
       # Remove <protocol> tag
-      @receiveBuffer = @receiveBuffer.gsub('<protocol>', '')
-      @receiveBuffer = @receiveBuffer.gsub('</protocol>', '')
+      @receive_buffer = @receive_buffer.gsub('<protocol>', '')
+      @receive_buffer = @receive_buffer.gsub('</protocol>', '')
 
-      logger.debug "Received XML from server: #{@receiveBuffer}"
+      logger.debug "Received XML from server: #{@receive_buffer}"
 
       # Process text
-      @protocol.process_string(@receiveBuffer);
-      self.emptyReceiveBuffer
+      @protocol.process_string(@receive_buffer)
+      emptyReceiveBuffer
     end
-    return true
+    true
   end
 
-  # empties the receive buffer
-  def emptyReceiveBuffer
-    @receiveBuffer = ''
+  # sends a xml Document to the buffer
+  #
+  # @param xml [REXML::Document] the Document, that will be sent
+  def sendXML(xml)
+    text = ''
+    xml.write(text)
+    sendString(text)
   end
 
   # processes an incomming message
   #
   # @return [Boolean] true, if the processing of a incomming message was successfull
   def processMessages
-    if !@connected
-      return false
-    end
-    return self.readString
+    return false unless @connected
+    readString
   end
 
   # sends a string to the socket
   #
   # @param s [String] the message, to be sent
   def sendString(s)
-    if(@connected)
-      @socket.print(s);
-      logger.debug "Sending: #{s}"
-    end
+    return unless @connected
+    logger.debug "Sending: #{s}"
+    @socket.print(s)
   end
 
-  # sends a xml Document to the buffer
-  #
-  # @param xml [REXML::Document] the Document, that will be sent
-  def sendXML(xml)
-    text  = ''
-    xml.write(text)
-    self.sendString(text);
+  private
+
+  # empties the receive buffer
+  def emptyReceiveBuffer
+    @receive_buffer = ''
   end
 
 end

data/lib/software_challenge_client/runner.rb

@@ -6,31 +6,29 @@ require_relative 'network'
 class Runner
   include Logging
 
-  attr_reader :network
-
   def initialize(host, port, client, reservation = nil)
-    logger.info 'Software Challenge 2017'
+    logger.info 'Software Challenge 2018'
     logger.info 'Ruby Client'
     logger.info "Host: #{host}"
     logger.info "Port: #{port}"
 
-    board = Board.new()
+    board = Board.new
     @network = Network.new(host, port, board, client, reservation)
   end
 
   def start
-    self.network.connect
-    if self.network.connected == false
+    @network.connect
+    unless @network.connected
       logger.error 'Not connected'
       return
     end
 
-    while self.network.connected
-      self.network.processMessages
+    while @network.connected
+      @network.processMessages
       sleep(0.01)
     end
 
     logger.info 'Program end...'
-    self.network.disconnect
+    @network.disconnect
   end
 end

data/lib/software_challenge_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - 'kwollw '
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum