Merge pull request #540 from davidt/compiler-paths

Allow compilers to override output_path.
jazzband · Feb 22, 2016 · 7198db4 · 7198db4
2 parents 76da062 + 2899300
commit 7198db4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/pipeline/compilers/__init__.py b/pipeline/compilers/__init__.py
@@ -31,12 +31,12 @@ def _compile(input_path):
             for compiler in self.compilers:
                 compiler = compiler(verbose=self.verbose, storage=self.storage)
                 if compiler.match_file(input_path):
-                    output_path = self.output_path(input_path, compiler.output_extension)
+                    output_path = compiler.output_path(input_path, compiler.output_extension)
                     try:
                         infile = self.storage.path(input_path)
                     except NotImplementedError:
                         infile = finders.find(input_path)
-                    outfile = self.output_path(infile, compiler.output_extension)
+                    outfile = compiler.output_path(infile, compiler.output_extension)
                     outdated = compiler.is_outdated(input_path, output_path)
                     compiler.compile_file(infile, outfile,
                                           outdated=outdated, force=force)
@@ -53,10 +53,6 @@ def _compile(input_path):
             with futures.ThreadPoolExecutor(max_workers=multiprocessing.cpu_count()) as executor:
                 return list(executor.map(_compile, paths))
 
-    def output_path(self, path, extension):
-        path = os.path.splitext(path)
-        return '.'.join((path[0], extension))
-
 
 class CompilerBase(object):
     def __init__(self, verbose, storage):
@@ -78,6 +74,10 @@ def read_file(self, path):
         file.close()
         return content
 
+    def output_path(self, path, extension):
+        path = os.path.splitext(path)
+        return '.'.join((path[0], extension))
+
     def is_outdated(self, infile, outfile):
         if not self.storage.exists(outfile):
             return True

diff --git a/tests/tests/test_compiler.py b/tests/tests/test_compiler.py
@@ -81,7 +81,9 @@ def setUp(self):
         self.compiler = Compiler()
 
     def test_output_path(self):
-        output_path = self.compiler.output_path("js/helpers.coffee", "js")
+        compiler_class = self.compiler.compilers[0]
+        compiler = compiler_class(verbose=self.compiler.verbose, storage=self.compiler.storage)
+        output_path = compiler.output_path("js/helpers.coffee", "js")
         self.assertEqual(output_path, "js/helpers.js")
 
     def test_compilers_class(self):
@@ -107,7 +109,9 @@ def setUp(self):
         self.compiler = Compiler()
 
     def test_output_path(self):
-        output_path = self.compiler.output_path("js/helpers.coffee", "js")
+        compiler_class = self.compiler.compilers[0]
+        compiler = compiler_class(verbose=self.compiler.verbose, storage=self.compiler.storage)
+        output_path = compiler.output_path("js/helpers.coffee", "js")
         self.assertEqual(output_path, "js/helpers.js")
 
     def test_compile(self):
@@ -126,7 +130,9 @@ def setUp(self):
         self.compiler = Compiler()
 
     def test_output_path(self):
-        output_path = self.compiler.output_path("js/helpers.coffee", "js")
+        compiler_class = self.compiler.compilers[0]
+        compiler = compiler_class(verbose=self.compiler.verbose, storage=self.compiler.storage)
+        output_path = compiler.output_path("js/helpers.coffee", "js")
         self.assertEqual(output_path, "js/helpers.js")
 
     def test_compile(self):