onering-client 0.0.77 → 0.0.78

data/bin/onering

@@ -32,6 +32,8 @@ end
 plugin = ARGV.shift
 Trollop::die("plugin argument is requried") if plugin.nil?
 
+Onering::Config.load()
+
 if plugins.include?(plugin)
   begin
     plugin = Onering::CLI.const_get(plugin.capitalize)
@@ -44,4 +46,4 @@ if plugins.include?(plugin)
   end
 else
   Trollop::die("unknown plugin #{plugin}")
-end
+end

data/lib/onering/api.rb

@@ -16,6 +16,7 @@ require 'hashlib'
 require 'deep_merge'
 require 'addressable/uri'
 require 'httparty'
+require 'onering/config'
 
 module Onering
   class API
@@ -43,22 +44,19 @@ module Onering
     attr_accessor :url
     format        :json
 
-    DEFAULT_CONFIG={}
     DEFAULT_BASE="https://onering"
     DEFAULT_PATH="/api"
-    DEFAULT_OPTIONS_FILE=["~/.onering/cli.yml", "/etc/onering/cli.yml"]
     DEFAULT_CLIENT_PEM=["~/.onering/client.pem", "/etc/onering/client.pem"]
     DEFAULT_CLIENT_KEY=["~/.onering/client.key", "/etc/onering/client.key"]
     DEFAULT_VALIDATION_PEM="/etc/onering/validation.pem"
 
 
     def initialize(options={})
-      @_config = {}
       @_plugins = {}
       @_connection_options = options
 
     # load and merge all config file sources
-      _load_config(@_connection_options[:configfile], @_connection_options.get(:config, {}))
+      Onering::Config.load(@_connection_options[:configfile], @_connection_options.get(:config, {}))
 
     # source interface specified
     # !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !! HAX !!
@@ -91,7 +89,7 @@ module Onering
     end
 
     # set API connectivity details
-      Onering::API.base_uri @_config.get(:url, DEFAULT_BASE)
+      Onering::API.base_uri Onering::Config.get(:url, DEFAULT_BASE)
 
     # add default parameters
       options.get('config.params',{}).each do |k,v|
@@ -111,7 +109,7 @@ module Onering
 
 
     def request(method, endpoint, options={})
-      endpoint = [@_config.get(:path, DEFAULT_PATH).strip, endpoint.sub(/^\//,'')].join('/')
+      endpoint = [Onering::Config.get(:path, DEFAULT_PATH).strip, endpoint.sub(/^\//,'')].join('/')
 
       case (method.to_sym rescue method)
       when :post
@@ -191,47 +189,13 @@ module Onering
       end
     end
 
-    def opt(name, default=nil)
-      @_config.get(name, default)
-    end
-
-
     def status()
       Onering::API.get("/").parsed_response
     end
 
-
-
-  private
-# -----------------------------------------------------------------------------
-    def _load_config(configfile, config={})
-      if configfile.nil?
-        configfile = []
-      else
-      # recursively grab all .yml files if directory is specified
-        configfile = (File.directory?(configfile) ? Dir.glob(File.join(configfile, "**", "*.yml")).sort : [configfile])
-      end
-
-    # list all existing config files from least specific to most
-      @_configfiles = (configfile + DEFAULT_OPTIONS_FILE).compact.select{|i|
-        (File.exists?(File.expand_path(i)) rescue false)
-      }.reverse
-
-    # merge all config files with more-specific values overriding less-specific ones
-      @_config = DEFAULT_CONFIG
-      @_configfiles.each do |i|
-        c = YAML.load(File.read(File.expand_path(i))) rescue {}
-        @_config.deep_merge!(c)
-      end
-
-    # settings specified in the library override everything
-      @_config.deep_merge!(config.compact) unless config.empty?
-    end
-
-
 # -----------------------------------------------------------------------------
     def _setup_auth()
-      type = @_config.get('authentication.type', :auto)
+      type = Onering::Config.get('authentication.type', :auto)
 
       case type.to_sym
       when :token
@@ -253,14 +217,14 @@ module Onering
     def _setup_auth_ssl()
       begin
       # get first keyfile found
-        key = (([@_config.get('authentication.keyfile')] + DEFAULT_CLIENT_PEM).compact.select{|i|
+        key = (([Onering::Config.get('authentication.keyfile')] + DEFAULT_CLIENT_PEM).compact.select{|i|
           (File.exists?(File.expand_path(i)) rescue false)
         }).first
 
       # SSL client key not found, attempt autoregistration...
         if key.nil?
-          if @_config.get('authentication.autoregister', true)
-            validation_key = @_config.get('authentication.validation_keyfile', DEFAULT_VALIDATION_PEM)
+          if Onering::Config.get('authentication.autoregister', true)
+            validation_key = Onering::Config.get('authentication.validation_keyfile', DEFAULT_VALIDATION_PEM)
             validation_key = (File.expand_path(validation_key) rescue validation_key)
 
           # if validation key exists, autoregister
@@ -328,7 +292,7 @@ module Onering
 # -----------------------------------------------------------------------------
     def _setup_auth_token()
     # get first keyfile found
-      key = @_config.get('authentication.key')
+      key = Onering::Config.get('authentication.key')
       raise Errors::AuthenticationMissing.new("Cannot find an API token") if key.nil?
 
     # set auth mechanism

data/lib/onering/cli/reporter.rb

@@ -5,6 +5,7 @@ module Onering
         @api = (Onering::CLI.connect(global.merge({
           :autoconnect => false
         })) rescue nil)
+
         @opts = ::Trollop::options do
           banner <<-EOS
 Generate a system report that can be saved or submitted to a Onering server
@@ -31,7 +32,7 @@ EOS
         report = Onering::Reporter.report().stringify_keys()
 
       # pull report overrides from the config file
-        @api.opt('reporter.fields',{}).each do |key, value|
+        Onering::Config.get('reporter.fields',{}).each do |key, value|
           if value.is_a?(Hash)
             value.coalesce(key, nil, '.').each do |k,v|
               v = nil if ['null', '', '-'].include?(v.to_s.strip.chomp)

data/lib/onering/cli/version.rb

@@ -1,5 +1,5 @@
 module Onering
   module CLI
-    VERSION = "0.0.77"
+    VERSION = "0.0.78"
   end
 end

data/lib/onering/config.rb

@@ -0,0 +1,48 @@
+require 'hashlib'
+
+module Onering
+  class Config
+    class<<self
+      DEFAULT_CONFIG={}
+      DEFAULT_OPTIONS_FILE=["~/.onering/cli.yml", "/etc/onering/cli.yml"]
+
+      def load(configfile=nil, config={})
+        if configfile.nil?
+          configfile = []
+        else
+        # recursively grab all .yml files if directory is specified
+          configfile = (File.directory?(configfile) ? Dir.glob(File.join(configfile, "**", "*.yml")).sort : [configfile])
+        end
+
+      # list all existing config files from least specific to most
+        @_configfiles = (configfile + DEFAULT_OPTIONS_FILE).compact.select{|i|
+          (File.exists?(File.expand_path(i)) rescue false)
+        }.reverse
+
+      # merge all config files with more-specific values overriding less-specific ones
+        @_config ||= DEFAULT_CONFIG
+        @_configfiles.each do |i|
+          c = YAML.load(File.read(File.expand_path(i))) rescue {}
+          @_config.deep_merge!(c)
+        end
+
+      # settings specified in the library override everything
+        @_config.deep_merge!(config.compact) unless config.empty?
+
+        return @_config
+      end
+
+      def get(key, default=nil)
+        @_config.get(key, default)
+      end
+
+      def set(key, value)
+        @_config.set(key, value)
+      end
+
+      def unset(key)
+        @_config.unset(key)
+      end
+    end
+  end
+end

data/lib/onering/plugins/reporter.rb

@@ -31,16 +31,17 @@ module Onering
         @options = config
         @facter_path = DEFAULT_FACTER_PATH
 
-        @path = [*@options[:plugin_path]]
+        @path = [*Onering::Config.get('reporter.plugin_path',[])]
         @path += DEFAULT_PLUGIN_PATH
 
       # add gem paths to the @path
-        ([*@options[:plugin_gems]]+DEFAULT_PLUGIN_GEMNAMES).compact.each do |g|
+        ([*Onering::Config.get('reporter.plugin_gems',[])]+DEFAULT_PLUGIN_GEMNAMES).compact.each do |g|
           begin
             p = File.join(Util.gem_path(g), 'lib')
             @path << File.join(p, 'reporter')
             @facter_path << File.join(p, 'facter')
-          rescue Gem::LoadError
+          rescue Gem::LoadError => e
+            STDERR.puts("Error loading gem: #{e.message}")
             next
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.78
   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: &13246140 !ruby/object:Gem::Requirement
+  requirement: &6409160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *13246140
+  version_requirements: *6409160
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &13245100 !ruby/object:Gem::Requirement
+  requirement: &6408420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13245100
+  version_requirements: *6408420
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &13244140 !ruby/object:Gem::Requirement
+  requirement: &6423780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13244140
+  version_requirements: *6423780
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &13242580 !ruby/object:Gem::Requirement
+  requirement: &6422520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13242580
+  version_requirements: *6422520
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &13226000 !ruby/object:Gem::Requirement
+  requirement: &6420980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *13226000
+  version_requirements: *6420980
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &13223680 !ruby/object:Gem::Requirement
+  requirement: &6418720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13223680
+  version_requirements: *6418720
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &13220880 !ruby/object:Gem::Requirement
+  requirement: &6431820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13220880
+  version_requirements: *6431820
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &13218940 !ruby/object:Gem::Requirement
+  requirement: &6430940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13218940
+  version_requirements: *6430940
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -108,6 +108,7 @@ extra_rdoc_files: []
 files:
 - lib/onering.rb
 - lib/onering/cli.rb
+- lib/onering/config.rb
 - lib/onering/api.rb
 - lib/onering/util.rb
 - lib/onering/plugins/authentication.rb