tedserv 0.0.1a → 0.0.1c

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a378475eccb7ef108dd215af2f477e696acaca37
-  data.tar.gz: c79aca996266df7fc143fcc75214a099762ee5d0
+  metadata.gz: 4fd129cd99ea9211fe1c145cee2183c9c049e8be
+  data.tar.gz: f6779b941b922863dd5bb15db696323510e02469
 SHA512:
-  metadata.gz: 5e870eea6146e73458b3ee9cca278ae4b9224678b5e5884a632a2538628481733b667e28a3a304332d556198aa12d60126fc7f4f6361bc7f49dc282109a90e24
-  data.tar.gz: 16da831339581b61be6f23a3a79cdc3fd1b933aac1bb45f50d6e7c34417690496ae92d85fed5546c3e0d8fb47a4c1d856dc6c33a857f3ed8e6c71945ee2ddd99
+  metadata.gz: 5e84c333625547bfe5d4de569e90d53835b300c863b08da729f14da383733938a75e7fc91d75c6cb9411362bb6b8cbb1bf9817329c088b55319ed96075735ab3
+  data.tar.gz: 16e83d2fca5ee8efb3ddc3c2224255c9381122af65e56a7825bc84d9817af3b2e20c2fbbbb6c5e6a2f4409fb6e5f0b9967ab5c82f4b4e6084a6aaffefbd8ceff

data/bin/tedserver

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require "tedserv"
-require "socket"
 
 @f = TED::Config.new(".tedconfig.txt")
 

data/lib/client.rb

@@ -2,15 +2,16 @@ require "socket"
 require "proto"
 
 class TED::Client
-    def intitialze()
+    def initialize
         @s = UDPSocket.new
-        puts "Welcom to TED Client"
+        puts "Welcome to TED Client"
         mainLobby
     end
 
     def mainLobby
         loop{
-            p = sendAndGet("LIST", Protocol.hubIp, Protocol.hubPort)
+            p = sendAndGet("LIST", TED::Protocol.hubIp, TED::Protocol.hubPort)
+            puts p.cmd
         }
     end
 
@@ -19,16 +20,15 @@ class TED::Client
     end
 
     def getMeaning(msg)
-        return Protocol.read(msg)
+        return TED::Protocol.read(msg)
     end
 
     def sendAndGet(msg, ip, port)
-        p = Protocol.new
-        p.msg = msg
-        p.kind = Protocol.player
-        p.msg = msg
+        p = TED::Protocol.new
+        p.kind = TED::Protocol.player
+        p.cmd = msg
 
-        @s.send(p, 0, ip, port)
+        @s.send(p.to_binary_s, 0, ip, port)
         rep, from = @s.recvfrom(20)
         return getMeaning(rep)
     end

data/lib/proto.rb

@@ -5,10 +5,33 @@ class TED::Protocol < BinData::Record
 	@@node = 0x01
 	@@hub = 0x10
 	@@other = 0x11
-
 	@@hubIp = "46.101.76.160"
 	@@hubPort = 9017
 
 	stringz :cmd
 	bit2 :kind
+
+	def self.player
+		@@player
+	end
+
+	def self.node
+		@@node
+	end
+
+	def self.hub
+		@@hub
+	end
+
+	def self.other
+		@@other
+	end
+
+	def self.hubIp
+		@@hubIp
+	end
+
+	def self.hubPort
+		@@hubPort
+	end
 end

data/lib/server.rb

@@ -10,18 +10,16 @@ class TED::Server
 
   def run
   	Socket.udp_server_loop(@port) do |msg, from|
-				proto = Protocol.new
+				proto = TED::Protocol.new
 				proto.read(msg)
 
-        ip = from.addr[3]
+        puts proto.cmd
 
-        puts proto.msg
+				if proto.kind == TED::Protocol.server
 
-				if proto.kind == Protocol.server
+				elsif proto.kind == TED::Protocol.node
 
-				elsif proto.kind == Protocol.node
-
-        elsif proto.kind == Protocol.player
+        elsif proto.kind == TED::Protocol.player
 
         else
           log("Unknow user type from: #{ip}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tedserv
 version: !ruby/object:Gem::Version
-  version: 0.0.1a
+  version: 0.0.1c
 platform: ruby
 authors:
 - Elliot Lee-Cerrino
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-08-24 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bindata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 description: All in one TED gem
 email: "@h2n0"
 executables: