Automatically calculate some prefixes

manifests/params.pp

@@ -39,7 +39,7 @@
   $webhook_protected             = true
   $webhook_discovery_timeout     = 10
   $webhook_client_timeout        = 120
-  $webhook_prefix                = false
+  $webhook_prefix                = false         # ':repo' | ':user' | ':command' (or true for backwards compatibility) | 'string' | false
   $webhook_prefix_command        = '/bin/echo example'
   $webhook_enable_ssl            = true
   $webhook_use_mcollective       = true

templates/webhook.bin.erb

@@ -126,17 +126,24 @@ class Server < Sinatra::Base
     # github sends a 'ref', stash sends an array in 'refChanges'
     branch = ( data['ref'] || data['refChanges'][0]['refId'] rescue nil || data['push']['changes'][0]['new']['name'] ).sub('refs/heads/', '')
 
-    # If prefix is enabled in our config file run the command to determine the prefix
-    if $config['prefix']
-      prefix = run_prefix_command(data.to_json)
-      if prefix.empty?
-        deploy(branch)
-      else
-        deploy("#{prefix}_#{branch}")
-      end
-    else
+    # If prefix is enabled in our config file, determine what the prefix should be
+    prefix = case $config['prefix']
+    when :repo
+      repo_name(data)
+    when :user
+      repo_user(data)
+    when :command, TrueClass
+      run_prefix_command(data.to_json)
+    when String
+      $config['prefix']
+    end
+
+    if prefix.nil? or prefix.empty?
       deploy(branch)
+    else
+      deploy("#{prefix}_#{branch}")
     end
+
   end
 
   not_found do
@@ -239,6 +246,16 @@ class Server < Sinatra::Base
       @auth.credentials == [$config['user'],$config['pass']]
     end  #end authorized?
 
+    def repo_name(data)
+      # Tested with GitHub only
+      data['repository']['name'] rescue nil
+    end
+
+    def repo_user(data)
+      # Tested with GitHub only
+      data['repository']['owner']['name'] rescue nil
+    end
+
     def run_prefix_command(payload)
       IO.popen($config['prefix_command'], mode='r+') do |io|
           io.write payload.to_s

templates/webhook.yaml.erb

@@ -7,6 +7,8 @@
     value
   when Array
     value.sort.inspect.to_s
+  when /^:/
+    value.to_sym
   else
     "\"#{value}\""
   end