The fetch module really should preserve the whole directory structure being…

The fetch module really should preserve the whole directory structure being fetched to allow subsequent calls,
particularly in playbook, to recreate the host tree structure.  Making it thus.

lib/ansible/runner.py

@@ -404,8 +404,9 @@ class Runner(object):
             return (host, True, dict(failed=True, msg="src and dest are required"), '')
 
         # files are saved in dest dir, with a subdir for each host, then the filename
-        filename = os.path.basename(source)
-        dest   = "%s/%s/%s" % (utils.path_dwim(self.basedir, dest), host, filename)
+        dest   = "%s/%s/%s" % (utils.path_dwim(self.basedir, dest), host, source)
+        dest   = dest.replace("//","/")
+        print "DEST=%s" % dest
 
         # compare old and new md5 for support of change hooks
         local_md5 = None

test/TestRunner.py

@@ -201,9 +201,8 @@ class TestRunner(unittest.TestCase):
 
    def test_fetch(self):
        input = self._get_test_file('sample.j2')
-       output = self._get_stage_file('127.0.0.2/sample.j2')
+       output = os.path.join(self.stage_dir, '127.0.0.2', input)
        result = self._run('fetch', [ "src=%s" % input, "dest=%s" % self.stage_dir ])
-       print "output file=%s" % output
        assert os.path.exists(output)
        assert open(input).read() == open(output).read()