Merge branch 'master' into compiler-is_outdated

Author: davidt

pipeline/compilers/__init__.py

@@ -35,12 +35,12 @@ def _compile(input_path):
                         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(infile, outfile)
                     compiler.compile_file(infile, outfile,
                                           outdated=outdated, force=force)
 
-                    return self.output_path(input_path, compiler.output_extension)
+                    return compiler.output_path(input_path, compiler.output_extension)
             else:
                 return input_path
 
@@ -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
@@ -111,6 +111,7 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
             else:
                 argument_list.extend(flattening_arg)
 
+        stdout = None
         try:
             # We always catch stdout in a file, but we may not have a use for it.
             temp_file_container = cwd or os.path.dirname(stdout_captured or "") or os.getcwd()
@@ -135,7 +136,8 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
             raise CompilerError(e)
         finally:
             # Decide what to do with captured stdout.
-            if stdout_captured:
-                os.rename(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
-            else:
-                os.remove(stdout.name)
+            if stdout:
+                if stdout_captured:
+                    os.rename(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
+                else:
+                    os.remove(stdout.name)

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):