steam-condenser 0.13.0 → 0.13.1

data/lib/steam-condenser/version.rb

@@ -5,6 +5,6 @@
 
 module SteamCondenser
 
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 
 end

data/lib/steam/servers/game_server.rb

@@ -28,8 +28,6 @@ module GameServer
   def self.player_status_attributes(status_header)
     status_header.split.map do |attribute|
       case attribute
-        when '#'
-          :id
         when 'connected'
           :time
         when 'frag'
@@ -42,13 +40,22 @@ module GameServer
 
   # Splits the player status obtained with +rcon status+
   def self.split_player_status(attributes, player_status)
-    data = player_status[1..-1].strip.split '"'
+    player_status.sub! /^\d+ +/, '' if attributes.first != :userid
+
+    first_quote = player_status.index '"'
+    last_quote  = player_status.rindex '"'
+    data = [
+      player_status[0, first_quote],
+      player_status[first_quote + 1..last_quote - 1],
+      player_status[last_quote + 1..-1]
+    ]
     data = [ data[0].split, data[1], data[2].split ]
     data.flatten!
 
-    if attributes.size > data.size + 1
-      data.insert 1, nil
-      data.insert 4, nil, nil, nil
+    if attributes.size > data.size && attributes.include?(:state)
+      data.insert 3, nil, nil, nil
+    elsif attributes.size < data.size
+      data.delete_at 1
     end
 
     player_data = {}
@@ -89,6 +96,10 @@ module GameServer
     @player_hash
   end
 
+  def rcon_authenticated?
+    @rcon_authenticated
+  end
+
   # Returns a hash of the settings applied on the server. These settings are
   # also called rules.
   # The hash has the format of +rule_name+ => +rule_value+
@@ -173,6 +184,8 @@ module GameServer
       rcon_auth rcon_password
       players = rcon_exec('status').lines.select do |line|
         line.start_with?('#') && line != "#end\n"
+      end.map do |line|
+        line[1..-1].strip
       end
       attributes = GameServer.player_status_attributes players.shift
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steam-condenser
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 13
-  - 0
-  version: 0.13.0
+  - 1
+  version: 0.13.1
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 Z
+date: 2011-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bzip2-ruby