old_gamespy_query 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8f54d93bfc818e02160f94962481e85af83be531
+  data.tar.gz: 9c8edf4c0b4c6e756a0a963801245b56d5b649c2
+SHA512:
+  metadata.gz: 9061eb11c935e656e59ae6553cdd0b27ecc67be9e4e966b4ca442fa85a2151762341c24c1027b22d8caa9188b9e2fe0cc2ef7d0ccf64fada5db35a62881ea843
+  data.tar.gz: fe240cca045c514ea64268c4cd8537ee5cf4e174ddb90f3e0cd066ffddcd5e7756c65213f08d9e36d1a48997a9f399f53f6f1f20db115823682408e1c009f5c1

data/lib/old_gamespy_query.rb

@@ -1,7 +1,8 @@
-require "gamespy_query"
+require "gamespy_query" # TODO: Make requiring this optional.
 
 require "socket"
 require "timeout"
+require "ostruct"
 
 require_relative "old_gamespy_query/version"
 require_relative "old_gamespy_query/master_server"

data/lib/old_gamespy_query/parser.rb

@@ -1,12 +1,34 @@
 class OldGameSpyQuery
+  class QueryObject
+    attr_accessor :data
+    def initialize(status, players, general, data)
+      @data = OpenStruct.new(:status => status, :players => players, :general => general, :data => data)
+      return @data
+    end
+  end
+
+  class PlayerObject
+    attr_accessor :data
+    def initialize(hash)
+      @data = OpenStruct.new(hash)
+      return @data
+    end
+  end
+
   class Parser
-    def initialize(string, mode = 'status')
-      @string = string
+    def initialize(socket_array, mode = 'status', multi_packet = false)
+      @socket_array = socket_array
       @mode   = mode
+      @multi_packet = multi_packet
       @data   = {}
-      @array  = @string[0].force_encoding('utf-8').strip.split("\\")
-      @array.delete(@array.first) # Remove blank first item
+
+      @players = []
+      @status  = {}
+      @general = {}
+
       parse
+
+      @struct = OldGameSpyQuery::QueryObject.new(@status, @players, @general, @data)
     end
 
     def parse
@@ -16,57 +38,122 @@ class OldGameSpyQuery
       when 'players'
         players_parse
       when 'rules'
-        status_parse # Status and Rules appear compatible
+        general_parse
       when 'info'
-        status_parse # Status and Info appear compatible
+        general_parse
       end
 
+      @data["status"]   = @status
+      @data["players"]  = @players
+      @data["general"]  = @general
       @data["_gamespy"] = {
-        "hostname" => "#{@string[1][3]}", "gamespy_port" => @string[1][1]
+        "hostname" => "#{@socket_array[0][1][3]}",
+        "gamespy_port" => @socket_array[0][1][1]
         }
     end
 
-    def status_parse
+    def array_object(index = 0)
+      if @socket_array.count >= 2
+        @socket_array[index][0].force_encoding('utf-8').strip.split("\\")
+      else
+        @socket_array[0].force_encoding('utf-8').strip.split("\\")
+      end
+    end
+
+    # Generic key -> value
+    def general_parse(_index = 0)
+      array  = @socket_array[_index][0].force_encoding('utf-8').strip.split("\\")
+      array.delete(array.first) # Remove blank first item
+
       keys   = []
       values = []
 
-      @array.each_with_index do |object, index|
+      array.each_with_index do |object, index|
         keys   << object if index.even?
         values << object if index.odd?
       end
 
       keys.each_with_index do |key, index|
         value = values[index]
-        @data["#{key}"] = value
+        @status["#{key}"] = value if @mode == 'status'
+        @general["#{key}"]= value if @mode != 'status'
       end
     end
 
-    def players_parse
+    def status_parse
+      if @multi_packet
+        @socket_array.each_with_index do |packet, index|
+          array  = @socket_array[index][0].force_encoding('utf-8').strip.split("\\")
+          array.delete(array.first) # Remove blank first item
+
+          if array.find{|string| true if string == "gamename"}
+            general_parse(index)
+          end
+          if array.find {|string| true if string.include?("player_")}
+            players_parse(index)
+          end
+        end
+      else
+        general_parse
+      end
+    end
+
+    def players_parse(_index = 0)
+      array  = array_object(_index)
+      array.delete(array.first) # Remove blank first item
+
       sub_hash = {}
       keys   = []
       values = []
-      num = 0
+      if array.first.include?("_")
+        _num = Integer(array.first.split('_')[1])
+      else
+        _num = 0
+      end
 
-      @array.each_with_index do |object, index|
+      num = _num
+
+      array.each_with_index do |object, index|
         keys   << object if index.even?
         values << object if index.odd?
       end
 
       keys.each_with_index do |key, index|
         value = values[index]
+
         if key.end_with?("#{num}")
           sub_hash["#{key}"] = value
         elsif key.end_with?("#{num+1}")
-          @data["player_#{num}"] = sub_hash
+          _hash = clean_player_hash(sub_hash)
+          _player = OldGameSpyQuery::PlayerObject.new(_hash)
+          @players << _player
           sub_hash = {}
           num+=1
           sub_hash["#{key}"] = value
+        else
+          unless key == "queryid"
+            puts "Hi, umm, an error: 'key' did not end with 'num' or 'num+1'"
+            puts "Here is the output of: Key:Value-Num"
+            p "#{key}:#{value}-#{num}"
+            puts "-----------------------------------------------------------"
+          end
         end
       end
     end
 
+    def clean_player_hash(hash)
+      temp_hash = {}
+
+      hash.each_pair do |key, value|
+        array = key.split("_")
+        temp_hash[array[0]] = value
+      end
+
+      return temp_hash
+    end
+
     def data
-      @data
+      @struct.data
     end
   end
 end

data/lib/old_gamespy_query/server_data.rb

@@ -2,6 +2,7 @@ class OldGameSpyQuery
   class ServerData
     def initialize(address = "hostname:port")
       @address = address
+      @data = []
     end
 
     def get_server_data(request = "status")
@@ -14,20 +15,41 @@ class OldGameSpyQuery
         raise "#{self.class}: can't parse \\#{request}\\"
       end
 
+      retrieve_data(request)
+
+      if @data.count >= 2 # Received multiple packets
+        @gamespy_query = OldGameSpyQuery::Parser.new(@data, request, true).data
+      else
+        @gamespy_query = OldGameSpyQuery::Parser.new(@data, request).data
+      end
+
+      return data
+    end
+
+    def retrieve_data(request)
       addr = @address.split(':')
       @socket = UDPSocket.new
       @socket.connect("#{addr[0]}", addr[1].to_i)
+
       begin
-        timeout(5) {
+        timeout(8) do
           @socket.send("\\#{request}\\", 0)
-          @data = @socket.recvfrom(4096)
-        }
+          loop do
+            data = @socket.recvfrom(4096)
+            _data = data[0].sub("\\final\\", '')
+            a = data.dup
+            a[0] = _data
+            @data << a
+
+            if data[0].include?("\\final\\")
+              break
+            end
+          end
+        end
+
       rescue Timeout::Error
         raise Timeout::Error, "#{self.class}: The Server At '#{@address}' Did Not Respond In Time (Within 5 Seconds)"
       end
-
-      @data[0].sub!("\\final\\", '')
-      @gamespy_query = OldGameSpyQuery::Parser.new(@data, request).data
     end
 
     def data

data/lib/old_gamespy_query/version.rb

@@ -1,3 +1,3 @@
 class OldGameSpyQuery
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: old_gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamespy_query
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Query old GameSpy servers.
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -81,26 +74,26 @@ files:
 homepage: https://github.com/cyberarm/old_gamespy_query
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Query old GameSpy servers.
 test_files: []
+has_rdoc: