onering-client 0.1.7 → 0.2.0

data/bin/onering

@@ -45,9 +45,6 @@ Onering::Logger.setup({
   :threshold   => global[:verbosity]
 })
 
-Onering::Config.load()
-
-
 if plugins.include?(plugin)
   begin
     plugin = Onering::CLI.const_get(plugin.capitalize)

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.1.7"
+    VERSION = "0.2.0"
 
     class Error < Exception; end
     class FatalError < Error; end
@@ -10,6 +10,14 @@ module Onering
 end
 
 require 'onering/logger'
+
+if not ENV['ONERING_LOGLEVEL'].nil?
+  Onering::Logger.setup({
+    :destination => 'stderr',
+    :threshold   => ENV['ONERING_LOGLEVEL']
+  })
+end
+
 require 'onering/util'
 require 'onering/api'
 require 'onering/cli'
@@ -23,3 +31,6 @@ end
 Dir[File.join(File.expand_path(File.dirname(__FILE__)),"onering","cli","*.rb")].each do |i|
   require i
 end
+
+# you've loaded the library, now load the config
+Onering::Config.load()

data/lib/onering/api.rb

@@ -109,7 +109,6 @@ module Onering
         _default_param(k,v)
       end
 
-      Onering::Reporter.setup()
       connect(options) if options.get(:autoconnect, true)
     end
 

data/lib/onering/cli/assets.rb

@@ -17,7 +17,6 @@ Subcommands:
     list <property> [property2 ..]
     save
     set  <property> <value>
-    show <
 
 Options:
 EOS

data/lib/onering/cli/fact.rb

@@ -2,8 +2,6 @@ module Onering
   module CLI
     module Fact
       def self.configure(global={})
-        Onering::Reporter.setup()
-
         @opts = ::Trollop::options do
           banner <<-EOS
 Return the value of an internal fact.
@@ -16,6 +14,7 @@ EOS
       end
 
       def self.run(args)
+        args[0] = :hardwareid if args[0] and args[0] == 'id'
         return Onering::Util.fact(args[0])
       end
     end

data/lib/onering/cli/reporter.rb

@@ -5,16 +5,26 @@ module Onering
 
       def self.configure(global={})
 
-        @api = (Onering::CLI.connect(global.merge({
+        @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
 
+Subcommands:
+    <none>
+      Generate and output the system inventory report.
+
+    get  <property> [fallback]
+      Get a specific <property> from the report, return [fallback] if not found.
+
+    save
+      Generate and save the system inventory report to Onering.
+
 Usage:
-    onering [global] report [options]
+    onering [global] report [options] [subcommands]
 
 Options:
 EOS
@@ -32,7 +42,7 @@ EOS
         end
 
       # initialize report generator with user options
-        Onering::Reporter.setup({
+        @_reporter = Onering::Reporter.new({
           :id             => @opts[:id],
           :timeout        => @opts[:timeout],
           :plugin_timeout => @opts[:plugin_timeout],
@@ -75,9 +85,39 @@ EOS
             return nil
 
           when :get
-            Onering::Logger.fatal!("Expected at least 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length >= 1
-
-            rv = report.get("properties.#{args[0]}", report.get(args[0], args[1]))
+            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.collect.with_index{|i,ix|
+              (['properties']+(ix == 0 ? [] : parts[0..(ix-1)]) + ["@#{i}"] + parts[ix+1..-1]).join('.')
+            }.flatten()
+
+          # 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]
@@ -108,7 +148,8 @@ EOS
       def self._report(options={})
         begin
           Onering::Logger.debug("Gathering local data for report", "Onering::CLI::Report")
-          report = Onering::Reporter.report(options).stringify_keys()
+          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|

data/lib/onering/plugins/reporter.rb

@@ -5,10 +5,6 @@ require 'optparse'
 require 'hashlib'
 require 'set'
 
-def report(&block)
-  Onering::Reporter.add(&block)
-end
-
 module Onering
   class Reporter
     DEFAULT_PLUGIN_GEMNAMES=[
@@ -26,235 +22,263 @@ module Onering
     DEFAULT_CACHE_FILE='/var/tmp/.onering-report-cache.json'
     DEFAULT_CACHE_MAXAGE=600
 
-    class<<self
-      include Onering::Util
+    include Onering::Util
 
-      attr_reader :facter_path
+    attr_reader :facter_path
 
-      def setup(config={})
-        @options = config
-        @facter_path = DEFAULT_FACTER_PATH
-        @detected_gems = []
+    class PluginDelegate
+      def initialize(reporter, options={})
+        @_name = options.get(:plugin)
+        @_path = options.get(:path)
 
-        @path = [*Onering::Config.get('reporter.plugin_path',[])]
-        @path += DEFAULT_PLUGIN_PATH
+        Onering::Logger.debug3("Creating plugin delegate for plugin #{@_name}", "Onering::Reporter::PluginDelegate")
+        @_reporter = reporter
+      end
 
+      def get_binding()
+        return binding()
+      end
 
-        begin
-          specs = Set.new()
-          @detected_gems = []
+    # DSL methods
+    # -------------------------------------------------------------------------
+      def report(&block)
+        if block_given?
+          start = Time.now.to_f
+          yield
 
-          Gem::Specification.each do |spec|
-            specs << spec.name
-          end
+          finish = (Time.now.to_f - start.to_f)
+          finish = (finish.round(4) rescue finish)
+          Onering::Logger.debug3("Finished evaluating report for plugin #{@_name}, took #{finish} seconds", "Onering::Reporter::PluginDelegate")
+        end
+      end
 
-          @detected_gems = (specs.to_a.select{|i|
-            i =~ /^onering-report-/
-          } - DEFAULT_PLUGIN_GEMNAMES)
-        rescue Exception => e
-          Onering::Logger.warn("Unable to detect plugin gems: #{e.class.name} - #{e.message}", "Onering::Reporter")
+      def property(name, value=nil)
+        @_reporter.property(name, value)
+      end
+
+      def stat(name, value=nil)
+        unless value.nil?
+          @_reporter.property((['metrics']+name.to_s.split('.')).join('.'), value)
         end
+      end
+    end
 
-      # add gem paths to the @path
-        ([*Onering::Config.get('reporter.plugin_gems',[])]+@detected_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 => e
-            Onering::Logger.warn("Error loading gem: #{e.message}", "Onering::Reporter")
-            next
-          end
+    def initialize(config={})
+      @options = config
+      @facter_path = DEFAULT_FACTER_PATH
+      @detected_gems = []
+
+      @path = [*Onering::Config.get('reporter.plugin_path',[])]
+      @path += DEFAULT_PLUGIN_PATH
+
+
+      begin
+        specs = Set.new()
+        @detected_gems = []
+
+        Gem::Specification.each do |spec|
+          specs << spec.name
         end
 
-        begin
-          ENV['FACTERLIB'] = @facter_path.join(':')
-          require 'facter'
-          Onering::Logger.debug("Facter loaded successfully, FACTERLIB is #{ENV['FACTERLIB']}", "Onering::Reporter")
+        @detected_gems = (specs.to_a.select{|i|
+          i =~ /^onering-report-/
+        } - DEFAULT_PLUGIN_GEMNAMES)
+      rescue Exception => e
+        Onering::Logger.warn("Unable to detect plugin gems: #{e.class.name} - #{e.message}", "Onering::Reporter")
+      end
 
-        rescue LoadError
-          Onering::Logger.error("Unable to load Facter library", "Onering::Reporter")
+    # add gem paths to the @path
+      ([*Onering::Config.get('reporter.plugin_gems',[])]+@detected_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 => e
+          Onering::Logger.warn("Error loading gem: #{e.message}", "Onering::Reporter")
+          next
         end
       end
 
-      def load_plugins()
-      # load plugins from @path
-        @path.compact.each do |root|
-          begin
-            Dir["#{root}/*"].each do |directory|
-
-            # only process top-level directories
-              if File.directory?(directory)
-                d = File.basename(directory)
-
-              # allow plugins to be conditionally loaded based on fact values:
-              #   default - always load
-              #   <fact>-<fact_value> - load if <fact> == <fact_value>
-              #
-                if d == 'default' or Facter.value(d.split('-',2).first).to_s.downcase.nil_empty == d.split('-',2).last.to_s.downcase.nil_empty
-                  Dir[File.join(directory, '*.rb')].each do |plugin|
-                    plugin = File.basename(plugin, '.rb')
-
-                    begin
-                      Timeout.timeout((@options[:plugin_timeout] || 10).to_i) do
-                        Onering::Logger.debug("Loading plugin #{plugin}", "Onering::Reporter")
-                        require "#{directory}/#{plugin}"
-                      end
-                    rescue Timeout::Error
-                      Onering::Logger.warn("Plugin #{plugin} took too long to return, skipping", "Onering::Reporter")
+      begin
+        ENV['FACTERLIB'] = @facter_path.join(':')
+        require 'facter'
+        Onering::Logger.debug("Facter loaded successfully, FACTERLIB is #{ENV['FACTERLIB']}", "Onering::Reporter")
+
+      rescue LoadError
+        Onering::Logger.error("Unable to load Facter library", "Onering::Reporter")
+      end
+    end
+
+    def load_plugins()
+
+    # load plugins from @path
+      @path.compact.each do |root|
+        begin
+          Dir["#{root}/*"].each do |directory|
+
+          # only process top-level directories
+            if File.directory?(directory)
+              d = File.basename(directory)
+
+              Onering::Logger.debug("Loading plugins from path #{directory}", "Onering::Reporter")
+
+            # allow plugins to be conditionally loaded based on fact values:
+            #   default - always load
+            #   <fact>-<fact_value> - load if <fact> == <fact_value>
+            #
+              if d == 'default' or Facter.value(d.split('-',2).first).to_s.downcase.nil_empty == d.split('-',2).last.to_s.downcase.nil_empty
+
+                Dir[File.join(directory, '*.rb')].each do |plugin|
+                  plugin = File.basename(plugin, '.rb')
+
+                  begin
+                    Timeout.timeout((@options[:plugin_timeout] || 10).to_i) do
+                      Onering::Logger.debug("Loading plugin #{directory}/#{plugin}.rb", "Onering::Reporter")
+                      eval(File.read("#{directory}/#{plugin}.rb"), PluginDelegate.new(self, {
+                        :plugin => plugin,
+                        :path   => "#{directory}/#{plugin}.rb"
+                      }).get_binding())
                     end
+                  rescue Timeout::Error
+                    Onering::Logger.warn("Plugin #{plugin} took too long to return, skipping", "Onering::Reporter")
                   end
                 end
               end
             end
-          rescue Exception => e
-            raise e if e.class === Timeout::Error
-
-            Onering::Logger.warn(e.message, "Onering::Reporter/#{e.class.name}")
+          end
+        rescue Exception => e
+          raise e if e.class === Timeout::Error
 
-            e.backtrace.each do |eb|
-              Onering::Logger.debug(eb, "Onering::Reporter/#{e.class.name}")
-            end
+          Onering::Logger.warn(e.message, "Onering::Reporter/#{e.class.name}")
 
-            next
+          e.backtrace.each do |eb|
+            Onering::Logger.debug(eb, "Onering::Reporter/#{e.class.name}")
           end
-        end
-      end
 
-      def add(&block)
-        if block_given?
-          instance_eval(&block)
+          next
         end
       end
+    end
 
-      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")
-          @_report[:properties].set(name.to_s, value)
-        end
+    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")
+        @_report[:properties].set(name.to_s, value)
       end
+    end
 
-      def stat(name, value=nil)
-        unless value.nil?
-          @_report[:properties][:metrics] ||= {}
-          Onering::Logger.debug3("-> Set metric #{name.to_s}", "Onering::Reporter")
-          @_report[:properties][:metrics].set(name.to_s, value)
-        end
-      end
+    def report(options={})
+      options = @options.merge(options)
+      @id = (@options[:id] || Onering::Util.fact('hardwareid', nil))
 
-      def report(options={})
-        options = @options.merge(options)
-        @id = (@options[:id] || Onering::Util.fact('hardwareid', nil))
-
-        if not @id.nil?
-          if options[:nocache]
-            return _generated_report()
-          else
-            rv = _cached_report(options)
-            return _generated_report() if rv.nil? or rv.empty?
-            return rv
-          end
+      if not @id.nil?
+        if options[:nocache]
+          return _generated_report()
         else
-          Onering::Logger.fatal!("Cannot generate report without a hardware ID", "Onering::Reporter")
+          rv = _cached_report(options)
+          return _generated_report() if rv.nil? or rv.empty?
+          return rv
         end
-
-        return {}
+      else
+        Onering::Logger.fatal!("Cannot generate report without a hardware ID", "Onering::Reporter")
       end
 
+      return {}
+    end
 
-      def _generated_report()
-        Timeout.timeout((@options[:timeout] || 60).to_i) do
-          hostname = (Facter.value('fqdn') rescue %x{hostname -f}.strip.chomp)
 
-          @_report = {
-            :id           => @id,
-            :name         => hostname,
-            :aliases      => @options[:aliases],
-            :tags         => @options[:tags],
-            :status       => (@options[:status] || 'online'),
-            :inventory    => true,
-            :properties   => {}
-          }
+    def _generated_report()
+      Timeout.timeout((@options[:timeout] || 60).to_i) do
+        hostname = (Facter.value('fqdn') rescue %x{hostname -f}.strip.chomp)
 
-        # loads plugins and populates @_report
-          load_plugins()
+        @_report = {
+          :id           => @id,
+          :name         => hostname,
+          :aliases      => @options[:aliases],
+          :tags         => @options[:tags],
+          :status       => (@options[:status] || 'online'),
+          :inventory    => true,
+          :properties   => {}
+        }
 
-          return @_report.stringify_keys()
-        end
+      # loads plugins and populates @_report
+        load_plugins()
 
-        return {}
+        return @_report.stringify_keys()
       end
 
-      def _cached_report(options={})
-        options = @options.merge(options)
-        cachefile = (options[:cachefile] || DEFAULT_CACHE_FILE)
-        tries = 0
+      return {}
+    end
 
-        catch(:retry) do
-          tries += 1
+    def _cached_report(options={})
+      options = @options.merge(options)
+      cachefile = (options[:cachefile] || DEFAULT_CACHE_FILE)
+      tries = 0
 
-          if tries > 10
-            Onering::Logger.error("Too many retries reading cache #{cachefile}, generating report", "Onering::Reporter")
-            return _generated_report()
-          end
+      catch(:retry) do
+        tries += 1
 
-          if File.readable?(cachefile)
-            Onering::Logger.debug("Loading cache file at #{cachefile}", "Onering::Reporter")
-            cache = File.read(cachefile)
-            cache = (MultiJson.load(cache) rescue {})
+        if tries > 10
+          Onering::Logger.error("Too many retries reading cache #{cachefile}, generating report", "Onering::Reporter")
+          return _generated_report()
+        end
 
-            if _cache_expired?(cache, options[:maxage])
-              Onering::Logger.debug("Cache expired, regenerating", "Onering::Reporter")
-              throw :retry if _update_cache_file(cachefile)  
-            end
+        if File.readable?(cachefile)
+          Onering::Logger.debug("Loading cache file at #{cachefile}", "Onering::Reporter")
+          cache = File.read(cachefile)
+          cache = (MultiJson.load(cache) rescue {})
 
-            if options[:cacheregen] == true
-              Onering::Logger.debug("Forcing cache regeneration", "Onering::Reporter")
-              cache = _update_cache_file(cachefile)
-            end
+          if _cache_expired?(cache, options[:maxage])
+            Onering::Logger.debug("Cache expired, regenerating", "Onering::Reporter")
+            throw :retry if _update_cache_file(cachefile)  
+          end
 
-            if cache
-            # remove cached_at key
-              Onering::Logger.debug("Using cached data (#{Time.now.to_i - Time.parse(cache.get('cached_at')).to_i} seconds old)", "Onering::Reporter")
-              cache.delete('cached_at')
-              return cache
-            end
-          else
-            Onering::Logger.debug("Report cache file could not be read at #{cachefile}", "Onering::Reporter")
-            throw :retry if _update_cache_file(cachefile)
+          if options[:cacheregen] == true
+            Onering::Logger.debug("Forcing cache regeneration", "Onering::Reporter")
+            cache = _update_cache_file(cachefile)
           end
-        end
 
-        return {}
+          if cache
+          # remove cached_at key
+            Onering::Logger.debug("Using cached data (#{Time.now.to_i - Time.parse(cache.get('cached_at')).to_i} seconds old)", "Onering::Reporter")
+            cache.delete('cached_at')
+            return cache
+          end
+        else
+          Onering::Logger.debug("Report cache file could not be read at #{cachefile}", "Onering::Reporter")
+          throw :retry if _update_cache_file(cachefile)
+        end
       end
 
+      return {}
+    end
 
-      def _update_cache_file(cachefile=DEFAULT_CACHE_FILE)
-        begin
-          report = nil
-
-          File.open(cachefile, 'w+') do |file|
-            Onering::Logger.debug("Regenerating cache file at #{cachefile}", "Onering::Reporter")
-            report = _generated_report()
-            report['cached_at'] = Time.now.strftime('%Y-%m-%dT%H:%M:%S%z')
-            json = MultiJson.dump(report, :pretty => true)
-            file.puts(json)
-          end
 
-          return report
-        rescue Exception => e
-          Onering::Logger.info("Unable to write cache file #{cachefile}: #{e.class.name} - #{e.message}", "Onering::Reporter")
-          return false
+    def _update_cache_file(cachefile=DEFAULT_CACHE_FILE)
+      begin
+        report = nil
+
+        File.open(cachefile, 'w+') do |file|
+          Onering::Logger.debug("Regenerating cache file at #{cachefile}", "Onering::Reporter")
+          report = _generated_report()
+          report['cached_at'] = Time.now.strftime('%Y-%m-%dT%H:%M:%S%z')
+          json = MultiJson.dump(report, :pretty => true)
+          file.puts(json)
         end
+
+        return report
+      rescue Exception => e
+        Onering::Logger.info("Unable to write cache file #{cachefile}: #{e.class.name} - #{e.message}", "Onering::Reporter")
+        return false
       end
+    end
 
 
-      def _cache_expired?(cache, age=DEFAULT_CACHE_MAXAGE)
-        if cache.is_a?(Hash)
-          return (Time.parse(cache.get('cached_at')) < (Time.now - age) rescue true)
-        else
-          return true
-        end
+    def _cache_expired?(cache, age=DEFAULT_CACHE_MAXAGE)
+      if cache.is_a?(Hash)
+        return (Time.parse(cache.get('cached_at')) < (Time.now - age) rescue true)
+      else
+        return true
       end
     end
   end

data/lib/onering/util.rb

@@ -88,11 +88,12 @@ module Onering
     end
 
     def fact(name, default=nil)
+      reporter = Onering::Reporter.new()
       name = name.to_s
 
       if defined?(Facter)
         if name.downcase == 'all'
-          return Facter.to_hash
+          return Facter.to_hash()
         else
           case name.to_sym
           when :hardwareid
@@ -106,7 +107,9 @@ module Onering
           end
 
         # short circuit nil responses
-          return default if fact.nil?
+          if fact.nil?
+            return reporter.report().get(name, default)
+          end
 
         # if we are asking for a nested object...
           if name.include?('.')
@@ -117,7 +120,7 @@ module Onering
               return fact.get(name, default)
             else
             # not an object, return default
-              return default
+              return reporter.report().get(name, default)
             end
           else
         # this is a simple request, return the fact
@@ -126,7 +129,7 @@ module Onering
         end
       end
 
-      return default
+      return reporter.report().get(name, default)
     end
 
     def make_filter(filter)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.7
 platform: ruby
 authors:
 - Gary Hetzel
@@ -12,149 +12,104 @@ cert_chain: []
 date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-    none: false
-  prerelease: false
   name: facter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23267720 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.2
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    none: false
   prerelease: false
+  version_requirements: *23267720
+- !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23267140 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-    none: false
   prerelease: false
+  version_requirements: *23267140
+- !ruby/object:Gem::Dependency
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23266580 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.3.5
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    none: false
   prerelease: false
+  version_requirements: *23266580
+- !ruby/object:Gem::Dependency
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23266000 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.11.0
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.35
-    none: false
   prerelease: false
+  version_requirements: *23266000
+- !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23265400 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.35
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.9
-    none: false
   prerelease: false
+  version_requirements: *23265400
+- !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23264860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.7.9
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-    none: false
   prerelease: false
+  version_requirements: *23264860
+- !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23264280 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <=
       - !ruby/object:Gem::Version
         version: 1.1.4
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    none: false
   prerelease: false
+  version_requirements: *23264280
+- !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23263760 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-    none: false
   prerelease: false
+  version_requirements: *23263760
+- !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23263240 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.2
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: *23263240
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -162,23 +117,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/onering.rb
+- lib/onering/config.rb
 - lib/onering/logger.rb
 - lib/onering/cli.rb
-- lib/onering/config.rb
-- lib/onering/api.rb
-- lib/onering/util.rb
-- lib/onering/plugins/authentication.rb
 - lib/onering/plugins/reporter.rb
-- lib/onering/plugins/config.rb
+- lib/onering/plugins/authentication.rb
 - lib/onering/plugins/automation.rb
 - lib/onering/plugins/assets.rb
-- lib/onering/cli/reporter.rb
 - lib/onering/cli/devices.rb
-- lib/onering/cli/automation.rb
+- lib/onering/cli/reporter.rb
 - lib/onering/cli/fact.rb
+- lib/onering/cli/automation.rb
 - lib/onering/cli/assets.rb
 - lib/onering/cli/call.rb
+- lib/onering/api.rb
+- lib/onering/util.rb
+- lib/onering.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []
@@ -187,20 +141,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Onering client API and utilities

data/lib/onering/plugins/config.rb

@@ -1,27 +0,0 @@
-module Onering
-  class API
-    class Configuration < API
-      def get(key, options={})
-        get("/config/#{key}").parsed_response
-      end
-
-      def set(key, value)
-        if not value.is_a?(Hash) and not value.is_a?(Array)
-          return save(key, value)
-        end
-
-        return nil
-      end
-
-      def save(key, data=nil, &block)
-        if block_given?
-          post("/config/#{key}", {}, &block)
-        else
-          post("/config/#{key}", {
-            :body => data
-          })
-        end
-      end
-    end
-  end
-end