Fix for failing extractcode tests on Windowss

Author: pombredanne

src/extractcode/__init__.py

@@ -160,9 +160,12 @@ def new_name(location, is_dir=False):
        the extension unchanged.
     """
     assert location
+    
     location = location.rstrip('\\/')
     name = fileutils.file_name(location).strip()
-    if not name or name == '.':
+    if (not name or name == '.' 
+        # windows bare drive path as in c: or z:
+        or (name and len(name)==2 and name.endswith(':'))):
         name = 'file'
 
     parent = fileutils.parent_directory(location)

src/extractcode/libarchive2.py

@@ -280,19 +280,19 @@ def write(self, target_dir, transform_path=lambda x: x):
         # skip links and special files
         if not (self.isfile or self.isdir):
             return
-
+        abs_target_dir = os.path.abspath(os.path.expanduser(target_dir))
         # TODO: return some warning when original path has been transformed
         clean_path = transform_path(self.path)
         if self.isdir:
-            dir_path = posixpath.join(target_dir, clean_path)
+            dir_path = posixpath.join(abs_target_dir, clean_path)
             fileutils.create_dir(dir_path)
             return dir_path
 
         # isfile
         try:
             # create parent directories if needed
             # TODO: also rename directories, segment by segment?
-            target_path = os.path.join(target_dir, clean_path)
+            target_path = os.path.join(abs_target_dir, clean_path)
             parent_path = posixpath.dirname(target_path)
             fileutils.create_dir(parent_path)
 

tests/commoncode/test_fileutils.py

@@ -38,6 +38,7 @@
 
 from commoncode import filetype
 from commoncode import fileutils
+from commoncode.fileutils import as_posixpath
 
 
 class TestPermissions(FileBasedTesting):
@@ -317,7 +318,7 @@ def test_os_walk_with_unicode_path(self):
     def test_fileutils_walk(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = self.get_test_loc('fileutils')
-        result = [(t.replace(base, ''), d, f,) for t, d, f in fileutils.walk(test_dir)]
+        result = [(as_posixpath(t.replace(base, '')), d, f,) for t, d, f in fileutils.walk(test_dir)]
         expected = [
             ('/walk', ['d1'], ['f', 'unicode.zip']),
             ('/walk/d1', ['d2'], ['f1']),
@@ -357,7 +358,7 @@ def test_fileutils_walk_can_walk_an_empty_dir(self):
     def test_file_iter(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = self.get_test_loc('fileutils')
-        result = [f.replace(base, '') for f in fileutils.file_iter(test_dir)]
+        result = [as_posixpath(f.replace(base, '')) for f in fileutils.file_iter(test_dir)]
         expected = [
             '/walk/f',
             '/walk/unicode.zip',
@@ -369,7 +370,7 @@ def test_file_iter(self):
 
     def test_file_iter_can_iterate_a_single_file(self):
         test_file = self.get_test_loc('fileutils/walk/f')
-        result = list(fileutils.file_iter(test_file))
+        result = [as_posixpath(f) for f in fileutils.file_iter(test_file)]
         expected = [test_file]
         assert expected == result
 

tests/extractcode/test_extract.py

@@ -29,6 +29,7 @@
 
 from commoncode.testcase import FileBasedTesting
 from commoncode import fileutils
+from commoncode.fileutils import as_posixpath
 
 import extractcode
 from extractcode_assert_utils import check_files
@@ -857,7 +858,7 @@ def test_walk_can_be_extended_while_walking(self):
         self.touch(os.path.join(test_dir, 'dir', 'otherarch.gz'))
         allpaths = []
         for top, dirs, files in self.extract_walker(test_dir):
-            allpaths.extend([os.path.join(top, d).replace(test_dir, '') for d in dirs + files])
+            allpaths.extend([as_posixpath(os.path.join(top, d).replace(test_dir, '')) for d in dirs + files])
 
         expected = [
             '/arch.gzextract/extracted_file',

tests/scancode/test_cli.py

@@ -30,6 +30,7 @@
 
 from commoncode.testcase import FileBasedTesting
 from scancode import cli
+from commoncode.fileutils import as_posixpath
 
 
 class TestCommandLine(FileBasedTesting):
@@ -97,7 +98,7 @@ def test_extract_option_works_with_relative_paths(self):
         assert not 'WARNING' in result.output
         assert not 'ERROR' in result.output
         expected = ['/c/a/a.txt', '/c/b/a.txt', '/c/c/a.txt']
-        file_result  = [f.replace(test_tgt_dir, '') for f in fileutils.file_iter(test_tgt_dir)]
+        file_result  = [as_posixpath(f.replace(test_tgt_dir, '')) for f in fileutils.file_iter(test_tgt_dir)]
         assert sorted(expected)==sorted(file_result)
 
     def test_copyright_option_detects_copyrights(self):