onering-client 0.0.29 → 0.0.30

data/bin/onering

@@ -150,7 +150,7 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
           json = ::JSON.load(STDIN.read)
           raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
 
-          print_format(api.save((sc[:args].first || json['id']), json))
+          print_format(api.save((sc[:args].first || json['id']), json), :json)
         rescue Exception => e
           STDERR.puts "#{e.class.name}: #{e.message}"
           exit 1
@@ -232,7 +232,7 @@ subcommand :call, "Call generic Onering API endpoints" do |call|
       :fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
     })
 
-    print_format(rv, call[:format]) unless rv.nil? or rv.to_s.strip.chomp.empty?
+    print_format(rv, call[:format] || :json) unless rv.nil? or rv.to_s.strip.chomp.empty?
   end
 end
 
@@ -241,6 +241,7 @@ subcommand :fact, "Retrieve a system fact" do |fact|
   fact.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
 
   fact.exec do
+    Onering::Reporter.setup()
     rv = []
 
     fact[:args].each_index do |i|
@@ -250,13 +251,49 @@ subcommand :fact, "Retrieve a system fact" do |fact|
         default = fact[:args][i]
       end
 
-      rv << Onering::Util.fact(name, default)
+      rv << Onering::Reporter.fact(name, default)
     end
 
     rv.compact!
     rv = rv.first if rv.length == 1
 
-    print_format(rv, fact[:format]) unless not rv or rv.empty?
+    print_format(rv, fact[:format]) unless rv.nil? or rv.empty?
+  end
+end
+
+
+subcommand :report, "Collect and output system information" do |report|
+  report.usage = "onering report"
+  report.opt :plugin_path, '-p', '--plugin PATH',   'Add the named path to the plugin search path'
+  report.opt :status,      '-S', '--status STATUS', 'Set the status to report'
+  report.opt :tags,        '-T', '--tag TAG[,...]', 'Add a tag to the report output'
+  report.opt :aliases,     '-A', '--alias [,...]',  'Add a tag to the report output'
+  report.opt :id,          '-I', '--id ID',         'Override the auto-detected hardware ID'
+  report.opt :format,      '-t', '--format',        'Format the output'
+
+  report.exec do
+    config = {}
+    %w{
+      plugin_path
+      status
+      tags
+      aliases
+      id
+    }.each do |a|
+      a = a.to_sym
+      next if report[a].nil?
+
+      if [:tags, :aliases].include?(a)
+        config[a] = report[a].split(',')
+      else
+        config[a] = report[a]
+      end
+    end
+
+    Onering::Reporter.setup(config)
+
+    rv = Onering::Reporter.report()
+    print_format(rv, report[:format] || :json) unless rv.nil?
   end
 end
 

data/lib/onering.rb

@@ -3,3 +3,4 @@ require 'onering/util'
 require 'onering/api'
 require 'onering/plugins/devices'
 require 'onering/plugins/authentication'
+require 'onering/plugins/reporter'

data/lib/onering/api.rb

@@ -61,8 +61,8 @@ module Onering
             if @_pemfile
               @_pem = File.read(File.expand_path(@_pemfile))
               @_http = Net::HTTP.new(@_uri.host, (@_uri.port || 443))
-              @_http.open_timeout = 10
-              @_http.read_timeout = 10
+              @_http.open_timeout = 30
+              @_http.read_timeout = 120
               @_http.use_ssl = true
               @_http.cert = OpenSSL::X509::Certificate.new(@_pem)
               @_http.key = OpenSSL::PKey::RSA.new(@_pem)

data/lib/onering/plugins/reporter.rb

@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'optparse'
+require 'json'
+require 'hashlib'
+
+def report(&block)
+  Onering::Reporter.add(&block)
+end
+
+module Onering
+  class Reporter
+    DEFAULT_PLUGIN_GEMNAMES=[
+      'onering-report-plugins'
+    ]
+
+    DEFAULT_PLUGIN_PATH = [
+      '/var/lib/onering/reporter'
+    ]
+
+    DEFAULT_FACTER_PATH = [
+      '/etc/facter'
+    ]
+
+    class<<self
+      attr_reader :facter_path
+
+      def setup(config={})
+        @options = config
+        @facter_path = DEFAULT_FACTER_PATH
+
+        @path = [*@options[:plugin_path]]
+        @path += DEFAULT_PLUGIN_PATH
+
+      # add gem paths to the @path
+        ([*@options[:plugin_gems]]+DEFAULT_PLUGIN_GEMNAMES).compact.each do |g|
+          begin
+            p = File.join(Gem::Specification.find_by_name(g).gem_dir, 'lib')
+            @path << File.join(p, 'reporter')
+            @facter_path << File.join(p, 'facter')
+          rescue Gem::LoadError
+            next
+          end
+        end
+
+      # attempt to load things
+        begin
+          require 'rubygems'
+        rescue
+          nil
+        end
+
+        begin
+          require 'ohai'
+          Ohai::Config[:plugin_path] << '/etc/chef/ohai_plugins'
+          @ohai = Ohai::System.new
+          @ohai.all_plugins
+        rescue LoadError
+          @ohai = nil
+        end
+
+        begin
+          ENV['FACTERLIB'] = @facter_path.join(':')
+          require 'facter'
+          @facter = Facter
+        rescue LoadError
+          @facter = nil
+        end
+      end
+
+
+      def fact(name, default=nil)
+        if @facter
+          return (Facter.value(name) or default)
+        end
+
+        return nil
+      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 |e|
+                    e = File.basename(e, '.rb')
+                    require "#{directory}/#{e}"
+                  end
+                end
+              end
+            end
+          rescue Exception => e
+            STDERR.puts e.message
+            next
+          end
+        end
+      end
+
+      def add(&block)
+        if block_given?
+          instance_eval(&block)
+        end
+      end
+
+      def property(name, value=nil)
+        @_report[:properties].set(name, value) if value
+      end
+
+      def stat(name, value=nil)
+        @_report[:properties][:metrics] ||= {}
+        @_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))
+
+        if not @id.nil?
+          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   => {}
+          }
+
+        # loads plugins and populates @_report
+          load_plugins
+
+          return @_report.compact
+        else
+          raise "Cannot generate report without a hardware ID"
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/onering/util.rb

@@ -1,12 +1,14 @@
 module Onering
   module Util
-    ENV['FACTERLIB'] = '/etc/facter'
-    require 'facter'
-
-    class<<self
-      def fact(name, default=nil)
-        Facter.value(name) or default
+    module String
+      def nil_empty
+        return nil if (self.strip.chomp.empty? rescue true)
+        self.strip.chomp
       end
     end
   end
 end
+
+class String
+  include Onering::Util::String
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   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: &9144520 !ruby/object:Gem::Requirement
+  requirement: &12458020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9144520
+  version_requirements: *12458020
 - !ruby/object:Gem::Dependency
   name: subcommander
-  requirement: &9143420 !ruby/object:Gem::Requirement
+  requirement: &12752860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9143420
+  version_requirements: *12752860
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &9142660 !ruby/object:Gem::Requirement
+  requirement: &12749280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9142660
+  version_requirements: *12749280
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &9141620 !ruby/object:Gem::Requirement
+  requirement: &13196740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9141620
+  version_requirements: *13196740
+- !ruby/object:Gem::Dependency
+  name: hashlib
+  requirement: &13192600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *13192600
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -67,6 +78,7 @@ files:
 - lib/onering/api.rb
 - lib/onering/plugins/devices.rb
 - lib/onering/plugins/authentication.rb
+- lib/onering/plugins/reporter.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []
@@ -91,5 +103,5 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Onering client API
+summary: Onering client API and utilities
 test_files: []