jpcli 0.1.1__tar.gz → 0.1.3__tar.gz

{jpcli-0.1.1/jpcli.egg-info → jpcli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.1.1
+Version: 0.1.3
 Summary: A library to convert Linux command output to JSON
 Home-page: https://github.com/JaimeAdanCuevas/jpcli
 Author: Jaime Cuevas

{jpcli-0.1.1 → jpcli-0.1.3}/jpcli/main.py

@@ -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-0.1.3/jpcli/parsers/lsmem_parser.py

@@ -0,0 +1,24 @@
+def parse(command_output):
+    lines = command_output.splitlines()
+    data = []
+    headers = []
+
+    # Extract headers from the first line
+    if lines:
+        headers = [header.strip() for header in lines[0].split() if header.strip()]
+        lines = lines[1:]
+
+    for line in lines:
+        if not line.strip():  # Skip empty lines
+            continue
+
+        values = [value.strip() for value in line.split() if value.strip()]
+        if len(values) != len(headers):
+            # For handling lines with different formats (like summary lines)
+            data.append({headers[0]: " ".join(values)})
+        else:
+            entry = {headers[i]: values[i] for i in range(len(headers))}
+            data.append(entry)
+
+    return data
+

{jpcli-0.1.1 → jpcli-0.1.3/jpcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.1.1
+Version: 0.1.3
 Summary: A library to convert Linux command output to JSON
 Home-page: https://github.com/JaimeAdanCuevas/jpcli
 Author: Jaime Cuevas

{jpcli-0.1.1 → jpcli-0.1.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="jpcli",
-    version="0.1.1",
+    version="0.1.3",
     author="Jaime Cuevas",
     author_email="adancuevas@outlook.com",
     description="A library to convert Linux command output to JSON",

jpcli-0.1.1/jpcli/parsers/lsmem_parser.py

@@ -1,11 +0,0 @@
-def parse(command_output):
-    lines = command_output.strip().splitlines()
-    headers = [header.strip() for header in lines[0].split()]
-    data = []
-
-    for line in lines[1:]:
-        values = line.split()
-        entry = {headers[i]: values[i] for i in range(len(values))}
-        data.append(entry)
-
-    return data