Merge pull request #162 from orhtej2/fix_json_output

Fixed json output

Author: alexAubin

.gitignore

@@ -13,3 +13,6 @@ __pycache__/
 .apps/
 .manifest.*
 .tests.*
+
+.venv/
+venv/

lib/lib_package_linter.py

@@ -5,6 +5,8 @@
 import urllib
 import jsonschema
 
+from lib.print import _print
+
 # ############################################################################
 #   Utilities
 # ############################################################################
@@ -50,19 +52,6 @@ class Critical(TestReport):
     style = c.FAIL + " ✘✘✘ %s" + c.END
 
 
-output = "plain"
-
-
-def _print(*args, **kwargs):
-    if output == "plain":
-        print(*args, **kwargs)
-
-
-def set_output_json():
-    global output
-    output = "json"
-
-
 def report_warning_not_reliable(str):
     _print(c.MAYBE_FAIL + "?", str, c.END)
 

lib/print.py

@@ -0,0 +1,16 @@
+output = "plain"
+
+
+def _print(*args, **kwargs):
+    if not is_json_output():
+        print(*args, **kwargs)
+
+
+def set_output_json():
+    global output
+    print("setting")
+    output = "json"
+
+
+def is_json_output() -> bool:
+    return output == "json"

package_linter.py

@@ -4,7 +4,8 @@
 import argparse
 from pathlib import Path
 
-from lib.lib_package_linter import _print, c, set_output_json
+from lib.lib_package_linter import c
+from lib.print import _print, set_output_json
 
 from tests.test_app import App
 

requirements.txt

@@ -0,0 +1,2 @@
+jsonschema
+toml

tests/test_app.py

@@ -7,7 +7,7 @@
 import toml
 
 from lib.lib_package_linter import *
-from lib.lib_package_linter import _print
+from lib.print import _print, is_json_output
 
 from tests.test_manifest import Manifest
 from tests.test_scripts import Script
@@ -263,7 +263,7 @@ def report(self):
         self.run_single_test(App.qualify_for_level_8)
         self.run_single_test(App.qualify_for_level_9)
 
-        if output == "json":
+        if is_json_output():
             print(
                 json.dumps(
                     {

tests/test_catalog.py

@@ -7,7 +7,7 @@
 import subprocess
 
 from lib.lib_package_linter import *
-from lib.lib_package_linter import _print
+from lib.print import _print
 
 ########################################
 #  _____       _        _              #

tests/test_configurations.py

@@ -6,7 +6,7 @@
 import subprocess
 
 from lib.lib_package_linter import *
-from lib.lib_package_linter import _print
+from lib.print import _print
 
 
 class Configurations(TestSuite):

tests/test_manifest.py

@@ -8,7 +8,6 @@
 import re
 
 from lib.lib_package_linter import *
-from lib.lib_package_linter import _print
 
 
 # Only packaging v2 is supported on the linter now ... But someday™ according The Prophecy™, packaging v3 will be a thing

tests/test_scripts.py

@@ -6,7 +6,7 @@
 import statistics
 
 from lib.lib_package_linter import *
-from lib.lib_package_linter import _print
+from lib.print import _print
 
 
 ##################################