From 8d9f6053d3c4f8c15bf2d1fdff79efe3f6637255 Mon Sep 17 00:00:00 2001
From: Ricky Cook <rcook@odecee.com.au>
Date: Wed, 8 Oct 2014 22:19:26 +1100
Subject: [PATCH 1/4] Simplify command module option parsing

---
 commands/command.py | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/commands/command.py b/commands/command.py
index c584d6feed8..90a94fd8369 100644
--- a/commands/command.py
+++ b/commands/command.py
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+import copy
 import sys
 import datetime
 import traceback
@@ -99,12 +100,21 @@ EXAMPLES = '''
     creates: /path/to/database
 '''
 
+OPTIONS = {'chdir': None,
+           'creates': None,
+           'executable': None,
+           'NO_LOG': None,
+           'removes': None,
+           'warn': True,
+           }
+
 # This is a pretty complex regex, which functions as follows:
 #
 # 1. (^|\s)
 # ^ look for a space or the beginning of the line
-# 2. (creates|removes|chdir|executable|NO_LOG)=
-# ^ look for a valid param, followed by an '='
+# 2. ({options_list})=
+# ^ expanded to (chdir|creates|executable...)=
+#   look for a valid param, followed by an '='
 # 3. (?P<quote>[\'"])?
 # ^ look for an optional quote character, which can either be
 #   a single or double quote character, and store it for later
@@ -114,8 +124,12 @@ EXAMPLES = '''
 # ^ a non-escaped space or a non-escaped quote of the same kind
 #   that was matched in the first 'quote' is found, or the end of
 #   the line is reached
-
-PARAM_REGEX = re.compile(r'(^|\s)(creates|removes|chdir|executable|NO_LOG|warn)=(?P<quote>[\'"])?(.*?)(?(quote)(?<!\\)(?P=quote))((?<!\\)(?=\s)|$)')
+OPTIONS_REGEX = '|'.join(OPTIONS.keys())
+PARAM_REGEX = re.compile(
+    r'(^|\s)({options_list})=(?P<quote>[\'"])?(.*?)(?(quote)(?<!\\)(?P=quote))((?<!\\)(?=\s)|$)'.format(
+        options_regex=OPTIONS_REGEX
+    )
+)
 
 
 def check_command(commandline):
@@ -232,13 +246,8 @@ class CommandModule(AnsibleModule):
     def _load_params(self):
         ''' read the input and return a dictionary and the arguments string '''
         args = MODULE_ARGS
-        params = {}
-        params['chdir']      = None
-        params['creates']    = None
-        params['removes']    = None
-        params['shell']      = False
-        params['executable'] = None
-        params['warn'] = True
+        params = copy.copy(OPTIONS)
+        params['shell'] = False
         if "#USE_SHELL" in args:
             args = args.replace("#USE_SHELL", "")
             params['shell'] = True
@@ -251,7 +260,7 @@ class CommandModule(AnsibleModule):
                 # check to see if this is a special parameter for the command
                 k, v = x.split('=', 1)
                 v = unquote(v.strip())
-                if k in ('creates', 'removes', 'chdir', 'executable', 'NO_LOG'):
+                if k in OPTIONS.keys():
                     if k == "chdir":
                         v = os.path.abspath(os.path.expanduser(v))
                         if not (os.path.exists(v) and os.path.isdir(v)):

From 25789b3f474cb2a6c2d5692b49cde7e47d926180 Mon Sep 17 00:00:00 2001
From: Ricky Cook <rcook@odecee.com.au>
Date: Wed, 8 Oct 2014 22:25:02 +1100
Subject: [PATCH 2/4] Add comment to command options dict

---
 commands/command.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/commands/command.py b/commands/command.py
index 90a94fd8369..75927a5ba0b 100644
--- a/commands/command.py
+++ b/commands/command.py
@@ -100,6 +100,7 @@ EXAMPLES = '''
     creates: /path/to/database
 '''
 
+# Dict of options and their defaults
 OPTIONS = {'chdir': None,
            'creates': None,
            'executable': None,

From b195b5a6bb65acfbfddc61885df1fe9d721c34a3 Mon Sep 17 00:00:00 2001
From: Ricky Cook <rcook@odecee.com.au>
Date: Wed, 8 Oct 2014 22:30:20 +1100
Subject: [PATCH 3/4] Get warn option same as other args

---
 commands/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/command.py b/commands/command.py
index 75927a5ba0b..44c95a3d5bd 100644
--- a/commands/command.py
+++ b/commands/command.py
@@ -163,7 +163,7 @@ def main():
     args  = module.params['args']
     creates  = module.params['creates']
     removes  = module.params['removes']
-    warn = module.params.get('warn', True)
+    warn = module.params['warn']
 
     if args.strip() == '':
         module.fail_json(rc=256, msg="no command given")

From 6db328c79a8c1f406fdab4e901732ecc9682ced3 Mon Sep 17 00:00:00 2001
From: Ricky Cook <rcook@odecee.com.au>
Date: Wed, 8 Oct 2014 22:59:03 +1100
Subject: [PATCH 4/4] Fix regex string format

---
 commands/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/command.py b/commands/command.py
index 44c95a3d5bd..2b79b327d71 100644
--- a/commands/command.py
+++ b/commands/command.py
@@ -127,7 +127,7 @@ OPTIONS = {'chdir': None,
 #   the line is reached
 OPTIONS_REGEX = '|'.join(OPTIONS.keys())
 PARAM_REGEX = re.compile(
-    r'(^|\s)({options_list})=(?P<quote>[\'"])?(.*?)(?(quote)(?<!\\)(?P=quote))((?<!\\)(?=\s)|$)'.format(
+    r'(^|\s)({options_regex})=(?P<quote>[\'"])?(.*?)(?(quote)(?<!\\)(?P=quote))((?<!\\)(?=\s)|$)'.format(
         options_regex=OPTIONS_REGEX
     )
 )