onering-client 0.0.41 → 0.0.42

data/bin/onering

@@ -11,6 +11,7 @@ require 'rubygems'
 require 'subcommander'
 require 'onering'
 require 'pp'
+require 'rainbow'
 
 include Subcommander
 
@@ -22,10 +23,14 @@ def print_format(data, format=nil)
   when :text
     if data.is_a?(Hash)
       pp data
-    elsif data.is_a?(Array)
-      puts data.join("\n")
     else
-      puts data.to_s
+      unless data.empty?
+        if data.is_a?(Array)
+          puts data.join("\n")
+        else
+          puts data.to_s
+        end
+      end
     end
 
   when :yaml
@@ -41,262 +46,276 @@ def print_format(data, format=nil)
   end
 end
 
-subcommander.version = ::Gem.loaded_specs['onering-client'].version.to_s
-subcommander.desc    = ::Gem.loaded_specs['onering-client'].description
+begin
+  subcommander.version = ::Gem.loaded_specs['onering-client'].version.to_s
+  subcommander.desc    = ::Gem.loaded_specs['onering-client'].description
 
 
-subcommand :devices, "Operations related to Onering's assets database" do |devices|
-  api = Onering::API::Devices
-  api.connect({
-    :host    => ENV['ONERING_URL'],
-    :pemfile => ENV['ONERING_PEM']
-  })
+  subcommand :devices, "Operations related to Onering's assets database" do |devices|
+    api = Onering::API::Devices
+    api.connect({
+      :host    => ENV['ONERING_URL'],
+      :pemfile => ENV['ONERING_PEM']
+    })
 
-  def _field(action, field, value, opts={})
-    rv = []
-    ids = []
+    def _field(action, field, value, opts={})
+      rv = []
+      ids = []
 
-  # append IDs from filter
-    ids += Onering::API::Devices.list('id', {
-      :filter => opts[:filter]
-    }) if opts[:filter]
+    # append IDs from filter
+      ids += Onering::API::Devices.list('id', {
+        :filter => opts[:filter]
+      }) if opts[:filter]
 
-  # add specific ID
-    ids << opts[:id] if opts[:id]
+    # add specific ID
+      ids << opts[:id] if opts[:id]
 
-    ids.each do |id|
-      case action
-      when :get
-        rv << Onering::API::Devices.get_field(id, field)
-      when :set
-        rv << Onering::API::Devices.set_field(id, field, value)
+      ids.each do |id|
+        case action
+        when :get
+          rv << Onering::API::Devices.get_field(id, field)
+        when :set
+          rv << Onering::API::Devices.set_field(id, field, value)
+        end
       end
-    end
 
-    rv
-  end
+      rv
+    end
 
-# 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"
+  # 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), sc[:format])
+      sc.exec do
+        id = sc[:args].first
+        print_format(api.get(id), sc[:format])
+      end
     end
-  end
 
-# GET [FIELD]
-  devices.subcommand :get, "Get a named field from one or more devices" do |sc|
-    sc.usage = "onering devices get FIELD"
-    sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
-    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
-    sc.opt :id,     '-i', '--id ID',         "A specific node ID"
+  # GET [FIELD]
+    devices.subcommand :get, "Get a named field from one or more devices" do |sc|
+      sc.usage = "onering devices get FIELD"
+      sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
+      sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+      sc.opt :id,     '-i', '--id ID',         "A specific node ID"
 
 
-    sc.exec do
-      rv = _field(:get, sc[:args].first, nil, sc)
-      print_format(rv, sc[:format])
+      sc.exec do
+        rv = _field(:get, sc[:args].first, nil, sc)
+        print_format(rv, sc[:format])
+      end
     end
-  end
 
-# SET [FIELD]
-  devices.subcommand :set, "Set a named field for one or more devices" do |sc|
-    sc.usage = "onering devices set FIELD VALUE"
-    sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
-    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
-    sc.opt :id,     '-i', '--id ID',         "A specific node ID"
+  # SET [FIELD]
+    devices.subcommand :set, "Set a named field for one or more devices" do |sc|
+      sc.usage = "onering devices set FIELD VALUE"
+      sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
+      sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+      sc.opt :id,     '-i', '--id ID',         "A specific node ID"
 
-    sc.exec do
-      rv = _field(:set, sc[:args].first, sc[:args][1], sc)
-      print_format(rv, sc[:format])
+      sc.exec do
+        rv = _field(:set, sc[:args].first, sc[:args][1], sc)
+        print_format(rv, sc[:format])
+      end
     end
-  end
 
-# LIST
-  devices.subcommand :list, "List field values" do |sc|
-    sc.usage = "onering devices list [-f FILTER] FIELD"
-    sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
-    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+  # LIST
+    devices.subcommand :list, "List field values" do |sc|
+      sc.usage = "onering devices list [-f FILTER] FIELD"
+      sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
+      sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
-    sc.exec do
-      field = sc[:args].first
-      filter = sc[:filter]
+      sc.exec do
+        field = sc[:args].first
+        filter = sc[:filter]
 
-      print_format(api.list(field, {
-        :filter => filter
-      }), sc[:format])
+        print_format(api.list(field, {
+          :filter => filter
+        }), sc[:format])
+      end
     end
-  end
 
-# FIND
-  devices.subcommand :find, "Finds all nodes that match a urlquery filter string" do |sc|
-    sc.arity = 1
-    sc.usage = "onering devices find FILTER"
-    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+  # FIND
+    devices.subcommand :find, "Finds all nodes that match a urlquery filter string" do |sc|
+      sc.arity = 1
+      sc.usage = "onering devices find FILTER"
+      sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
-    sc.exec do
-      print_format(api.find(sc[:args].first), sc[:format])
+      sc.exec do
+        print_format(api.find(sc[:args].first), sc[:format])
+      end
     end
-  end
 
-# SAVE
-  devices.subcommand :save, "Creates or updates a new device in Onering, reading a JSON document from standard input" do |sc|
-    sc.usage = "onering report | onering devices save [ID]"
-
-    sc.exec do
-      unless STDIN.tty?
-        begin
-          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)
-          print_format(rv, :json) if rv
-        rescue Exception => e
-          STDERR.puts "#{e.class.name}: #{e.message}"
-          exit 1
+  # SAVE
+    devices.subcommand :save, "Creates or updates a new device in Onering, reading a JSON document from standard input" do |sc|
+      sc.usage = "onering report | onering devices save [ID]"
+
+      sc.exec do
+        unless STDIN.tty?
+          begin
+            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)
+            print_format(rv, :json) if rv
+          rescue Exception => e
+            STDERR.puts "#{e.class.name}: #{e.message}"
+            exit 1
+          end
         end
       end
     end
   end
-end
 
 
-subcommand :users, "Manage Onering users" do |users|
-  api = Onering::API::Auth
-  api.connect({
-    :host    => ENV['ONERING_URL'],
-    :pemfile => ENV['ONERING_PEM']
-  })
+  subcommand :users, "Manage Onering users" do |users|
+    api = Onering::API::Auth
+    api.connect({
+      :host    => ENV['ONERING_URL'],
+      :pemfile => ENV['ONERING_PEM']
+    })
 
-# SHOW
-  users.subcommand :show, "Print out a single user by ID" do |sc|
-    sc.usage = "onering users show ID"
+  # SHOW
+    users.subcommand :show, "Print out a single user by ID" do |sc|
+      sc.usage = "onering users show ID"
 
-    sc.exec do
-      id = sc[:args].first
-      print_format(api.get(:users, id))
+      sc.exec do
+        id = sc[:args].first
+        print_format(api.get(:users, id))
+      end
     end
-  end
 
-# LIST
-  users.subcommand :list, "List users" do |sc|
-    sc.usage = "onering users list FIELD"
-    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+  # LIST
+    users.subcommand :list, "List users" do |sc|
+      sc.usage = "onering users list FIELD"
+      sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
-    sc.exec do
-      field = sc[:args].first
-      filter = sc[:filter]
+      sc.exec do
+        field = sc[:args].first
+        filter = sc[:filter]
 
-      print_format(api.list(:users, field, {
-        :filter => filter
-      }), sc[:format])
+        print_format(api.list(:users, field, {
+          :filter => filter
+        }), sc[:format])
+      end
     end
-  end
-
-# SAVE
-  users.subcommand :save, "Creates or updates a new device in Onering, reading a JSON document from standard input" do |sc|
-    sc.usage = "cat user.json | onering users save [ID]"
 
-    sc.exec do
-      unless STDIN.tty?
-        begin
-          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))
-        rescue Exception => e
-          STDERR.puts "#{e.class.name}: #{e.message}"
-          exit 1
+  # SAVE
+    users.subcommand :save, "Creates or updates a new device in Onering, reading a JSON document from standard input" do |sc|
+      sc.usage = "cat user.json | onering users save [ID]"
+
+      sc.exec do
+        unless STDIN.tty?
+          begin
+            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))
+          rescue Exception => e
+            STDERR.puts "#{e.class.name}: #{e.message}"
+            exit 1
+          end
         end
       end
     end
   end
-end
 
-subcommand :call, "Call generic Onering API endpoints" do |call|
-  api = Onering::API::Base
-  api.connect({
-    :host    => ENV['ONERING_URL'],
-    :pemfile => ENV['ONERING_PEM']
-  })
-
-  call.usage = "onering call path/to/endpoint"
-  call.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
-  call.opt :method, '-m', '--method VERB', "The HTTP method to use for the call (default: GET)"
-  call.opt :opts,   '-o', '--option KEY:VALUE', Array, "A comma-separated list of key:value querystrings to pass with the request"
-
-  call.exec do
-    rv = api.request(call[:args].first.to_sym, {
-      :method => (call[:method] || :get),
-      :data   => (STDIN.tty? ? {} : ::MultiJson.load(STDIN.read)),
-      :fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
+  subcommand :call, "Call generic Onering API endpoints" do |call|
+    api = Onering::API::Base
+    api.connect({
+      :host    => ENV['ONERING_URL'],
+      :pemfile => ENV['ONERING_PEM']
     })
 
-    print_format(rv, call[:format] || :json) unless rv.nil? or rv.to_s.strip.chomp.empty?
+    call.usage = "onering call path/to/endpoint"
+    call.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+    call.opt :method, '-m', '--method VERB', "The HTTP method to use for the call (default: GET)"
+    call.opt :opts,   '-o', '--option KEY:VALUE', Array, "A comma-separated list of key:value querystrings to pass with the request"
+
+    call.exec do
+      rv = api.request(call[:args].first.to_sym, {
+        :method => (call[:method] || :get),
+        :data   => (STDIN.tty? ? {} : ::MultiJson.load(STDIN.read)),
+        :fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
+      })
+
+      print_format(rv, call[:format] || :json) unless rv.nil? or rv.to_s.strip.chomp.empty?
+    end
   end
-end
 
-subcommand :fact, "Retrieve a system fact" do |fact|
-  fact.usage = "onering fact NAME [DEFAULT] [NAME2 [DEFAULT2] ..]"
-  fact.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
+  subcommand :fact, "Retrieve a system fact" do |fact|
+    fact.usage = "onering fact NAME [DEFAULT] [NAME2 [DEFAULT2] ..]"
+    fact.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
-  fact.exec do
-    Onering::Reporter.setup()
-    rv = []
+    fact.exec do
+      Onering::Reporter.setup()
+      rv = []
 
-    fact[:args].each_index do |i|
-      if i.even?
-        name = fact[:args][i]
-      else
-        default = fact[:args][i]
-      end
+      fact[:args].each_index do |i|
+        if i.even?
+          name = fact[:args][i]
+        else
+          default = fact[:args][i]
+        end
 
-      rv << Onering::Reporter.fact(name, default)
-    end
+        rv << Onering::Reporter.fact(name, default)
+      end
 
-    rv.compact!
-    rv = rv.first if rv.length == 1
+      rv.compact!
+      rv = rv.first if rv.length == 1
 
-    print_format(rv, fact[:format]) unless rv.nil? or rv.to_s.empty?
+      print_format(rv, fact[:format]) unless rv.nil? or rv.to_s.empty?
+    end
   end
-end
 
 
-subcommand :report, "Collect and output system information" do |report|
-  report.usage = "onering report"
-  report.opt :plugin_path, '-p', '--plugin PATH',       'Add the named path to the plugin search path'
-  report.opt :status,      '-S', '--status STATUS',     'Set the status to report'
-  report.opt :tags,        '-T', '--tag TAG[,...]',     'Add a tag to the report output'
-  report.opt :aliases,     '-A', '--alias ALIAS[,...]', 'Add a alias to the report output'
-  report.opt :id,          '-I', '--id ID',             'Override the auto-detected hardware ID'
-  report.opt :format,      '-t', '--format FORMAT',     'Format the output'
-
-  report.exec do
-    config = {}
-    %w{
-      plugin_path
-      status
-      tags
-      aliases
-      id
-    }.each do |a|
-      a = a.to_sym
-      next if report[a].nil?
-
-      if [:tags, :aliases].include?(a)
-        config[a] = report[a].split(',')
-      else
-        config[a] = report[a]
+  subcommand :report, "Collect and output system information" do |report|
+    report.usage = "onering report"
+    report.opt :plugin_path, '-p', '--plugin PATH',       'Add the named path to the plugin search path'
+    report.opt :status,      '-S', '--status STATUS',     'Set the status to report'
+    report.opt :tags,        '-T', '--tag TAG[,...]',     'Add a tag to the report output'
+    report.opt :aliases,     '-A', '--alias ALIAS[,...]', 'Add a alias to the report output'
+    report.opt :id,          '-I', '--id ID',             'Override the auto-detected hardware ID'
+    report.opt :format,      '-t', '--format FORMAT',     'Format the output'
+
+    report.exec do
+      config = {}
+      %w{
+        plugin_path
+        status
+        tags
+        aliases
+        id
+      }.each do |a|
+        a = a.to_sym
+        next if report[a].nil?
+
+        if [:tags, :aliases].include?(a)
+          config[a] = report[a].split(',')
+        else
+          config[a] = report[a]
+        end
       end
+
+      Onering::Reporter.setup(config)
+
+      rv = Onering::Reporter.report()
+      print_format(rv, report[:format] || :json) unless rv.nil?
     end
+  end
 
-    Onering::Reporter.setup(config)
 
-    rv = Onering::Reporter.report()
-    print_format(rv, report[:format] || :json) unless rv.nil?
+  subcommander.go!
+rescue Onering::API::Errors::ClientError => e
+  STDERR.puts("#{e.message}".foreground(:red))
+  exit 1
+
+rescue Exception => e
+  STDERR.puts("#{e.class.name}: #{e.message}".foreground(:red))
+  e.backtrace.each do |b|
+    STDERR.puts("  #{b}")
   end
-end
 
-subcommander.go!
+  exit 1
+end

data/lib/onering/api.rb

@@ -1,4 +1,4 @@
-require 'net/https'
+require 'rest_client'
 require 'uri'
 require 'multi_json'
 require 'yaml'
@@ -12,6 +12,7 @@ module Onering
       class ClientError < Exception; end
       class ServerError < Exception; end
       class ConnectionTimeout < Exception; end
+      class ClientPemNotFound < Exception; end
     end
 
     class Base
@@ -29,6 +30,10 @@ module Onering
         "/etc/onering/client.pem"
       ]
 
+      DEFAULT_VALIDATION_PEM=[
+        "/etc/onering/validation.pem"
+      ]
+
       class<<self
         def connect(options={})
         # list all existing config files from least specific to most
@@ -51,21 +56,100 @@ module Onering
             @_uri = Addressable::URI.parse("#{@_config['url'] || DEFAULT_BASE}/#{@_config['apiroot'] || DEFAULT_PATH}")
           end
 
-          if @_uri
-            @_pemfile = ([options[:pemfile], @_config['pemfile']]+DEFAULT_CLIENT_PEM).compact.select{|i|
-              (File.exists?(File.expand_path(i)) rescue false)
-            }.first
-
-            if @_pemfile
-              @_pem = File.read(File.expand_path(@_pemfile))
-              @_http = Net::HTTP.new(@_uri.host, (@_uri.port || 443))
-              @_http.open_timeout = 30
-              @_http.read_timeout = 120
-              @_http.use_ssl = true
-              @_http.cert = OpenSSL::X509::Certificate.new(@_pem)
-              @_http.key = OpenSSL::PKey::RSA.new(@_pem)
-              @_http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          unless @_uri.nil?
+            begin
+              @_pemfile = ([options[:pemfile], @_config['pemfile']]+DEFAULT_CLIENT_PEM).compact.select{|i|
+                (File.exists?((File.expand_path(i) rescue i)) rescue nil)
+              }.compact.first
+
+              raise Errors::ClientPemNotFound if @_pemfile.nil?
+
+              @_pem = File.read((File.expand_path(@_pemfile) rescue @_pemfile))
+
+              @rest = RestClient::Resource.new("#{@_uri.scheme}://#{@_uri.host}:#{@_uri.port || 443}", {
+                :timeout         => 120,
+                :open_timeout    => 30,
+                :ssl_client_cert => OpenSSL::X509::Certificate.new(@_pem),
+                :ssl_client_key  => OpenSSL::PKey::RSA.new(@_pem),
+                :verify_peer     => OpenSSL::SSL::VERIFY_PEER
+              })
+
+            rescue Errors::ClientPemNotFound
+            # client PEM not present, attempt autoregistration
+              STDERR.puts("Onering client.pem not found, attempting automatic registration...")
+
+              @_validation = ([options[:validationfile], @_config['validationfile']]+DEFAULT_VALIDATION_PEM).compact.select{|i|
+                (File.exists?((File.expand_path(i) rescue i)) rescue nil)
+              }.compact.first
+
+              if @_validation.nil?
+                raise Errors::ClientError.new("Cannot automatically register client, cannot find validation.pem")
+              end
+
+              @_validation = File.read(@_validation)
+
+              @rest = RestClient::Resource.new("#{@_uri.scheme}://#{@_uri.host}:#{@_uri.port || 443}", {
+                :timeout         => 120,
+                :open_timeout    => 30,
+                :ssl_client_cert => OpenSSL::X509::Certificate.new(@_validation),
+                :ssl_client_key  => OpenSSL::PKey::RSA.new(@_validation),
+                :verify_peer     => OpenSSL::SSL::VERIFY_PEER
+              })
+
+
+              clients = [{
+                :path       => "/etc/onering",
+                :name       => (@_config['id'] || File.read("/etc/hardware.id")).strip.chomp,
+                :keyname    => 'system',
+                :autodelete => true
+              },{
+                :path       => "~/.onering",
+                :name       => ENV['USER'],
+                :keyname    => 'cli',
+                :autodelete => false
+              }]
+
+            # attempt to autoregister clients from least specific to most (machine account then user account)
+              clients.each do |client|
+              # determine if we can create this client
+                client[:path] = (File.expand_path(client[:path]) rescue client[:path])
+                next unless File.writable?(File.dirname(client[:path]))
+                File.mkdir(client[:path]) unless File.directory?(client[:path])
+                next unless File.writable?(client[:path])
+
+                begin
+                  response = @rest["/api/users/#{client[:name]}/keys/#{client[:keyname]}"].get({
+                    :params => {
+                      :cert       => 'pem',
+                      :autodelete => client[:autodelete]
+                    }
+                  })
+
+                rescue RestClient::Forbidden
+                  STDERR.puts("Cannot re-download key '#{client[:keyname]}' for client #{client[:name]}. Please remove the client key from Onering and try again.")
+                  next
+
+                rescue RestClient::Exception => e
+                  raise Errors::ClientError.new("HTTP #{e.http_code}: #{e.message}")
+                end
+
+
+                File.open("#{client[:path]}/client.pem", "w") do |file|
+                  file.puts(response.to_str)
+                  STDERR.puts("Successfully registered client key #{client[:name]}:#{client[:keyname]}, key is at #{file.path}")
+                  break
+                end
+              end
+
+              if clients.select{|i| p = "#{i[:path]}/client.pem"; File.exists?((File.expand_path(p) rescue p)) }.empty?
+                raise Errors::ClientError.new("Unable to register a Onering client.")
+              end
+
+              retry
             end
+
+          else
+            raise Errors::ClientError.new("Could not parse API URL.")
           end
         end
 
@@ -77,42 +161,37 @@ module Onering
           uri = Addressable::URI.parse("#{@_uri.to_s}/#{endpoint}")
           uri.query_values = options[:fields] if options[:fields]
 
-          raise Errors::NotConnected unless @_http
+          raise Errors::NotConnected unless @rest
 
-          case options[:method]
-          when :post
-            request = Net::HTTP::Post.new(uri.request_uri)
-            request['Content-Type'] = 'application/json'
-            request.body = MultiJson.dump(options[:data]) if options[:data]
+          begin
+            case options[:method]
+            when :post
+              data = (options[:data].nil? ? nil : MultiJson.dump(options[:data]))
 
-          when :delete
-            request = Net::HTTP::Delete.new(uri.request_uri)
+              response = @rest[uri.request_uri].post(data, {
+                :content_type => 'application/json'
+              })
 
-          else
-            request = Net::HTTP::Get.new(uri.request_uri)
-
-          end
+            when :delete
+              response = @rest[uri.request_uri].delete()
 
-          response = @_http.request(request)
+            when :head
+              response = @rest[uri.request_uri].head()
+            else
+              response = @rest[uri.request_uri].get()
+            end
 
-          if response.code.to_i >= 400
-            rv = (MultiJson.load(response.body) rescue {}) unless response.body.empty?
+          rescue RestClient::Unauthorized => e
+            raise Errors::ClientError.new("You are not authorized to perform this request")
 
-            if rv['errors']
-              msg = "#{rv['errors']['type']}: #{rv['errors']['message']}"
-            end
+          rescue RestClient::Exception => e
+            raise Errors::ClientError.new("(HTTP #{e.http_code}) #{e.class.name}: #{e.message}")
+          end
 
-            if response.code.to_i >= 500
-              raise Errors::ServerError.new("HTTP #{response.code}: #{msg}")
-            else
-              raise Errors::ClientError.new("HTTP #{response.code}: #{msg}")
-            end
-          else
-            if response['Content-Type'] == 'application/json'
-              rv = (response.body.empty? ? nil : MultiJson.load(response.body))
-            else
-              rv = response.body
-            end
+          begin
+            rv = (response.empty? ? nil : MultiJson.load(response))
+          rescue Exception
+            rv = response
           end
 
           rv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
   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: !ruby/object:Gem::Requirement
+  requirement: &13381180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13381180
 - !ruby/object:Gem::Dependency
   name: subcommander
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13380420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13380420
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13379480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13379480
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13379020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *13379020
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &13378480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *13378480
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13378080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13378080
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13377540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +87,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *13377540
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: &13377020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *13377020
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -141,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Onering client API and utilities