jerakia-client 0.5.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1e33dd378de698790edad5c5fff66666e59d1a
-  data.tar.gz: 7051717e68417a4fed955f345a6262ec75b3baba
+  metadata.gz: 4989cd5cb49bbd373c3fd8e45b8540a0f2966bac
+  data.tar.gz: 71f59ae0a1e0e2624e5d0eabfa4c00725b88d279
 SHA512:
-  metadata.gz: baa075fef4285f2608d25c67b9dbbc81ffa76f9cf293f2e34ea593f1dc627543b00a05f4169101e7b7d607088505e3a526ac765b1e57b9d3b286831524bba9e5
-  data.tar.gz: 8a5b1d27c25c87a48a61f1abedd9bb7cdecd74f114dbc8353c21de3177ceb2f981971ddcc22c99d6a4e40e1443dd1bf3ea2f2b3b12614b833eb1813aea799a9c
+  metadata.gz: ffa938ab9719823a952ef6880b779deb38552a9e8beaf3761a46262eeed1f5a30f4984e8661a8995a389ecf5f6edd608ff038ffe28f6fb3b8ab1cf5b6e313234
+  data.tar.gz: 8cc5df3a87890088bce061da24fee3b0a1988ca36e33ba2db9ef9a5c05c9ce335260e2d8f17082b1f7b351373d30b03fd51cd35dde71a3f1d1db82caf5eafce2

data/lib/jerakia/client.rb

@@ -6,6 +6,7 @@ require 'jerakia/client/token'
 require 'uri'
 require 'json'
 require 'net/http'
+require 'msgpack'
 
 class Jerakia
   class Client
@@ -53,6 +54,7 @@ class Jerakia
       :port => 9843,
       :api  => 'v1',
       :proto => 'http',
+      :content_type => 'json',
       }
     end
 
@@ -82,7 +84,11 @@ class Jerakia
 
       case response.code
       when "200"
-        return JSON.parse(response.body)
+        if not @config.key?(:content_type) or @config[:content_type] == 'json'
+          return JSON.parse(response.body)
+        else @config[:content_type] == 'msgpack'
+          return MessagePack.unpack(response.body)
+        end
       when "401"
         raise Jerakia::Client::AuthorizationError, "Request not authorized"
       when "501"
@@ -93,22 +99,39 @@ class Jerakia
       end
     end
 
+    def encode_request(request)
+      if not @config.key?(:content_type) or @config[:content_type] == 'json'
+        request.add_field('Content-Type', 'application/json')
+        if request.key?('body')
+          request.body.to_json
+        end
+      elsif @config[:content_type] == 'msgpack'
+        request.add_field('Content-Type', 'application/x-msgpack')
+        if request.key?('body')
+          request.body.to_msgpack
+        end
+      else
+        raise Jerakia::Client::Error, "Invalid setting \"#{@config[:content_type]}\" for \":content_type\" in config - supported is either json or msgpack."
+        exit(false)
+      end
+      return request
+    end
 
     def get(url_path, params={})
       uri = URI.parse(url_address +  url_path)
       uri.query = URI.encode_www_form(params)
       request = Net::HTTP::Get.new(uri.to_s)
+      request = encode_request(request)
       return http_send(request)
     end
 
     def put(url_path, params)
       uri = URI.parse(url_address + url_path)
       request = Net::HTTP::Put.new(uri.path)
-      request.add_field('Content-Type', 'application/json')
-      request.body = params.to_json
+      request = set_content_type(request)
+      request.body = params
+      request = encode_request(request)
       return http_send(request)
     end
   end
 end
-
-

data/lib/jerakia/client/cli/lookup.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'yaml'
+require 'msgpack'
 
 class Jerakia
   class Client
@@ -80,7 +81,13 @@ class Jerakia
                    aliases: :o,
                    type: :string,
                    default: 'json',
-                   desc: 'Output format, yaml or json'
+                   desc: 'Output format, yaml, json or msgpack'
+
+            option :content_type,
+                   aliases: :c,
+                   type: :string,
+                   default: 'json',
+                   desc: 'Content type, json or msgpack'
 
             def lookup(key)
               client = Jerakia::Client.new({
@@ -88,6 +95,7 @@ class Jerakia
                 :port  => options[:port],
                 :api   => options[:api],
                 :token => options[:token],
+                :content_type => options[:content_type],
               })
 
               lookup_opts = {
@@ -118,6 +126,8 @@ class Jerakia
                 puts answer.to_json
               when 'yaml'
                 puts answer.to_yaml
+              when 'msgpack'
+                puts answer.to_msgpack
               else
                 raise Jerakia::Client::Error, "Unknown output type #{options[:output]}"
               end

data/lib/jerakia/client/version.rb

@@ -1,6 +1,6 @@
 class Jerakia
   class Client
-    VERSION = '0.5.3'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia-client
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: CLI and ruby client libraries for Jerakia Server
 email: 
 executables: