Refactor to simplify code.

Author: domdfcoding

flake8_github_action/__init__.py

@@ -26,13 +26,11 @@
 #  OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-# stdlib
-import json
-from typing import List
+# 3rd party
+from typing_extensions import NoReturn
 
 # this package
 from flake8_github_action.annotation import Annotation
-from flake8_github_action.checks import Checks
 from flake8_github_action.flake8_app import Application
 
 __author__: str = "Dominic Davis-Foster"
@@ -44,9 +42,7 @@
 __all__ = ["action"]
 
 
-def action(
-		*args,
-		) -> int:
+def action(*args, ) -> NoReturn:
 	r"""
 	Action!
 
@@ -56,23 +52,3 @@ def action(
 	flake8_app = Application()
 	flake8_app.run(args)
 	flake8_app.exit()
-
-	annotations: List[Annotation] = []
-
-	json_annotations = json.loads(flake8_app.formatter.output_fd.getvalue()).items()
-	for filename, raw_annotations in json_annotations:
-		annotations.extend(Annotation.from_flake8json(filename, ann) for ann in raw_annotations)
-
-	if flake8_app.result_count:
-		ret = 1
-	else:
-		ret = 0
-
-	if annotations:
-		for annotation in annotations:
-			print(annotation.to_str())
-
-	return ret
-
-
-

flake8_github_action/__main__.py

@@ -28,45 +28,27 @@
 
 # stdlib
 import sys
-from typing import Union
 
 # 3rd party
 import click
-from apeye import URL
-
-__all__ = ["main"]
-
-# 3rd party
 from consolekit import CONTEXT_SETTINGS
 
-token_var = "GITHUB_TOKEN"
+__all__ = ["main"]
 
 
-@click.option(
-		"--annotate-only",
-		is_flag=True,
-		default=False,
-		help="Only add the annotations (exit 0 regardless of flake8 output).",
-		)
 @click.command(context_settings={"ignore_unknown_options": True, "allow_extra_args": True, **CONTEXT_SETTINGS})
 @click.pass_context
-def main(ctx: click.Context, annotate_only: bool = False,):
+def main(ctx: click.Context):
 	"""
 	Run flake8 and add the errors as annotations on GitHub.
+
+	All options and arguments are passed through to flake8.
 	"""
 
 	# this package
 	from flake8_github_action import action
 
-	response, ret = action(*ctx.args)
-
-	# if response.status_code == 200:
-	# 	sys.exit(0)
-
-	if annotate_only:
-		sys.exit(0)
-	else:
-		sys.exit(ret)
+	action(*ctx.args)
 
 
 if __name__ == "__main__":

flake8_github_action/checks.py

@@ -32,16 +32,21 @@
 #
 
 # stdlib
+import json
 from functools import partial
 from gettext import ngettext
 from io import StringIO
-from typing import Optional, Tuple, Type
+from typing import List, Optional, Tuple, Type
 
 # 3rd party
 import click
 import flake8.main.application  # type: ignore
 from flake8.formatting.base import BaseFormatter  # type: ignore
 from flake8_json_reporter.reporters import DefaultJSON  # type: ignore
+from typing_extensions import NoReturn
+
+# this package
+from flake8_github_action.annotation import Annotation
 
 __all__ = ["Application", "JsonFormatter"]
 
@@ -54,31 +59,31 @@ class Application(flake8.main.application.Application):
 	Subclass of Flake8's ``Application``.
 	"""
 
-	def exit(self) -> None:
+	def exit(self) -> NoReturn:
 		"""
 		Handle finalization and exiting the program.
 
 		This should be the last thing called on the application instance.
 		It will check certain options and exit appropriately.
 		"""
 
-		# if self.options.count:
-		if True:
-			files_checked = self.file_checker_manager.statistics["files"]
-			files_with_errors = self.file_checker_manager.statistics["files_with_errors"]
-			if self.result_count:
-				click.echo(
-						f"Found {self.result_count} {_error(self.result_count)} "
-						f"in {files_with_errors} {_file(files_with_errors)} "
-						f"(checked {files_checked} source {_file(files_checked)})"
-						)
-			else:
-				click.echo(f"Success: no issues found in {files_checked} source {_file(files_checked)}")
-
-		# if self.options.exit_zero:
-		# 	raise SystemExit(self.catastrophic_failure)
-		# else:
-		# 	raise SystemExit((self.result_count > 0) or self.catastrophic_failure)
+		if self.options.count:
+			if True:
+				files_checked = self.file_checker_manager.statistics["files"]
+				files_with_errors = self.file_checker_manager.statistics["files_with_errors"]
+				if self.result_count:
+					click.echo(
+							f"Found {self.result_count} {_error(self.result_count)} "
+							f"in {files_with_errors} {_file(files_with_errors)} "
+							f"(checked {files_checked} source {_file(files_checked)})"
+							)
+				else:
+					click.echo(f"Success: no issues found in {files_checked} source {_file(files_checked)}")
+
+		if self.options.exit_zero:
+			raise SystemExit(self.catastrophic_failure)
+		else:
+			raise SystemExit((self.result_count > 0) or self.catastrophic_failure)
 
 	def report_errors(self) -> None:
 		"""
@@ -122,10 +127,29 @@ def make_formatter(self, formatter_class: Optional[Type[BaseFormatter]] = None)
 
 		self.formatter = JsonFormatter(self.options)
 
+	def report(self):
+		"""
+		Report errors, statistics, and benchmarks.
+		"""
+
+		super().report()
+
+		annotations: List[Annotation] = []
+
+		json_annotations = json.loads(self.formatter.output_fd.getvalue()).items()
+		for filename, raw_annotations in json_annotations:
+			annotations.extend(Annotation.from_flake8json(filename, ann) for ann in raw_annotations)
+
+		for annotation in annotations:
+			print(annotation.to_str())
+
 
 class JsonFormatter(DefaultJSON):
 
 	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)
 
 		self.output_fd = StringIO()
+
+
+

flake8_github_action/flake8_app.py

@@ -1,10 +1,6 @@
-apeye>=0.4.0
 attrs>=20.3.0
 click>=7.1.2
 consolekit>=0.6.0
-domdf-python-tools>=1.7.0
-dulwich>=0.20.13
 flake8>=3.8.4
 flake8-json>=19.8.0
-requests>=2.25.0
 typing-extensions>=3.7.4.3