onering-client 0.0.37 → 0.0.39

data/bin/onering

@@ -6,7 +6,7 @@
 #  provision [options] [key:value .. ] [pxe profile | ]
 
 
-require 'json'
+require 'multi_json'
 require 'rubygems'
 require 'subcommander'
 require 'onering'
@@ -34,7 +34,7 @@ def print_format(data, format=nil)
 
   when :json
     require 'json'
-    puts JSON.dump(data)
+    puts MultiJson.dump(data)
 
   else
     raise "Unknown output format #{format}"
@@ -79,10 +79,11 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
 # SHOW
   devices.subcommand :show, "Print out a single node by ID" do |sc|
     sc.usage = "onering devices show ID"
+    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
     sc.exec do
       id = sc[:args].first
-      print_format(api.get(id))
+      print_format(api.get(id), sc[:format])
     end
   end
 
@@ -147,7 +148,7 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
     sc.exec do
       unless STDIN.tty?
         begin
-          json = ::JSON.load(STDIN.read)
+          json = ::MultiJson.load(STDIN.read)
           raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
 
           rv = api.save((sc[:args].first || json['id']), json)
@@ -201,7 +202,7 @@ subcommand :users, "Manage Onering users" do |users|
     sc.exec do
       unless STDIN.tty?
         begin
-          json = ::JSON.load(STDIN.read)
+          json = ::MultiJson.load(STDIN.read)
           raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
 
           print_format(api.save((sc[:args].first || json['id']), json))
@@ -229,7 +230,7 @@ subcommand :call, "Call generic Onering API endpoints" do |call|
   call.exec do
     rv = api.request(call[:args].first.to_sym, {
       :method => (call[:method] || :get),
-      :data   => (STDIN.tty? ? {} : ::JSON.load(STDIN.read)),
+      :data   => (STDIN.tty? ? {} : ::MultiJson.load(STDIN.read)),
       :fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
     })
 

data/lib/onering/api.rb

@@ -1,6 +1,6 @@
 require 'net/https'
 require 'uri'
-require 'json'
+require 'multi_json'
 require 'yaml'
 require 'addressable/uri'
 require 'deep_merge'
@@ -98,7 +98,7 @@ module Onering
           response = @_http.request(request)
 
           if response.code.to_i >= 400
-            rv = (JSON.load(response.body) rescue {}) unless response.body.empty?
+            rv = (MultiJson.load(response.body) rescue {}) unless response.body.empty?
 
             if rv['errors']
               msg = "#{rv['errors']['type']}: #{rv['errors']['message']}"
@@ -111,7 +111,7 @@ module Onering
             end
           else
             if response['Content-Type'] == 'application/json'
-              rv = (response.body.empty? ? nil : JSON.load(response.body))
+              rv = (response.body.empty? ? nil : MultiJson.load(response.body))
             else
               rv = response.body
             end

data/lib/onering/plugins/reporter.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'optparse'
-require 'json'
 require 'hashlib'
 
 def report(&block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.39
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &20185300 !ruby/object:Gem::Requirement
+  requirement: &13053640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20185300
+  version_requirements: *13053640
 - !ruby/object:Gem::Dependency
   name: subcommander
-  requirement: &20184740 !ruby/object:Gem::Requirement
+  requirement: &13053220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20184740
+  version_requirements: *13053220
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &20184080 !ruby/object:Gem::Requirement
+  requirement: &13052820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20184080
+  version_requirements: *13052820
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &20183480 !ruby/object:Gem::Requirement
+  requirement: &13052420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20183480
+  version_requirements: *13052420
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &20183080 !ruby/object:Gem::Requirement
+  requirement: &13052020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20183080
+  version_requirements: *13052020
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &20182640 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &13051620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20182640
+  version_requirements: *13051620
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables: