gamespy_query 0.0.2 → 0.0.3

data/lib/gamespy_query.rb

@@ -1,7 +1,7 @@
-require "gamespy_query/version"
-require "gamespy_query/base"
-require "gamespy_query/socket"
-require "gamespy_query/master"
+require_relative "gamespy_query/version"
+require_relative "gamespy_query/base"
+require_relative "gamespy_query/socket"
+require_relative "gamespy_query/master"
 
 module GamespyQuery
   # Your code goes here...

data/lib/gamespy_query/base.rb

@@ -3,6 +3,11 @@ require 'action_controller'
 require 'logger'
 
 module GamespyQuery
+  STR_X0, STR_X1, STR_X2 = "\x00", "\x01", "\x02"
+  RX_X0, RX_X0_S, RX_X0_E = /\x00/, /^\x00/, /\x00$/
+  RX_X0_SPEC = /^\x00|[^\x00]+\x00?/
+  STR_EMPTY = ""
+
   module Tools
     STR_EMPTY = ""
   
@@ -22,14 +27,13 @@ module GamespyQuery
       str
     end
 
-    STR_X00 = "\x00"
     RX_F = /\A\-?[0-9][0-9]*\.[0-9]*\Z/
     RX_I = /\A\-?[0-9][0-9]*\Z/
     RX_S = /\A\-?0[0-9]+.*\Z/
 
     def clean(value) # TODO: Force String, Integer, Float etc?
       case value
-        when STR_X00
+        when STR_X0
           nil
         when RX_F
           value =~ RX_S ? strip_tags(value) : value.to_f

data/lib/gamespy_query/parser.rb

@@ -11,13 +11,10 @@ require_relative 'base'
 
 module GamespyQuery
   class Parser
-    STR_X0 = "\x00"
     STR_SPLIT = STR_X0
-    STR_EMPTY = ""
     STR_ID = "\x00\x04\x05\x06\a"
 
     RX_SPLITNUM = /^splitnum\x00(.)/i
-    RX_X0_E = /\x00$/
     RX_PLAYER_HEADER = /\x01/
     RX_END = /\x00\x02$/
 
@@ -125,6 +122,8 @@ module GamespyQuery
     STR_PLAYER = "player_\x00\x00"
     STR_TEAM = "team_\x00\x00"
     STR_SCORE = "score_\x00\x00"
+    STR_SIX = "$SIX_OVERWRITE_PREVIOUS$"
+    STR_SIX_X0 = "\x00#{STR_SIX}\x00"
 
     # TODO: Cleanup
     def parse_player_data(packet)

data/lib/gamespy_query/socket.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 # GameSpy query class by Sickboy [Patrick Roza] (sb_at_dev-heaven.net)
 
+
+
 require 'yaml'
 require_relative 'base'
 require_relative 'parser'
@@ -25,19 +27,15 @@ module GamespyQuery
     STR_PLAYER = "player_\x00\x00"
     STR_TEAM = "team_\x00\x00"
     STR_SCORE = "score_\x00\x00"
-    STR_X0, STR_X1, STR_X2 = "\x00", "\x01", "\x02"
+
     SPLIT = STR_X0
     STR_END = "\x00\x02"
     STR_EMPTY = Tools::STR_EMPTY
     STR_BLA = "%c%c%c%c".encode("ASCII-8BIT")
     STR_GARBAGE = "\x00\x04\x05\x06\a"
-    STR_SIX = "$SIX_OVERWRITE_PREVIOUS$"
-    STR_SIX_X0 = "\x00#{STR_SIX}\x00"
 
     RX_PLAYER_EMPTY = /^player_\x00\x00\x00/
     RX_PLAYER_INFO = /\x01(team|player|score|deaths)_.(.)/ # \x00 from previous packet, \x01 from continueing player info, (.) - should it overwrite previous value?
-    RX_X0, RX_X0_S, RX_X0_E = /\x00/, /^\x00/, /\x00$/
-    RX_X0_SPEC = /^\x00|[^\x00]+\x00?/
 
     RX_NO_CHALLENGE = /0@0$/
     RX_CHALLENGE = /0@/
@@ -261,7 +259,7 @@ end
 if $0 == __FILE__
   host = ARGV[0]
   port = ARGV[1]
-  g = Six::Query::Gamespy.new(host, port)
+  g = GamespyQuery::Socket.new(host, port)
   r = g.sync
   exit unless r
   puts r.to_yaml

data/lib/gamespy_query/version.rb

@@ -1,3 +1,3 @@
 module GamespyQuery
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gamespy_query
-rubygems_version: 1.8.13
+rubygems_version: 1.8.14
 signing_key: 
 specification_version: 3
 summary: Ruby library for accessing Gamespy services