steam-condenser 1.1.0 → 1.2.0

data/test/steam/servers/test_source_server.rb

@@ -1,140 +1,126 @@
-# This code is free software; you can redistribute it and/or modify it under
-# the terms of the new BSD License.
-#
-# Copyright (c) 2011, Sebastian Staudt
-
-require 'helper'
-require 'steam/servers/source_server'
-
-class TestSourceServer < Test::Unit::TestCase
-
-  context 'The user' do
-
-    should 'be able to get a master server for Source servers' do
-      master = mock
-      MasterServer.expects(:new).with(*MasterServer::SOURCE_MASTER_SERVER).
-        returns master
-
-      assert_equal master, SourceServer.master
-    end
-
-  end
-
-  context 'A Source server' do
-
-    setup do
-      Socket.stubs(:getaddrinfo).
-        with('source', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
-        returns [[nil, nil, 'source', '127.0.0.1']]
-
-      @server = SourceServer.new 'source', 27015
-    end
-
-    should 'create client sockets upon initialization' do
-      socket = mock
-      SourceSocket.expects(:new).with('127.0.0.1', 27015).returns socket
-      rcon_socket = mock
-      RCONSocket.expects(:new).with('127.0.0.1', 27015).returns rcon_socket
-
-      @server.init_socket
-
-      assert_same socket, @server.instance_variable_get(:@socket)
-      assert_same rcon_socket, @server.instance_variable_get(:@rcon_socket)
-    end
-
-    should 'be able to authenticate successfully' do
-      reply = mock
-
-      rcon_socket = mock
-      rcon_socket.expects(:send).with do |packet|
-        reply.expects(:request_id).twice.returns packet.request_id
-
-        packet.is_a? RCONAuthRequest
-      end
-      rcon_socket.expects(:reply).twice.returns(nil).returns(reply)
-      @server.instance_variable_set :@rcon_socket, rcon_socket
-
-      assert @server.rcon_auth 'password'
-      assert @server.instance_variable_get(:@rcon_authenticated)
-    end
-
-    should 'fail to authenticate if the wrong request ID is returned' do
-      reply = mock
-      reply.expects(:request_id).twice.returns -2
-
-      rcon_socket = mock
-      rcon_socket.expects(:send).with { |packet| packet.is_a? RCONAuthRequest }
-      rcon_socket.expects(:reply).twice.returns(nil).returns(reply)
-      @server.instance_variable_set :@rcon_socket, rcon_socket
-
-      assert_not @server.rcon_auth 'password'
-      assert_not @server.instance_variable_get(:@rcon_authenticated)
-    end
-
-    should 'raise an error if authentication fails' do
-      reply = mock
-      reply.expects(:request_id).returns -1
-
-      rcon_socket = mock
-      rcon_socket.expects(:send).with { |packet| packet.is_a? RCONAuthRequest }
-      rcon_socket.expects(:reply).twice.returns(nil).returns(reply)
-      @server.instance_variable_set :@rcon_socket, rcon_socket
-
-      assert_raises RCONNoAuthError do
-        @server.rcon_auth 'password'
-      end
-    end
-
-    should 'raise an error if the RCON connection is not authenticated' do
-      assert_raises RCONNoAuthError do
-        @server.rcon_exec 'command'
-      end
-    end
-
-    context 'with an authenticated RCON connection' do
-
-      setup do
-        @rcon_socket = mock
-        @rcon_socket.expects(:send).with do |packet|
-          packet.is_a?(RCONExecRequest) &&
-          packet.instance_variable_get(:@content_data).string == "command\0\0" &&
-          packet.instance_variable_get(:@request_id) == 1234
-        end
-        @rcon_socket.expects(:send).with do |packet|
-          packet.is_a?(RCONTerminator) &&
-          packet.instance_variable_get(:@request_id) == 1234
-        end
-
-        @server.instance_variable_set :@rcon_authenticated, true
-        @server.instance_variable_set :@rcon_request_id, 1234
-        @server.instance_variable_set :@rcon_socket, @rcon_socket
-      end
-
-      should 'reset the connection if the server indicates so' do
-        reply = mock
-        reply.expects(:is_a?).with(RCONAuthResponse).returns true
-        @rcon_socket.expects(:reply).returns(reply)
-
-        assert_raises RCONNoAuthError do
-          @server.rcon_exec 'command'
-        end
-        assert_not @server.instance_variable_get(:@rcon_authenticated)
-      end
-
-      should 'receive the response of a command' do
-        reply1 = mock :response => 'test'
-        reply2 = mock :response => 'test'
-        reply3 = mock
-        reply3.expects(:response).twice.returns ''
-
-        @rcon_socket.expects(:reply).times(3).returns(reply1).returns(reply2).
-          returns reply3
-
-        assert_equal 'testtest', @server.rcon_exec('command')
-      end
-
-    end
-
-  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) 2011, Sebastian Staudt
+
+require 'helper'
+require 'steam/servers/source_server'
+
+class TestSourceServer < Test::Unit::TestCase
+
+  context 'The user' do
+
+    should 'be able to get a master server for Source servers' do
+      master = mock
+      MasterServer.expects(:new).with(*MasterServer::SOURCE_MASTER_SERVER).
+        returns master
+
+      assert_equal master, SourceServer.master
+    end
+
+  end
+
+  context 'A Source server' do
+
+    setup do
+      Socket.stubs(:getaddrinfo).
+        with('source', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
+        returns [[nil, nil, 'source', '127.0.0.1']]
+
+      @server = SourceServer.new 'source', 27015
+    end
+
+    should 'create client sockets upon initialization' do
+      socket = mock
+      SourceSocket.expects(:new).with('127.0.0.1', 27015).returns socket
+      rcon_socket = mock
+      RCONSocket.expects(:new).with('127.0.0.1', 27015).returns rcon_socket
+
+      @server.init_socket
+
+      assert_same socket, @server.instance_variable_get(:@socket)
+      assert_same rcon_socket, @server.instance_variable_get(:@rcon_socket)
+    end
+
+    should 'be able to authenticate successfully' do
+      reply = mock
+
+      rcon_socket = mock
+      rcon_socket.expects(:send).with do |packet|
+        reply.expects(:request_id).returns packet.request_id
+
+        packet.is_a? RCONAuthRequest
+      end
+      rcon_socket.expects(:reply).twice.returns(nil).returns(reply)
+      @server.instance_variable_set :@rcon_socket, rcon_socket
+
+      assert @server.rcon_auth 'password'
+      assert @server.instance_variable_get(:@rcon_authenticated)
+    end
+
+    should 'fail to authenticate if the wrong request ID is returned' do
+      reply = mock
+      reply.expects(:request_id).returns -1
+
+      rcon_socket = mock
+      rcon_socket.expects(:send).with { |packet| packet.is_a? RCONAuthRequest }
+      rcon_socket.expects(:reply).twice.returns(nil).returns(reply)
+      @server.instance_variable_set :@rcon_socket, rcon_socket
+
+      assert_not @server.rcon_auth 'password'
+      assert_not @server.instance_variable_get(:@rcon_authenticated)
+    end
+
+    should 'raise an error if the RCON connection is not authenticated' do
+      assert_raises RCONNoAuthError do
+        @server.rcon_exec 'command'
+      end
+    end
+
+    context 'with an authenticated RCON connection' do
+
+      setup do
+        @rcon_socket = mock
+        @rcon_socket.expects(:send).with do |packet|
+          packet.is_a?(RCONExecRequest) &&
+          packet.instance_variable_get(:@content_data).string == "command\0\0" &&
+          packet.instance_variable_get(:@request_id) == 1234
+        end
+        @rcon_socket.expects(:send).with do |packet|
+          packet.is_a?(RCONTerminator) &&
+          packet.instance_variable_get(:@request_id) == 1234
+        end
+
+        @server.instance_variable_set :@rcon_authenticated, true
+        @server.instance_variable_set :@rcon_request_id, 1234
+        @server.instance_variable_set :@rcon_socket, @rcon_socket
+      end
+
+      should 'reset the connection if the server indicates so' do
+        reply = mock
+        reply.expects(:is_a?).with(RCONAuthResponse).returns true
+        @rcon_socket.expects(:reply).returns(reply)
+
+        assert_raises RCONNoAuthError do
+          @server.rcon_exec 'command'
+        end
+        assert_not @server.instance_variable_get(:@rcon_authenticated)
+      end
+
+      should 'receive the response of a command' do
+        reply1 = mock :response => 'test'
+        reply2 = mock :response => 'test'
+        reply3 = mock
+        reply3.expects(:response).twice.returns ''
+
+        @rcon_socket.expects(:reply).times(3).returns(reply1).returns(reply2).
+          returns reply3
+
+        assert_equal 'testtest', @server.rcon_exec('command')
+      end
+
+    end
+
+  end
+
+end

data/test/steam/sockets/test_master_server_socket.rb

@@ -12,6 +12,7 @@ class TestMasterServerSocket < Test::Unit::TestCase
 
     setup do
       @socket = MasterServerSocket.new '127.0.0.1'
+      @socket.instance_variable_set :@buffer, mock
     end
 
     should 'raise an error if the packet header is incorrect' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steam-condenser
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bzip2-ruby
@@ -41,34 +41,50 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 25
         segments: 
         - 1
-        - 0
         - 3
-        version: 1.0.3
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: multi_xml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 13
         segments: 
         - 0
-        - 10
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
         - 0
-        version: 0.10.0
+        - 11
+        - 1
+        version: 0.11.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +96,11 @@ dependencies:
         - 2
         version: 0.9.2
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: shoulda-context
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +112,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,7 +128,7 @@ dependencies:
         - 2
         version: 0.7.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: A multi-language library for querying the Steam Community, Source, GoldSrc servers and Steam master servers
 email: 
 - koraktor@gmail.com
@@ -124,6 +140,7 @@ extra_rdoc_files: []
 
 files: 
 - Gemfile
+- Gemfile.lock
 - lib/core_ext/stringio.rb
 - lib/errors/packet_format_error.rb
 - lib/errors/rcon_ban_error.rb
@@ -178,6 +195,7 @@ files:
 - lib/steam/community/tf2/tf2_spy.rb
 - lib/steam/community/tf2/tf2_stats.rb
 - lib/steam/community/web_api.rb
+- lib/steam/community/xml_data.rb
 - lib/steam/packets/a2m_get_servers_batch2_packet.rb
 - lib/steam/packets/a2s_info_packet.rb
 - lib/steam/packets/a2s_player_packet.rb
@@ -236,6 +254,7 @@ files:
 - test/steam/communtiy/test_steam_group.rb
 - test/steam/communtiy/test_steam_id.rb
 - test/steam/communtiy/test_web_api.rb
+- test/steam/packets/test_steam_packet.rb
 - test/steam/servers/test_game_server.rb
 - test/steam/servers/test_goldsrc_server.rb
 - test/steam/servers/test_master_server.rb
@@ -275,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Steam Condenser - A Steam query library
@@ -290,6 +309,7 @@ test_files:
 - test/steam/communtiy/test_steam_group.rb
 - test/steam/communtiy/test_steam_id.rb
 - test/steam/communtiy/test_web_api.rb
+- test/steam/packets/test_steam_packet.rb
 - test/steam/servers/test_game_server.rb
 - test/steam/servers/test_goldsrc_server.rb
 - test/steam/servers/test_master_server.rb