onering-client 0.2.1 → 0.2.3

data/bin/onering

@@ -5,7 +5,7 @@ require 'hashlib'
 require 'rainbow'
 require 'pp'
 
-plugins = Onering::CLI.submodules.collect{|i| i.name.split('::').last.downcase }
+plugins = Onering::CLI::Plugin.registered_plugins.collect{|i| i.name.split('::').last.downcase }
 exclude_plugins = %w{devices}
 
 global = Trollop::options do
@@ -25,7 +25,7 @@ EOS
   opt :path,        "The base path to prepend to all requests (default: /api)", :type => :string
   opt :source,      "Specify the source IP address to use (i.e. which network interface the request should originate from)", :short => '-I', :type => :string
   opt :param,       "Additional query string parameters to include with the request in the format FIELD=VALUE. Can be specified multiple times.", :short => '-p', :type => :string, :multi => true
-  opt :format,      "The output format for return values (i.e.: json, yaml, text)", :default => 'text', :short => '-t', :type => :string
+  opt :format,      "The output format for return values (i.e.: json, yaml, text)", :short => '-t', :type => :string
   opt :sslkey,      "Location of the SSL client key to use for authentication", :short => '-c', :type => :string
   opt :nosslverify, "Disable verification of the server SSL certificate", :type => :boolean
   opt :apikey,      "The API token to use for authentication", :short => '-k', :type => :string
@@ -52,7 +52,7 @@ if plugins.include?(plugin)
 
     Onering::Logger.debug("Executing plugin #{plugin}\#run()", $0)
     rv = plugin.run(ARGV)
-    Onering::CLI.output(rv, global[:format])
+    Onering::CLI.output(rv, (global[:format] || plugin.default_format(rv, ARGV) || 'text'))
 
   rescue Onering::API::Errors::Exception => e
     Onering::Logger.fatal(e.message, e.class.name.split('::').last) rescue nil

data/lib/onering.rb

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

data/lib/onering/cli.rb

@@ -5,6 +5,30 @@ module Onering
 
     @_args = {}
 
+    class Plugin
+      def self.default_format(output_value=nil, args=nil)
+        if output_value.is_a?(Hash) or 
+           (output_value.is_a?(Array) and output_value.compact.first.is_a?(Hash))
+        then
+          return 'yaml'
+        end
+
+        return nil
+        
+      rescue Exception
+        return nil
+      end
+
+      def self.inherited(subsclass)
+        @_subclasses ||= []
+        @_subclasses << subsclass unless @_subclasses.include?(subsclass)
+      end
+
+      def self.registered_plugins()
+        @_subclasses || []
+      end
+    end
+
     def self.connect(cliargs)
       @_args = cliargs
 

data/lib/onering/cli/assets.rb

@@ -1,6 +1,6 @@
 module Onering
   module CLI
-    module Assets
+    class Assets < Plugin
       def self.configure(global={})
         @api = Onering::CLI.connect(global).assets
 

data/lib/onering/cli/automation.rb

@@ -1,6 +1,6 @@
 module Onering
   module CLI
-    module Automation
+    class Automation < Plugin
       def self.configure(global={})
         @requests = Onering::CLI.connect(global).automation_requests
         @jobs = Onering::CLI.connect(global).automation_jobs

data/lib/onering/cli/call.rb

@@ -1,6 +1,6 @@
 module Onering
   module CLI
-    module Call
+    class Call < Plugin
       def self.configure(global={})
         @api = Onering::CLI.connect(global)
 

data/lib/onering/cli/devices.rb

@@ -1,6 +1,6 @@
 module Onering
   module CLI
-    module Devices
+    class Devices < Plugin
       def self.configure(global={})
         @api = Onering::CLI.connect(global).assets
 

data/lib/onering/cli/fact.rb

@@ -1,6 +1,6 @@
 module Onering
   module CLI
-    module Fact
+    class Fact < Plugin
       def self.configure(global={})
         @opts = ::Trollop::options do
           banner <<-EOS

data/lib/onering/cli/reporter.rb

@@ -1,6 +1,6 @@
 module Onering
   module CLI
-    module Report
+    class Report < Plugin
       DEFAULT_CACHE_MAXAGE=600
 
       def self.configure(global={})
@@ -122,7 +122,7 @@ EOS
 
           # 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)
@@ -155,21 +155,6 @@ EOS
           Onering::Logger.fatal("Reporter not configured. This is a bug", "Onering::CLI::Report") if @_reporter.nil?
           report = @_reporter.report(options).stringify_keys()
 
-        # pull report overrides from the config file
-          Onering::Config.get('reporter.fields',{}).each do |key, value|
-            Onering::Logger.debug("Override value #{key} from config file", "Onering::CLI::Report")
-
-            if value.is_a?(Hash)
-              value.coalesce(key, nil, '.').each do |k,v|
-                v = nil if ['null', '', '-'].include?(v.to_s.strip.chomp)
-                report = report.set(k, v)
-              end
-            else
-              value = nil if ['null', '', '-'].include?(value.to_s.strip.chomp)
-              report = report.set(key, value)
-            end
-          end
-
           return report
         rescue Timeout::Error
           Onering::Logger.fatal!("Report took too long to generate, exiting...", "Onering::CLI::Report")

data/lib/onering/plugins/assets.rb

@@ -8,7 +8,7 @@ module Onering
       def get_field(id, field, fallback=nil)
         rv = get("/devices/#{id}/get/#{field}")
         rv = (rv.parsed_response rescue rv.response.body)
-        return fallback if rv.nil? or rv.strip.chomp.empty?
+        return fallback if rv.nil? or (rv.is_a?(String) and rv.strip.chomp.empty?)
         return rv
       end
 

data/lib/onering/plugins/reporter.rb

@@ -112,9 +112,9 @@ module Onering
     def load_plugins()
 
     # load plugins from @path
-      @path.compact.each do |root|
+      @path.compact.uniq.each do |root|
         begin
-          Dir["#{root}/*"].each do |directory|
+          Dir["#{root}/*"].uniq.each do |directory|
 
           # only process top-level directories
             if File.directory?(directory)
@@ -134,6 +134,7 @@ module Onering
                   begin
                     Timeout.timeout((@options[:plugin_timeout] || 10).to_i) do
                       Onering::Logger.debug("Loading plugin #{directory}/#{plugin}.rb", "Onering::Reporter")
+                      Onering::Logger.debug3("Properties will be set in report object #{@_report.object_id}", "Onering::Reporter")
                       eval(File.read("#{directory}/#{plugin}.rb"), PluginDelegate.new(self, {
                         :plugin => plugin,
                         :path   => "#{directory}/#{plugin}.rb"
@@ -162,14 +163,14 @@ module Onering
 
     def property(name, value=nil)      
       unless value.nil?
-        Onering::Logger.debug3("-> Set property #{name.to_s} (was: #{@_report[:properties].get(name.to_s,'null')})", "Onering::Reporter")
+        Onering::Logger.debug3("-> Set property #{name.to_s} (was: #{@_report[:properties].get(name.to_s,'null')}) in object #{@_report.object_id}", "Onering::Reporter")
         @_report[:properties].set(name.to_s, value)
       end
     end
 
     def report(options={})
       options = @options.merge(options)
-      @id = (@options[:id] || Onering::Util.fact('hardwareid', nil))
+      @id = (@options[:id] || Onering::Config.get('id') || Onering::Config.get('reporter.fields.id') || Onering::Util.fact('hardwareid', nil))
 
       if not @id.nil?
         if options[:nocache]
@@ -180,7 +181,7 @@ module Onering
           return rv
         end
       else
-        Onering::Logger.fatal!("Cannot generate report without a hardware ID", "Onering::Reporter")
+        Onering::Logger.fatal!("Cannot generate report without an ID", "Onering::Reporter")
       end
 
       return {}
@@ -204,6 +205,22 @@ module Onering
       # loads plugins and populates @_report
         load_plugins()
 
+      # pull report field overrides from the config file
+        Onering::Config.get('reporter.fields',{}).each do |key, value|
+          Onering::Logger.debug("Override value #{key} from config file", "Onering::CLI::Report")
+
+          if value.is_a?(Hash)
+            value.coalesce(key, nil, '.').each do |k,v|
+              v = nil if ['null', '', '-'].include?(v.to_s.strip.chomp)
+              @_report = @_report.set(k, v)
+            end
+          else
+            value = nil if ['null', '', '-'].include?(value.to_s.strip.chomp)
+            @_report = @_report.set(key, value)
+          end
+        end
+
+      # return final report
         return @_report.stringify_keys()
       end
 

metadata

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