gameoverseer 0.1.7 → 0.1.8

data/lib/gameoverseer/services/service.rb

@@ -1,111 +1,112 @@
-module GameOverseer
-
-  # Services are at the heart on GameOverseer
-  #
-  # Subclass this class to implement a service
-  class Service
-    attr_accessor :client_id
-    attr_reader :safe_methods
-
-    # Adds the class that subclassed this class to a list for activation later
-    # @param subclass [Service]
-    def self.inherited(subclass)
-      Services.register(subclass)
-      GameOverseer::Console.log "Service> added '#{subclass}' to Services::List."
-    end
-
-    # This method should not be overridden, you should instead implement {#setup} with no arguments
-    def initialize
-      if defined?(self.setup)
-        @client_id = 0
-        @safe_methods = []
-        setup
-        enable
-      end
-    end
-
-    # Called before {#enable} there should be no active code here, only setup variables.
-    def setup
-    end
-
-    # Called when services are first initialized, put active code here, in a thread.
-    def enable
-    end
-
-    # Called when a message is recieved for this channel.
-    # @param data [Hash] The data from the packet
-    def process(data)
-    end
-
-    def version
-      # Please use the sematic versioning system,
-      # http://semver.org
-      #
-      # e.g.
-      # "1.5.9"
-      # (Major.Minor.Patch)
-      "0.0.0-default"
-    end
-
-    # Sets methods that are safe for {#data_to_method} to call
-    # @param array [Array] Array of strings or symbols that match a method in the service class
-    def set_safe_methods(array)
-      raise "argument must be an array of strings or symbols" unless array.is_a?(Array)
-      @safe_methods = array
-    end
-
-    # @return [ChannelManager] Active instance of ChannelManager
-    def channel_manager
-      ChannelManager.instance
-    end
-
-    # @return [MessageManager] Instance of MessageManager
-    def message_manager
-      MessageManager.instance
-    end
-
-    # @return [ClientManager] Current instance of ClientManager
-    def client_manager
-      ClientManager.instance
-    end
-
-    # Uses the 'mode' from a packet to call the method of the same name
-    # @param data [Hash] data from packet
-    def data_to_method(data)
-      @safe_methods.each do |method|
-        if data['mode'] == method.to_s
-          self.send(data['mode'], data)
-        end
-      end
-    end
-
-    # Calls Proc immediately then every milliseconds, async.
-    # @param milliseconds [Integer][Float] Time to wait before calling the block
-    # @param block [Proc]
-    def every(milliseconds, &block)
-      Thread.new do
-        loop do
-          block.call
-          sleep(milliseconds/1000.0)
-        end
-      end
-    end
-
-    # Calls Proc after milliseconds have passed, async.
-    # @param milliseconds [Integer][Float] Time to wait before calling the block
-    # @param block [Proc]
-    def after(milliseconds, &block)
-      Thread.new do
-        sleep(milliseconds/1000.0)
-        block.call
-      end
-    end
-
-    # String to be logged
-    # @param string [String] text to log
-    # @param color [Gosu::Color] color of text in console
-    def log(string, color = Gosu::Color::RED)
-      GameOverseer::Console.log_with_color(string, color)
-    end
-  end
-end
+module GameOverseer
+
+  # Services are at the heart on GameOverseer
+  #
+  # Subclass this class to implement a service
+  class Service
+    attr_accessor :client_id
+    attr_reader :safe_methods
+
+    # Adds the class that subclassed this class to a list for activation later
+    # @param subclass [Service]
+    def self.inherited(subclass)
+      Services.register(subclass)
+      GameOverseer::Console.log "Service> added '#{subclass}' to Services::List."
+    end
+
+    # This method should not be overridden, you should instead implement {#setup} with no arguments
+    def initialize
+      if defined?(self.setup)
+        @client_id = 0
+        @safe_methods = []
+        setup
+        enable
+      end
+    end
+
+    # Called before {#enable} there should be no active code here, only setup variables.
+    def setup
+    end
+
+    # Called when services are first initialized, put active code here, in a thread.
+    def enable
+    end
+
+    # Called when a message is recieved for this channel.
+    # @param data [Hash] The data from the packet
+    def process(data)
+    end
+
+    def version
+      # Please use the sematic versioning system,
+      # http://semver.org
+      #
+      # e.g.
+      # "1.5.9"
+      # (Major.Minor.Patch)
+      "0.0.0-default"
+    end
+
+    # Sets methods that are safe for {#data_to_method} to call
+    # @param array [Array] Array of strings or symbols that match a method in the service class
+    def set_safe_methods(array)
+      raise "argument must be an array of strings or symbols" unless array.is_a?(Array)
+      @safe_methods = array
+    end
+
+    # @return [ChannelManager] Active instance of ChannelManager
+    def channel_manager
+      ChannelManager.instance
+    end
+
+    # @return [MessageManager] Instance of MessageManager
+    def message_manager
+      MessageManager.instance
+    end
+
+    # @return [ClientManager] Current instance of ClientManager
+    def client_manager
+      ClientManager.instance
+    end
+
+    # Uses the 'mode' from a packet to call the method of the same name
+    # @param data [Hash] data from packet
+    def data_to_method(data)
+      raise "No safe methods defined!" unless @safe_methods.size > 0
+      @safe_methods.each do |method|
+        if data['mode'] == method.to_s
+          self.send(data['mode'], data)
+        end
+      end
+    end
+
+    # Calls Proc immediately then every milliseconds, async.
+    # @param milliseconds [Integer][Float] Time to wait before calling the block
+    # @param block [Proc]
+    def every(milliseconds, &block)
+      Thread.new do
+        loop do
+          block.call
+          sleep(milliseconds/1000.0)
+        end
+      end
+    end
+
+    # Calls Proc after milliseconds have passed, async.
+    # @param milliseconds [Integer][Float] Time to wait before calling the block
+    # @param block [Proc]
+    def after(milliseconds, &block)
+      Thread.new do
+        sleep(milliseconds/1000.0)
+        block.call
+      end
+    end
+
+    # String to be logged
+    # @param string [String] text to log
+    # @param color [Gosu::Color] color of text in console
+    def log(string, color = Gosu::Color::RED)
+      GameOverseer::Console.log_with_color(string, color)
+    end
+  end
+end

data/lib/gameoverseer/services/services.rb

@@ -1,38 +1,38 @@
-module GameOverseer
-  module Services
-    LIST = []
-    ACTIVE=[]
-
-    # Adds klass to list
-    # @param klass [Service] Service class to add to services list
-    def self.register(klass)
-      LIST << klass
-    end
-
-    # instantiates the Services in 'LIST' and adds them to the 'ACTIVE' list
-    def self.enable
-      LIST.each do |service|
-        _service = service.new
-        GameOverseer::Console.log "Services> #{_service.class} #{_service.version}"
-        ACTIVE << _service
-      end
-    end
-
-    # Tells all services that have 'client_connected' defined that 'client_id' has connected
-    # @param client_id [Integer] ID of client
-    # @param ip_address [String] ip address of client
-    def self.client_connected(client_id, ip_address)
-      ACTIVE.each do |service|
-        service.client_connected(client_id, ip_address) if defined?(service.client_connected)
-      end
-    end
-
-    # Tells all services that have 'client_disconnected' defined that 'client_id' is now disconnected
-    # @param client_id [Integer] ID of client
-    def self.client_disconnected(client_id)
-      ACTIVE.each do |service|
-        service.client_disconnected(client_id) if defined?(service.client_disconnected)
-      end
-    end
-  end
-end
+module GameOverseer
+  module Services
+    LIST = []
+    ACTIVE=[]
+
+    # Adds klass to list
+    # @param klass [Service] Service class to add to services list
+    def self.register(klass)
+      LIST << klass
+    end
+
+    # instantiates the Services in 'LIST' and adds them to the 'ACTIVE' list
+    def self.enable
+      LIST.each do |service|
+        _service = service.new
+        GameOverseer::Console.log "Services> #{_service.class} #{_service.version}"
+        ACTIVE << _service
+      end
+    end
+
+    # Tells all services that have 'client_connected' defined that 'client_id' has connected
+    # @param client_id [Integer] ID of client
+    # @param ip_address [String] ip address of client
+    def self.client_connected(client_id, ip_address)
+      ACTIVE.each do |service|
+        service.client_connected(client_id, ip_address) if defined?(service.client_connected)
+      end
+    end
+
+    # Tells all services that have 'client_disconnected' defined that 'client_id' is now disconnected
+    # @param client_id [Integer] ID of client
+    def self.client_disconnected(client_id)
+      ACTIVE.each do |service|
+        service.client_disconnected(client_id) if defined?(service.client_disconnected)
+      end
+    end
+  end
+end

data/lib/gameoverseer/version.rb

@@ -1,4 +1,4 @@
-module GameOverseer
-  VERSION = "0.1.7"
-  RELEASE_NAME = "Blank Slate" # 1.0 is to be "Ice Crystal"
-end
+module GameOverseer
+  VERSION = "0.1.8"
+  RELEASE_NAME = "Blank Slate" # 1.0 is to be "Ice Crystal"
+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-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}"