gameoverseer 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d3a55d13dda70786ed10781f46094031df06eb4
-  data.tar.gz: d1435409e75de708fbe9b9860ebc7e6959af5789
+  metadata.gz: 28c2eb4a05934b78327ce681c1fbc76de3a4f8b9
+  data.tar.gz: e06290e98d2ec47fdfedd0a098c0dfd4de7e413b
 SHA512:
-  metadata.gz: 540a6cc5212f1a1a30e430a31efcd92ba31f411ef70559de2f46cde0802a4ef395fdeb7729a3d277a397693de51ed3a4ed58b3f2d3bf2e753e67d051311230ca
-  data.tar.gz: f37e496848ca40fc3316e3dd7a2125f919aec507209c9e183e14d9d649755e9bc741db14a57c4c9af9daf6945d3a9cb6ec72e1ab411ed9a71e6fdbdce0f66d2f
+  metadata.gz: 7d605106b5a488bc26459782ad154d17e07d24bbb51c5e650ef48a0e30b76b4999cfeacea96a0c52683dd397d07e8868e846a0ae9d21f778e6ec2a6d86180871
+  data.tar.gz: c47f9d0de2fd48b97732b07db2bbc0bed6a1f7e034c52192b95b9d85b2a5dd5f795d45da5833458fc341309619eba035938bda72244336d75b60073a6753543f

data/.gitignore

@@ -1,4 +1,4 @@
-log-*.txt
-.yardoc/*
-protocol.md
-*.gem
+log-*.txt
+.yardoc/*
+protocol.md
+*.gem

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
-
-gemspec
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -1,30 +1,30 @@
-PATH
-  remote: .
-  specs:
-    gameoverseer (0.1.2)
-      concurrent-ruby
-      gosu (= 0.10.6)
-      multi_json
-      renet
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    concurrent-ruby (1.0.1)
-    concurrent-ruby (1.0.1-java)
-    gosu (0.10.6)
-    gosu (0.10.6-x64-mingw32)
-    gosu (0.10.6-x86-mingw32)
-    multi_json (1.11.3)
-    renet (0.2.1)
-
-PLATFORMS
-  java
-  x64-mingw32
-  x86-mingw32
-
-DEPENDENCIES
-  gameoverseer!
-
-BUNDLED WITH
-   1.11.2
+PATH
+  remote: .
+  specs:
+    gameoverseer (0.1.2)
+      concurrent-ruby
+      gosu (= 0.10.6)
+      multi_json
+      renet
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.1-java)
+    gosu (0.10.6)
+    gosu (0.10.6-x64-mingw32)
+    gosu (0.10.6-x86-mingw32)
+    multi_json (1.11.3)
+    renet (0.2.1)
+
+PLATFORMS
+  java
+  x64-mingw32
+  x86-mingw32
+
+DEPENDENCIES
+  gameoverseer!
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -1,51 +1,51 @@
-[![Code Climate](https://codeclimate.com/github/cyberarm/rewrite-gameoverseer/badges/gpa.svg)](https://codeclimate.com/github/cyberarm/rewrite-gameoverseer)
-[![Inline docs](http://inch-ci.org/github/cyberarm/rewrite-gameoverseer.svg?branch=master)](http://inch-ci.org/github/cyberarm/rewrite-gameoverseer)
-
-# GameOverseer
-A game server, designed to be able to play host to up to 4 players in Planet Wars.
-
-This repo is a complete rewrite of  [GameOverseer](https://github.com/cyberarm/gameoverseer).
-
-# Status
-In development.
-Any examples given are subject to be outdated at anytime.
-
-# Install
-### Using bundler
-Add this to your Gemfile
-``` ruby
-gem "gameoverseer"
-```
-and run to install.
-```
-bundle install
-```
-
-### Or using RubyGems
-```
-gem install gameoverseer
-```
-
-# Usage
-``` ruby
-require 'gameoverseer'
-
-# Write a service for your game
-class GameWorld < GameOverseer::Service
-  def setup
-    channel_manager.register_channel('game_world', self)
-  end
-
-  def process(data)
-    # Do stuff with the data hash.
-  end
-
-  def version
-    "1.3.75"
-  end
-end
-
-host = "localhost"
-port = 56789
-GameOverseer.activate(host, port)
-```
+[![Code Climate](https://codeclimate.com/github/cyberarm/rewrite-gameoverseer/badges/gpa.svg)](https://codeclimate.com/github/cyberarm/rewrite-gameoverseer)
+[![Inline docs](http://inch-ci.org/github/cyberarm/rewrite-gameoverseer.svg?branch=master)](http://inch-ci.org/github/cyberarm/rewrite-gameoverseer)
+
+# GameOverseer
+A game server, designed to be able to play host to up to 4 players in Planet Wars.
+
+This repo is a complete rewrite of  [GameOverseer](https://github.com/cyberarm/gameoverseer).
+
+# Status
+In development.
+Any examples given are subject to be outdated at anytime.
+
+# Install
+### Using bundler
+Add this to your Gemfile
+``` ruby
+gem "gameoverseer"
+```
+and run to install.
+```
+bundle install
+```
+
+### Or using RubyGems
+```
+gem install gameoverseer
+```
+
+# Usage
+``` ruby
+require 'gameoverseer'
+
+# Write a service for your game
+class GameWorld < GameOverseer::Service
+  def setup
+    channel_manager.register_channel('game_world', self)
+  end
+
+  def process(data)
+    # Do stuff with the data hash.
+  end
+
+  def version
+    "1.3.75"
+  end
+end
+
+host = "localhost"
+port = 56789
+GameOverseer.activate(host, port)
+```

data/gameoverseer.gemspec

@@ -1,22 +1,22 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "gameoverseer/version"
-
-Gem::Specification.new do |s|
-  s.name = "gameoverseer"
-  s.version = GameOverseer::VERSION
-  s.authors = ["Cyberarm"]
-  s.email = ["matthewlikesrobots@gmail.com"]
-  s.homepage = "https://github.com/cyberarm/rewrite-gameoverseer"
-  s.summary = "Generic game server."
-  s.description = "GameOverseer is designed to simplify the making of multiplayer games by providing a way to simply and easily write a game server."
-
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", "bin"]
-
-  s.add_runtime_dependency "concurrent-ruby"
-  s.add_runtime_dependency "renet", "~> 0.2", ">= 0.2.2"
-  s.add_runtime_dependency "multi_json"
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "gameoverseer/version"
+
+Gem::Specification.new do |s|
+  s.name = "gameoverseer"
+  s.version = GameOverseer::VERSION
+  s.authors = ["Cyberarm"]
+  s.email = ["matthewlikesrobots@gmail.com"]
+  s.homepage = "https://github.com/cyberarm/rewrite-gameoverseer"
+  s.summary = "Generic game server."
+  s.description = "GameOverseer is designed to simplify the making of multiplayer games by providing a way to simply and easily write a game server."
+
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib", "bin"]
+
+  s.add_runtime_dependency "concurrent-ruby"
+  s.add_runtime_dependency "renet", "~> 0.2", ">= 0.2.2"
+  s.add_runtime_dependency "multi_json"
+end

data/lib/gameoverseer.rb

@@ -1,70 +1,73 @@
-require "set"
-require "openssl"
-
-require "concurrent"
-require "renet"
-require "multi_json"
-
-require_relative "gameoverseer/version"
-
-begin
-  require_relative "gameoverseer/console/console"
-rescue => e
-  require_relative "gameoverseer/console/namespace_creator"
-  require_relative "gameoverseer/console/console"
-end
-
-require_relative "gameoverseer/channels/channel_manager"
-
-require_relative "gameoverseer/messages/message_manager"
-
-require_relative "gameoverseer/clients/client_manager"
-
-require_relative "gameoverseer/services/service"
-require_relative "gameoverseer/services/services"
-
-require_relative "gameoverseer/input_handler/input_handler"
-
-require_relative "gameoverseer/packet_handler/packet_handler"
-require_relative "gameoverseer/encryption_handler/encryption_handler"
-
-require_relative "gameoverseer/server/renet_server"
-
-
-Thread.abort_on_exception = true
-# General purpose game server that uses services (plugins) for logic.
-module GameOverseer
-
-  # Start server
-  def self.activate(host, port, use_inbuilt_console = false, packet_handler = PacketHandler, encryption_handler = nil)
-    begin
-      GameOverseer::Console.log "Using inbuilt console"
-      require "gosu" if use_inbuilt_console
-    rescue LoadError
-      fatal "Install gosu 0.10.8 or later to use inbuilt console."
-    end
-
-    GameOverseer::ChannelManager.new
-    GameOverseer::MessageManager.new
-    GameOverseer::ClientManager.new
-
-    @console = GameOverseer::Console.new if use_inbuilt_console
-    @server  = GameOverseer::ENetServerRunner.new
-
-    Thread.new {@server.start(host, port, packet_handler, encryption_handler)}
-    @console.show if use_inbuilt_console
-    sleep
-
-    at_exit do
-      GameOverseer::Console.instance.close if use_inbuilt_console
-      @server.supervisor.terminate if defined?(@server.supervisor.terminate)
-      GameOverseer::Console.log "Server Shutdown"
-    end
-  end
-
-  # Stop server
-  def self.deactivate
-    puts "ALERT \"CONSOLE CLOSED. LOST CONTROL OF SERVER.\""
-    @server.supervisor.terminate
-  end
-end
+require "set"
+require "openssl"
+
+require "concurrent"
+require "renet"
+
+require_relative "gameoverseer/version"
+
+begin
+  require_relative "gameoverseer/console/console"
+rescue => e
+  require_relative "gameoverseer/console/namespace_creator"
+  require_relative "gameoverseer/console/console"
+end
+
+require_relative "gameoverseer/channels/channel_manager"
+
+require_relative "gameoverseer/messages/message_manager"
+
+require_relative "gameoverseer/clients/client_manager"
+
+require_relative "gameoverseer/services/service"
+require_relative "gameoverseer/services/services"
+
+require_relative "gameoverseer/input_handler/input_handler"
+
+require_relative "gameoverseer/packet_handler/packet_handler"
+require_relative "gameoverseer/packet_handler/json_packet_handler"
+require_relative "gameoverseer/packet_handler/messagepack_packet_handler"
+require_relative "gameoverseer/encryption_handler/encryption_handler"
+
+require_relative "gameoverseer/server/renet_server"
+
+
+Thread.abort_on_exception = true
+# General purpose game server that uses services (plugins) for logic.
+module GameOverseer
+
+  # Start server
+  def self.activate(host, port, use_inbuilt_console = false, packet_handler = JsonPacketHandler, encryption_handler = nil)
+    begin
+      if use_inbuilt_console
+        require "gosu"
+        GameOverseer::Console.log "Using inbuilt console"
+      end
+    rescue LoadError
+      fatal "Install gosu 0.10.8 or later to use inbuilt console."
+    end
+
+    GameOverseer::ChannelManager.new
+    GameOverseer::MessageManager.new
+    GameOverseer::ClientManager.new
+
+    @console = GameOverseer::Console.new if use_inbuilt_console
+    @server  = GameOverseer::ENetServerRunner.new
+
+    Thread.new {@server.start(host, port, packet_handler, encryption_handler)}
+    @console.show if use_inbuilt_console
+    sleep
+
+    at_exit do
+      GameOverseer::Console.instance.close if use_inbuilt_console
+      @server.supervisor.terminate if defined?(@server.supervisor.terminate)
+      GameOverseer::Console.log "Server Shutdown"
+    end
+  end
+
+  # Stop server
+  def self.deactivate
+    puts "ALERT \"CONSOLE CLOSED. LOST CONTROL OF SERVER.\""
+    @server.supervisor.terminate
+  end
+end

data/lib/gameoverseer/channels/channel_manager.rb

@@ -1,49 +1,48 @@
-module GameOverseer
-
-  # Handles routing packets to the services that subscribe to channels
-  class ChannelManager
-    CHAT = 0
-    WORLD= 1
-    HANDSHAKE = 2
-    FAULT=3
-
-    def initialize
-      @channels = {}
-      ChannelManager.instance = self
-    end
-
-    # Enables a service to subscribe to a channel
-    # @param channel [String]
-    # @param service [Service]
-    def register_channel(channel, service)
-      _channel = channel.downcase
-      unless @channels[_channel]
-        @channels[_channel] = service
-        GameOverseer::Console.log("ChannelManager> mapped '#{_channel}' to '#{service.class}'.")
-      else
-        raise "Could not map channel '#{_channel}' because '#{@channels[data[_channel]].class}' is already using it."
-      end
-    end
-
-    # Routes packet to {Service}
-    # @param client_id [Integer] ID of client that sent the packet
-    # @param data [Hash] data from packet
-    def send_to_service(client_id, data)
-      GameOverseer::Console.log("ChannelManager> sent '#{data}' to '#{@channels[data['channel']].class}'.")
-      @channels[data['channel']].client_id = client_id
-      @channels[data['channel']].process(data)
-    end
-
-    # Returns instance of active {ChannelManager}
-    # @return [ChannelManager]
-    def self.instance
-      @instance
-    end
-
-    # Sets instance of {ChannelManager} that is used through out the system
-    # @param _instance [ChannelManager]
-    def self.instance=_instance
-      @instance = _instance
-    end
-  end
-end
+module GameOverseer
+
+  # Handles routing packets to the services that subscribe to channels
+  class ChannelManager
+    CHAT = 0
+    WORLD= 1
+    HANDSHAKE = 2
+    FAULT=3
+
+    def initialize
+      @channels = {}
+      ChannelManager.instance = self
+    end
+
+    # Enables a service to subscribe to a channel
+    # @param channel [String]
+    # @param service [Service]
+    def register_channel(channel, service)
+      _channel = channel.downcase
+      unless @channels[_channel]
+        @channels[_channel] = service
+        GameOverseer::Console.log("ChannelManager> mapped '#{_channel}' to '#{service.class}'.")
+      else
+        raise "Could not map channel '#{_channel}' because '#{@channels[data[_channel]].class}' is already using it."
+      end
+    end
+
+    # Routes packet to {Service}
+    # @param client_id [Integer] ID of client that sent the packet
+    # @param data [Hash] data from packet
+    def send_to_service(client_id, data)
+      @channels[data['channel']].client_id = client_id
+      @channels[data['channel']].process(data)
+    end
+
+    # Returns instance of active {ChannelManager}
+    # @return [ChannelManager]
+    def self.instance
+      @instance
+    end
+
+    # Sets instance of {ChannelManager} that is used through out the system
+    # @param _instance [ChannelManager]
+    def self.instance=_instance
+      @instance = _instance
+    end
+  end
+end