Merge lp:~toelke+lp/doit/onlychanged-bug into lp:doit

[Philipp Tölke]

[Philipp Tölke (toelke+lp)]

See bug 434327.

[schettino72 (schettino72)]

merged. thanks a lot.
i've done a few changes. please review it.

ps. added your name on README file with a link to the launchpad page. if you want to change it let me know.

review: Approve

=== modified file 'lib/doit/dependency.py'
--- lib/doit/dependency.py	2009-08-22 12:40:22 +0000
+++ lib/doit/dependency.py	2009-09-25 19:05:24 +0000
@@ -119,23 +119,25 @@
         by doit. they can only be cleared manualy.
         @return: (bool) True if up to date, False needs to re-execute.
         """
+
         # no dependencies means it is never up to date.
         if (not dependencies) and (not runOnce):
-            return False
+            return [], False
 
         # user managed dependency always up-to-date if it exists
         if runOnce:
             if not self._get(taskId,''):
-                return False
+                return [], False
 
         # if target file is not there, task is not up to date
         for targ in targets:
             if not os.path.exists(targ):
-                return False
+                return dependencies, False
 
         # check for modified dependencies
+        changed = []
         for dep in tuple(dependencies):
             if self.modified(taskId,dep):
-                return False
+                changed.append(dep)
 
-        return True
+        return changed, len(changed) == 0

=== modified file 'lib/doit/runner.py'
--- lib/doit/runner.py	2009-09-06 05:01:33 +0000
+++ lib/doit/runner.py	2009-09-25 19:05:24 +0000
@@ -42,7 +42,7 @@
 
         # check if task is up-to-date
         try:
-            task_uptodate = dependencyManager.up_to_date(task.name,
+            task.dep_changed, task_uptodate = dependencyManager.up_to_date(task.name,
                                  task.file_dep, task.targets, task.run_once)
         # TODO: raise an exception here.
         except:
@@ -55,7 +55,7 @@
         if not alwaysExecute and task_uptodate:
             print "---", task.title()
         else:
-            print task.title()
+            print task.title() % {'targets' : " ".join(task.targets), 'changed': " ".join(task.dep_changed), 'dependencies': " ".join(["%s" % x for x in task.dependencies])}
             # process folder dependency
             for dep in task.folder_dep:
                 if not os.path.exists(dep):

=== modified file 'lib/doit/task.py'
--- lib/doit/task.py	2009-09-20 08:27:51 +0000
+++ lib/doit/task.py	2009-09-25 19:05:24 +0000
@@ -45,7 +45,7 @@
     def __init__(self, action):
         assert isinstance(action,str), "CmdAction must be a string."
         self.action = action
-
+        self.task = None
 
     def execute(self, capture_stdout=False, capture_stderr=False):
         """
@@ -68,8 +68,13 @@
         else:
             stderr = subprocess.PIPE
 
+        if self.task:
+            action = self.action % {'targets' : " ".join(self.task.targets), 'changed': " ".join(self.task.dep_changed), 'dependencies': " ".join(["%s" % x for x in self.task.dependencies])}
+        else:
+            action = self.action
+
         # spawn task process
-        process = subprocess.Popen(self.action,stdout=stdout,
+        process = subprocess.Popen(action,stdout=stdout,
                                  stderr=stderr, shell=True)
 
         # log captured stream
@@ -84,12 +89,12 @@
         # it doesnt make so much difference to return as Error or Failed anyway
         if process.returncode > 125:
             raise TaskError("Command error: '%s' returned %s" %
-                            (self.action,process.returncode))
+                            (action,process.returncode))
 
         # task failure
         if process.returncode != 0:
             raise TaskFailed("Command failed: '%s' returned %s" %
-                             (self.action,process.returncode))
+                             (action,process.returncode))
 
     def __str__(self):
         return "Cmd: %s" % self.action
@@ -252,6 +257,7 @@
         self.setup = setup
         self.run_once = False
         self.is_subtask = is_subtask
+        self.dep_changed = []
 
         if actions is None:
             self.actions = []
@@ -276,6 +282,10 @@
             else:
                 self.doc = ''
 
+        for action in self.actions:
+            action.task = self
+            open("log","a").write("%s -- %s\n" % (action.task, action))
+
         # there are 3 kinds of dependencies: file, task, and folder
         self.folder_dep = []
         self.task_dep = []

=== modified file 'tests/test_dependency.py'
--- tests/test_dependency.py	2009-08-19 14:01:23 +0000
+++ tests/test_dependency.py	2009-09-25 19:05:24 +0000
@@ -163,9 +163,9 @@
     def test_upToDate_noDependency(self):
         taskId = "task A"
         # first time execute
-        assert not self.d.up_to_date(taskId,[],[],False)
+        assert self.d.up_to_date(taskId,[],[],False) == ([], False)
         # second too
-        assert not self.d.up_to_date(taskId,[],[],False)
+        assert self.d.up_to_date(taskId,[],[],False) == ([], False)
 
 
     # if there is a dependency the task is executed only if one of
@@ -179,10 +179,10 @@
         taskId = "task X";
         dependencies = [filePath]
         # first time execute
-        assert not self.d.up_to_date(taskId,dependencies,[],False)
+        assert self.d.up_to_date(taskId,dependencies,[],False) == (dependencies, False)
         self.d.save_dependencies(taskId,dependencies)
         # second time no
-        assert self.d.up_to_date(taskId,dependencies,[],False)
+        assert self.d.up_to_date(taskId,dependencies,[],False) == ([], True)
 
         # a small change on the file
         ff = open(filePath,"a")
@@ -190,7 +190,7 @@
         ff.close()
 
         # execute again
-        assert not self.d.up_to_date(taskId,dependencies,[],False)
+        assert self.d.up_to_date(taskId,dependencies,[],False) == (dependencies, False)
 
 
     # if target file does not exist, task is outdated.
@@ -203,7 +203,7 @@
         if os.path.exists(filePath):
             os.remove(filePath)
 
-        assert not self.d.up_to_date(taskId,dependencies,[filePath],False)
+        assert self.d.up_to_date(taskId,dependencies,[filePath],False) == (dependencies, False)
 
     def test_upToDate_targets(self):
         filePath = get_abspath("data/target")
@@ -216,7 +216,7 @@
         targets = [filePath]
         self.d.save_dependencies(taskId,dependencies)
         # up-to-date because target exist
-        assert self.d.up_to_date(taskId,dependencies,targets,False)
+        assert self.d.up_to_date(taskId,dependencies,targets,False) == ([], True)
 
     def test_upToDate_targetFolder(self):
         # folder not there. task is not up-to-date
@@ -226,16 +226,16 @@
         folderPath = get_abspath("data/target-folder")
         if os.path.exists(folderPath):
             os.rmdir(folderPath)
-        assert not self.d.up_to_date(taskId,dependencies,[folderPath],False)
+        assert self.d.up_to_date(taskId,dependencies,[folderPath],False) == (dependencies, False)
         # create folder. task is up-to-date
         os.mkdir(folderPath)
-        assert self.d.up_to_date(taskId,dependencies,[folderPath],False)
+        assert self.d.up_to_date(taskId,dependencies,[folderPath],False) == ([], True)
 
 class TestRunOnceDependency(DependencyTestBase):
 
     def test_upToDate_BoolDependency(self):
         taskId = "task X"
-        assert not self.d.up_to_date(taskId,[],[],True)
+        assert self.d.up_to_date(taskId,[],[],True) == ([], False)
         self.d.save_run_once(taskId)
-        assert self.d.up_to_date(taskId,[],[],True)
+        assert self.d.up_to_date(taskId,[],[],True) == ([], True)