jpcli 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

jpcli/main.py

@@ -1,7 +1,7 @@
 
 import argparse
 import subprocess
-from .parsers import lsmem_parser, other_command_parser
+from .parsers import lsmem_parser, free_parser, other_command_parser
 
 def run_command(command):
     result = subprocess.run(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -9,10 +9,10 @@ def run_command(command):
         raise RuntimeError(f"Command '{command}' failed with error: {result.stderr.decode()}")
     return result.stdout.decode()
 
-def parse_command_output(command_output, parser_name=''):
+def parse_command_output(command_output, parser_name):
     parsers = {
-        '': lsmem_parser.parse,
-        'other_command': other_command_parser.parse,
+        'lsmem': lsmem_parser.parse,
+        'free': free_parser.parse,
         # Add other parsers here
     }
     if parser_name in parsers:
@@ -23,12 +23,23 @@ def parse_command_output(command_output, parser_name=''):
 def main():
     parser = argparse.ArgumentParser(description='JP - JSON Parser for Linux commands')
     parser.add_argument('command', type=str, help='The Linux command to run')
-    parser.add_argument('parser_name', type=str, nargs='?', default='', help='The name of the parser to use')
+    parser.add_argument('parser_name', type=str, nargs='?', default=None, help='The name of the parser to use')
 
     args = parser.parse_args()
     result = jpcli(args.command, args.parser_name)
     print(result)
 
-def jpcli(command, parser_name):
-    output = run_command(command)
-    return parse_command_output(output, parser_name)
+def jpcli(command, parser_name=None):
+    result = subprocess.run(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+    if result.returncode != 0:
+        print(f"Error: {result.stderr}", file=sys.stderr)
+        sys.exit(result.returncode)
+
+    command_output = result.stdout
+    if parser_name is None:
+        parser_name = command.split()[0]  # Use the first word of the command as the parser name
+    return parse_command_output(command_output, parser_name)
+
+if __name__ == '__main__':
+    main()
+

jpcli/parsers/free_parser.py

@@ -0,0 +1,22 @@
+import json
+
+def parse(command_output):
+    lines = command_output.strip().split('\n')
+    headers = lines[0].split()
+    memory_data = []
+
+    for line in lines[1:]:
+        values = line.split()
+        # Ensure that the length of headers and values are the same
+        if len(values) == len(headers):
+            entry = {headers[i]: values[i] for i in range(len(headers))}
+        else:
+            # Handle cases where the line might not match header length
+            entry = {}
+            for i in range(len(values)):
+                key = headers[i] if i < len(headers) else f'unknown_{i}'
+                entry[key] = values[i]
+        memory_data.append(entry)
+
+    return json.dumps(memory_data, indent=2)
+

{jpcli-0.1.0.dist-info → jpcli-0.1.2.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.1.0
+Version: 0.1.2
 Summary: A library to convert Linux command output to JSON
-Home-page: https://github.com/JaimeAdanCuevas/jp
+Home-page: https://github.com/JaimeAdanCuevas/jpcli
 Author: Jaime Cuevas
 Author-email: adancuevas@outlook.com
 License: UNKNOWN
@@ -14,9 +14,9 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENCE
 
-# JP
+# jpcli
 
-JP is a library that converts the output of various Linux commands to JSON format.
+jpcli is a library that converts the output of various Linux commands to JSON format.
 
 ## Installation
 

{jpcli-0.1.0.dist-info → jpcli-0.1.2.dist-info}/RECORD

@@ -1,14 +1,15 @@
 jpcli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli/main.py,sha256=nxYET5ctdYLVxjyVzckMwU2g7te8U12m43kLUlkaDfA,1241
+jpcli/main.py,sha256=yqnw53CJ6cBFtV6X1ujy3sfKGu9I3Tp9Rrrm1gcOauU,1653
 jpcli/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jpcli/parsers/free_parser.py,sha256=XymIi1eafmIElMMVxS3DmlZ-oC4dcYvKmNWDm5tCEEs,721
 jpcli/parsers/lsmem_parser.py,sha256=wlOInwE_gkrarxvRp-4_tk1zCbb3RDGHyLME56AR7Go,321
 jpcli/parsers/other_command_parser.py,sha256=G2so9nFluHiyuyEDJouxuN4FHkNheyIY_laDFXxE6xM,134
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_lsmem_parser.py,sha256=maT0mCSFyAHCMdRMl0NEa-FUE_2-MMDoYZS5W67PYZU,791
 tests/test_other_command_parser.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli-0.1.0.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
-jpcli-0.1.0.dist-info/METADATA,sha256=HRs4zmnRiLinqrU9BgGtqjFfLMXVm1NVl_v-QDWsDls,616
-jpcli-0.1.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-jpcli-0.1.0.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
-jpcli-0.1.0.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
-jpcli-0.1.0.dist-info/RECORD,,
+jpcli-0.1.2.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
+jpcli-0.1.2.dist-info/METADATA,sha256=8R1KypivbdKAqhfw5YPFWwu5jEEMrn0tX3qYwurHUrM,625
+jpcli-0.1.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+jpcli-0.1.2.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
+jpcli-0.1.2.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
+jpcli-0.1.2.dist-info/RECORD,,