software_challenge_client 22.1.0 → 23.0.2

data/lib/software_challenge_client/runner.rb

@@ -1,36 +1,36 @@
-# encoding: UTF-8
-# frozen_string_literal: true
-require_relative 'board'
-require_relative 'client_interface'
-require_relative 'network'
-
-# Klasse zum Starten einer neue Verbindung zum Spielserver und Verarbeiten der Nachrichten des Servers.
-class Runner
-  include Logging
-
-  def initialize(host, port, client, reservation = nil)
-    logger.info 'Software Challenge 2022'
-    logger.info 'Ruby Client'
-    logger.info "Host: #{host}"
-    logger.info "Port: #{port}"
-
-    board = Board.new
-    @network = Network.new(host, port, board, client, reservation)
-  end
-
-  def start
-    @network.connect
-    unless @network.connected
-      logger.error 'Not connected'
-      return
-    end
-
-    while @network.connected
-      @network.processMessages
-      sleep(0.01)
-    end
-
-    logger.info 'Program end...'
-    @network.disconnect
-  end
-end
+# encoding: UTF-8
+# frozen_string_literal: true
+require_relative 'board'
+require_relative 'client_interface'
+require_relative 'network'
+
+# Klasse zum Starten einer neue Verbindung zum Spielserver und Verarbeiten der Nachrichten des Servers.
+class Runner
+  include Logging
+
+  def initialize(host, port, client, reservation = nil)
+    logger.info 'Software Challenge 2022'
+    logger.info 'Ruby Client'
+    logger.info "Host: #{host}"
+    logger.info "Port: #{port}"
+
+    board = Board.new
+    @network = Network.new(host, port, board, client, reservation)
+  end
+
+  def start
+    @network.connect
+    unless @network.connected
+      logger.error 'Not connected'
+      return
+    end
+
+    while @network.connected
+      @network.processMessages
+      sleep(0.01)
+    end
+
+    logger.info 'Program end...'
+    @network.disconnect
+  end
+end

data/lib/software_challenge_client/team.rb

@@ -1,25 +1,23 @@
-# frozen_string_literal: true
-
-require 'typesafe_enum'
-
-require_relative 'color'
-
-# Erster oder zweiter Spieler:
-#
-#   ONE
-#   TWO
-#
-# Zugriff z.B. mit Team::ONE
-class Team < TypesafeEnum::Base
-  new :ONE, 'Red'
-  new :TWO, 'Blue'
-
-  # @return [Color] Gibt die zugehörige Farbe zurück
-  def to_c
-    if self.key == :ONE
-      Color::RED
-    else
-      Color::BLUE
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'typesafe_enum'
+
+# Erster oder zweiter Spieler:
+#
+#   ONE
+#   TWO
+#
+# Zugriff z.B. mit Team::ONE
+class Team < TypesafeEnum::Base
+  new :ONE, 'ONE'
+  new :TWO, 'TWO'
+
+  # @return [Team] Das Team, was nicht t ist.
+  def other_team(t)
+    if t == :ONE
+      :TWO
+    else
+      :ONE
+    end
+  end
+end

data/lib/software_challenge_client/util/constants.rb

@@ -1,9 +1,9 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-# Konstanten zum aktuellen Spiel.
-module Constants
-  ROUND_LIMIT = 30 # Rundenbegrenzung. Nach Ende der angegebenen Runde endet auch das Spiel.
-  GAME_IDENTIFIER = 'swc_2022_ostseeschach' # Der Identifikator des Spiels. Für die Kommunikation mit dem Spielserver.
-  BOARD_SIZE = 8 # Seitenlänge des Spielbretts in Feldern
-end
+# encoding: utf-8
+# frozen_string_literal: true
+
+# Konstanten zum aktuellen Spiel.
+module Constants
+  ROUND_LIMIT = 30 # Rundenbegrenzung. Nach Ende der angegebenen Runde endet auch das Spiel.
+  GAME_IDENTIFIER = 'swc_2023_penguins' # Der Identifikator des Spiels. Für die Kommunikation mit dem Spielserver.
+  BOARD_SIZE = 8 # Seitenlänge des Spielbretts in Feldern
+end

data/lib/software_challenge_client/version.rb

@@ -1,5 +1,5 @@
-# encoding: UTF-8
-# frozen_string_literal: true
-module SoftwareChallengeClient
-  VERSION = '22.1.0'
-end
+# encoding: UTF-8
+# frozen_string_literal: true
+module SoftwareChallengeClient
+  VERSION = '23.0.2'
+end

data/lib/software_challenge_client.rb

@@ -1,25 +1,23 @@
-# frozen_string_literal: true
-module SoftwareChallengeClient
-  require 'software_challenge_client/board.rb'
-  require 'software_challenge_client/client_interface.rb'
-  require 'software_challenge_client/color.rb'
-  require 'software_challenge_client/condition.rb'
-  require 'software_challenge_client/coordinates.rb'
-  require 'software_challenge_client/debug_hint.rb'
-  require 'software_challenge_client/field.rb'
-  require 'software_challenge_client/game_rule_logic.rb'
-  require 'software_challenge_client/game_state.rb'
-  require 'software_challenge_client/has_hints.rb'
-  require 'software_challenge_client/invalid_move_exception.rb'
-  require 'software_challenge_client/logging.rb'
-  require 'software_challenge_client/move.rb'
-  require 'software_challenge_client/network.rb'
-  require 'software_challenge_client/piece.rb'
-  require 'software_challenge_client/piece_type.rb'
-  require 'software_challenge_client/player.rb'
-  require 'software_challenge_client/protocol.rb'
-  require 'software_challenge_client/runner.rb'
-  require 'software_challenge_client/team.rb'
-  require 'software_challenge_client/util/constants.rb'
-  require 'software_challenge_client/version.rb'
-end
+# frozen_string_literal: true
+module SoftwareChallengeClient
+  require 'software_challenge_client/board.rb'
+  require 'software_challenge_client/client_interface.rb'
+  require 'software_challenge_client/condition.rb'
+  require 'software_challenge_client/coordinates.rb'
+  require 'software_challenge_client/debug_hint.rb'
+  require 'software_challenge_client/direction.rb'
+  require 'software_challenge_client/field.rb'
+  require 'software_challenge_client/game_rule_logic.rb'
+  require 'software_challenge_client/game_state.rb'
+  require 'software_challenge_client/invalid_move_exception.rb'
+  require 'software_challenge_client/logging.rb'
+  require 'software_challenge_client/move.rb'
+  require 'software_challenge_client/network.rb'
+  require 'software_challenge_client/piece.rb'
+  require 'software_challenge_client/player.rb'
+  require 'software_challenge_client/protocol.rb'
+  require 'software_challenge_client/runner.rb'
+  require 'software_challenge_client/team.rb'
+  require 'software_challenge_client/util/constants.rb'
+  require 'software_challenge_client/version.rb'
+end

data/lib/update_client_module.sh

@@ -1,15 +1,15 @@
-#!/bin/bash
-# This creates a entrypoint for the gem named 'software_challenge_client.rb'
-# which includes all ruby files under lib. Making sure that everthing is
-# included after some files were added or removed (in the process of updating
-# the gem for a new game).
-shopt -s globstar || exit 1
-cd lib || exit 1
-FILENAME='software_challenge_client.rb'
-
-echo "# frozen_string_literal: true
-module SoftwareChallengeClient" > $FILENAME
-for file in software_challenge_client/**/*.rb; do
-    echo "  require '${file}'"
-done >> $FILENAME;
-echo "end" >> $FILENAME
+#!/bin/bash
+# This creates a entrypoint for the gem named 'software_challenge_client.rb'
+# which includes all ruby files under lib. Making sure that everthing is
+# included after some files were added or removed (in the process of updating
+# the gem for a new game).
+shopt -s globstar || exit 1
+cd lib || exit 1
+FILENAME='software_challenge_client.rb'
+
+echo "# frozen_string_literal: true
+module SoftwareChallengeClient" > $FILENAME
+for file in software_challenge_client/**/*.rb; do
+    echo "  require '${file}'"
+done >> $FILENAME;
+echo "end" >> $FILENAME

data/push_image_production.sh

@@ -1,12 +1,12 @@
-#!/bin/bash
-
-server=flut
-docker build . -t sc-ruby
-docker tag sc-ruby localhost:5000/sc-ruby
-ssh -M -S ssh-ctrl-socket -fnNT -L 5000:localhost:5000 $server
-ssh -S ssh-ctrl-socket -O check $server || exit 1
-docker login localhost:5000 || exit 1
-docker push localhost:5000/sc-ruby
-ssh -S ssh-ctrl-socket -O exit $server
-ssh $server 'sudo docker pull localhost:5000/sc-ruby'
-ssh $server 'sudo docker tag localhost:5000/sc-ruby sc-ruby'
+#!/bin/bash
+
+server=flut
+docker build . -t sc-ruby
+docker tag sc-ruby localhost:5000/sc-ruby
+ssh -M -S ssh-ctrl-socket -fnNT -L 5000:localhost:5000 $server
+ssh -S ssh-ctrl-socket -O check $server || exit 1
+docker login localhost:5000 || exit 1
+docker push localhost:5000/sc-ruby
+ssh -S ssh-ctrl-socket -O exit $server
+ssh $server 'sudo docker pull localhost:5000/sc-ruby'
+ssh $server 'sudo docker tag localhost:5000/sc-ruby sc-ruby'

data/release.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
-
-# This shell script automates the process of releasing a new gem version when
-# running ruby in a docker container.
-
-set -x # echo commands as they are executed
-sudo chown -R root.root "$HOME/.ssh"
-docker run -it --rm -v "$PWD":/usr/src/app -v "$HOME/.gitconfig":/root/.gitconfig -v "$HOME/.ssh":/root/.ssh -v "$HOME/.gem/credentials":/root/.gem/credentials -w /usr/src/app ruby:latest sh -c "bundle install --path vendor/bundle && bundle exec rake release"
-sudo chown -R $USER.$USER "$HOME/.ssh"
+#!/bin/sh
+
+# This shell script automates the process of releasing a new gem version when
+# running ruby in a docker container.
+
+set -x # echo commands as they are executed
+sudo chown -R root.root "$HOME/.ssh"
+docker run -it --rm -v "$PWD":/usr/src/app -v "$HOME/.gitconfig":/root/.gitconfig -v "$HOME/.ssh":/root/.ssh -v "$HOME/.gem/credentials":/root/.gem/credentials -w /usr/src/app ruby:latest sh -c "bundle install --path vendor/bundle && bundle exec rake release"
+sudo chown -R $USER.$USER "$HOME/.ssh"

data/software_challenge_client.gemspec

@@ -1,41 +1,41 @@
-# coding: utf-8
-# frozen_string_literal: true
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'software_challenge_client/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'software_challenge_client'
-  spec.version       = SoftwareChallengeClient::VERSION
-  spec.authors       = File.readlines('AUTHORS').select { |l| l[' <'] }.map { |l| l.match(/^(.*) *</)[1] }
-  spec.email         = File.readlines('AUTHORS').select { |l| l[' <'] }.map { |l| l.match(/<(.*)>/)[1] }
-
-  spec.summary       = 'Provides functions to build a client for the coding competition Software-Challenge Germany.'
-  spec.description   = ''
-  spec.homepage      = 'http://www.software-challenge.de'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = '>= 2.5.5'
-  spec.add_dependency 'builder'
-  spec.add_dependency 'typesafe_enum'
-
-  spec.add_development_dependency 'bundler', '>= 1.10'
-  spec.add_development_dependency 'fuubar'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'guard-rubocop'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'pry-coolline'
-  spec.add_development_dependency 'pry-rescue'
-  spec.add_development_dependency 'rake', '>= 10.0'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'solargraph'
-  spec.add_development_dependency 'yard', '>= 0.8'
-end
+# coding: utf-8
+# frozen_string_literal: true
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'software_challenge_client/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'software_challenge_client'
+  spec.version       = SoftwareChallengeClient::VERSION
+  spec.authors       = File.readlines('AUTHORS').select { |l| l[' <'] }.map { |l| l.match(/^(.*) *</)[1] }
+  spec.email         = File.readlines('AUTHORS').select { |l| l[' <'] }.map { |l| l.match(/<(.*)>/)[1] }
+
+  spec.summary       = 'Provides functions to build a client for the coding competition Software-Challenge Germany.'
+  spec.description   = ''
+  spec.homepage      = 'http://www.software-challenge.de'
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.5.5'
+  spec.add_dependency 'builder'
+  spec.add_dependency 'typesafe_enum'
+
+  spec.add_development_dependency 'bundler', '>= 1.10'
+  spec.add_development_dependency 'fuubar'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'guard-rubocop'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'pry-coolline'
+  spec.add_development_dependency 'pry-rescue'
+  spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'solargraph'
+  spec.add_development_dependency 'yard', '>= 0.8'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: software_challenge_client
 version: !ruby/object:Gem::Version
-  version: 22.1.0
+  version: 23.0.2
 platform: ruby
 authors:
 - 'kwollw '
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -284,20 +284,18 @@ files:
 - lib/software_challenge_client.rb
 - lib/software_challenge_client/board.rb
 - lib/software_challenge_client/client_interface.rb
-- lib/software_challenge_client/color.rb
 - lib/software_challenge_client/condition.rb
 - lib/software_challenge_client/coordinates.rb
 - lib/software_challenge_client/debug_hint.rb
+- lib/software_challenge_client/direction.rb
 - lib/software_challenge_client/field.rb
 - lib/software_challenge_client/game_rule_logic.rb
 - lib/software_challenge_client/game_state.rb
-- lib/software_challenge_client/has_hints.rb
 - lib/software_challenge_client/invalid_move_exception.rb
 - lib/software_challenge_client/logging.rb
 - lib/software_challenge_client/move.rb
 - lib/software_challenge_client/network.rb
 - lib/software_challenge_client/piece.rb
-- lib/software_challenge_client/piece_type.rb
 - lib/software_challenge_client/player.rb
 - lib/software_challenge_client/protocol.rb
 - lib/software_challenge_client/runner.rb

data/lib/software_challenge_client/color.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'typesafe_enum'
-
-require_relative 'team'
-
-# TODO 2022: Replace with bool?
-# Die Spielsteinfarben. BLUE, und RED
-class Color < TypesafeEnum::Base
-  new :BLUE, 'B'
-  new :RED, 'R'
-
-  # Gibt den color namen zurück
-  def to_s
-    self.key.to_s
-  end
-
-  # Gibt das zugehörige Team zurück
-  def to_t
-    if self.key == :RED
-      Team::ONE
-    else
-      Team::TWO
-    end
-  end
-end

data/lib/software_challenge_client/has_hints.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-module HasHints
-  # @!attribute [r] hints
-  # @return [Array<DebugHint>] Hinweise, die an den Zug angeheftet werden sollen. Siehe {DebugHint}.
-  attr_reader :hints
-
-  # @param hint [DebugHint]
-  def add_hint(hint)
-    @hints.push(hint)
-  end
-end

data/lib/software_challenge_client/piece_type.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'typesafe_enum'
-
-# Die Spielsteintypen. Herzmuschel, Möwe, Seestern und Robbe
-class PieceType < TypesafeEnum::Base
-  new :Herzmuschel, 'C'
-  new :Moewe, 'G'
-  new :Seestern, 'S'
-  new :Robbe, 'R'
-
-  # @return [String] Gibt den color namen zurück
-  def to_s
-    self.key.to_s
-  end
-end