steam-condenser 0.10.1 → 0.11.0

data/test/datagram_channel_tests.rb

@@ -1,14 +1,14 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2009, Sebastian Staudt
-
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+# Copyright (c) 2009-2010, Sebastian Staudt
 
 require 'test/unit'
 
-require 'byte_buffer'
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'datagram_channel'
+require 'stringio_additions'
 
 class DatagramChannelTests < Test::Unit::TestCase
 
@@ -22,18 +22,18 @@ class DatagramChannelTests < Test::Unit::TestCase
     channel.connect('localhost', port)
 
     string = 'test'
-    
-    buffer = ByteBuffer.wrap(string)
+
+    buffer = StringIO.new string
     channel.write(buffer)
     sent, socket_addr = socket.recvfrom(4)
     socket.send(string, 0, 'localhost', socket_addr[1])
-    buffer = ByteBuffer.allocate(4)
+    buffer = StringIO.allocate 4
     channel.read(buffer)
 
     channel.close
     socket.close
 
-    received = buffer.array
+    received = buffer.data
 
     assert_equal(string, sent)
     assert_equal(string, received)

data/test/query_tests.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) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
+
+require 'ipaddr'
+require 'test/unit'
 
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
-require "exceptions/timeout_exception"
-require "ipaddr"
-require "steam/servers/goldsrc_server"
-require "steam/servers/master_server"
-require "steam/servers/source_server"
-require "test/unit"
+require 'exceptions/timeout_exception'
+require 'steam/servers/goldsrc_server'
+require 'steam/servers/master_server'
+require 'steam/servers/source_server'
 
 class QueryTests < Test::Unit::TestCase
 
@@ -18,7 +19,7 @@ class QueryTests < Test::Unit::TestCase
   def test_invalid_goldsrc_server
     assert_raise TimeoutException do
       invalid_server = GoldSrcServer.new IPAddr.new("1.0.0.0")
-      invalid_server.get_ping
+      invalid_server.ping
     end
   end
 
@@ -26,16 +27,16 @@ class QueryTests < Test::Unit::TestCase
   def test_invalid_source_server
     assert_raise TimeoutException do
       invalid_server = SourceServer.new IPAddr.new("1.0.0.0")
-      invalid_server.get_ping
+      invalid_server.ping
     end
   end
-  
+
   # This test gets a random GoldSrc server from the master server and does a
   # full query on it
   def test_random_goldsrc_server
     assert_nothing_raised do
       master_server = MasterServer.new(*MasterServer::GOLDSRC_MASTER_SERVER)
-      servers = master_server.get_servers MasterServer::REGION_ALL, "\\type\\d\\empty\\1\\full\\1\\gamedir\\valve"
+      servers = master_server.servers MasterServer::REGION_ALL, "\\type\\d\\empty\\1\\full\\1\\gamedir\\valve"
 
       assert !servers.empty?, "Got no servers from master server."
 
@@ -47,13 +48,13 @@ class QueryTests < Test::Unit::TestCase
       print server.to_s
     end
   end
-  
+
   # This test gets a random Source server from the master server and does a
   # full query on it
   def test_random_source_server
     assert_nothing_raised do
       master_server = MasterServer.new(*MasterServer::SOURCE_MASTER_SERVER)
-      servers = master_server.get_servers MasterServer::REGION_ALL, "\\type\\d\\empty\\1\\full\\1\\gamedir\\tf"
+      servers = master_server.servers MasterServer::REGION_ALL, "\\type\\d\\empty\\1\\full\\1\\gamedir\\tf"
 
       assert !servers.empty?, "Got no servers from master server."
 
@@ -65,5 +66,5 @@ class QueryTests < Test::Unit::TestCase
       print server.to_s
     end
   end
-  
+
 end

data/test/rcon_tests.rb

@@ -1,76 +1,77 @@
 # 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-2010, Sebastian Staudt
+
+require 'ipaddr'
+require 'test/unit'
 
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
-require "ipaddr"
-require "steam/servers/goldsrc_server"
-require "steam/servers/source_server"
-require "test/unit"
+require 'steam/servers/goldsrc_server'
+require 'steam/servers/source_server'
 
 class RCONTests < Test::Unit::TestCase
 
   # This test tries to run the "status" command over RCON on a GoldSrc server
   def test_long_rcon_goldsrc_server
     assert_nothing_raised do
-      server = GoldSrcServer.new IPAddr.new("127.0.0.1")
-      server.rcon_auth "test"
-      rcon_reply = server.rcon_exec "cvarlist"
+      server = GoldSrcServer.new IPAddr.new('127.0.0.1')
+      server.rcon_auth 'test'
+      rcon_reply = server.rcon_exec 'cvarlist'
       print "#{rcon_reply}\n"
 
       assert(
-        rcon_reply.include?("CvarList ? for syntax"),
-        "Did not receive complete cvarlist.")
+        rcon_reply.include?('CvarList ? for syntax'),
+        'Did not receive complete cvarlist.')
     end
   end
-  
+
   # This test tries to run the "status" command over RCON on a Source server
   def test_long_rcon_source_server
     assert_nothing_raised do
-      server = SourceServer.new IPAddr.new("127.0.0.1")
-      if server.rcon_auth "test"
-        rcon_reply = server.rcon_exec "cvarlist"
+      server = SourceServer.new IPAddr.new('127.0.0.1')
+      if server.rcon_auth 'test'
+        rcon_reply = server.rcon_exec 'cvarlist'
         print "#{rcon_reply}\n"
       end
 
       assert(
-        rcon_reply.include?("total convars/concommands"),
-        "Did not receive complete cvarlist.")
+        rcon_reply.include?('total convars/concommands'),
+        'Did not receive complete cvarlist.')
     end
   end
-  
+
   # This test tries to run the "status" command over RCON on a GoldSrc server
   def test_short_rcon_goldsrc_server
     assert_nothing_raised do
-      server = GoldSrcServer.new IPAddr.new("127.0.0.1")
-      server.rcon_auth "test"
-      rcon_reply = server.rcon_exec "version"
+      server = GoldSrcServer.new IPAddr.new('127.0.0.1')
+      server.rcon_auth 'test'
+      rcon_reply = server.rcon_exec 'version'
       print "#{rcon_reply}\n"
 
       assert(
-        rcon_reply.include?("Protocol version") &&
-        rcon_reply.include?("Exe version") &&
-        rcon_reply.include?("Exe build"),
-        "Did not receive correct version response.");
+        rcon_reply.include?('Protocol version') &&
+        rcon_reply.include?('Exe version') &&
+        rcon_reply.include?('Exe build'),
+        'Did not receive correct version response.');
     end
   end
 
   # This test tries to run the "status" command over RCON on a Source server
   def test_short_rcon_source_server
     assert_nothing_raised do
-      server = SourceServer.new IPAddr.new("127.0.0.1")
-      if server.rcon_auth "test"
-        rcon_reply = server.rcon_exec "version"
+      server = SourceServer.new IPAddr.new('127.0.0.1')
+      if server.rcon_auth 'test'
+        rcon_reply = server.rcon_exec 'version'
         print "#{rcon_reply}\n"
       end
 
       assert(
-        rcon_reply.include?("Protocol version") &&
-        rcon_reply.include?("Exe version") &&
-        rcon_reply.include?("Exe build"),
-        "Did not receive correct version response.");
+        rcon_reply.include?('Protocol version') &&
+        rcon_reply.include?('Exe version') &&
+        rcon_reply.include?('Exe build'),
+        'Did not receive correct version response.');
     end
   end
 

data/test/socket_channel_tests.rb

@@ -1,13 +1,13 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2009, Sebastian Staudt
+# Copyright (c) 2009-2010, Sebastian Staudt
 
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'test/unit'
 
-require 'byte_buffer'
+require 'stringio_additions'
 require 'socket_channel'
 
 class SocketChannelTests < Test::Unit::TestCase
@@ -19,22 +19,22 @@ class SocketChannelTests < Test::Unit::TestCase
 
     channel = SocketChannel.open
     channel.connect Socket.getaddrinfo('localhost', port)
-    
+
     socket= server.accept
 
     string = 'test'
-    
-    buffer = ByteBuffer.wrap(string)
+
+    buffer = StringIO.new string
     channel.write(buffer)
     sent, socket_addr = socket.recvfrom(4)
     socket.send(string, 0)
-    buffer = ByteBuffer.allocate(4)
+    buffer = StringIO.allocate 4
     channel.read(buffer)
 
     channel.close
     socket.close
 
-    received = buffer.array
+    received = buffer.data
 
     assert_equal(string, sent)
     assert_equal(string, received)

data/test/steam/communtiy/steam_community_test_suite.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) 2009, Sebastian Staudt
+# Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'test/unit' 
+require 'test/unit'
+
+suite_dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(suite_dir) unless $LOAD_PATH.include?(suite_dir)
 
 require 'steam_group_tests'
 require 'steam_id_tests'

data/test/steam_community_tests.rb

@@ -3,10 +3,11 @@
 #
 # Copyright (c) 2008-2009, Sebastian Staudt
 
+require 'test/unit'
+
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
-require "steam/community/steam_id"
-require "test/unit"
+require 'steam/community/steam_id'
 
 class SteamCommunityTests < Test::Unit::TestCase
 
@@ -40,5 +41,5 @@ class SteamCommunityTests < Test::Unit::TestCase
       p steam_id.game_stats('tf2')
     end
   end
-  
+
 end

data/test/stringio_additions_tests.rb

@@ -0,0 +1,77 @@
+# This code is free software; you can redistribute it and/or modify it under the
+# terms of the new BSD License.
+#
+# Copyright (c) 2009-2010, Sebastian Staudt
+
+require 'test/unit'
+
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'stringio_additions'
+
+class StringIOAdditionsTests < Test::Unit::TestCase
+
+  def test_allocate
+    buffer = StringIO.allocate(10)
+    assert_equal("\0" * 10, buffer.data)
+  end
+
+  def test_byte
+    buffer = StringIO.new('test')
+    assert_equal('t'[0], buffer.byte)
+    assert_equal(3, buffer.remaining)
+  end
+
+  def test_float
+    buffer = StringIO.new('test')
+    assert_equal('7.71353668494131e+31', buffer.float.to_s)
+    assert_equal(0, buffer.remaining)
+  end
+
+  def test_long
+    buffer = StringIO.new('test')
+    assert_equal(1953719668, buffer.long)
+    assert_equal(0, buffer.remaining)
+  end
+
+  def test_short
+    buffer = StringIO.new('test')
+    assert_equal(25972, buffer.short)
+    assert_equal(2, buffer.remaining)
+  end
+
+  def test_signed_long
+    buffer = StringIO.new("   \255")
+    assert_equal(-1390403552, buffer.signed_long)
+    assert_equal(0, buffer.remaining)
+  end
+
+  def test_string
+    buffer = StringIO.new("test\0test")
+    assert_equal('test', buffer.string)
+    assert_equal(4, buffer.remaining)
+  end
+
+  def test_put
+    buffer = StringIO.new('te')
+    buffer.write('st')
+    assert_equal('st', buffer.data)
+    buffer = StringIO.allocate(4)
+    buffer.write('test')
+    assert_equal('test', buffer.data)
+  end
+
+  def test_rewind
+    buffer = StringIO.new('test')
+    assert_equal(25972, buffer.short)
+    buffer.rewind
+    assert_equal(25972, buffer.short)
+  end
+
+  def test_wrap
+    string = 'test'
+    buffer = StringIO.new(string)
+    assert_equal(string, buffer.data)
+  end
+
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steam-condenser
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 1
-  version: 0.10.1
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +02:00
+date: 2010-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,9 +33,7 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/abstract_class.rb
-- lib/byte_buffer.rb
 - lib/datagram_channel.rb
-- lib/exceptions/buffer_underflow_exception.rb
 - lib/exceptions/packet_format_exception.rb
 - lib/exceptions/rcon_ban_exception.rb
 - lib/exceptions/rcon_no_auth_exception.rb
@@ -43,6 +42,9 @@ files:
 - lib/socket_channel.rb
 - lib/steam-condenser.rb
 - lib/steam/community/cacheable.rb
+- lib/steam/community/css/css_map.rb
+- lib/steam/community/css/css_stats.rb
+- lib/steam/community/css/css_weapon.rb
 - lib/steam/community/defense_grid/defense_grid_stats.rb
 - lib/steam/community/dods/dods_class.rb
 - lib/steam/community/dods/dods_stats.rb
@@ -104,7 +106,7 @@ files:
 - lib/steam/sockets/source_socket.rb
 - lib/steam/sockets/steam_socket.rb
 - lib/steam/steam_player.rb
-- test/byte_buffer_tests.rb
+- lib/stringio_additions.rb
 - test/datagram_channel_tests.rb
 - test/query_tests.rb
 - test/rcon_tests.rb
@@ -113,6 +115,7 @@ files:
 - test/steam/communtiy/steam_group_tests.rb
 - 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: []
@@ -127,23 +130,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: steam-condenser
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Steam Condenser - A Steam query library