minor slackdiff refactor

untested
ytti · Nov 3, 2018 · 4cc7fc3 · 4cc7fc3
1 parent 1985f0a
commit 4cc7fc3
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
@@ -1,7 +1,7 @@
 require 'slack'
 
 # defaults to posting a diff, if messageformat is supplied them a message will be posted too
-# diffenable defaults to true
+# diff defaults to true
 
 class SlackDiff < Oxidized::Hook
   def validate_cfg!
@@ -21,14 +21,7 @@ def run_hook(ctx)
     client = Slack::Client.new
     client.auth_test
     log "Connected"
-    # diff snippet - default
-    diffenable = true
-    if cfg.has_key?('diff') == true
-      if cfg.diff == false
-        diffenable = false
-      end
-    end
-    if diffenable == true
+    if cfg.diff? ? cfg.diff : true
       gitoutput = ctx.node.output.new
       diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
       unless diff == "no diffs"
@@ -42,9 +35,9 @@ def run_hook(ctx)
       end
     end
     # message custom formatted - optional
-    if cfg.has_key?('message') == true
+    if cfg.message?
       log cfg.message
-      msg = cfg.message % { :node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase }
+      msg = cfg.message % { node: ctx.node.name.to_s, group: ctx.node.group.to_s, commitref: ctx.commitref, model: ctx.node.model.class.name.to_s.downcase }
       log msg
       log "Posting message to #{cfg.channel}"
       client.chat_postMessage(channel: cfg.channel, text: msg, as_user: true)