ts3query 0.3 → 0.3.1

data/features/run_command.feature

@@ -6,19 +6,19 @@ Feature: Run a query command
 	Scenario: Run 'version' command
 		Given I am connected to the default server with the password 0L8awVFD
 		When I run the command version
-		Then I should get a hash with version=3.0.5 build=1335156372 platform=Linux id=0 msg=ok
+		Then I should get a hash with version=3.0.5 build=1335156372 platform=Linux
 		
 	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
 		
 	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
+		Then I should get a hash
 
 	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
+		Then I should get a hash

data/features/step_definitions/run_command_steps.rb

@@ -46,10 +46,19 @@ When /^I run the command use with the options (.+) and the parameters (.+)$/ do
 end
 
 Then /^I should get a hash with (.+)$/ do |data|
+  list = []
   hash = {}
+  
   data.split(" ").each do |entity|
     hash[entity.split("=")[0]] = entity.split("=")[1]
   end
+  list << hash
+  list << {"id" => "0", "msg" => "ok"}
 
-  @result.should eq(hash)
+  @result.should eq(list)
 end
+
+Then /^I should get a hash$/ do
+  list = [{"id" => "0", "msg" => "ok"}]
+  @result.should eq(list)
+end

data/features/support/env.rb

@@ -8,6 +8,6 @@ rescue Bundler::BundlerError => e
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'TS3Query'
+require 'ts3query'
 
 require 'rspec/expectations'

data/lib/ts3query/ts3_connection.rb

@@ -10,7 +10,7 @@ class TS3Connection
   end
   
   def method_missing(meth, *args, &block)
-    result  = {}
+    result  = []
     options = ""
     params  = ""
     
@@ -28,11 +28,14 @@ class TS3Connection
     end
     
     @connection.cmd("String" => "#{meth}#{params}#{options}\r",
-                    "Match" => /error id=0 msg=ok\n/) { |data| 
+                    "Match" => /error id=0 msg=ok\n/) { |data|
+      current_data = {}
       data.split(" ").each do |entity|
-        result[entity.split("=")[0]] = entity.split("=")[1]
+        current_data[entity.split("=")[0]] = entity.split("=")[1]
       end
-      result.delete("error")              
+      current_data.delete("error")
+      
+      result << current_data
     }
     result
   end

metadata

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