onering-client 0.2.3 → 0.2.4

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
 
     class Error < Exception; end
     class FatalError < Error; end

data/lib/onering/api.rb

@@ -41,6 +41,7 @@ module Onering
 
     def initialize(options={})
       @_plugins = {}
+      options = {} if options.nil?
       @_connection_options = options
 
     # load and merge all config file sources

data/lib/onering/cli/reporter.rb

@@ -4,8 +4,8 @@ module Onering
       DEFAULT_CACHE_MAXAGE=600
 
       def self.configure(global={})
-
-        @api = Onering::CLI.connect(global.merge({
+        @global_opts = global
+        @api = Onering::CLI.connect(@global_opts.merge({
           :autoconnect => false
         }))
 
@@ -86,55 +86,11 @@ EOS
 
           when :get
             Onering::Logger.fatal!("Expected at least 1 parameter, got #{args.length}", "Onering::CLI::Report") unless args.length >= 1
-
-          # this is kinda ugly
-          # because we don't know which property might have an @-prefix, progressively
-          # search through all of them.  first non-null match wins
-            parts       = args[0].split('.')
-
-          # create an array with every component of the path prefixed with the @-symbol, then with
-          # the path as is.
-          #
-          # e.g.:  onering report get metrics.disk.block
-          #        -> value exists in the inventory as properties.metrics.disk.@block,
-          #           but the user shouldn't need to know where that @-prefix is, so...
-          #
-          #        Search for all of these, first non-nil value wins:
-          #        * properties.metrics.disk.block
-          #        * properties.@metrics.disk.block
-          #        * properties.metrics.@disk.block
-          #        * properties.metrics.disk.@block
-          #        * metrics.disk.block
-          #
-            candidates  = [(['properties']+parts).join('.')]
-
-            parts.each_index{|ix|
-              candidates << (['properties']+(ix == 0 ? [] : parts[0..(ix-1)]) + ["@#{parts[ix]}"] + parts[ix+1..-1]).join('.')
-            }.flatten()
-
-            rv = nil
-
-          # search for the key using science or something
-            candidates.each do |c|
-              rv = report.get(c)
-              break unless rv.nil?
-            end            
-
-          # if we're still nil by this point, use the fallback value
-            rv = report.get(args[0], args[1]) if rv.nil?
-
-          # attempt to get the value remotely if not found locally
-            if rv.nil? and not @opts[:local]
-              hid = Onering::Util.fact(:hardwareid)
-
-              if not hid.nil?
-                Onering::Logger.debug("Getting remote value #{args[0]} for asset #{hid}")
-                @api.connect()
-                return @api.assets.get_field(hid, args[0], args[1])
-              end
-            end
-
-            return rv
+            return @_reporter.get(args[0], args[1], {
+              :data  => report,
+              :api   => @global_opts,
+              :local => @opts[:local]
+            })
           end
         end
 

data/lib/onering/plugins/reporter.rb

@@ -188,6 +188,64 @@ module Onering
     end
 
 
+    def get(field, default=nil, options={})
+      if options[:data].is_a?(Hash)
+        _report = options[:data]
+      else
+        _report = self.report(options)
+      end
+
+    # this is kinda ugly
+    # because we don't know which property might have an @-prefix, progressively
+    # search through all of them.  first non-null match wins
+      parts       = field.split('.')
+
+    # create an array with every component of the path prefixed with the @-symbol, then with
+    # the path as is.
+    #
+    # e.g.:  onering report get metrics.disk.block
+    #        -> value exists in the inventory as properties.metrics.disk.@block,
+    #           but the user shouldn't need to know where that @-prefix is, so...
+    #
+    #        Search for all of these, first non-nil value wins:
+    #        * properties.metrics.disk.block
+    #        * properties.@metrics.disk.block
+    #        * properties.metrics.@disk.block
+    #        * properties.metrics.disk.@block
+    #        * metrics.disk.block
+    #
+      candidates  = [(['properties']+parts).join('.')]
+
+      parts.each_index{|ix|
+        candidates << (['properties']+(ix == 0 ? [] : parts[0..(ix-1)]) + ["@#{parts[ix]}"] + parts[ix+1..-1]).join('.')
+      }.flatten()
+
+      rv = nil
+
+    # search for the key using science or something
+      candidates.each do |c|
+        rv = _report.get(c)
+        break unless rv.nil?
+      end            
+
+    # if we're still nil by this point, use the fallback value
+      rv = _report.get(field) if rv.nil?
+
+    # attempt to get the value remotely if not found locally
+      if rv.nil? and not options[:local]
+        hid = Onering::Util.fact(:hardwareid)
+
+        if not hid.nil?
+          Onering::Logger.debug("Getting remote value #{field} for asset #{hid}")
+          return Onering::API.new(options[:api]).assets.get_field(hid, field, default)
+        end
+      end
+
+      return default if rv.nil?
+      return rv
+    end
+
+
     def _generated_report()
       Timeout.timeout((@options[:timeout] || 60).to_i) do
         hostname = (Facter.value('fqdn') rescue %x{hostname -f}.strip.chomp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   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: &25261540 !ruby/object:Gem::Requirement
+  requirement: &16020480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *25261540
+  version_requirements: *16020480
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &25261040 !ruby/object:Gem::Requirement
+  requirement: &16019920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *25261040
+  version_requirements: *16019920
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &25260460 !ruby/object:Gem::Requirement
+  requirement: &16019340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *25260460
+  version_requirements: *16019340
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &25259960 !ruby/object:Gem::Requirement
+  requirement: &16018800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *25259960
+  version_requirements: *16018800
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &25259500 !ruby/object:Gem::Requirement
+  requirement: &16018240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *25259500
+  version_requirements: *16018240
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &25258920 !ruby/object:Gem::Requirement
+  requirement: &16017460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *25258920
+  version_requirements: *16017460
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &25258480 !ruby/object:Gem::Requirement
+  requirement: &16016740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *25258480
+  version_requirements: *16016740
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &25258000 !ruby/object:Gem::Requirement
+  requirement: &16016160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *25258000
+  version_requirements: *16016160
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &25257520 !ruby/object:Gem::Requirement
+  requirement: &16015680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *25257520
+  version_requirements: *16015680
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables: