foreman_hooks 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ca0cd0fe9eea695a2ba74c390f3a7366191551
-  data.tar.gz: 9d542ea2ef4121c46249bbc2d1f7c24b4574ad4d
+  metadata.gz: 4aa78594bdb6c2cc863097039b920bafe1b21b0e
+  data.tar.gz: 25fad3c59ce04be593118ac643f326c1daafe9c9
 SHA512:
-  metadata.gz: 5c62797e52f6965700536068d6c782fcc65b835c36f5108d965459aa6195ac6167f3687c9feb7751649df2c055074eb1f47180189bae51dd6a42d2cfa8968568
-  data.tar.gz: 4650f6a9156b8ef5d8d4628bfa52f2e44fd148155f26fe0bd7b00a01ebd440706e7d5d8a5c7a0968c58efd230b021fe0426b83a7c3b93a9c57b0233a79c07738
+  metadata.gz: 1fa4d89f00745e4cc5863988f5c9da6df9ed5a424abc549acfd0d5d6513b4f5a12646bd00cd2b735b20599289503a671130c0f2583c99224f050683e5cb7ed7a
+  data.tar.gz: f0ca3b8c45b66224bfa21e5e893d8a381a9cca95cbac135d1403fe420f3894b63c6313706522b70134511169126f1c3e2d83a125657c57d081b7ff0715c03be7

data/lib/foreman_hooks/util.rb

@@ -3,12 +3,32 @@ require 'open3'
 module ForemanHooks::Util
   extend ActiveSupport::Concern
 
+  def render_hook_type
+    case self
+      when Host::Managed
+        'host'
+      else
+        self.class.name.to_lower
+    end
+  end
+
+  def render_hook_json
+    # APIv2 has some pretty good templates.  We could extend them later in special cases.
+    # Wrap them in a root node for pre-1.4 compatibility
+    json = Rabl.render(self, "api/v2/#{render_hook_type.tableize}/show", :view_path => 'app/views', :format => :json)
+    %Q|{"#{render_hook_type}":#{json}}|
+  rescue => e
+    logger.warn "Unable to render #{self} (#{self.class}) using RABL: #{e.message}"
+    logger.debug e.backtrace.join("\n")
+    self.to_json
+  end
+
   def exec_hook(*args)
     logger.debug "Running hook: #{args.join(' ')}"
     success = if defined? Bundler && Bundler.responds_to(:with_clean_env)
-                Bundler.with_clean_env { exec_hook_int(self.to_json, *args) }
+                Bundler.with_clean_env { exec_hook_int(render_hook_json, *args) }
               else
-                exec_hook_int(self.to_json, *args)
+                exec_hook_int(render_hook_json, *args)
               end.success?
 
     # Raising here causes Foreman Orchestration to correctly show error bubble in GUI

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hooks
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies: []
 description: Plugin engine for Foreman that enables running custom hook scripts on
   Foreman events