json: add support for 'output' argument

Author: Sarcasm

compdb/backend/json.py

@@ -43,7 +43,8 @@ def _dict_to_compile_command(d):
             # PERFORMANCE: I think shlex is inherently slow,
             # something performing better may be necessary
             arguments = shlex.split(d['command'])
-        return CompileCommand(d['directory'], d['file'], arguments)
+        return CompileCommand(d['directory'], d['file'], arguments,
+                              d.get('output'))
 
     @property
     def _data(self):
@@ -75,14 +76,18 @@ def str_to_json(s):
 
 
 def compile_command_to_json(compile_command):
+    output_str = ""
+    if compile_command.output:
+        output_str = ',\n  "output": {}'.format(
+            str_to_json(compile_command.output))
     return r'''{{
   "directory": {},
   "command": {},
-  "file": {}
+  "file": {}{}
 }}'''.format(
         str_to_json(compile_command.directory),
         arguments_to_json(compile_command.arguments),
-        str_to_json(compile_command.file))
+        str_to_json(compile_command.file), output_str)
 
 
 class JSONCompileCommandSerializer(object):

compdb/models.py

@@ -15,24 +15,26 @@ def __init__(self, message, cause=None):
 
 
 class CompileCommand:
-    def __init__(self, directory, file, arguments):
+    def __init__(self, directory, file, arguments, output=None):
         self.directory = directory
         self.file = file
         self.arguments = arguments
+        self.output = output
 
     @property
     def normfile(self):
         return os.path.normpath(os.path.join(self.directory, self.file))
 
     def __repr__(self):
-        return "{{directory: {},\nfile: {},\n arguments: {}}}\n\n".format(
-            self.directory, self.file, pprint.pformat(self.arguments))
+        return "{{directory: {}, file: {}, arguments: {}, output: {}}}".format(
+            repr(self.directory),
+            repr(self.file), pprint.pformat(self.arguments), repr(self.output))
 
     def __str__(self):
         return self.__repr__()
 
     def _as_tuple(self):
-        return (self.directory, self.file, self.arguments)
+        return (self.directory, self.file, self.arguments, self.output)
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):

tests/unit/backend/test_json.py

@@ -31,6 +31,11 @@ def test_get_compile_commands(self):
         self.assertEqual(b_commands[1],
                          CompileCommand("/tmp/", "/tmp/b.cpp",
                                         ["clang", "-DB=2"]))
+        c_commands = list(self.db.get_compile_commands("/tmp/c.cpp"))
+        self.assertEqual(len(c_commands), 1)
+        self.assertEqual(c_commands[0],
+                         CompileCommand("/tmp/", "/tmp/c.cpp",
+                                        ["clang", "-DC=1"], "c.o"))
 
     def test_get_all_files(self):
         files = list(sorted(self.db.get_all_files()))
@@ -41,4 +46,5 @@ def test_get_all_files(self):
                 '/tmp/b.cpp',
                 # note: it's debatable whether duplicates should be present
                 '/tmp/b.cpp',
+                '/tmp/c.cpp',
             ])

tests/unit/backend/test_json_data/compile_commands.json

@@ -13,5 +13,11 @@
     "directory": "/tmp/",
     "arguments": [ "clang", "-DB=2" ],
     "file": "/tmp/b.cpp"
+},
+{
+    "directory": "/tmp/",
+    "arguments": [ "clang", "-DC=1" ],
+    "file": "/tmp/c.cpp",
+    "output": "c.o"
 }
 ]

tests/unit/test_dump.py

@@ -35,6 +35,7 @@
 COMPILE_COMMANDS_TO_JSON_DATA = ([
     CompileCommand("/tmp", "foo.cpp", ["clang++"]),
     CompileCommand("/tmp/bar", "bar.cpp", ["clang++", "-std=c++11"]),
+    CompileCommand("/tmp/foo", "foo.cpp", ["clang++", "-std=c++11"], "foo.o"),
 ], r"""[
 {
   "directory": "/tmp",
@@ -46,6 +47,13 @@
   "directory": "/tmp/bar",
   "command": "clang++ -std=c++11",
   "file": "bar.cpp"
+},
+
+{
+  "directory": "/tmp/foo",
+  "command": "clang++ -std=c++11",
+  "file": "foo.cpp",
+  "output": "foo.o"
 }
 ]
 """)