Fix notificationcommand template

Make sure the "command" parameter is passed as an array to the
"each_with_index" method, otherwise an exeption is thrown.

Minor syntax corrections and spec test adjustment.

Author: n00by

spec/defines/icinga2__object/notificationcommand_spec.rb

@@ -26,6 +26,23 @@
     pending
   end
 
+  context "with parameter command = string" do
+
+    let(:title) { 'testnotificationcommand' }
+
+    let(:params) do
+      {
+        :object_notificationcommandname => 'testnotificationcommand',
+        :command => 'testcommand1'
+      }
+    end
+
+    object_file = '/etc/icinga2/objects/notificationcommands/testnotificationcommand.conf'
+    it { should contain_icinga2__object__notificationcommand('testnotificationcommand') }
+    it { should contain_file(object_file).with_content(/^\s*command = \[ PluginDir \+ "testcommand1" \]$/) }
+
+  end
+
   context "with parameter command = array with one item" do
 
     let(:title) { 'testnotificationcommand' }

templates/object/notificationcommand.conf.erb

@@ -16,22 +16,23 @@ object NotificationCommand "<%= @object_notificationcommandname %>" {
   <%- end -%>
   <%- if @command -%>
 
-  command = [ <% @command.each_with_index do |cmd, i| %><% if @cmd_path -%><%= @cmd_path -%> + <% end -%>"<%= cmd -%>"<%= ', ' if i < (@command.size - 1) %><% end %> ]
+  <%- a_command = [@command].flatten.compact -%>
+  command = [ <% a_command.each_with_index do |cmd, i| %><% if @cmd_path -%><%= @cmd_path -%> + <% end -%>"<%= cmd -%>"<%= ', ' if i < (a_command.size - 1) %><% end %> ]
   <%- end -%>
   <%- if @arguments.any? -%>
 
   arguments = <%= scope.function_icinga2_config_value([@arguments]) %>
   <%- end -%>
   <%- if @vars.any? -%>
 
-  vars += <%= scope.function_icinga2_config_value([@vars]) %>
+  vars = <%= scope.function_icinga2_config_value([@vars]) %>
   <%- end -%>
   <%- if @timeout -%>
 
   timeout = <%= @timeout %>
   <%- end -%>
   <%- if @env.any? -%>
 
-  env += <%= scope.function_icinga2_config_value([@env]) %>
+  env = <%= scope.function_icinga2_config_value([@env]) %>
   <%- end -%>
 }