steam-condenser 1.1.0 → 1.2.0

data/test/steam/servers/test_goldsrc_server.rb

@@ -1,59 +1,59 @@
-# 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/goldsrc_server'
-
-class TestGoldSrcServer < Test::Unit::TestCase
-
-  context 'The user' do
-
-    should 'be able to get a master server for GoldSrc servers' do
-      master = mock
-      MasterServer.expects(:new).with(*MasterServer::GOLDSRC_MASTER_SERVER).
-        returns master
-
-      assert_equal master, GoldSrcServer.master
-    end
-
-  end
-
-  context 'A GoldSrc server' do
-
-    setup do
-      Socket.stubs(:getaddrinfo).
-        with('goldsrc', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
-        returns [[nil, nil, 'goldsrc', '127.0.0.1']]
-
-      @server = GoldSrcServer.new 'goldsrc', 27015
-    end
-
-    should 'create a client socket upon initialization' do
-      socket = mock
-      GoldSrcSocket.expects(:new).with('127.0.0.1', 27015, false).returns socket
-
-      @server.init_socket
-
-      assert_same socket, @server.instance_variable_get(:@socket)
-    end
-
-    should 'save the RCON password for further use' do
-      assert @server.rcon_auth 'password'
-      assert_equal 'password', @server.instance_variable_get(:@rcon_password)
-    end
-
-    should 'send RCON commands with the password' do
-      socket = mock
-      socket.expects(:rcon_exec).with('password', 'command').returns 'test '
-
-      @server.instance_variable_set :@rcon_password, 'password'
-      @server.instance_variable_set :@socket, socket
-
-      assert_equal 'test', @server.rcon_exec('command')
-    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/goldsrc_server'
+
+class TestGoldSrcServer < Test::Unit::TestCase
+
+  context 'The user' do
+
+    should 'be able to get a master server for GoldSrc servers' do
+      master = mock
+      MasterServer.expects(:new).with(*MasterServer::GOLDSRC_MASTER_SERVER).
+        returns master
+
+      assert_equal master, GoldSrcServer.master
+    end
+
+  end
+
+  context 'A GoldSrc server' do
+
+    setup do
+      Socket.stubs(:getaddrinfo).
+        with('goldsrc', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
+        returns [[nil, nil, 'goldsrc', '127.0.0.1']]
+
+      @server = GoldSrcServer.new 'goldsrc', 27015
+    end
+
+    should 'create a client socket upon initialization' do
+      socket = mock
+      GoldSrcSocket.expects(:new).with('127.0.0.1', 27015, false).returns socket
+
+      @server.init_socket
+
+      assert_same socket, @server.instance_variable_get(:@socket)
+    end
+
+    should 'save the RCON password for further use' do
+      assert @server.rcon_auth 'password'
+      assert_equal 'password', @server.instance_variable_get(:@rcon_password)
+    end
+
+    should 'send RCON commands with the password' do
+      socket = mock
+      socket.expects(:rcon_exec).with('password', 'command').returns 'test '
+
+      @server.instance_variable_set :@rcon_password, 'password'
+      @server.instance_variable_set :@socket, socket
+
+      assert_equal 'test', @server.rcon_exec('command')
+    end
+
+  end
+
+end

data/test/steam/servers/test_master_server.rb

@@ -1,131 +1,131 @@
-# 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/master_server'
-
-class TestMasterServer < Test::Unit::TestCase
-
-  context 'The user' do
-
-    should 'be able to set the number of retries' do
-      MasterServer.retries = 5
-
-      assert_equal 5, MasterServer.send(:class_variable_get, :@@retries)
-    end
-
-  end
-
-  context 'A master server' do
-
-    setup do
-      Socket.stubs(:getaddrinfo).
-        with('master', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
-        returns [[nil, nil, 'master', '127.0.0.1']]
-
-      @server = MasterServer.new 'master', 27015
-    end
-
-    should 'create a client socket upon initialization' do
-      socket = mock
-      MasterServerSocket.expects(:new).with('127.0.0.1', 27015).returns socket
-
-      @server.init_socket
-
-      assert_same socket, @server.instance_variable_get(:@socket)
-    end
-
-    should 'be able to get a challenge' do
-      reply = mock :challenge => 1234
-
-      socket = @server.instance_variable_get :@socket
-      socket.expects(:send).with { |packet| packet.is_a? C2M_CHECKMD5_Packet }
-      socket.expects(:reply).returns reply
-
-      assert_equal 1234, @server.challenge
-    end
-
-    should 'be able to get a list of servers' do
-      reply1 = mock :servers => %w{127.0.0.1:27015 127.0.0.2:27015 127.0.0.3:27015}
-      reply2 = mock :servers => %w{127.0.0.4:27015 0.0.0.0:0}
-
-      socket = @server.instance_variable_get :@socket
-      socket.expects(:send).with do |packet|
-        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
-        packet.instance_variable_get(:@filter) == 'filter' &&
-        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
-        packet.instance_variable_get(:@start_ip) == '0.0.0.0:0'
-      end
-      socket.expects(:send).with do |packet|
-        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
-        packet.instance_variable_get(:@filter) == 'filter' &&
-        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
-        packet.instance_variable_get(:@start_ip) == '127.0.0.3:27015'
-      end
-      socket.expects(:reply).times(2).returns(reply1).returns reply2
-
-      servers = [['127.0.0.1', '27015'], ['127.0.0.2', '27015'], ['127.0.0.3', '27015'], ['127.0.0.4', '27015']]
-      assert_equal servers, @server.servers(MasterServer::REGION_EUROPE, 'filter')
-    end
-
-    should 'be able to send a heartbeat' do
-      reply1 = mock
-      reply2 = mock
-
-      socket = @server.instance_variable_get :@socket
-      socket.expects(:send).with { |packet| packet.is_a? S2M_HEARTBEAT2_Packet }
-      socket.expects(:reply).times(3).returns(reply1).returns(reply2).then.
-        raises SteamCondenser::TimeoutError
-
-      data = { :challenge => 1234 }
-      assert_equal [reply1, reply2], @server.send_heartbeat(data)
-    end
-
-    should 'not timeout if returning servers is forced' do
-      MasterServer.retries = 1
-
-      reply = mock :servers => %w{127.0.0.1:27015 127.0.0.2:27015 127.0.0.3:27015}
-
-      socket = @server.instance_variable_get :@socket
-      socket.expects(:send).with do |packet|
-        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
-        packet.instance_variable_get(:@filter) == 'filter' &&
-        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
-        packet.instance_variable_get(:@start_ip) == '0.0.0.0:0'
-      end
-      socket.expects(:send).with do |packet|
-        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
-        packet.instance_variable_get(:@filter) == 'filter' &&
-        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
-        packet.instance_variable_get(:@start_ip) == '127.0.0.3:27015'
-      end
-      socket.expects(:reply).times(2).returns(reply).then.
-        raises(SteamCondenser::TimeoutError)
-
-      servers = [['127.0.0.1', '27015'], ['127.0.0.2', '27015'], ['127.0.0.3', '27015']]
-      assert_equal servers, @server.servers(MasterServer::REGION_EUROPE, 'filter', true)
-    end
-
-    should 'timeout after a predefined number of retries' do
-      retries = rand(4) + 1
-      MasterServer.retries = retries
-
-      socket = @server.instance_variable_get :@socket
-      socket.expects(:send).times(retries).with do |packet|
-        packet.is_a? A2M_GET_SERVERS_BATCH2_Packet
-        packet.instance_variable_get(:@filter) == ''
-        packet.instance_variable_get(:@region_code) == MasterServer::REGION_ALL
-        packet.instance_variable_get(:@start_ip) == '0.0.0.0:0'
-      end
-      socket.expects(:reply).times(retries).raises SteamCondenser::TimeoutError
-
-      assert_raises SteamCondenser::TimeoutError do
-        @server.servers
-      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/master_server'
+
+class TestMasterServer < Test::Unit::TestCase
+
+  context 'The user' do
+
+    should 'be able to set the number of retries' do
+      MasterServer.retries = 5
+
+      assert_equal 5, MasterServer.send(:class_variable_get, :@@retries)
+    end
+
+  end
+
+  context 'A master server' do
+
+    setup do
+      Socket.stubs(:getaddrinfo).
+        with('master', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
+        returns [[nil, nil, 'master', '127.0.0.1']]
+
+      @server = MasterServer.new 'master', 27015
+    end
+
+    should 'create a client socket upon initialization' do
+      socket = mock
+      MasterServerSocket.expects(:new).with('127.0.0.1', 27015).returns socket
+
+      @server.init_socket
+
+      assert_same socket, @server.instance_variable_get(:@socket)
+    end
+
+    should 'be able to get a challenge' do
+      reply = mock :challenge => 1234
+
+      socket = @server.instance_variable_get :@socket
+      socket.expects(:send).with { |packet| packet.is_a? C2M_CHECKMD5_Packet }
+      socket.expects(:reply).returns reply
+
+      assert_equal 1234, @server.challenge
+    end
+
+    should 'be able to get a list of servers' do
+      reply1 = mock :servers => %w{127.0.0.1:27015 127.0.0.2:27015 127.0.0.3:27015}
+      reply2 = mock :servers => %w{127.0.0.4:27015 0.0.0.0:0}
+
+      socket = @server.instance_variable_get :@socket
+      socket.expects(:send).with do |packet|
+        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
+        packet.instance_variable_get(:@filter) == 'filter' &&
+        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
+        packet.instance_variable_get(:@start_ip) == '0.0.0.0:0'
+      end
+      socket.expects(:send).with do |packet|
+        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
+        packet.instance_variable_get(:@filter) == 'filter' &&
+        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
+        packet.instance_variable_get(:@start_ip) == '127.0.0.3:27015'
+      end
+      socket.expects(:reply).times(2).returns(reply1).returns reply2
+
+      servers = [['127.0.0.1', '27015'], ['127.0.0.2', '27015'], ['127.0.0.3', '27015'], ['127.0.0.4', '27015']]
+      assert_equal servers, @server.servers(MasterServer::REGION_EUROPE, 'filter')
+    end
+
+    should 'be able to send a heartbeat' do
+      reply1 = mock
+      reply2 = mock
+
+      socket = @server.instance_variable_get :@socket
+      socket.expects(:send).with { |packet| packet.is_a? S2M_HEARTBEAT2_Packet }
+      socket.expects(:reply).times(3).returns(reply1).returns(reply2).then.
+        raises SteamCondenser::TimeoutError
+
+      data = { :challenge => 1234 }
+      assert_equal [reply1, reply2], @server.send_heartbeat(data)
+    end
+
+    should 'not timeout if returning servers is forced' do
+      MasterServer.retries = 1
+
+      reply = mock :servers => %w{127.0.0.1:27015 127.0.0.2:27015 127.0.0.3:27015}
+
+      socket = @server.instance_variable_get :@socket
+      socket.expects(:send).with do |packet|
+        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
+        packet.instance_variable_get(:@filter) == 'filter' &&
+        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
+        packet.instance_variable_get(:@start_ip) == '0.0.0.0:0'
+      end
+      socket.expects(:send).with do |packet|
+        packet.is_a?(A2M_GET_SERVERS_BATCH2_Packet) &&
+        packet.instance_variable_get(:@filter) == 'filter' &&
+        packet.instance_variable_get(:@region_code) == MasterServer::REGION_EUROPE &&
+        packet.instance_variable_get(:@start_ip) == '127.0.0.3:27015'
+      end
+      socket.expects(:reply).times(2).returns(reply).then.
+        raises(SteamCondenser::TimeoutError)
+
+      servers = [['127.0.0.1', '27015'], ['127.0.0.2', '27015'], ['127.0.0.3', '27015']]
+      assert_equal servers, @server.servers(MasterServer::REGION_EUROPE, 'filter', true)
+    end
+
+    should 'timeout after a predefined number of retries' do
+      retries = rand(4) + 1
+      MasterServer.retries = retries
+
+      socket = @server.instance_variable_get :@socket
+      socket.expects(:send).times(retries).with do |packet|
+        packet.is_a? A2M_GET_SERVERS_BATCH2_Packet
+        packet.instance_variable_get(:@filter) == ''
+        packet.instance_variable_get(:@region_code) == MasterServer::REGION_ALL
+        packet.instance_variable_get(:@start_ip) == '0.0.0.0:0'
+      end
+      socket.expects(:reply).times(retries).raises SteamCondenser::TimeoutError
+
+      assert_raises SteamCondenser::TimeoutError do
+        @server.servers
+      end
+    end
+
+  end
+
+end

data/test/steam/servers/test_server.rb

@@ -1,72 +1,72 @@
-# 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/server'
-
-class TestServer < Test::Unit::TestCase
-
-  context 'A generic server' do
-
-    class GenericServer
-      include Server
-    end
-
-    should 'split IP and port combinations' do
-      Socket.expects(:getaddrinfo).
-        with('127.0.0.1', '27015', Socket::AF_INET, Socket::SOCK_DGRAM).
-        returns []
-      Socket.expects(:getaddrinfo).
-        with('someserver', '27015', Socket::AF_INET, Socket::SOCK_DGRAM).
-        returns []
-
-      GenericServer.new '127.0.0.1:27015'
-      GenericServer.new 'someserver:27015'
-    end
-
-    should 'resolve multiple DNS names' do
-      Socket.expects(:getaddrinfo).
-        with('someserver', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
-        returns [
-          [nil, nil, 'someserver', '127.0.0.1'],
-          [nil, nil, 'someserver2', '127.0.0.2']
-        ]
-
-      server = GenericServer.new 'someserver', 27015
-
-      assert_equal %w{someserver someserver2}, server.host_names
-      assert_equal %w{127.0.0.1 127.0.0.2}, server.ip_addresses
-    end
-
-    should 'rotate through multiple IP addresses' do
-      Socket.stubs(:getaddrinfo).returns []
-
-      server = GenericServer.new 'someserver'
-      server.instance_variable_set :@ip_addresses, %w{127.0.0.1 127.0.0.2}
-      server.instance_variable_set :@ip_address, '127.0.0.1'
-      server.expects(:init_socket).twice
-
-      assert_not server.rotate_ip
-      assert_equal '127.0.0.2', server.instance_variable_get(:@ip_address)
-      assert server.rotate_ip
-      assert_equal '127.0.0.1', server.instance_variable_get(:@ip_address)
-    end
-
-    should 'allow a failsafe block to execute with IP fallback' do
-      Socket.stubs(:getaddrinfo).returns []
-      block = Proc.new { raise 'error' }
-
-      server = GenericServer.new 'someserver'
-      server.expects(:rotate_ip).twice.returns(false).then.returns(true)
-
-      error = assert_raises RuntimeError do
-        server.send :failsafe, &block
-      end
-      assert_equal 'error', error.message
-    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/server'
+
+class TestServer < Test::Unit::TestCase
+
+  context 'A generic server' do
+
+    class GenericServer
+      include Server
+    end
+
+    should 'split IP and port combinations' do
+      Socket.expects(:getaddrinfo).
+        with('127.0.0.1', '27015', Socket::AF_INET, Socket::SOCK_DGRAM).
+        returns []
+      Socket.expects(:getaddrinfo).
+        with('someserver', '27015', Socket::AF_INET, Socket::SOCK_DGRAM).
+        returns []
+
+      GenericServer.new '127.0.0.1:27015'
+      GenericServer.new 'someserver:27015'
+    end
+
+    should 'resolve multiple DNS names' do
+      Socket.expects(:getaddrinfo).
+        with('someserver', 27015, Socket::AF_INET, Socket::SOCK_DGRAM).
+        returns [
+          [nil, nil, 'someserver', '127.0.0.1'],
+          [nil, nil, 'someserver2', '127.0.0.2']
+        ]
+
+      server = GenericServer.new 'someserver', 27015
+
+      assert_equal %w{someserver someserver2}, server.host_names
+      assert_equal %w{127.0.0.1 127.0.0.2}, server.ip_addresses
+    end
+
+    should 'rotate through multiple IP addresses' do
+      Socket.stubs(:getaddrinfo).returns []
+
+      server = GenericServer.new 'someserver'
+      server.instance_variable_set :@ip_addresses, %w{127.0.0.1 127.0.0.2}
+      server.instance_variable_set :@ip_address, '127.0.0.1'
+      server.expects(:init_socket).twice
+
+      assert_not server.rotate_ip
+      assert_equal '127.0.0.2', server.instance_variable_get(:@ip_address)
+      assert server.rotate_ip
+      assert_equal '127.0.0.1', server.instance_variable_get(:@ip_address)
+    end
+
+    should 'allow a failsafe block to execute with IP fallback' do
+      Socket.stubs(:getaddrinfo).returns []
+      block = Proc.new { raise 'error' }
+
+      server = GenericServer.new 'someserver'
+      server.expects(:rotate_ip).twice.returns(false).then.returns(true)
+
+      error = assert_raises RuntimeError do
+        server.send :failsafe, &block
+      end
+      assert_equal 'error', error.message
+    end
+
+  end
+
+end