onering-client 0.0.76 → 0.0.77

data/lib/onering/cli/reporter.rb

@@ -14,14 +14,16 @@ Usage:
 
 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"
+          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"
+          opt :timeout, "The maximum amount of time to wait for a report to be generated", :type => :integer
         end
 
       # initialize report generator with user options
         Onering::Reporter.setup({
-          :id => @opts[:id]
+          :id      => @opts[:id],
+          :timeout => @opts[:timeout]
         }.compact)
       end
 

data/lib/onering/cli/version.rb

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

data/lib/onering/plugins/reporter.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'timeout'
 require 'optparse'
 require 'hashlib'
 
@@ -100,22 +101,24 @@ module Onering
         @id = (@options[:id] || Onering::Util.fact('hardwareid', 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.stringify_keys()
+          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   => {}
+            }
+
+          # loads plugins and populates @_report
+            load_plugins
+
+            return @_report.stringify_keys()
+          end
         else
           raise "Cannot generate report without a hardware ID"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.76
+  version: 0.0.77
   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: !ruby/object:Gem::Requirement
+  requirement: &13246140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+  version_requirements: *13246140
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13245100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13245100
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13244140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13244140
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13242580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13242580
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13226000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.19
+  version_requirements: *13226000
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13223680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13223680
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13220880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13220880
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13218940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,12 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13218940
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -146,21 +106,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/onering.rb
 - lib/onering/cli.rb
-- lib/onering/plugins/devices.rb
-- lib/onering/plugins/reporter.rb
+- lib/onering/api.rb
+- lib/onering/util.rb
 - lib/onering/plugins/authentication.rb
+- lib/onering/plugins/reporter.rb
+- lib/onering/plugins/devices.rb
 - lib/onering/plugins/automation.rb
-- lib/onering/cli/devices.rb
 - lib/onering/cli/reporter.rb
-- lib/onering/cli/config.rb
-- lib/onering/cli/fact.rb
 - lib/onering/cli/version.rb
+- lib/onering/cli/devices.rb
+- lib/onering/cli/config.rb
 - lib/onering/cli/automation.rb
+- lib/onering/cli/fact.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: []
@@ -182,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Onering client API and utilities