refactor cli tools entry points

Author: mr-mixas

nested_diff/cli.py

@@ -54,6 +54,11 @@ def _decode_fmt_opts(opts):
         import json
         return json.loads(opts)
 
+    @classmethod
+    def cli(cls):
+        """Cli tool entry point."""
+        return cls().run()
+
     @property
     def dumper(self):  # noqa D102
         try:

nested_diff/diff_tool.py

@@ -332,8 +332,3 @@ def get_opts(opts):
         """
         opts.setdefault('sort_keys', True)
         return opts
-
-
-def cli():
-    """Cli tool entry point."""
-    return App().run()

nested_diff/patch_tool.py

@@ -86,8 +86,3 @@ def run(self):
         self.args.target_file.truncate()
 
         return 0
-
-
-def cli():
-    """Cli tool entry point."""
-    return App().run()

setup.py

@@ -42,8 +42,8 @@
     packages=['nested_diff'],
     entry_points={
         'console_scripts': [
-            'nested_diff=nested_diff.diff_tool:cli',
-            'nested_patch=nested_diff.patch_tool:cli',
+            'nested_diff=nested_diff.diff_tool:App.cli',
+            'nested_patch=nested_diff.patch_tool:App.cli',
         ],
     },
     extras_require={

tests/cli/test_diff_tool.py

@@ -398,7 +398,7 @@ def test_exit_code_diff_absent_U_opt_enabled(rpath):  # noqa N802
 def test_entry_point(capsys):
     with mock.patch('sys.argv', ['nested_diff', '-h']):
         with pytest.raises(SystemExit) as e:
-            nested_diff.diff_tool.cli()
+            nested_diff.diff_tool.App.cli()
 
         assert e.value.code == 0
 

tests/cli/test_patch_tool.py

@@ -155,7 +155,7 @@ def test_toml_fmt(capsys, content, rpath, tmp_path):
 def test_entry_point(capsys):
     with mock.patch('sys.argv', ['nested_patch', '-h']):
         with pytest.raises(SystemExit) as e:
-            nested_diff.patch_tool.cli()
+            nested_diff.patch_tool.App.cli()
 
         assert e.value.code == 0