Refactor to mixin

Author: stsewd

readthedocs/doc_builder/environments.py

@@ -347,10 +347,7 @@ def run_command_class(self, cls, cmd, warn_only=False, **kwargs):
         return build_cmd
 
 
-class LocalEnvironment(BaseEnvironment):
-
-    # TODO: BuildCommand name doesn't make sense here, should be just Command
-    command_class = BuildCommand
+class PostCommandRecordMixin(object):
 
     def post_run_command(self):
         command = self.commands[-1]
@@ -359,6 +356,12 @@ def post_run_command(self):
         if self.record:
             command.save()
 
+
+class LocalEnvironment(BaseEnvironment, PostCommandRecordMixin):
+
+    # TODO: BuildCommand name doesn't make sense here, should be just Command
+    command_class = BuildCommand
+
     def run(self, *cmd, **kwargs):
         self.record = kwargs.pop('record', False)
         self.record_as_success = kwargs.pop('record_as_success', False)
@@ -381,7 +384,7 @@ def run_command_class(self, *cmd, **kwargs):  # noqa
         return super(LocalEnvironment, self).run_command_class(*cmd, **kwargs)
 
 
-class BuildEnvironment(BaseEnvironment):
+class BuildEnvironment(BaseEnvironment, PostCommandRecordMixin):
 
     """
     Base build environment.
@@ -459,13 +462,6 @@ def handle_exception(self, exc_type, exc_value, _):
                 self.failure = exc_value
             return True
 
-    def post_run_command(self):
-        command = self.commands[-1]
-        if self.record_as_success:
-            command.exit_code = 0
-        if self.record:
-            command.save()
-
     def run(self, *cmd, **kwargs):
         kwargs.update({
             'build_env': self,