onering-client 0.0.10 → 0.0.15

data/bin/onering

@@ -26,27 +26,79 @@ def print_format(data, format=nil)
     else
       puts data.to_s
     end
-    
+
   else
     puts YAML.dump(data)
   end
 end
 
-subcommander.version = Gem.loaded_specs['onering-client'].version.to_s
-subcommander.desc    = Gem.loaded_specs['onering-client'].description
+subcommander.version = ::Gem.loaded_specs['onering-client'].version.to_s
+subcommander.desc    = ::Gem.loaded_specs['onering-client'].description
 
 #subcommander.opt :server, '-s', '--server', 'Specify the Onering server URL'
 
 subcommand :devices, "Operations related to Onering's assets database" do |devices|
   api = Onering::API::Devices
-  api.connect
+  api.connect ENV['ONERING_URL']
+
+  def _field(action, field, value, opts={})
+    rv = []
+    ids = []
+
+  # 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]
+
+    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
+
+    rv
+  end
+
+# SHOW
+  devices.subcommand :show, "Print out a single node by ID" do |sc|
+    sc.usage = "onering devices show ID"
+
+    sc.exec do
+      id = sc[:args].first
+      print_format(api.get(id))
+    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 :as_txt, '-t', '--as-text', "Return the results as text"
+    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[:as_txt] ? :text : nil))
+    end
+  end
 
-# GET
-  devices.subcommand :get, "Get a single node by ID" do |sc|
-    sc.usage = "onering devices get 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 :as_txt, '-t', '--as-text', "Return the results as text"
+    sc.opt :id,     '-i', '--id ID',         "A specific node ID"
 
-    sc.exec do 
-      print_format(api.get(sc[:args].first))
+    sc.exec do
+      rv = _field(:set, sc[:args].first, sc[:args].last, sc)
+      print_format(rv, (sc[:as_txt] ? :text : nil))
     end
   end
 
@@ -56,7 +108,7 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
     sc.opt :filter, '-f', '--filter FILTER', "A urlquery filter string"
     sc.opt :as_txt, '-t', '--as-text', "Return the results as text"
 
-    sc.exec do 
+    sc.exec do
       field = sc[:args].first
       filter = sc[:filter]
 
@@ -71,10 +123,29 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
     sc.arity = 1
     sc.usage = "onering devices find FILTER"
 
-    sc.exec do 
+    sc.exec do
       print_format(api.find(sc[:args].first))
     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 = "cat device.json | onering devices save [ID]"
+
+    sc.exec do
+      unless STDIN.tty?
+        begin
+          json = ::JSON.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
 
 

data/lib/onering/api.rb

@@ -2,26 +2,30 @@ require 'net/http'
 require 'uri'
 require 'json'
 require 'yaml'
+require 'addressable/uri'
 
 module Onering
   module API
     module Errors
       class NotConnected < Exception; end
       class ClientError < Exception; end
+      class ServerError < Exception; end
     end
 
     class Base
+      DEFAULT_BASE="http://onering"
+      DEFAULT_PATH="/api"
+      DEFAULT_OPTIONS={}
+
       class<<self
-        DEFAULT_URI="http://onering/api"
-        DEFAULT_OPTIONS={}
 
         def connect(host=nil)
           if host.is_a?(URI)
             @_uri = host
           elsif host.is_a?(String)
-            @_uri = URI.parse(host)
+            @_uri = Addressable::URI.parse("#{host}/#{DEFAULT_PATH}")
           else
-            @_uri = URI.parse(DEFAULT_URI)
+            @_uri = Addressable::URI.parse("#{DEFAULT_BASE}/#{DEFAULT_PATH}")
           end
 
 
@@ -34,17 +38,17 @@ module Onering
           options = DEFAULT_OPTIONS.merge(options)
           request = nil
 
-          qs = options[:fields].collect{|k,v| "#{k}=#{v}" }.join("&") if options[:fields]
-          qs = nil if qs and qs.empty?
-          endpoint = [endpoint, qs].compact.join('?')
-          uri = URI.parse("#{@_uri.to_s}/#{endpoint}")
+          uri = Addressable::URI.parse("#{@_uri.to_s}/#{endpoint}")
+          uri.query_values = options[:fields] if options[:fields]
 
           raise Errors::NotConnected unless @_http
 
+          #STDERR.puts "DEBUG: Request #{options[:method].to_s.upcase} #{uri.normalize.to_s}"
+
           case options[:method]
           when :post
             request = Net::HTTP::Post.new(uri.request_uri)
-            request.body = JSON.dump(options[:data]) if options[:data]
+            request.body = options[:data].to_json if options[:data]
 
           when :delete
             request = Net::HTTP::Delete.new(uri.request_uri)
@@ -63,9 +67,17 @@ module Onering
               msg = "#{rv['errors']['type']}: #{rv['errors']['message']}"
             end
 
-            raise ClientError.new(msg)
+            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
-            rv = JSON.load(response.body)
+            if response['Content-Type'] == 'application/json'
+              rv = JSON.load(response.body)
+            else
+              rv = response.body
+            end
           end
 
           rv

data/lib/onering/plugins/devices.rb

@@ -11,6 +11,14 @@ module Onering
           request("devices/#{id}")
         end
 
+        def get_field(id, field)
+          request("devices/#{id}/get/#{field}")
+        end
+
+        def set_field(id, field, value)
+          request("devices/#{id}/set/#{field}/#{value}")
+        end
+
         def list(field, options={
           :unique => true,
           :sort   => true,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: onering-client
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Gary Hetzel
@@ -16,8 +16,35 @@ bindir: bin
 cert_chain: []
 
 date: 2013-01-29 00:00:00 Z
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: subcommander
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables: