From 61d8e2e7c7c70eb04844c3c66a540e2c49303dee Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Sun, 15 Jul 2012 09:17:04 -0400
Subject: [PATCH] with_items should be processed inside the task class, also
 make first_available_file and with_items incompatible.  Most cases that would
 need this could be solved with vars_files.

---
 lib/ansible/playbook/play.py |  9 --------
 lib/ansible/playbook/task.py | 43 +++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
index 590acec240..a67f3559c4 100644
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -103,16 +103,7 @@ class Play(object):
             else:
                 raise Exception("unexpected task type")
             for y in data:
-                items = y.get('with_items',None)
-                if items is None:
-                    items = [ ]
-                elif isinstance(items, basestring):
-                    #items = utils.varLookup(items, task_vars)
-                    if type(items) != list:
-                        raise errors.AnsibleError("with_items must be a list, got: %s" % items)
-                # items = [ utils.template(item, task_vars) for item in items]
                 mv = task_vars.copy()
-                mv['items'] = items
                 results.append(Task(self,y,module_vars=mv))
 
         for x in results:
diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py
index 6441ec2942..aa860bc0bc 100644
--- a/lib/ansible/playbook/task.py
+++ b/lib/ansible/playbook/task.py
@@ -25,53 +25,74 @@ class Task(object):
     __slots__ = [ 
         'name', 'action', 'only_if', 'async_seconds', 'async_poll_interval',
         'notify', 'module_name', 'module_args', 'module_vars', 
-        'play', 'notified_by', 'tags'
+        'play', 'notified_by', 'tags', 'with_items', 'first_available_file'
     ]
 
     def __init__(self, play, ds, module_vars=None):
         ''' constructor loads from a task or handler datastructure '''
 
-        # TODO: more error handling
-        # include task specific vars
-
         self.module_vars = module_vars
-
         self.play        = play
+
+        # load various attributes
         self.name        = ds.get('name', None)
         self.action      = ds.get('action', '')
         self.tags        = [ 'all' ]
 
+        # notified by is used by Playbook code to flag which hosts
+        # need to run a notifier
         self.notified_by = []
 
+        # if no name is specified, use the action line as the name
         if self.name is None:
             self.name = self.action
 
+        # load various attributes
         self.only_if = ds.get('only_if', 'True')
         self.async_seconds = int(ds.get('async', 0))  # not async by default
         self.async_poll_interval = int(ds.get('poll', 10))  # default poll = 10 seconds
         self.notify = ds.get('notify', [])
+        self.first_available_file = ds.get('first_available_file', None)
+        self.with_items = ds.get('with_items', None)
+
+        # notify can be a string or a list, store as a list
         if isinstance(self.notify, basestring):
             self.notify = [ self.notify ]
 
+        # split the action line into a module name + arguments
         tokens = self.action.split(None, 1)
         if len(tokens) < 1:
             raise errors.AnsibleError("invalid/missing action in task")
-
         self.module_name = tokens[0]
         self.module_args = ''
         if len(tokens) > 1:
             self.module_args = tokens[1]
 
-        import_tags = []
-        if 'tags' in self.module_vars:
-            import_tags = self.module_vars['tags'].split(",")
+        import_tags = self.module_vars.get('tags',[])
+        if type(import_tags) in [str,unicode]:
+            # allow the user to list comma delimited tags
+            import_tags = import_tags.split(",")
 
         self.name = utils.template(self.name, self.module_vars)
         self.action = utils.template(self.name, self.module_vars)
 
+        # handle mutually incompatible options
+        if self.with_items is not None and self.first_available_file is not None:
+            raise errors.AnsibleError("with_items and first_available_file are mutually incompatible in a single task")
+
+        # make first_available_file accessable to Runner code
+        if self.first_available_file:
+            self.module_vars['first_available_file'] = self.first_available_file
+      
+        # process with_items so it can be used by Runner code 
+        if self.with_items is None:
+            self.with_items = [ ]
+        elif isinstance(self.with_items, basestring):
+            self.with_items = utils.varLookup(self.with_items, self.module_vars)
+            if type(self.with_items) != list:
+                raise errors.AnsibleError("with_items must be a list, got: %s" % self.with_items)
+        self.module_vars['items'] = self.with_items
 
-        if 'first_available_file' in ds:
-            self.module_vars['first_available_file'] = ds.get('first_available_file')
 
         # tags allow certain parts of a playbook to be run without
         # running the whole playbook