gameoverseer 0.1.4 → 0.1.5

data/lib/gameoverseer.rb

@@ -1,59 +1,59 @@
-require "set"
-require "openssl"
-
-require "gosu"
-require "concurrent"
-require "renet"
-require "multi_json"
-
-require_relative "gameoverseer/version"
-
-require_relative "gameoverseer/console/console"
-
-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, packet_handler = PacketHandler, encryption_handler = nil)
-    GameOverseer::ChannelManager.new
-    GameOverseer::MessageManager.new
-    GameOverseer::ClientManager.new
-
-    @console = GameOverseer::Console.new
-    @server  = GameOverseer::ENetServerRunner.new
-
-    Thread.new {@server.start(host, port, packet_handler, encryption_handler)}
-    @console.show
-    sleep
-
-    at_exit do
-      GameOverseer::Console.instance.close
-      @server.supervisor.terminate if defined?(@server.supervisor.terminate)
-      puts "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 "gosu"
+require "concurrent"
+require "renet"
+require "multi_json"
+
+require_relative "gameoverseer/version"
+
+require_relative "gameoverseer/console/console"
+
+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)
+    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)
+      puts "Server Shutdown"
+    end
+  end
+
+  # Stop server
+  def self.deactivate
+    puts "ALERT \"CONSOLE CLOSED. LOST CONTROL OF SERVER.\""
+    @server.supervisor.terminate
+  end
+end

data/license.md

@@ -1,9 +1,9 @@
-MIT License
-
-Copyright (c) 2014 cyberarm
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+MIT License
+
+Copyright (c) 2014 cyberarm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/test_helper.rb

@@ -1 +1 @@
-require "minitest"
+require "minitest"

data/test-clients/test-client-gamma.rb

@@ -1,62 +1,62 @@
-require "multi_json"
-require 'uri'
-require "renet"
-require_relative "protocol-lib"
-
-class TestClientGamma
-  HANDSHAKE = 2
-  # include Celluloid
-
-  def initialize(host, port)
-    @client = ENet::Connection.new(host, port, 4, 0, 0)
-
-    @client.on_connection(method(:on_connect))
-    @client.on_packet_receive(method(:on_packet))
-    @client.on_disconnection(method(:on_disconnect))
-
-    @client.connect(2000)
-    @client.send_packet("#{PROTOCOLS[:handshake_extend_hand]}", true, HANDSHAKE)
-
-    puts "Running...."
-    run
-  end
-
-  def run
-    loop do
-      @client.update(0)
-    end
-  end
-
-  def on_packet(data, channel)
-    p "P: #{data}-#{channel}"
-    handle_connection(data, channel)
-  end
-
-  def on_connect(data = 0, channel = 0)
-    p "C: #{data}-#{channel}"
-  end
-
-  def on_disconnect(data = 0, channel = 0)
-    p "D: #{data}-#{channel}"
-  end
-
-  def handle_connection(data, channel)
-    response = MultiJson.load(data)
-    case response['channel']
-    when 'handshake'
-      public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
-      public_key = OpenSSL::PKey::RSA.new public_key_pem
-      encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}".force_encoding("utf-8")}})
-      @client.send_packet(encrypted_auth_key_response, true, HANDSHAKE)
-      puts "PAST"
-    else
-      puts "hmm"
-    end
-  end
-end
-
-start_time = Time.now
-
-TestClientGamma.new("localhost", 56789)
-
-puts "Time to complete: #{Time.now-start_time}"
+require "multi_json"
+require 'uri'
+require "renet"
+require_relative "protocol-lib"
+
+class TestClientGamma
+  HANDSHAKE = 2
+  # include Celluloid
+
+  def initialize(host, port)
+    @client = ENet::Connection.new(host, port, 4, 0, 0)
+
+    @client.on_connection(method(:on_connect))
+    @client.on_packet_receive(method(:on_packet))
+    @client.on_disconnection(method(:on_disconnect))
+
+    @client.connect(2000)
+    @client.send_packet("#{PROTOCOLS[:handshake_extend_hand]}", true, HANDSHAKE)
+
+    puts "Running...."
+    run
+  end
+
+  def run
+    loop do
+      @client.update(0)
+    end
+  end
+
+  def on_packet(data, channel)
+    p "P: #{data}-#{channel}"
+    handle_connection(data, channel)
+  end
+
+  def on_connect(data = 0, channel = 0)
+    p "C: #{data}-#{channel}"
+  end
+
+  def on_disconnect(data = 0, channel = 0)
+    p "D: #{data}-#{channel}"
+  end
+
+  def handle_connection(data, channel)
+    response = MultiJson.load(data)
+    case response['channel']
+    when 'handshake'
+      public_key_pem = response['data']['public_key'] if response['mode'] == 'public_key'
+      public_key = OpenSSL::PKey::RSA.new public_key_pem
+      encrypted_auth_key_response = MultiJson.dump({'channel'=> 'handshake', 'mode' => 'authenticate', 'data' => {'auth_key' => "#{public_key.public_encrypt('HELLO_WORLD')}".force_encoding("utf-8")}})
+      @client.send_packet(encrypted_auth_key_response, true, HANDSHAKE)
+      puts "PAST"
+    else
+      puts "hmm"
+    end
+  end
+end
+
+start_time = Time.now
+
+TestClientGamma.new("localhost", 56789)
+
+puts "Time to complete: #{Time.now-start_time}"

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: gameoverseer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.6
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.6
@@ -42,16 +48,22 @@ dependencies:
   name: renet
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -117,9 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generic game server.
 test_files: []
-has_rdoc: