Report file name once in --full-root path. Fix #746

 * When scanning a single file with --full-root the report path
   contained a repeated trailing file name.
 
Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/scancode/cache.py

@@ -323,6 +323,7 @@ def iterate(self, scan_names, root_dir=None, paths_subset=tuple()):
                     rooted_path = posixpath.join(root_dir, unicode_path)
                 else:
                     rooted_path = unicode_path
+                rooted_path = fileutils.as_posixpath(rooted_path)
                 logger_debug('iterate:', 'rooted_path:', rooted_path)
 
                 # rare but possible corner case
@@ -336,11 +337,7 @@ def iterate(self, scan_names, root_dir=None, paths_subset=tuple()):
                     yield scan_result
                     continue
 
-                unicode_path_from_file_info = file_info.pop('path')
-                #print('unicode_path_from_file_info', type(unicode_path_from_file_info), repr(unicode_path_from_file_info))
-                #print('unicode_path', type(unicode_path), repr(unicode_path))
-                #print('rooted_path', type(rooted_path), repr(rooted_path))
-                #print('path', type(path), repr(path))
+                _unicode_path_from_file_info = file_info.pop('path')
                 scan_result = OrderedDict(path=rooted_path)
 
                 if 'infos' in scan_names:

src/scancode/cli.py

@@ -709,14 +709,16 @@ def _get_root_dir(input_path, strip_root=False, full_root=False):
 
     scanned_path = os.path.abspath(os.path.normpath(os.path.expanduser(input_path)))
     scanned_path = fileutils.as_posixpath(scanned_path)
-    if full_root:
-        return scanned_path
-
     if filetype.is_dir(scanned_path):
         root_dir = scanned_path
     else:
         root_dir = fileutils.parent_directory(scanned_path)
-    return fileutils.file_name(root_dir)
+        root_dir = fileutils.as_posixpath(root_dir)
+
+    if full_root:
+        return root_dir
+    else:
+        return fileutils.file_name(root_dir)
 
 
 def _resource_logger(logfile_fd, resources):

tests/scancode/test_cli.py

@@ -264,11 +264,32 @@ def test_scan_info_does_collect_infos_with_root():
 
 def test_scan_info_returns_full_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
+    result_file = test_env.get_temp_file('json')
+    result = run_scan_click(['--info', '--full-root', test_dir, result_file])
+
+    assert result.exit_code == 0
+    assert 'Scanning done' in result.output
+    result_data = json.loads(open(result_file, 'rb').read())
+    file_paths = [f['path'] for f in result_data['files']]
+    assert 11 == len(file_paths)
+    root = fileutils.as_posixpath(test_dir)
+    assert all(p.startswith(root) for p in file_paths)
+
+
+def test_scan_info_returns_correct_full_root_with_single_file():
+    test_file = test_env.get_test_loc('info/basic.tgz')
+    result_file = test_env.get_temp_file('json')
+    result = run_scan_click(['--info', '--full-root', test_file, result_file])
 
-    result = run_scan_click(['--info', '--full-root', test_dir])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
-    assert fileutils.as_posixpath(test_dir) in result.output
+    result_data = json.loads(open(result_file, 'rb').read())
+    files = result_data['files']
+    # we have a single file
+    assert len(files) == 1
+    scanned_file = files[0]
+    # and we check that the path is the full path without repeating the file name
+    assert fileutils.as_posixpath(test_file) == scanned_file['path']
 
 
 def test_scan_info_license_copyrights():