onering-client 0.0.24 → 0.0.25

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6d7664ddd6d93278275eb69f327c8f2c9eabb3ef
+  data.tar.gz: 7abb254571eb0ade4f0ceb89070fe80429eb9000
+SHA512:
+  metadata.gz: d6bb6e230fb3420b3a759ad8d14920e2489b1984f288700c06e965a1f78ad755da0ceed85c7c4946fe86ae663184343d1effe564ce8dbf896a1c7ad5c2f2d3eb
+  data.tar.gz: 5290eb69ad4be31e9b75a59d44b7921c806d8e778fbafc666e8719c13b6dccc1fee8e68bd286153e049908a28b706ebdda71500660e7a0231257a01c5c0f2b56

data/bin/onering

@@ -10,14 +10,15 @@ require 'json'
 require 'rubygems'
 require 'subcommander'
 require 'onering'
-require 'yaml'
 require 'pp'
 
 include Subcommander
 
 
 def print_format(data, format=nil)
-  case format
+  format = :text unless format
+
+  case format.to_sym
   when :text
     if data.is_a?(Hash)
       pp data
@@ -27,8 +28,16 @@ def print_format(data, format=nil)
       puts data.to_s
     end
 
-  else
+  when :yaml
+    require 'yaml'
     puts YAML.dump(data)
+
+  when :json
+    require 'json'
+    puts JSON.dump(data)
+
+  else
+    raise "Unknown output format #{format}"
   end
 end
 
@@ -81,13 +90,13 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
   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 :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[:as_txt] ? :text : nil))
+      print_format(rv, sc[:format])
     end
   end
 
@@ -95,12 +104,12 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
   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 :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].last, sc)
-      print_format(rv, (sc[:as_txt] ? :text : nil))
+      print_format(rv, sc[:format])
     end
   end
 
@@ -108,7 +117,7 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
   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 :as_txt, '-t', '--as-text', "Return the results as text"
+    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
     sc.exec do
       field = sc[:args].first
@@ -116,7 +125,7 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
 
       print_format(api.list(field, {
         :filter => filter
-      }), (sc[:as_txt] ? :text : nil))
+      }), sc[:format])
     end
   end
 
@@ -171,7 +180,7 @@ subcommand :users, "Manage Onering users" do |users|
 # LIST
   users.subcommand :list, "List users" do |sc|
     sc.usage = "onering users list FIELD"
-    sc.opt :as_txt, '-t', '--as-text', "Return the results as text"
+    sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
     sc.exec do
       field = sc[:args].first
@@ -179,7 +188,7 @@ subcommand :users, "Manage Onering users" do |users|
 
       print_format(api.list(:users, field, {
         :filter => filter
-      }), (sc[:as_txt] ? :text : nil))
+      }), sc[:format])
     end
   end
 
@@ -211,7 +220,7 @@ subcommand :call, "Call generic Onering API endpoints" do |call|
   })
 
   call.usage = "onering call path/to/endpoint"
-  call.opt :as_txt, '-t', '--as-text', "Return the results as text"
+  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"
 
@@ -222,7 +231,29 @@ subcommand :call, "Call generic Onering API endpoints" do |call|
       :fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
     })
 
-    print_format(rv, (call[:as_txt] ? :text : nil)) unless rv.nil? or rv.to_s.strip.chomp.empty?
+    print_format(rv, call[:format]) unless rv.nil? or rv.to_s.strip.chomp.empty?
+  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"
+
+  fact.exec do
+    rv = []
+
+    fact[:args].each_index do |i|
+      if i.even?
+        name = fact[:args][i]
+      else
+        default = fact[:args][i]
+      end
+
+      rv << Onering::Util.fact(name, default)
+    end
+
+    rv = rv.first if rv.length == 1
+    print_format(rv, fact[:format]) unless not rv or rv.empty?
   end
 end
 

data/lib/onering/api.rb

@@ -14,6 +14,8 @@ module Onering
     end
 
     class Base
+      include Onering::Util
+
       DEFAULT_BASE="https://onering"
       DEFAULT_PATH="/api"
       DEFAULT_OPTIONS_FILE=[

data/lib/onering/util.rb

@@ -0,0 +1,12 @@
+module Onering
+  module Util
+    ENV['FACTERLIB'] = '/etc/facter'
+    require 'facter'
+
+    class<<self
+      def fact(name, default=nil)
+        Facter.value(name) or default
+      end
+    end
+  end
+end

data/lib/onering.rb

@@ -1,4 +1,5 @@
 $: << File.expand_path(File.dirname(__FILE__))
+require 'onering/util'
 require 'onering/api'
 require 'onering/plugins/devices'
 require 'onering/plugins/authentication'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.24
-  prerelease: 
+  version: 0.0.25
 platform: ruby
 authors:
 - Gary Hetzel
@@ -11,39 +10,62 @@ bindir: bin
 cert_chain: []
 date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: subcommander
-  requirement: &9119860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9119860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &9119220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9119220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &9118700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9118700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -52,32 +74,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/onering.rb
+- lib/onering/util.rb
 - lib/onering/api.rb
 - lib/onering/plugins/devices.rb
 - lib/onering/plugins/authentication.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Onering client API
 test_files: []