jpcli 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

jpcli/parsers/cmdline_parser.py

@@ -1,12 +1,19 @@
-def parse(cmdline_output):
-    """
-    Parse the contents of /proc/cmdline.
-    """
+import json
+
+
+def parse(command_output):
+    # Split the command line output into individual parameters
+    params = command_output.strip().split()
+
+    # Create a dictionary to hold the parsed key-value pairs
     cmdline_dict = {}
-    for item in cmdline_output.strip().split():
-        if '=' in item:
-            key, value = item.split('=', 1)
-            cmdline_dict[key] = value
+
+    for param in params:
+        if '=' in param:
+            key, value = param.split('=', 1)
         else:
-            cmdline_dict[item] = None
-    return cmdline_dict
+            key, value = param, None  # Handle flags with no value (e.g., "quiet")
+        cmdline_dict[key] = value
+
+    # Convert the dictionary to a JSON-formatted string
+    return json.dumps(cmdline_dict, indent=2)

jpcli/parsers/cpuinfo_parser.py

@@ -1,33 +1,29 @@
-# cpuinfo_parser.py
+import json
 
-def parse(command_output):
-    """
-    Parses the output of the 'cat /proc/cpuinfo' command into a list of dictionaries,
-    where each dictionary contains information about one processor core.
-
-    Args:
-    command_output (str): The string output from the 'cat /proc/cpuinfo' command.
 
-    Returns:
-    list: A list of dictionaries, each representing a CPU core's information.
-    """
+def parse(command_output):
     processors = []
     current_processor = {}
+
     lines = command_output.splitlines()
     for line in lines:
-        line = line.strip()  # Remove leading and trailing whitespace
-        if line:
-            key_value_pair = line.split(':', 1)  # Split only on the first colon
-            if len(key_value_pair) == 2:
-                key, value = key_value_pair
-                key = key.strip()
-                value = value.strip()
-                current_processor[key] = value
+        if line.strip():  # Check if line is not empty
+            key, value = line.split(':')
+            key = key.strip().replace(' ', '_').lower()
+            value = value.strip()
+            if key == 'processor' and current_processor:
+                # When a new processor block starts, append the previous one
+                processors.append(current_processor)
+                current_processor = {}
+            current_processor[key] = value
         else:
-            # Handle new processor block (empty line)
+            # Empty line indicates the end of one processor's info
             if current_processor:
                 processors.append(current_processor)
                 current_processor = {}
+
+    # Append the last processor if exists
     if current_processor:
         processors.append(current_processor)
-    return processors
+
+    return json.dumps(processors, indent=2)

jpcli/parsers/df_parser.py

@@ -1,3 +1,6 @@
+import json
+
+
 def parse(command_output):
     lines = command_output.splitlines()
     data = []
@@ -13,4 +16,4 @@ def parse(command_output):
         entry = {headers[i]: values[i] for i in range(len(headers))}
         data.append(entry)
 
-    return data
+    return json.dumps(data, indent=2)

jpcli/parsers/dmesg_parser.py

@@ -1,12 +1,13 @@
+import json
+
+
 def parse(dmesg_output):
     """
     Parse the contents of dmesg output.
     """
     try:
         dmesg_lines = dmesg_output.strip().split('\n')
-        dmesg_list = []
-        for line in dmesg_lines:
-            dmesg_list.append(line)
-        return dmesg_list
+        dmesg_list = [{"message": line} for line in dmesg_lines]
+        return json.dumps(dmesg_list, indent=2)
     except Exception as e:
-        return {"error": str(e), "message": "Failed to parse dmesg output"}
+        return json.dumps({"error": str(e), "message": "Failed to parse dmesg output"}, indent=2)

jpcli/parsers/ifconfig_parser.py

@@ -1,4 +1,5 @@
 import re
+import json
 
 
 def parse(ifconfig_output):
@@ -37,4 +38,4 @@ def parse(ifconfig_output):
     if current_interface:
         interfaces[current_interface['name']] = current_interface
 
-    return interfaces
+    return json.dumps(interfaces, indent=2)

jpcli/parsers/journalctl_parser.py

@@ -1,12 +1,27 @@
+import json
+
+
 def parse(journalctl_output):
     """
     Parse the contents of journalctl output.
     """
     try:
+        # Split the output into individual lines
         journalctl_lines = journalctl_output.strip().split('\n')
+
+        # Initialize a list to store JSON objects
         journalctl_list = []
+
+        # Process each line
         for line in journalctl_lines:
-            journalctl_list.append(line)
-        return journalctl_list
+            if line:  # Skip empty lines
+                # Parse each line as JSON and append to the list
+                journalctl_list.append(json.loads(line))
+
+        # Convert the list of JSON objects to a pretty-printed JSON string
+        return json.dumps(journalctl_list, indent=2)
+
+    except json.JSONDecodeError as e:
+        return json.dumps({"error": str(e), "message": "Failed to parse JSON from journalctl output"}, indent=2)
     except Exception as e:
-        return {"error": str(e), "message": "Failed to parse journalctl output"}
+        return json.dumps({"error": str(e), "message": "Failed to parse journalctl output"}, indent=2)

jpcli/parsers/lscpu_parser.py

@@ -1,3 +1,6 @@
+import json
+
+
 def parse(command_output):
     """
     Parses the output of the lscpu command into a dictionary.
@@ -17,17 +20,4 @@ def parse(command_output):
                 key = parts[0].strip()
                 value = parts[1].strip()
                 cpu_info[key] = value
-    return cpu_info
-
-
-def lscpu_parser(command_output):
-    """
-    Wrapper function to parse lscpu output.
-
-    Args:
-    command_output (str): The string output from the lscpu command.
-
-    Returns:
-    dict: Parsed CPU information.
-    """
-    return parse(command_output)
+    return json.dumps(cpu_info, indent=2)

jpcli/parsers/lshw_parser.py

@@ -1,4 +1,10 @@
-def parse(command_output):
+import json
+
+
+def parse(command_output, indent_level=0):
+    """
+    Recursively parse sections of command output based on indentation level.
+    """
     def parse_section(lines, indent_level):
         data = {}
         current_section = {}  # Initialize as empty dictionary
@@ -6,14 +12,16 @@ def parse(command_output):
             line = lines.pop(0)
             if line.strip() == "":
                 continue  # Ignore empty lines
+
             indent = len(line) - len(line.lstrip())
+
             if indent < indent_level:
                 lines.insert(0, line)
                 break
             elif line.startswith('  *-'):
                 if current_section:
                     yield current_section
-                current_section = {'description': line.split('-')[-1].strip()}  # Initialize here
+                current_section = {'description': line.split('-')[-1].strip()}  # Initialize with description
             elif indent == indent_level and line.startswith('       '):
                 parts = line.strip().split(': ', 1)
                 if len(parts) == 2:
@@ -25,14 +33,10 @@ def parse(command_output):
                     if 'subsections' not in current_section:
                         current_section['subsections'] = []
                     current_section['subsections'].extend(parse_section([line] + lines, indent))
+
         if current_section:
             yield current_section
 
     lines = command_output.splitlines()
-    result = list(parse_section(lines, 0))
-    return result
-
-
-def lshw_parser(command_output):
-    lines = command_output.splitlines()
-    return list(parse_section(lines, 0))
+    parsed_data = list(parse_section(lines, indent_level))
+    return json.dumps(parsed_data, indent=2)

jpcli/parsers/lsmem_parser.py

@@ -1,7 +1,11 @@
+import json
+
+
 def parse(command_output):
     lines = command_output.splitlines()
-    data = []
+    memory_blocks = []
     headers = []
+    summary = {}
 
     # Extract headers from the first line
     if lines:
@@ -12,12 +16,19 @@ def parse(command_output):
         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)})
+        # Check if the line contains summary information
+        if ':' in line:
+            key, value = line.split(':')
+            summary[key.strip().lower().replace(' ', '_')] = value.strip()
         else:
-            entry = {headers[i]: values[i] for i in range(len(headers))}
-            data.append(entry)
+            values = [value.strip() for value in line.split() if value.strip()]
+            if len(values) == len(headers):
+                entry = {headers[i].lower(): values[i] for i in range(len(headers))}
+                memory_blocks.append(entry)
+
+    result = {
+        "memory_blocks": memory_blocks,
+        **summary
+    }
 
-    return data
+    return json.dumps(result, indent=2)

jpcli/parsers/mcelog_parser.py

@@ -1,3 +1,6 @@
+import json
+
+
 def parse(mcelog_output):
     """
     Parse the contents of mcelog output.
@@ -7,6 +10,6 @@ def parse(mcelog_output):
         mcelog_list = []
         for line in mcelog_lines:
             mcelog_list.append(line)
-        return mcelog_list
+        return json.dumps(mcelog_list, indent=2)
     except Exception as e:
         return {"error": str(e), "message": "Failed to parse mcelog output"}

jpcli/parsers/os_release_parser.py

@@ -1,4 +1,6 @@
-# jpcli/parsers/os_release_parser.py
+import json
+
+
 def parse(os_release_output):
     """
     Parse the contents of /etc/os-release.
@@ -8,4 +10,4 @@ def parse(os_release_output):
         if '=' in line:
             key, value = line.split('=', 1)
             os_release_dict[key] = value.strip('"')
-    return os_release_dict
+    return json.dumps(os_release_dict, indent=2)

jpcli/parsers/uname_parser.py

@@ -1,8 +1,31 @@
-# jpcli/parsers/uname_parser.py
-def parse(uname_output):
+import json
+
+
+def parse(command_output):
     """
-    Parse the output of the `uname` command.
+    Parses the output of the uname -a command into a dictionary.
+
+    Args:
+    command_output (str): The string output from the uname -a command.
+
+    Returns:
+    str: A JSON-formatted string with system information.
     """
-    uname_info = uname_output.strip().split()
-    keys = ['sysname', 'nodename', 'release', 'version', 'machine', 'processor', 'hardware_platform', 'os']
-    return dict(zip(keys, uname_info))
+    uname_info = {}
+    parts = command_output.split()
+
+    if len(parts) >= 6:
+        uname_info['system'] = parts[0]  # Kernel name
+        uname_info['node'] = parts[1]    # Network node hostname
+        uname_info['kernel'] = parts[2]  # Kernel release
+        uname_info['kernel_version'] = parts[3]  # Kernel version
+        uname_info['architecture'] = parts[4]  # Machine hardware name
+        uname_info['processor'] = parts[5]  # Processor type
+
+        # Additional fields if available
+        if len(parts) > 6:
+            uname_info['platform'] = parts[6]  # Platform type (e.g., GNU/Linux)
+        if len(parts) > 7:
+            uname_info['additional_info'] = ' '.join(parts[7:])  # Any remaining info
+
+    return json.dumps(uname_info, indent=2)

{jpcli-0.3.0.dist-info → jpcli-0.4.0.dist-info}/METADATA

@@ -1,16 +1,17 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.3.0
+Version: 0.4.0
 Summary: A library to convert Linux command output to JSON
 Home-page: https://github.com/JaimeAdanCuevas/jpcli
 Author: Jaime Cuevas
 Author-email: adancuevas@outlook.com
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-License-File: LICENCE
 
 # jpcli
 
@@ -21,3 +22,5 @@ jpcli is a library that converts the output of various Linux commands to JSON fo
 ```sh
 pip install jpcli
 
+
+

jpcli-0.4.0.dist-info/RECORD

@@ -0,0 +1,25 @@
+jpcli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jpcli/main.py,sha256=yBIyZLm16x3sEI3iBw3uUHjFnJLzUd7evS1qN85M1HU,2610
+jpcli/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jpcli/parsers/cmdline_parser.py,sha256=S8PZjDTkxyz2IAY3hBvHDekWRGCkj9MHiLi2haupUZM,562
+jpcli/parsers/cpuinfo_parser.py,sha256=aL6NZ-_O_wmGRdZSzm7SttCngWoW7eqWckubxPWFpJk,973
+jpcli/parsers/df_parser.py,sha256=E2s8c6i60iKrS4IcCv_L_Fu5vDE_xnOTklAk_PFM5T4,549
+jpcli/parsers/dmesg_parser.py,sha256=v4i7inWGRKycyDIvjTyGaSBIYQZf7tNTJ4lxKKvKSN4,397
+jpcli/parsers/free_parser.py,sha256=GJuJKCT4cIN4O5D-rHjalx-6FzDT6-lpUurmh9PnUKE,721
+jpcli/parsers/ifconfig_parser.py,sha256=zEfTi8zdYnpQ4QNgZh1I31Z-mY9F1uAXGV9f6knJeJ0,1353
+jpcli/parsers/journalctl_parser.py,sha256=z9_6_8Gu798pQekosMCfoieCDGxbNcxOGcbteg4fzQk,949
+jpcli/parsers/lscpu_parser.py,sha256=b_OzMysCshP2lXY2Vmc-MJlxlYXocNTOvr7DHUeWkvQ,661
+jpcli/parsers/lshw_parser.py,sha256=0zoSIvYax2Ut_cNxQ8krPMPmiUyaV9n4sOIkXjtMrCA,1623
+jpcli/parsers/lsmem_parser.py,sha256=czWYUx6gwy2Z0nrLM5rJxBDz2HFQC9HSew2cenC-1vA,985
+jpcli/parsers/mcelog_parser.py,sha256=GLZlj_Yl1KAzuTFotosudWPBAi_VhkBGdeKUbjNFhuk,412
+jpcli/parsers/os_release_parser.py,sha256=XQetNqNxmjMMdQPgqKS9XLQIoa5T7DMAcOTJJ0gmhCo,352
+jpcli/parsers/uname_parser.py,sha256=Yx59k9JzzfNgKZ9pt3hhfSwk0o9Ow1kqQdQNWUF6asc,1040
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/test_lsmem_parser.py,sha256=mRlHTmU2ZmcxPGgcqAv_LNGs56yrwDBiw2-aHKrpuEo,793
+tests/test_other_command_parser.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jpcli-0.4.0.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
+jpcli-0.4.0.dist-info/METADATA,sha256=3KfCVsK1e1wxOccgV0JAOhSVhXQqIL2CirEhh5JyIB0,603
+jpcli-0.4.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+jpcli-0.4.0.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
+jpcli-0.4.0.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
+jpcli-0.4.0.dist-info/RECORD,,

{jpcli-0.3.0.dist-info → jpcli-0.4.0.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 jpcli = jpcli.main:main
+

jpcli-0.3.0.dist-info/RECORD

@@ -1,25 +0,0 @@
-jpcli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli/main.py,sha256=yBIyZLm16x3sEI3iBw3uUHjFnJLzUd7evS1qN85M1HU,2610
-jpcli/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli/parsers/cmdline_parser.py,sha256=HKiI_iGS1Iy6JKJFLUFPsfxyqYo57rPonKfvFfmQTqg,336
-jpcli/parsers/cpuinfo_parser.py,sha256=weYBoGBL8e82kkRAtAJvmWOMx-R3L72gRNKmgAg3DWQ,1177
-jpcli/parsers/df_parser.py,sha256=NC377ld_uUo9MxkGrxYjCAyFq2BdAQL4pgJtz4u3kL8,513
-jpcli/parsers/dmesg_parser.py,sha256=76AkYlcVvo3_5qzuPreTQaelPsExaEct1NDfniiySM0,367
-jpcli/parsers/free_parser.py,sha256=GJuJKCT4cIN4O5D-rHjalx-6FzDT6-lpUurmh9PnUKE,721
-jpcli/parsers/ifconfig_parser.py,sha256=KgtXPGG6QKKFID4YjHwJbL-jbTVoFB8SBjIyop2ICL4,1319
-jpcli/parsers/journalctl_parser.py,sha256=1pGAlrM7oe2vOCnspjdHk_RqDUDxlL2sBpfJJXlWxDU,412
-jpcli/parsers/lscpu_parser.py,sha256=8kAqrFLyVR-vEW6ODlx1fwF1HRNeCTt2CHQ2ZI1bQWg,881
-jpcli/parsers/lshw_parser.py,sha256=QUHE3ya64aaH9Md0VqMK-YQo457W8V8RgClxS41zRx8,1558
-jpcli/parsers/lsmem_parser.py,sha256=vdIyK0xsbrfkqxWOx6jLz-2gsrH5Ii-8mwx-PkL_fXI,744
-jpcli/parsers/mcelog_parser.py,sha256=z62xUwSy_DU-KlPh6d-Xmrz2qMQYVG8JDs7aZE7i7Gk,376
-jpcli/parsers/os_release_parser.py,sha256=5x_tjsG2Jvw1Lx-hVHHbuAMc3d8POPXDQ7Kt9Ux6GG4,353
-jpcli/parsers/uname_parser.py,sha256=dSPRtiSVxeBt7fdQCjU_zVvf63eU-lwxoOPMlahWkfQ,311
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_lsmem_parser.py,sha256=mRlHTmU2ZmcxPGgcqAv_LNGs56yrwDBiw2-aHKrpuEo,793
-tests/test_other_command_parser.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli-0.3.0.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
-jpcli-0.3.0.dist-info/METADATA,sha256=1n8NhyvwN28olreU2U7kSTdN0CEaQdmJsRxOktO1m_Y,588
-jpcli-0.3.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-jpcli-0.3.0.dist-info/entry_points.txt,sha256=HhCHDzZ91U7qT2KJDi76ewNFC1rehEQyD1sP0nIvDw0,42
-jpcli-0.3.0.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
-jpcli-0.3.0.dist-info/RECORD,,