foreman_hooks 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc10f54a3ede56411fb9702eacd35b19a340a49f
-  data.tar.gz: 33853d25749e467ae70a156c1ef59980874f6c93
+  metadata.gz: 89ca0cd0fe9eea695a2ba74c390f3a7366191551
+  data.tar.gz: 9d542ea2ef4121c46249bbc2d1f7c24b4574ad4d
 SHA512:
-  metadata.gz: 498e8466d6626c622351b7f0047f36e9ce8836caf9bdd04af6428c2b0e47782ffab6507bf44f66338310179565fd5c349d34ae8359fb7eb70860a5ba0a5fbe8c
-  data.tar.gz: 96e4a89cf183390aefe482250a29c9cf604f7ea26c57aa86d1496878e6a28dbee8733e5c1d19a41f7d84d3ec4a36dc1b47347bdd19a2b276964ddda467143574
+  metadata.gz: 5c62797e52f6965700536068d6c782fcc65b835c36f5108d965459aa6195ac6167f3687c9feb7751649df2c055074eb1f47180189bae51dd6a42d2cfa8968568
+  data.tar.gz: 4650f6a9156b8ef5d8d4628bfa52f2e44fd148155f26fe0bd7b00a01ebd440706e7d5d8a5c7a0968c58efd230b021fe0426b83a7c3b93a9c57b0233a79c07738

data/README.md

@@ -10,20 +10,14 @@ Foreman object, all with shell scripts.
 
 # Installation:
 
-If you're using an RPM based installation, please use the packages provided in
-the plugin repos at http://yum.theforeman.org/plugins.
+Please see the Foreman wiki for appropriate instructions:
 
-For other setups, include in your `~foreman/bundler.d/foreman_hooks.rb`
+* [Foreman: How to Install a Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 
-    gem 'foreman_hooks'
+The gem name is "foreman_hooks".
 
-Or from git:
-
-    gem 'foreman_hooks', :git => "https://github.com/domcleal/foreman_hooks.git"
-
-Regenerate Gemfile.lock or upgrade to the latest version of the plugin:
-
-    cd ~foreman && sudo -u foreman bundle update foreman_hooks
+RPM users can install the "ruby193-rubygem-foreman_hooks" or
+"rubygem-foreman_hooks" packages.
 
 # Usage
 
@@ -34,12 +28,11 @@ with a subdirectory for the object, then a subdirectory for the event name.
 
 Examples:
 
-    ~foreman/config/hooks/host/create/50_register_system.sh
-    ~foreman/config/hooks/host/destroy/15_cleanup_database.sh
+    ~foreman/config/hooks/host/managed/create/50_register_system.sh
+    ~foreman/config/hooks/host/managed/destroy/15_cleanup_database.sh
     ~foreman/config/hooks/smart_proxy/after_create/01_email_operations.sh
 
-In Foreman 1.1, all hosts are `host` but in Foreman 1.2, managed hosts will
-become `host/managed` instead.
+(`host/managed` is for Foreman 1.2+, change to just `host` for Foreman 1.1)
 
 ## Objects / Models
 
@@ -78,8 +71,8 @@ documentation.
 
 The host object has two additional callbacks that you can use:
 
-* `host/after_build` triggers when a host is put into build mode
-* `host/before_provision` triggers when a host completes the OS install
+* `host/managed/after_build` triggers when a host is put into build mode
+* `host/managed/before_provision` triggers when a host completes the OS install
 
 ## Execution of hooks
 
@@ -90,7 +83,7 @@ The first argument is always the event name, enabling scripts to be symlinked
 into multiple event directories.  The second argument is the string
 representation of the object that was hooked, e.g. the hostname for a host.
 
-    ~foreman/config/hooks/host/create/50_register_system.sh create foo.example.com
+    ~foreman/config/hooks/host/managed/create/50_register_system.sh create foo.example.com
 
 A JSON representation of the hook object will be passed in on stdin.  A utility
 to read this with jgrep is provided in `examples/hook_functions.sh` and
@@ -98,7 +91,7 @@ sourcing this utility script will be enough for most users.  Otherwise, you
 may want to ensure stdin is closed.
 
     echo '{"host":{"name":"foo.example.com"}}' \
-      | ~foreman/config/hooks/host/create/50_register_system.sh \
+      | ~foreman/config/hooks/host/managed/create/50_register_system.sh \
            create foo.example.com
 
 Every hook within the event directory is executed in alphabetical order.  For

data/lib/foreman_hooks.rb

@@ -4,6 +4,8 @@ module ForemanHooks
   require 'foreman_hooks/callback_hooks'
   require 'foreman_hooks/orchestration_hook'
 
+  class Error < RuntimeError; end
+
   class << self
     def hooks_root
       File.join(Rails.application.root, 'config', 'hooks')

data/lib/foreman_hooks/engine.rb

@@ -5,5 +5,10 @@ module ForemanHooks
     config.to_prepare do
       ForemanHooks.hooks.each { |klass,events| ForemanHooks.attach_hook(klass.constantize, events) }
     end
+
+    initializer 'foreman_hooks.register_plugin', :after=> :finisher_hook do |app|
+      Foreman::Plugin.register :foreman_hooks do
+      end if defined? Foreman::Plugin
+    end
   end
 end

data/lib/foreman_hooks/util.rb

@@ -11,9 +11,8 @@ module ForemanHooks::Util
                 exec_hook_int(self.to_json, *args)
               end.success?
 
-    unless success
-      logger.warn "Hook failure running `#{args.join(' ')}`: #{$?}"
-    end
+    # Raising here causes Foreman Orchestration to correctly show error bubble in GUI
+    raise ForemanHooks::Error.new "Hook failure running `#{args.join(' ')}`: #{$?}" unless success
     success
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hooks
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies: []
 description: Plugin engine for Foreman that enables running custom hook scripts on
   Foreman events
@@ -33,7 +33,7 @@ files:
 - lib/foreman_hooks/util.rb
 - test/test_helper.rb
 - test/unit/host_observer_test.rb
-homepage: http://github.com/domcleal/foreman_hooks
+homepage: http://github.com/theforeman/foreman_hooks
 licenses:
 - GPL-3
 metadata: {}