Fix the Greeting message - package is an attribute of version, not QMP.

At this stage, we can connect to a QEMU server and issue commands and queries.

lib/qmp_client/messages/greeting.rb

@@ -3,40 +3,34 @@ require 'qmp_client/messages/message'
 module QMPClient
   module Messages
     class Greeting < Message
-      attr_reader :qmp_version
+      attr_reader :version
-      attr_reader :qmp_package
       attr_reader :capabilities
 
       def self.represents?(hsh)
 
         super(hsh) && hsh['QMP'].is_a?(Hash) &&
           hsh['QMP']['version'].is_a?(Hash) &&
-          hsh['QMP']['package'].is_a?(String) &&
+          hsh['QMP']['capabilities'].is_a?(Array)
-          hsh['capabilities'].is_a?(Array)
       end
 
       # build an event from a Hash
       def self.build(hsh)
-        new(hsh['QMP']['version'], hsh['QMP']['package'], hsh['capabilities'])
+        new(hsh['QMP']['version'], hsh['QMP']['package'], hsh['QMP']['capabilities'])
       end
 
       def ==(other)
-        other.is_a?(Greeting) && other.qmp_version == self.qmp_version &&
+        other.is_a?(Greeting) && other.version == self.version &&
-          other.qmp_package == self.qmp_package &&
           other.capabilities == self.capabilities
       end
 
-      def initialize(qmp_version, qmp_package, capabilities)
+      def initialize(version, package, capabilities)
-        @qmp_version = qmp_version
+        @version = version
-        @qmp_package = qmp_package
+        @package = package
         @capabilities = capabilities
       end
 
       def to_hash
-        {
+        { 'QMP' => { 'version' => version, 'capabilities' => capabilities } }
-          'QMP' => {'version' => qmp_version, 'package' => qmp_package},
-          'capabilities' => capabilities
-        }
       end
 
       protected

test/unit/qmp_client/test_messages.rb

@@ -12,16 +12,16 @@ module TestQMPClient
       COMMAND_TXT = COMMAND_HSH.to_json
 
       GREETING_MSG = Messages::Greeting.new(
-        {'qemu' => {'micro' => 50, 'minor' => 13, 'major' => 0}},
+        {'qemu' => {'micro' => 50, 'minor' => 13, 'major' => 0}, 'package' => ''},
         "", []
       )
-      GREETING_HSH = {
+      GREETING_HSH = { 'QMP' => {
-        'QMP' => {
+        'version' => {
-          'version' => {'qemu' => {'micro' => 50, 'minor' => 13, 'major' => 0}},
+          'qemu' => {'micro' => 50, 'minor' => 13, 'major' => 0},
-          'package' => "",
+          'package' => ''
         },
         'capabilities' => []
-      }
+      }}
       GREETING_TXT = GREETING_HSH.to_json
 
       ETIME = Time.now