steam-condenser 1.0.1 → 1.0.2

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: utf-8
+#
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #

data/lib/steam-condenser/version.rb

@@ -6,6 +6,6 @@
 module SteamCondenser
 
   # The current version of Steam Condenser
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
 end

data/lib/steam/community/game_achievement.rb

@@ -16,12 +16,22 @@ require 'steam/community/web_api'
 # @author Sebastian Staudt
 class GameAchievement
 
+  # Returns the symbolic API name of this achievement
+  #
+  # @return [String] The API name of this achievement
+  attr_reader :api_name
+
   # Return the unique Steam Application ID of the  game this achievement
   # belongs to
   #
   # @return [Fixnum] The Steam Application ID of this achievement's game
   attr_reader :app_id
 
+  # Returns the description of this achievement
+  #
+  # @return [String] The description of this achievement
+  attr_reader :description
+
   # Returns the name of this achievement
   #
   # @return [String] The name of this achievement
@@ -70,10 +80,12 @@ class GameAchievement
   # @param [REXML::Element] achievement_data The achievement data extracted
   #        from XML
   def initialize(steam_id64, app_id, achievement_data)
-    @app_id     = app_id
-    @name       = achievement_data.elements['name'].text
-    @steam_id64 = steam_id64
-    @unlocked   = (achievement_data.attributes['closed'].to_i == 1)
+    @api_name    = achievement_data.elements['apiname'].text
+    @app_id      = app_id
+    @description = achievement_data.elements['description'].text
+    @name        = achievement_data.elements['name'].text
+    @steam_id64  = steam_id64
+    @unlocked    = (achievement_data.attributes['closed'].to_i == 1)
 
     if @unlocked && !achievement_data.elements['unlockTimestamp'].nil?
       @timestamp  = Time.at(achievement_data.elements['unlockTimestamp'].text.to_i)

data/lib/steam/packets/s2a_info2_packet.rb

@@ -38,20 +38,23 @@ class S2A_INFO2_Packet
     @password_needed = @content_data.byte == 1
     @secure = @content_data.byte == 1
     @game_version = @content_data.cstring
-    extra_data_flag = @content_data.byte
 
-    @server_port = @content_data.short unless extra_data_flag & 0x80 == 0
+    if @content_data.remaining > 0
+      extra_data_flag = @content_data.byte
 
-    unless extra_data_flag & 0x10 == 0
-      @server_id =  @content_data.long | (@content_data.long << 32)
-    end
+      @server_port = @content_data.short unless extra_data_flag & 0x80 == 0
 
-    unless extra_data_flag & 0x40 == 0
-      @tv_port = @content_data.short
-      @tv_name = @content_data.cstring
-    end
+      unless extra_data_flag & 0x10 == 0
+        @server_id =  @content_data.long | (@content_data.long << 32)
+      end
 
-    @server_tags = @content_data.cstring unless extra_data_flag & 0x20 == 0
+      unless extra_data_flag & 0x40 == 0
+        @tv_port = @content_data.short
+        @tv_name = @content_data.cstring
+      end
+
+      @server_tags = @content_data.cstring unless extra_data_flag & 0x20 == 0
+    end
 
     generate_info_hash
   end

data/lib/steam/packets/s2a_rules_packet.rb

@@ -39,7 +39,7 @@ class S2A_RULES_Packet
       rule  = @content_data.cstring
       value = @content_data.cstring
 
-      break if rule.empty? || value.empty?
+      break if rule.empty?
 
       @rules_hash[rule] = value
     end

data/lib/steam/servers/game_server.rb

@@ -201,45 +201,41 @@ module GameServer
   # @raise [SteamCondenserError] if either the request type or the response
   #        packet is not known
   def handle_response_for_request(request_type, repeat_on_failure = true)
-    begin
-      case request_type
-        when :challenge then
-          request_packet = A2S_SERVERQUERY_GETCHALLENGE_Packet.new
-          expected_response = S2C_CHALLENGE_Packet
-        when :info then
-          request_packet = A2S_INFO_Packet.new
-          expected_response = S2A_INFO_BasePacket
-        when :players then
-          request_packet = A2S_PLAYER_Packet.new(@challenge_number)
-          expected_response = S2A_PLAYER_Packet
-        when :rules then
-          request_packet = A2S_RULES_Packet.new(@challenge_number)
-          expected_response = S2A_RULES_Packet
-        else
-          raise SteamCondenserError, 'Called with wrong request type.'
-      end
-
-      send_request request_packet
-      response_packet = reply
-
-      if response_packet.kind_of? S2A_INFO_BasePacket
-        @info_hash = response_packet.info_hash
-      elsif response_packet.kind_of? S2A_PLAYER_Packet
-        @player_hash = response_packet.player_hash
-      elsif response_packet.kind_of? S2A_RULES_Packet
-        @rules_hash = response_packet.rules_hash
-      elsif response_packet.kind_of? S2C_CHALLENGE_Packet
-        @challenge_number = response_packet.challenge_number
+    case request_type
+      when :challenge then
+        request_packet = A2S_SERVERQUERY_GETCHALLENGE_Packet.new
+        expected_response = S2C_CHALLENGE_Packet
+      when :info then
+        request_packet = A2S_INFO_Packet.new
+        expected_response = S2A_INFO_BasePacket
+      when :players then
+        request_packet = A2S_PLAYER_Packet.new(@challenge_number)
+        expected_response = S2A_PLAYER_Packet
+      when :rules then
+        request_packet = A2S_RULES_Packet.new(@challenge_number)
+        expected_response = S2A_RULES_Packet
       else
-        raise SteamCondenserError, "Response of type #{response_packet.class} cannot be handled by this method."
-      end
+        raise SteamCondenserError, 'Called with wrong request type.'
+    end
 
-      unless response_packet.kind_of? expected_response
-        puts "Expected #{expected_response}, got #{response_packet.class}." if $DEBUG
-        handle_response_for_request(request_type, false) if repeat_on_failure
-      end
-    rescue SteamCondenser::TimeoutError
-      puts "Expected #{expected_response}, but timed out." if $DEBUG
+    send_request request_packet
+    response_packet = reply
+
+    if response_packet.kind_of? S2A_INFO_BasePacket
+      @info_hash = response_packet.info_hash
+    elsif response_packet.kind_of? S2A_PLAYER_Packet
+      @player_hash = response_packet.player_hash
+    elsif response_packet.kind_of? S2A_RULES_Packet
+      @rules_hash = response_packet.rules_hash
+    elsif response_packet.kind_of? S2C_CHALLENGE_Packet
+      @challenge_number = response_packet.challenge_number
+    else
+      raise SteamCondenserError, "Response of type #{response_packet.class} cannot be handled by this method."
+    end
+
+    unless response_packet.kind_of? expected_response
+      puts "Expected #{expected_response}, got #{response_packet.class}." if $DEBUG
+      handle_response_for_request(request_type, false) if repeat_on_failure
     end
   end
 

data/lib/steam/servers/source_server.rb

@@ -31,7 +31,7 @@ class SourceServer
   #
   # @return [MasterServer] The Source master server
   def self.master
-    MasterServer.new *MasterServer::GOLDSRC_MASTER_SERVER
+    MasterServer.new *MasterServer::SOURCE_MASTER_SERVER
   end
 
   # Creates a new instance of a server object representing a Source server,
@@ -84,7 +84,7 @@ class SourceServer
     @rcon_socket.send RCONExecRequest.new(@rcon_request_id, command)
     @rcon_socket.send RCONTerminator.new(@rcon_request_id)
 
-    response = ''
+    response = []
     begin
       response_packet = @rcon_socket.reply
       if response_packet.is_a? RCONAuthResponse
@@ -92,9 +92,9 @@ class SourceServer
         raise RCONNoAuthError
       end
       response << response_packet.response
-    end while response.length == 0 || response_packet.response.size > 0
+    end while response.size < 3 || response_packet.response.size > 0
 
-    response.strip
+    response.join('').strip
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steam-condenser
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Steam Condenser - A Steam query library