steam-condenser 0.12.0 → 0.13.0

data/lib/steam/sockets/rcon_socket.rb

@@ -1,9 +1,12 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2010, Sebastian Staudt
+# Copyright (c) 2008-2011, Sebastian Staudt
+
+require 'ipaddr'
+require 'socket'
+require 'timeout'
 
-require 'socket_channel'
 require 'exceptions/rcon_ban_exception'
 require 'steam/packets/rcon/rcon_packet'
 require 'steam/packets/rcon/rcon_packet_factory'
@@ -13,37 +16,45 @@ class RCONSocket
 
   include SteamSocket
 
-  def initialize(ip_address, port_number)
-    super ip_address, port_number
-    @channel = SocketChannel.open
+  def initialize(ip, port)
+    ip = IPSocket.getaddress(ip) unless ip.is_a? IPAddr
+
+    @ip     = ip
+    @port   = port
+    @socket = nil
+  end
+
+  # Closes the underlying socket if it exists
+  def close
+    super unless @socket.nil?
+  end
+
+  def connect
+    begin
+      timeout(@@timeout / 1000.0) { @socket = TCPSocket.new @ip, @port }
+    rescue Timeout::Error
+      raise TimeoutException
+    end
   end
 
   def send(data_packet)
-    @channel.connect @remote_socket unless @channel.connected?
+    connect if @socket.nil? || @socket.closed?
 
-    @buffer = StringIO.new data_packet.bytes
-    @channel.write @buffer
+    super
   end
 
   def reply
-    raise RCONBanException if receive_packet(1440) == 0
+    raise RCONBanException if receive_packet(4) == 0
 
-    packet_data = @buffer.get
     @buffer.rewind
-    packet_size = @buffer.long + 4
-
-    if packet_size > 1440
-      remaining_bytes = packet_size - @buffer.size
-      begin
-        if remaining_bytes < 1440
-          receive_packet remaining_bytes
-        else
-          receive_packet 1440
-        end
-        packet_data << @buffer.get
-        remaining_bytes -= @buffer.size
-      end while remaining_bytes > 0
-    end
+    remaining_bytes = @buffer.long
+
+    packet_data = ''
+    begin
+      received_bytes = receive_packet remaining_bytes
+      remaining_bytes -= received_bytes
+      packet_data << @buffer.get
+    end while remaining_bytes > 0
 
     RCONPacketFactory.packet_from_data(packet_data)
   end

data/lib/steam/sockets/steam_socket.rb

@@ -1,17 +1,27 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2010, Sebastian Staudt
+# Copyright (c) 2008-2011, Sebastian Staudt
 
-require 'datagram_channel'
 require 'ipaddr'
+require 'socket'
+
 require 'stringio_additions'
 require 'exceptions/timeout_exception'
 
-# Defines common methods for sockets used to connect to game and master
-# servers.
+# This module defines common methods for sockets used to connect to game and
+# master servers.
+#
+# @author Sebastian Staudt
+# @see GoldSrcSocket
+# @see MasterServerSocket
+# @see RCONSocket
+# @see SourceSocket
+# @since 0.5.0
 module SteamSocket
 
+  # The default timeout
+  # @since 0.11.0
   @@timeout = 1000
 
   # Sets the timeout for socket operations. This usually only affects timeouts,
@@ -27,21 +37,20 @@ module SteamSocket
     @@timeout = timeout
   end
 
-  def initialize(*args)
-    @channel = DatagramChannel.open
-    @channel.connect(*args)
-    @channel.configure_blocking false
-
-    @remote_socket = Socket.getaddrinfo args[0].to_s, args[1]
+  def initialize(ip_address, port = 27015)
+    @socket       = UDPSocket.new
+    @socket.connect ip_address, port
   end
 
-  # Abstract +reply+ method
-  def reply
-    raise NotImplementedError
+  # Closes the underlying socket
+  def close
+    @socket.close
   end
 
   def receive_packet(buffer_length = 0)
-    raise TimeoutException if select([@channel.socket], nil, nil, @@timeout / 1000).nil?
+    if select([@socket], nil, nil, @@timeout / 1000.0).nil?
+      raise TimeoutException
+    end
 
     if buffer_length == 0
       @buffer.rewind
@@ -49,7 +58,9 @@ module SteamSocket
       @buffer = StringIO.allocate buffer_length
     end
 
-    bytes_read = @channel.read @buffer
+    data = @socket.recv @buffer.remaining
+    bytes_read = @buffer.write data
+    @buffer.truncate bytes_read
     @buffer.rewind
 
     bytes_read
@@ -58,12 +69,7 @@ module SteamSocket
   def send(data_packet)
     puts "Sending data packet of type \"#{data_packet.class.to_s}\"." if $DEBUG
 
-    @buffer = StringIO.new data_packet.to_s
-    @channel.write @buffer
-  end
-
-  def finalize
-    @channel.close
+    @socket.send data_packet.to_s, 0
   end
 
 end

data/lib/steam/steam_player.rb

@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2011, Sebastian Staudt
 
 require 'exceptions/steam_condenser_exception'
 
@@ -9,7 +9,7 @@ require 'exceptions/steam_condenser_exception'
 class SteamPlayer
 
   attr_reader :client_port, :connect_time, :id, :ip_address, :name, :loss,
-              :ping, :real_id, :score, :state, :steam_id
+              :ping, :rate, :real_id, :score, :state, :steam_id
 
   # Creates a new SteamPlayer object based on the given information
   def initialize(id, name, score, connect_time)
@@ -22,25 +22,40 @@ class SteamPlayer
 
   # Extends this player object with additional information acquired using RCON
   # status
-  def add_info(real_id, name, steam_id, *player_data)
-    @extended = true
-
-    unless name == @name
+  def add_info(player_data)
+    unless player_data[:name] == @name
       raise SteamCondenserException.new('Information to add belongs to a different player.')
     end
 
-    @real_id  = real_id
-    @steam_id = steam_id
-    if steam_id == 'BOT'
-      @state = player_data[0]
-    else
-      @ip_address, @client_port  = player_data[4].split(':')
-      @loss  = player_data[2]
-      @ping  = player_data[1]
-      @state = player_data[3]
+    @extended = true
+
+    @real_id  = player_data[:userid].to_i
+    @steam_id = player_data[:uniqueid]
+    @state    = player_data[:state] if player_data.key? :state
+
+    if !bot?
+      @loss = player_data[:loss].to_i
+      @ping = player_data[:ping].to_i
+
+      if player_data.key? :adr
+        @ip_address, @client_port  = player_data[:adr].split(':')
+        @client_port = @client_port.to_i
+      end
+
+      @rate  = player_data[:rate].to_i if player_data.key? :rate
     end
   end
 
+  # Returns whether this player is a bot
+  def bot?
+    @steam_id == 'BOT'
+  end
+
+  # Returns whether this player object has extended information
+  def extended?
+    @extended
+  end
+
   # Returns a String representation of this player
   def to_s
     if @extended

data/lib/steam-condenser/community.rb

@@ -1,16 +1,17 @@
-# This code is free software; you can redistribute it and/or modify it under the
-# terms of the new BSD License.
-#
-# Copyright (c) 2010, Sebastian Staudt
-
-module SteamCondenser
-
-  require 'steam-condenser/version'
-
-  module Community
-
-    require 'steam/community/steam_id'
-
-  end
-
-end
+# This code is free software; you can redistribute it and/or modify it under the
+# terms of the new BSD License.
+#
+# Copyright (c) 2010, Sebastian Staudt
+
+module SteamCondenser
+
+  require 'steam-condenser/version'
+
+  module Community
+
+    require 'steam/community/steam_id'
+    require 'steam/community/web_api' 
+
+  end
+
+end

data/lib/steam-condenser/version.rb

@@ -1,10 +1,10 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2010, Sebastian Staudt
+# Copyright (c) 2010-2011, Sebastian Staudt
 
 module SteamCondenser
 
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steam-condenser
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
+  hash: 43
+  prerelease: 
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 +01:00
-default_executable: 
+date: 2011-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bzip2-ruby
@@ -35,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ore-tasks
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ore-tasks
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,9 +64,10 @@ dependencies:
         - 0
         version: 0.3.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: A multi-language library for querying the Steam Community, Source, GoldSrc servers and Steam master servers
-email: koraktor@gmail.com
+email: 
+- koraktor@gmail.com
 executables: []
 
 extensions: []
@@ -60,16 +76,16 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- lib/datagram_channel.rb
 - lib/exceptions/packet_format_exception.rb
 - lib/exceptions/rcon_ban_exception.rb
 - lib/exceptions/rcon_no_auth_exception.rb
 - lib/exceptions/steam_condenser_exception.rb
 - lib/exceptions/timeout_exception.rb
-- lib/socket_channel.rb
+- lib/exceptions/web_api_exception.rb
 - lib/steam/community/alien_swarm/alien_swarm_mission.rb
 - lib/steam/community/alien_swarm/alien_swarm_stats.rb
 - lib/steam/community/alien_swarm/alien_swarm_weapon.rb
+- lib/steam/community/app_news.rb
 - lib/steam/community/cacheable.rb
 - lib/steam/community/css/css_map.rb
 - lib/steam/community/css/css_stats.rb
@@ -96,18 +112,23 @@ files:
 - lib/steam/community/tf2/tf2_class.rb
 - lib/steam/community/tf2/tf2_class_factory.rb
 - lib/steam/community/tf2/tf2_engineer.rb
+- lib/steam/community/tf2/tf2_golden_wrench.rb
+- lib/steam/community/tf2/tf2_inventory.rb
+- lib/steam/community/tf2/tf2_item.rb
 - lib/steam/community/tf2/tf2_medic.rb
 - lib/steam/community/tf2/tf2_sniper.rb
 - lib/steam/community/tf2/tf2_spy.rb
 - lib/steam/community/tf2/tf2_stats.rb
-- lib/steam/packets/a2a_ack_packet.rb
-- lib/steam/packets/a2a_ping_packet.rb
+- lib/steam/community/web_api.rb
 - lib/steam/packets/a2m_get_servers_batch2_packet.rb
 - lib/steam/packets/a2s_info_packet.rb
 - lib/steam/packets/a2s_player_packet.rb
 - lib/steam/packets/a2s_rules_packet.rb
 - lib/steam/packets/a2s_serverquery_getchallenge_packet.rb
+- lib/steam/packets/c2m_checkmd5_packet.rb
 - lib/steam/packets/m2a_server_batch_packet.rb
+- lib/steam/packets/m2c_isvalidmd5_packet.rb
+- lib/steam/packets/m2s_requestrestart_packet.rb
 - lib/steam/packets/rcon/rcon_auth_request.rb
 - lib/steam/packets/rcon/rcon_auth_response.rb
 - lib/steam/packets/rcon/rcon_exec_request.rb
@@ -116,18 +137,22 @@ files:
 - lib/steam/packets/rcon/rcon_goldsrc_response.rb
 - lib/steam/packets/rcon/rcon_packet.rb
 - lib/steam/packets/rcon/rcon_packet_factory.rb
+- lib/steam/packets/rcon/rcon_terminator.rb
 - lib/steam/packets/request_with_challenge.rb
 - lib/steam/packets/s2a_info2_packet.rb
 - lib/steam/packets/s2a_info_base_packet.rb
 - lib/steam/packets/s2a_info_detailed_packet.rb
+- lib/steam/packets/s2a_logstring_packet.rb
 - lib/steam/packets/s2a_player_packet.rb
 - lib/steam/packets/s2a_rules_packet.rb
 - lib/steam/packets/s2c_challenge_packet.rb
+- lib/steam/packets/s2m_heartbeat2_packet.rb
 - lib/steam/packets/steam_packet.rb
 - lib/steam/packets/steam_packet_factory.rb
 - lib/steam/servers/game_server.rb
 - lib/steam/servers/goldsrc_server.rb
 - lib/steam/servers/master_server.rb
+- lib/steam/servers/server.rb
 - lib/steam/servers/source_server.rb
 - lib/steam/sockets/goldsrc_socket.rb
 - lib/steam/sockets/master_server_socket.rb
@@ -150,7 +175,6 @@ files:
 - test/steam/communtiy/steam_id_tests.rb
 - test/steam_community_tests.rb
 - test/stringio_additions_tests.rb
-has_rdoc: true
 homepage: http://koraktor.github.com/steam-condenser
 licenses: 
 - BSD
@@ -180,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: steam-condenser
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Steam Condenser - A Steam query library

data/lib/datagram_channel.rb

@@ -1,67 +0,0 @@
-# This code is free software; you can redistribute it and/or modify it under the
-# terms of the new BSD License.
-#
-# Copyright (c) 2008-2010, Sebastian Staudt
-
-require 'ipaddr'
-require 'socket'
-
-require 'stringio_additions'
-
-class DatagramChannel
-
-  attr_reader :socket
-
-  def self.open
-    DatagramChannel.new
-  end
-
-  def close
-    @socket.close
-  end
-
-  def connect(*args)
-    if args[0].is_a? IPAddr
-      ip_address = args[0].to_s
-    elsif args[0].is_a? String
-      ip_address = IPSocket.getaddress args[0]
-    else
-      raise ArgumentError
-    end
-
-    if args[1].is_a? Numeric
-      port_number = args[1]
-    else
-      port_number = args[1].to_i
-    end
-
-    @socket.connect ip_address, port_number
-
-    self
-  end
-
-  def configure_blocking(do_block)
-  end
-
-  def read(destination_io)
-    raise ArgumentError unless destination_io.is_a? StringIO
-
-    data = @socket.recv destination_io.remaining
-    length = destination_io.write data
-    destination_io.truncate length
-  end
-
-  def write(source_io)
-    raise ArgumentError unless source_io.is_a? StringIO
-
-    @socket.send(source_io.get, 0)
-  end
-
-  protected
-
-  def initialize
-    @socket = UDPSocket.new
-    configure_blocking true
-  end
-
-end

data/lib/socket_channel.rb

@@ -1,55 +0,0 @@
-# This code is free software; you can redistribute it and/or modify it under the
-# terms of the new BSD License.
-#
-# Copyright (c) 2008-2010, Sebastian Staudt
-
-require 'ipaddr'
-require 'socket'
-require 'timeout'
-
-require 'stringio_additions'
-
-class SocketChannel
-
-  attr_reader :socket
-
-  def self.open
-    SocketChannel.new
-  end
-
-  def close
-    @socket.close
-  end
-
-  def connect(*args)
-    timeout(1) do
-      @socket = TCPSocket.new args[0][0][3], args[0][0][1]
-      @connected = true
-    end
-
-    self
-  end
-
-  def initialize
-    @connected = false
-  end
-
-  def connected?
-    @connected
-  end
-
-  def read(destination_buffer)
-    raise ArgumentError unless destination_buffer.is_a? StringIO
-
-    data = @socket.recv destination_buffer.remaining
-    length = destination_buffer.write data
-    destination_buffer.truncate length
-  end
-
-  def write(source_buffer)
-    raise ArgumentError unless source_buffer.is_a? StringIO
-
-    @socket.send(source_buffer.get, 0)
-  end
-
-end

data/lib/steam/packets/a2a_ack_packet.rb

@@ -1,24 +0,0 @@
-# This code is free software; you can redistribute it and/or modify it under the
-# terms of the new BSD License.
-#
-# Copyright (c) 2008-2010, Sebastian Staudt
-
-require 'exceptions/packet_format_exception'
-require 'steam/packets/steam_packet'
-
-# The A2A_ACK_Packet class represents the response to a A2A_PING
-# request send to the server.
-class A2A_ACK_Packet
-
-  include SteamPacket
-
-  # Creates a A2A_ACK response object based on the data received.
-  def initialize(data)
-    if data != "\0" && data != "00000000000000\0"
-      raise PacketFormatException.new('Wrong formatted A2A_ACK packet.')
-    end
-
-    super A2A_ACK_HEADER, data
-  end
-
-end

data/lib/steam/packets/a2a_ping_packet.rb

@@ -1,19 +0,0 @@
-# This code is free software; you can redistribute it and/or modify it under the
-# terms of the new BSD License.
-#
-# Copyright (c) 2008-2010, Sebastian Staudt
-
-require 'steam/packets/steam_packet'
-
-# The A2A_PING_Packet class represents a A2A_PING request send to the
-# server.
-class A2A_PING_Packet
-
-  include SteamPacket
-
-  # Creates a new A2A_PING request object
-  def initialize
-    super SteamPacket::A2A_PING_HEADER
-  end
-
-end