step8

Author: Nurzhan2023

README.md

@@ -83,3 +83,5 @@ The project uses GitHub Actions for automated testing and linting. You can see s
 [![asciicast](https://asciinema.org/a/Hc7xhdtxCYwpHkDT0RCYTOhJ9.svg)](https://asciinema.org/a/Hc7xhdtxCYwpHkDT0RCYTOhJ9)
 
 [![asciicast](https://asciinema.org/a/W3OLlaIN5eQ1MMhkHUFwjiR6M.svg)](https://asciinema.org/a/W3OLlaIN5eQ1MMhkHUFwjiR6M)
+
+[![asciicast](https://asciinema.org/a/5k2hEC3CIVQ2BDMBAM487ANPy.svg)](https://asciinema.org/a/5k2hEC3CIVQ2BDMBAM487ANPy)

actual_output.txt

@@ -0,0 +1,45 @@
+{
+    common: {
+      + follow: false
+        setting1: Value 1
+      - setting2: 200
+      - setting3: true
+      + setting3: null
+      + setting4: blah blah
+      + setting5: {
+            key5: value5
+        }
+        setting6: {
+            doge: {
+              - wow: 
+              + wow: so much
+            }
+            key: value
+          + ops: vops
+        }
+    }
+    group1: {
+      - baz: bas
+      + baz: bars
+        foo: bar
+      - nest: {
+            key: value
+        }
+      + nest: str
+    }
+  - group2: {
+        abc: 12345
+        deep: {
+            id: 45
+        }
+    }
+  + group3: {
+        deep: {
+            id: {
+                number: 45
+            }
+        }
+        fee: 100500
+    }
+}
+None

build/lib/gendiff/scripts/gendiff.py

@@ -0,0 +1,16 @@
+{"version": 2, "width": 192, "height": 29, "timestamp": 1742453624, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[1.460301, "o", "\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007"]
+[1.460846, "o", "[nurzhan@localhost python-project-50]$ "]
+[7.627898, "o", "gendiff --format plain gendiff/tests/file1.yaml gendiff/tests/file2.yaml"]
+[8.092095, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\bjson gendiff/tests/file2.json"]
+[9.429866, "o", "\r\n"]
+[9.719749, "o", "Property 'common.follow' was added with value: false\r\nProperty 'common.setting2' was removed\r\nProperty 'common.setting3' was updated. From true to null\r\nProperty 'common.setting4' was added with value: 'blah blah'\r\nProperty 'common.setting5' was added with value: [complex value]\r\nProperty 'common.setting6.doge.wow' was updated. From '' to 'so much'\r\nProperty 'common.setting6.ops' was added with value: 'vops'\r\nProperty 'group1.baz' was updated. From 'bas' to 'bars'\r\nProperty 'group1.nest' was updated. From [complex value] to 'str'\r\nProperty 'group2' was removed\r\nProperty 'group3' was added with value: [complex value]\r\nNone\r\n"]
+[9.727114, "o", "\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007"]
+[9.727362, "o", "[nurzhan@localhost python-project-50]$ "]
+[10.327866, "o", "gendiff --format plain gendiff/tests/file1.json gendiff/tests/file2.json"]
+[10.711627, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\byaml gendiff/tests/file2.yaml"]
+[11.409966, "o", "\r\n"]
+[11.564576, "o", "Property 'common.follow' was added with value: false\r\nProperty 'common.setting2' was removed\r\nProperty 'common.setting3' was updated. From true to null\r\nProperty 'common.setting4' was added with value: 'blah blah'\r\nProperty 'common.setting5' was added with value: [complex value]\r\nProperty 'common.setting6.doge.wow' was updated. From '' to 'so much'\r\nProperty 'common.setting6.ops' was added with value: 'vops'\r\nProperty 'group1.baz' was updated. From 'bas' to 'bars'\r\nProperty 'group1.nest' was updated. From [complex value] to 'str'\r\nProperty 'group2' was removed\r\nProperty 'group3' was added with value: [complex value]\r\nNone\r\n"]
+[11.585123, "o", "\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007"]
+[11.585181, "o", "[nurzhan@localhost python-project-50]$ "]
+[15.16202, "o", "exit\r\n"]

demo4.cast

@@ -1,4 +1,8 @@
+# gendiff/diff_generator.py
 from gendiff.read import read_file
+from gendiff.formaters.stylish import format_stylish
+from gendiff.formaters.plain import format_plain
+from gendiff.formaters.json import format_json
 
 
 def build_diff(data1, data2):
@@ -13,16 +17,16 @@ def build_diff(data1, data2):
         elif isinstance(data1[key], dict) and isinstance(data2[key], dict):
             diff[key] = {
                 "status": "nested",
-                "children": build_diff(
-                    data1[key],
-                    data2[key])}
+                "children": build_diff(data1[key], data2[key])
+            }
         elif data1[key] == data2[key]:
             diff[key] = {"status": "unchanged", "value": data1[key]}
         else:
             diff[key] = {
                 "status": "modified",
                 "old_value": data1[key],
-                "new_value": data2[key]}
+                "new_value": data2[key]
+            }
 
     return diff
 
@@ -33,8 +37,12 @@ def generate_diff(file_path1, file_path2, format_name="stylish"):
 
     diff = build_diff(data1, data2)
 
+    # Выбор форматирования
     if format_name == "stylish":
-        from gendiff.formaters.stylish import format_stylish
         return format_stylish(diff)
-
-    raise ValueError(f"Unsupported format: {format_name}")
+    elif format_name == "plain":
+        return format_plain(diff)
+    elif format_name == "json":
+        return format_json(diff)
+    else:
+        raise ValueError(f"Unsupported format: {format_name}")

gendiff/diff_generator.py

@@ -0,0 +1,6 @@
+# gendiff/formaters/json.py
+import json
+
+
+def format_json(diff):
+    return json.dumps(diff, indent=4)

gendiff/formaters/json.py

@@ -0,0 +1,35 @@
+def format_plain(diff, path=""):
+    lines = []
+
+    for key, value in diff.items():
+        property_path = f"{path}.{key}" if path else key
+        status = value["status"]
+
+        if status == "added":
+            formatted_value = format_value(value["value"])
+            lines.append(f"Property '{property_path}'"
+                         f"was added with value: {formatted_value}")
+        elif status == "removed":
+            lines.append(f"Property '{property_path}' was removed")
+        elif status == "modified":
+            old_value = format_value(value["old_value"])
+            new_value = format_value(value["new_value"])
+            lines.append(f"Property '{property_path}'"
+                         f" was updated. From {old_value} to {new_value}")
+        elif status == "nested":
+            lines.append(format_plain(value["children"], property_path))
+
+    return "\n".join(lines)
+
+
+def format_value(value):
+    """Форматирует значение для plain-вывода."""
+    if isinstance(value, dict):
+        return "[complex value]"
+    if isinstance(value, bool):
+        return "true" if value else "false"
+    if value is None:
+        return "null"
+    if isinstance(value, str):
+        return f"'{value}'"
+    return str(value)

gendiff/formaters/plain.py

@@ -1,3 +1,4 @@
+# gendiff/formaters/stylish.py
 def format_value(value, depth):
     indent = " " * (depth * 4)
 

gendiff/formaters/stylish.py

@@ -1,4 +1,3 @@
-# gendiff/parser.py
 import argparse
 from gendiff.diff_generator import generate_diff
 
@@ -15,5 +14,8 @@ def args_parser():
         default="stylish"
     )
     args = parser.parse_args()
-    diff = generate_diff(args.first_file, args.second_file)
+
+
+    diff = generate_diff(args.first_file, args.second_file, 
+                         format_name=args.format)
     print(diff)

gendiff/parser.py

@@ -1,3 +1,4 @@
+# gendiff/read.py
 import json
 import yaml
 import os