foreman_hooks 0.3.0 → 0.3.1

data/foreman_hooks.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = "foreman_hooks"
 
-  s.version = "0.3.0"
-  s.date = "2013-04-06"
+  s.version = "0.3.1"
+  s.date = "2013-04-07"
 
   s.summary = "Run custom hook scripts on Foreman events"
   s.description = "Plugin engine for Foreman that enables running custom hook scripts on Foreman events"

data/lib/foreman_hooks/util.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module ForemanHooks::Util
   extend ActiveSupport::Concern
 
@@ -35,7 +37,7 @@ module ForemanHooks::Util
           @hooks = discover_hooks
           @hooks.each do |klass,events|
             events.each do |event,hooks|
-              logger.info "Finished registering #{hooks.size} hooks for #{Host::Base.to_s}##{event}"
+              logger.info "Finished registering #{hooks.size} hooks for #{klass.to_s}##{event}"
               hooks.sort!
             end
           end
@@ -75,13 +77,18 @@ module ForemanHooks::Util
   end
 
   def exec_hook_int(stdin_data, *args)
-    output = nil
-    IO.popen(args.push(:err=>[:child, :out]), mode='r+') do |io|
-      io.write(stdin_data)
-      io.close_write
-      output = io.read
+    output, status = if Open3.respond_to? :capture2e
+      Open3.capture2e(*args.push(:stdin_data => stdin_data))
+    else  # 1.8
+      Open3.popen3(*args) do |stdin,stdout,stderr|
+        stdin.write(stdin_data)
+        stdin.close
+        # we could still deadlock here, it'd ideally select() on stdout+err
+        output = stderr.read
+      end
+      [output, $?]
     end
     logger.debug "Hook output: #{output}" if output && !output.empty?
-    $?
+    status
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hooks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Plugin engine for Foreman that enables running custom hook scripts on
   Foreman events