hawkular-client 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d98c76e5262c54b3c0949ebfd998051e3abb81
-  data.tar.gz: b7c63829113d7bd814d5a300f3e6d8da36b48195
+  metadata.gz: 6d77d09316e981da7ac6e3b388086113d124edd8
+  data.tar.gz: b68cd6c87554d6277d2f3f58c2ed58d7af667b51
 SHA512:
-  metadata.gz: 5e3c7e6e3ccc5bdd7357dfa435046bf428f7f5a88800222d4dedddcd6e525a28a348a6af6d725096c49b71b8c724ceed0263948b2ec85b9a963b31f2761dd92a
-  data.tar.gz: 50aa5323c03caf2704e1d5848c7311ef7d9c640a7c73583aa911da9d8976262f75bc6139a385a8f541f58cdf1c1b5dd843e642ce4d9367523c5062370d2d214b
+  metadata.gz: 401153f15fb3a7fb00414e9febdb8499521338607dd473880ff66dfca8c742b7f613f4517126210d6991dbf4f91478c2ad3a111ea0629e680978755b94707d1b
+  data.tar.gz: f90f8cc4c20d36967403fca69d68c438b7166deb11637c0daf72e375712e6db1527b2bb9bda777f29db7f3f68308ebfbe0cdc75c4355408189e6f41847f28400

data/CHANGES.rdoc

@@ -3,6 +3,9 @@
 This document describes the relevant changes between releases of the
 _hawkular-client_ project.
 
+=== v 4.1.0
+* Fixed binary data handling when invoking <em>Export JDR</em> on operations API.
+* Added <em>delete_immediately</em> parameter to <em>Export JDR</em> operation.
 
 === v 4.0.0
 * Standardized Exceptions under the Hawkular namespace, and the old names were deprecated, here is the list:

data/lib/hawkular/operations/operations_api.rb

@@ -28,14 +28,40 @@ module Hawkular::Operations
     include WebSocket::Client
     include MonitorMixin
 
-    attr_accessor :ws, :session_id, :logger
+    attr_accessor :ws, :logger
 
     # helper for parsing the "OperationName=json_payload" messages
     class WebSocket::Frame::Data
       def to_msg_hash
-        chunks = split('=', 2)
+        operation_name, json = split('=', 2)
+
+        # Check if there is a zip file following JSON.
+        # This check is done only in the first 100KB, hoping it's unlikely to
+        # have such large amount of JSON before a zip file is attached.
+        magic_bits = [
+          "\x50\x4B\x03\x04", # "PK" + 0x03 + 0x04 = Regular ZIP file
+          "\x50\x4B\x05\x06", # "PK" + 0x05 + 0x06 = Empty ZIP
+          "\x50\x4B\x07\x08"  # "PK" + 0x07 + 0x08 = Spanned ZIP
+        ]
+        search_chunk = json[0, 102_400]
+        zip_file = nil
+
+        magic_bits.each do |bits|
+          idx = search_chunk.index(bits)
+
+          next unless idx
+
+          zip_file = json[idx..-1]
+          json = json[0, idx]
+          break
+        end
+
+        # Parse JSON and, if received, attach zip file
+        json = JSON.parse(json)
+        json[:attachments] = zip_file
 
-        { operationName: chunks[0], data: JSON.parse(chunks[1]) }
+        # Return processed data
+        { operationName: operation_name, data: json }
       rescue
         {}
       end
@@ -105,12 +131,8 @@ module Hawkular::Operations
         client.on(:message, once: true) do |msg|
           parsed_message = msg.data.to_msg_hash
 
+          logger = Hawkular::Logger.new
           logger.log("Sent WebSocket message: #{parsed_message}")
-
-          case parsed_message[:operationName]
-          when 'WelcomeResponse'
-            @session_id = parsed_message[:data]['sessionId']
-          end
         end
       end
 
@@ -304,12 +326,16 @@ module Hawkular::Operations
     # Exports the JDR report
     #
     # @param [String] resource_path canonical path of the WildFly server
+    # @param [Boolean] delete_immediately specifies whether the temporary file at the remote
+    # server should be deleted. False, by default.
     # @param callback [Block] callback that is run after the operation is done
-    def export_jdr(resource_path, &callback)
+    def export_jdr(resource_path, delete_immediately = false, &callback)
       fail Hawkular::ArgumentError, 'resource_path must be specified' if resource_path.nil?
       check_pre_conditions(&callback)
 
-      invoke_specific_operation({ resourcePath: resource_path }, 'ExportJdr', &callback)
+      invoke_specific_operation({ resourcePath: resource_path,
+                                  deleteImmediately: delete_immediately },
+                                'ExportJdr', &callback)
     end
 
     # Updates the collection intervals.

data/lib/hawkular/version.rb

@@ -4,5 +4,5 @@
 # @see https://github.com/hawkular
 module Hawkular
   # Version of the Hawkular Ruby Gem
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hawkular-client
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Libor Zoubek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Hawkular