ts3query 0.1 → 0.2

data/README.rdoc

@@ -30,6 +30,26 @@ This will return a hash with the serverlist. (Options -uid and -short)
   	opt.short
   end
 
+This will select the first server. (Parameters sid=1)
+
+  @query.use :sid => 1
+  
+You can also combine parameters and options.
+
+  @query.use :sid => 1 do |opt|
+  	opt.virtual
+  end
+
+=== Close the connection
+
+If you don't need the query connection any longer you should close it.
+
+  @query.disconnect
+  
+=== Query commands
+
+For a full command reference you can download the {Teamspeak 3 Query Manuel}[http://media.teamspeak.com/ts3_literature/TeamSpeak%203%20Server%20Query%20Manual.pdf].
+
 == Contributing to TS3Query
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -40,6 +60,15 @@ This will return a hash with the serverlist. (Options -uid and -short)
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+== Running the tests
+
+If you try to run the tests, you need a local teamspeak server running with this data:
+
+* Address:  127.0.0.1
+* Port:     10011
+* User:     serveradmin
+* Password: 0L8awVFD
+
 == Copyright
 
 Copyright (c) 2012 TnT Web Solutions GbR. See LICENSE.txt for

data/features/run_command.feature

@@ -11,4 +11,14 @@ Feature: Run a query command
 	Scenario: Run 'serverlist' command with options
 		Given I am connected to the default server with the password 0L8awVFD
 		When I run the command serverlist with the options -uid -short
-		Then I should get a hash with virtualserver_id=1 virtualserver_port=9987 virtualserver_status=online id=0 msg=ok
+		Then I should get a hash with virtualserver_id=1 virtualserver_port=9987 virtualserver_status=online id=0 msg=ok
+		
+	Scenario: Run 'use' command with parameters
+		Given I am connected to the default server with the password 0L8awVFD
+		When I run the command use with the parameters sid=1
+		Then I should get a hash with id=0 msg=ok
+
+	Scenario: Run 'use' command with options and parameters
+		Given I am connected to the default server with the password 0L8awVFD
+		When I run the command use with the options -virtual and the parameters sid=1
+		Then I should get a hash with id=0 msg=ok

data/features/step_definitions/run_command_steps.rb

@@ -4,6 +4,7 @@ end
 
 When /^I run the command version$/ do
   @result = @query.version()
+  @query.disconnect
 end
 
 When /^I run the command serverlist with the options (.+)$/ do |options|
@@ -14,6 +15,34 @@ When /^I run the command serverlist with the options (.+)$/ do |options|
       opt.send(current)
     end
   end
+  @query.disconnect
+end
+
+When /^I run the command use with the parameters (.+)$/ do |parameters|
+  parameters = parameters.split(" ")
+  params = {}
+  parameters.each do |current|
+    params[current.split("=")[0]] = current.split("=")[1]
+  end
+  @result = @query.use params
+  @query.disconnect
+end
+
+When /^I run the command use with the options (.+) and the parameters (.+)$/ do |options, parameters|
+  parameters = parameters.split(" ")
+  params = {}
+  parameters.each do |current|
+    params[current.split("=")[0]] = current.split("=")[1]
+  end
+  
+  options = options.split(" ")
+  @result = @query.use params do |opt|
+    options.each do |current|
+      current[0] = ""
+      opt.send(current)
+    end
+  end
+  @query.disconnect
 end
 
 Then /^I should get a hash with (.+)$/ do |data|

data/lib/ts3query/ts3_connection.rb

@@ -12,6 +12,7 @@ class TS3Connection
   def method_missing(meth, *args, &block)
     result  = {}
     options = ""
+    params  = ""
     
     if block
       query_options = QueryOptions.new
@@ -21,8 +22,12 @@ class TS3Connection
         options += " -#{opt}"
       end
     end
+
+    args.each do |param|
+      params += " #{param.keys[0]}=#{param[param.keys[0]]}"
+    end
     
-    @connection.cmd("String" => "#{meth}#{options}\r",
+    @connection.cmd("String" => "#{meth}#{params}#{options}\r",
                     "Match" => /error id=0 msg=ok\n/) { |data| 
       data.split(" ").each do |entity|
         result[entity.split("=")[0]] = entity.split("=")[1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ts3query
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors: