Refs #4873 - Add bundle command_execution_module() and adapt command_execution() and its tests

tests/acceptance/30_generic_methods/command_execution.cf

@@ -39,7 +39,7 @@ bundle agent test
 bundle agent check
 {
   classes:
-    "ok" expression => "command_execution_${init.canonified_command_name}_ok.!command_execution_${init.canonified_command_name}_error";
+    "ok" expression => "command_execution_module_${init.canonified_command_name}_ok.!command_execution_module_${init.canonified_command_name}_error";
 
   reports:
     ok::

tests/acceptance/30_generic_methods/command_execution_test_invalid_command.cf

@@ -39,7 +39,7 @@ bundle agent test
 bundle agent check
 {
   classes:
-    "ok" expression => "command_execution_${init.canonified_command_name}_ok.!command_execution_${init.canonified_command_name}_error";
+    "ok" expression => "command_execution_module_${init.canonified_command_name}_ok.!command_execution_module_${init.canonified_command_name}_error";
 
   reports:
     DEBUG::

tree/30_generic_methods/command_execution.cf

@@ -21,21 +21,13 @@
 #
 # @parameter command_name  Command name
 # 
-# @class_prefix command_execution
+# @class_prefix command_execution_module
 # @class_parameter command_name
-# This bundle will define a class command_execution_${command_name}_{kept,repaired,error,ok,reached}
+# This bundle will define a class command_execution_module_${command_name}_{kept,repaired,error,ok,reached}
 
 bundle agent command_execution(command_name)
 {
-  vars:
-      "class_prefix"        string => canonify("command_execution_${command_name}");
-
-  commands:
-
-      "${command_name}"
-        classes      => classes_generic("${class_prefix}");
 
   methods:
-      "report"
-        usebundle => _logger("Execute the command ${command_name}", "${class_prefix}");
+      "ph1" usebundle => command_execution_module("${command_name}", "false", "true");
 }

tree/30_generic_methods/command_execution_module.cf

@@ -0,0 +1,51 @@
+#####################################################################################
+# Copyright 2014 Normation SAS
+#####################################################################################
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, Version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#####################################################################################
+
+# @name Command execution
+# @description Execute a command
+#
+# @parameter command_name Command name
+# @parameter module boolean to know if command should be considered as a CFEngine module (true/false)
+# @parameter shell boolean to know if command can be complex or not (true/false)
+# 
+# @class_prefix command_execution_module
+# @class_parameter command_name
+# This bundle will define a class command_execution_module_${command_name}_{kept,repaired,error,ok,reached}
+
+bundle agent command_execution_module(command_name, module, shell)
+{
+  vars:
+      "class_prefix"
+         string    => canonify("command_execution_module_${command_name}");
+
+  methods:
+      "report"
+        usebundle  => _logger("Execute the command ${command_name}", "${class_prefix}"),
+        ifvarclass => "${class_prefix}_reached";
+
+  commands:
+      "${command_name}"
+         module    => "${module}",
+         contain   => command_execution_module_contain("${shell}"),
+         classes   => classes_generic("${class_prefix}");
+}
+
+body contain command_execution_module_contain(shell)
+{
+  useshell => "${shell}";
+}