onering-client 0.0.46 → 0.0.50

data/lib/onering/cli/reporter.rb

@@ -0,0 +1,61 @@
+module Onering
+  module CLI
+    module Report
+      def self.configure(global={})
+        @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
+
+Usage:
+    onering [global] report [options]
+
+Options:
+EOS
+          opt :id,     "Override the autodetected Hardware ID for this node", :short => '-I', :type => :string
+          opt :fields, "Set the named FIELD to equal VALUE in the format FIELD=VALUE. Can be specified multiple times", :short => '-o', :type => :string, :multi => true
+          opt :save,   "Save the report output to the configured Onering server"
+        end
+
+      # initialize report generator with user options
+        Onering::Reporter.setup({
+          :id => @opts[:id]
+        }.compact)
+      end
+
+      def self.run(args)
+        report = Onering::Reporter.report().stringify_keys()
+
+      # pull report overrides from the config file
+        @api.opt('reporter.fields',{}).each do |field, value|
+          if value.is_a?(Hash)
+            value.coalesce(field, nil, '.').each do |k,v|
+              report = report.set(k, v)
+            end
+          else
+            report = report.set(field, value)
+          end
+        end
+
+      # pull overrides from CLI arguments
+        @opts[:fields].each do |field|
+          key, value = field.split('=', 2)
+          report = report.set(key, value)
+        end
+
+
+      # save if specified
+        if @opts[:save] === true
+          @api.connect()
+          @api.devices.save(report['id']) do
+            MultiJson.dump(report)
+          end
+        end
+
+        return report
+      end
+    end
+  end
+end

data/lib/onering/cli.rb

@@ -0,0 +1,56 @@
+module Onering
+  module CLI
+    require 'yaml'
+    require 'multi_json'
+
+    def self.connect(cliargs)
+      @_args = cliargs
+
+      return Onering::API.new({
+        'autoconnect' => cliargs[:autoconnect],
+        'config' => {
+          'url'  => cliargs[:url],
+          'path' => cliargs[:path],
+          'authentication' => {
+            'type'    => (cliargs[:apikey_given] ? :token : nil),
+            'keyfile' => (cliargs[:apikey] || cliargs[:sslkey])
+          }.compact
+        }.compact
+      }.compact)
+    end
+
+    def self.output(data, format)
+      return nil if @_args[:quiet]
+
+      case format
+      when 'text'
+        if data.is_a?(Hash)
+          data.coalesce.each do |k,v|
+            puts k.to_s+': '+v.to_s
+          end
+        else
+          [*data].each do |d|
+            if d.is_a?(Hash)
+              d.coalesce.each do |k,v|
+                puts k.to_s+': '+v.to_s
+              end
+            else
+              puts d unless d.empty?
+            end
+          end
+        end
+
+      when 'json'
+        puts MultiJson.dump(data)
+
+      when 'yaml'
+        puts YAML.dump(data)
+
+      else
+        raise "Unknown output format #{format.inspect}"
+      end
+
+      nil
+    end
+  end
+end

data/lib/onering/plugins/authentication.rb

@@ -1,38 +1,34 @@
-
 module Onering
-  module API
-    class Auth < Base
-      class<<self
-        def _check_type(type)
-          raise "Invalid authentication module object '#{type}'" unless %w{
-            users groups capabilities
-          }.include?(type.to_s)
-        end
+  class API
+    class Auth < API
+      def _check_type(type)
+        raise "Invalid authentication module object '#{type}'" unless %w{
+          users groups capabilities
+        }.include?(type.to_s)
+      end
 
-        def get(type, id='current')
-          _check_type(type)
-          request("#{type}/#{id}")
-        end
+      def show(type, id='current')
+        _check_type(type)
+        get("#{type}/#{id}").parsed_response
+      end
 
-        def list(type, field='id', options={
-          :unique => true,
-          :sort   => true,
-          :filter => nil
-        })
-          _check_type(type)
-          rv = request("#{type}/list").collect{|i| i[field.to_s] }
-          rv = rv.uniq if options[:unique]
-          rv = rv.sort if options[:sort]
-          rv
-        end
+      def list(type, field='id', options={
+        :unique => true,
+        :sort   => true,
+        :filter => nil
+      })
+        _check_type(type)
+        rv = get("#{type}/list").parsed_response.collect{|i| i[field.to_s] }
+        rv = rv.uniq if options[:unique]
+        rv = rv.sort if options[:sort]
+        rv
+      end
 
-        def save(type, id, data)
-          _check_type(type)
-          request("#{type}/#{id}", {
-            :method => :post,
-            :data   => data
-          })
-        end
+      def save(type, id, data)
+        _check_type(type)
+        post("#{type}/#{id}", {
+          :body   => data
+        }).parsed_response
       end
     end
   end

data/lib/onering/plugins/automation.rb

@@ -0,0 +1,66 @@
+module Onering
+  class API
+    class AutomationRequests < API
+      def summary(fields)
+        get("/automation/requests/summary/#{[*fields].join('/')}").parsed_response
+      end
+
+      def find_by_status(status)
+        get("/automation/requests/status/#{status}").parsed_response
+      end
+
+      def show(id)
+        get("/automation/requests/#{id}").parsed_response
+      end
+
+      def requeue(id)
+        get("/automation/requests/#{id}/requeue").parsed_response
+      end
+
+      def flush_queue()
+        get("/automation/requests/flush").parsed_response
+      end
+
+      def requeue_all_failed()
+        get("/automation/requests/requeue").parsed_response
+      end
+    end
+
+
+# -----------------------------------------------------------------------------
+    class AutomationJobs < API
+      def list()
+        get("/automation/jobs/list").parsed_response
+      end
+
+      def show(name)
+        get("/automation/jobs/#{name}").parsed_response
+      end
+
+      def requests_waiting(name)
+        get("/automation/jobs/#{name}/waiting").parsed_response
+      end
+
+      def run(name, options={}, &block)
+        if block_given?
+          post("/automation/jobs/#{name}/run", {
+            :query => options
+          }, &block).parsed_response
+        else
+          get("/automation/jobs/#{name}/run", {
+            :query => options
+          }).parsed_response
+        end
+      end
+    end
+
+# -----------------------------------------------------------------------------
+    class AutomationTasks < API
+      def run(name, options={})
+        get("/automation/tasks/#{name}/run", {
+          :query => options
+        }).parsed_response
+      end
+    end
+  end
+end

data/lib/onering/plugins/devices.rb

@@ -1,47 +1,47 @@
-
 module Onering
-  module API
-    class Devices < Base
-      class<<self
-        def get(id)
-          request("devices/#{id}")
-        end
+  class API
+    class Devices < API
+      def show(id)
+        get("/devices/#{id}").parsed_response
+      end
 
-        def get_field(id, field)
-          request("devices/#{id}/get/#{field}")
-        end
+      def get_field(id, field)
+        get("/devices/#{id}/get/#{field}").response.body
+      end
 
-        def set_field(id, field, value)
-          request("devices/#{id}/set/#{field}/#{value}")
-        end
+      def set_field(id, field, value)
+        get("/devices/#{id}/set/#{field}/#{value}").response.body
+      end
 
-        def list(field, options={
-          :unique => true,
-          :sort   => true,
-          :filter => nil
-        })
-          qs = {
-            :q => make_filter(options[:filter])
-          } if options[:filter]
-
-          rv = request("devices/list/#{field}", {
-            :fields => qs
-          })
+      def list(field, options={
+        :unique => true,
+        :sort   => true,
+        :filter => nil
+      })
+        qs = {
+          :q => make_filter(options[:filter])
+        } if options[:filter]
 
-          rv = rv.uniq if options[:unique]
-          rv = rv.sort if options[:sort]
+        rv = get("/devices/list/#{field}", {
+          :query => qs
+        }).parsed_response
 
-          rv
-        end
+        rv = rv.uniq if options[:unique]
+        rv = rv.sort if options[:sort]
 
-        def find(filter, options={})
-          request("devices/find/#{make_filter(filter)}")
-        end
+        return rv
+      end
+
+      def find(filter, options={})
+        get("/devices/find/#{make_filter(filter)}").parsed_response
+      end
 
-        def save(id, data)
-          request("devices/#{id}", {
-            :method => :post,
-            :data   => data
+      def save(id, data=nil, &block)
+        if block_given?
+          post("/devices/#{id}", {}, &block)
+        else
+          post("/devices/#{id}", {
+            :body => data
           })
         end
       end

data/lib/onering/plugins/reporter.rb

@@ -22,6 +22,8 @@ module Onering
     ]
 
     class<<self
+      include Onering::Util
+
       attr_reader :facter_path
 
       def setup(config={})
@@ -50,15 +52,6 @@ module Onering
         end
       end
 
-
-      def fact(name, default=nil)
-        if defined?(Facter)
-          return (Facter.value(name) or default)
-        end
-
-        return nil
-      end
-
       def load_plugins
       # load plugins from @path
         @path.compact.each do |root|
@@ -103,8 +96,8 @@ module Onering
         @_report[:properties][:metrics].set(name, value) if value
       end
 
-      def report
-        @id = (@options[:id] || (IO.read('/etc/hardware.id').to_s.nil_empty rescue nil))
+      def report()
+        @id = (@options[:id] || Onering::Util.fact('hardwareid', nil))
 
         if not @id.nil?
           hostname = (Facter.value('fqdn') rescue %x{hostname -f}.strip.chomp)
@@ -122,12 +115,12 @@ module Onering
         # loads plugins and populates @_report
           load_plugins
 
-          return @_report
+          return @_report.stringify_keys()
         else
           raise "Cannot generate report without a hardware ID"
         end
 
-        nil
+        {}
       end
     end
   end

data/lib/onering/util.rb

@@ -7,8 +7,53 @@ module Onering
       end
     end
 
+    extend self
 
-    def self.gem_path(name)
+
+    HTTP_STATUS_CODES = {
+      400 => 'Bad Request',
+      401 => 'Unauthorized',
+      402 => 'Payment Required',
+      403 => 'Forbidden',
+      404 => 'Not Found',
+      405 => 'Method Not Allowed',
+      406 => 'Not Acceptable',
+      407 => 'Proxy Authentication Required',
+      408 => 'Request Timeout',
+      409 => 'Conflict',
+      410 => 'Gone',
+      411 => 'Length Required',
+      412 => 'Precondition Failed',
+      413 => 'Request Entity Too Large',
+      414 => 'Request-URI Too Long',
+      415 => 'Unsupported Media Type',
+      416 => 'Requested Range Not Satisfiable',
+      417 => 'Expectation Failed',
+      418 => 'I\'m a Teapot',
+      420 => 'Enhance Your Calm',
+      422 => 'Unprocessable Entity',
+      423 => 'Locked',
+      424 => 'Failed Dependency',
+      426 => 'Upgrade Required',
+      428 => 'Precondition Required',
+      429 => 'Too Many Requests',
+      431 => 'Request Header Fields Too Large',
+      444 => 'No Response',
+      451 => 'Unavailable For Legal Reasons',
+
+      500 => 'Internal Server Error',
+      501 => 'Not Implemented',
+      502 => 'Bad Gateway',
+      503 => 'Service Unavailable',
+      504 => 'Gateway Timeout',
+      505 => 'HTTP Version Not Supported',
+      508 => 'Loop Detected',
+      509 => 'Bandwidth Limit Exceeded',
+      510 => 'Not Extended',
+      511 => 'Network Authentication Required'
+    }
+
+    def gem_path(name)
       if Gem::Specification.respond_to?(:find_by_name)
         return Gem::Specification.find_by_name(name).gem_dir
       else
@@ -17,9 +62,54 @@ module Onering
         }.last.full_gem_path
       end
     end
+
+    def fact(name, default=nil)
+      name = name.to_s
+
+      if defined?(Facter)
+        fact = Facter.value(name)
+
+      # short circuit nil responses
+        return default if fact.nil?
+
+      # if we are asking for a nested object...
+        if name.include?('.')
+        # ...and the response IS an object...
+          if fact.is_a?(Hash)
+          # remove the first part and return the rest
+            name = name.sub(/^[^\.]+\./,'')
+            return fact.get(name, default)
+          else
+          # not an object, return default
+            return default
+          end
+        else
+      # this is a simple request, return the fact
+          return fact
+        end
+      end
+
+      return default
+    end
+
+    def make_filter(filter)
+      filter = filter.collect{|k,v| "#{k}/#{v}" } if filter.is_a?(Hash)
+      filter = filter.collect{|i| i.sub(':','/') }.join("/") if filter.is_a?(Array)
+      return filter
+    end
+
+    def http_status(code)
+      return (HTTP_STATUS_CODES[code.to_i] || nil)
+    end
   end
 end
 
 class String
   include Onering::Util::String
+end
+
+class Module
+  def submodules
+    constants.collect {|const_name| const_get(const_name)}.select {|const| const.class == Module}
+  end
 end

data/lib/onering.rb

@@ -3,4 +3,11 @@ require 'onering/util'
 require 'onering/api'
 require 'onering/plugins/devices'
 require 'onering/plugins/authentication'
+require 'onering/plugins/automation'
 require 'onering/plugins/reporter'
+require 'onering/cli'
+require 'onering/cli/call'
+require 'onering/cli/fact'
+require 'onering/cli/devices'
+require 'onering/cli/automation'
+require 'onering/cli/reporter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.50
   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: &21024540 !ruby/object:Gem::Requirement
+  requirement: &6690160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21024540
+  version_requirements: *6690160
 - !ruby/object:Gem::Dependency
-  name: subcommander
-  requirement: &21022680 !ruby/object:Gem::Requirement
+  name: deep_merge
+  requirement: &6689220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21022680
+  version_requirements: *6689220
 - !ruby/object:Gem::Dependency
-  name: deep_merge
-  requirement: &21020640 !ruby/object:Gem::Requirement
+  name: addressable
+  requirement: &6688340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21020640
+  version_requirements: *6688340
 - !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: &20995240 !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: &6687680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20995240
+  version_requirements: *6687680
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &20993960 !ruby/object:Gem::Requirement
+  name: hashlib
+  requirement: &6686980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20993960
+  version_requirements: *6686980
 - !ruby/object:Gem::Dependency
-  name: hashlib
-  requirement: &20992780 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &6578580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20992780
+  version_requirements: *6578580
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &20990720 !ruby/object:Gem::Requirement
+  name: rainbow
+  requirement: &6577580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20990720
+  version_requirements: *6577580
 - !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: &20989400 !ruby/object:Gem::Requirement
+  name: trollop
+  requirement: &6576960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20989400
+  version_requirements: *6576960
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -109,8 +109,15 @@ files:
 - lib/onering.rb
 - lib/onering/util.rb
 - lib/onering/api.rb
+- lib/onering/cli.rb
+- lib/onering/cli/fact.rb
+- lib/onering/cli/call.rb
+- lib/onering/cli/devices.rb
+- lib/onering/cli/automation.rb
+- lib/onering/cli/reporter.rb
 - lib/onering/plugins/devices.rb
 - lib/onering/plugins/authentication.rb
+- lib/onering/plugins/automation.rb
 - lib/onering/plugins/reporter.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby