step6

Author: Nurzhan2023

.gitignore

@@ -8,3 +8,4 @@ coverage.xml
 hello.py
 demo.cast
 .python-version
+

README.md

@@ -78,4 +78,6 @@ make lint
 
 The project uses GitHub Actions for automated testing and linting. You can see status of the last commit at the top of this README
 
-[![asciicast](https://asciinema.org/a/Pe196IZV1YWZEZojjxIbKHeU8.svg)](https://asciinema.org/a/Pe196IZV1YWZEZojjxIbKHeU8)
+[![asciicast](https://asciinema.org/a/Pe196IZV1YWZEZojjxIbKHeU8.svg)](https://asciinema.org/a/Pe196IZV1YWZEZojjxIbKHeU8)
+
+[![asciicast](https://asciinema.org/a/Hc7xhdtxCYwpHkDT0RCYTOhJ9.svg)](https://asciinema.org/a/Hc7xhdtxCYwpHkDT0RCYTOhJ9)

demo1.cast

@@ -0,0 +1,82 @@
+{"version": 2, "width": 192, "height": 25, "timestamp": 1741772235, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[5.154937, "o", "\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007"]
+[5.253998, "o", "[nurzhan@localhost python-project-50]$ "]
+[6.974335, "o", "exit"]
+[7.351945, "o", "\b\b\b\bgendiff file1.yaml file2.yaml"]
+[7.734498, "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\b\u001b[17Pmake install"]
+[8.152504, "o", "\b\b\b\b\b\b\b\b\b\b\b\bgendiff file1.yaml file2.yaml"]
+[10.968943, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\bjson file2.json"]
+[12.569944, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\byaml file2.yaml"]
+[13.128872, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\bjson file2.json"]
+[13.561457, "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\b\u001b[12Pcd gendiff/tests/"]
+[14.201499, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\u001b[5Pmake install"]
+[14.58986, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\u001b[7Pcd .."]
+[15.048388, "o", "\b\b\b\b\bmake install"]
+[15.274075, "o", "\b\b\b\b\b\b\b\b\b\b\b\bcd gendiff/tests/"]
+[15.440589, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\bgendiff file1.json file2.json"]
+[15.607306, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\byaml file2.yaml"]
+[15.791387, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\bjson file2.json"]
+[15.941811, "o", "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\byaml file2.yaml"]
+[16.107662, "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\b\u001b[17Pmake install"]
+[16.651472, "o", "\b\b\b\b\b\b\b\b\b\b\b\bgendiff file1.yaml file2.yaml"]
+[17.334376, "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\bexit\u001b[K"]
+[18.765604, "o", "\b\b\b\b\u001b[K"]
+[19.218266, "o", "\u0007"]
+[21.188901, "o", "g"]
+[21.325231, "o", "e"]
+[21.665806, "o", "n"]
+[22.259676, "o", "d"]
+[22.460159, "o", "i"]
+[23.605346, "o", "f"]
+[23.776764, "o", "f"]
+[24.526324, "o", " "]
+[27.125751, "o", "g"]
+[27.244438, "o", "e"]
+[27.69534, "o", "n"]
+[28.938199, "o", "d"]
+[29.215914, "o", "i"]
+[29.636739, "o", "ff/"]
+[31.220963, "o", "t"]
+[31.47333, "o", "ests/"]
+[33.159301, "o", "f"]
+[33.346874, "o", "i"]
+[33.588171, "o", "\u0007"]
+[34.32262, "o", "l"]
+[34.589704, "o", "e"]
+[35.808605, "o", "1"]
+[36.217002, "o", "."]
+[37.10768, "o", "y"]
+[37.481422, "o", "a"]
+[37.798883, "o", "m"]
+[38.190763, "o", "l"]
+[39.043041, "o", " "]
+[40.447225, "o", "g"]
+[40.728559, "o", "e"]
+[41.102637, "o", "n"]
+[41.339934, "o", "\u0007"]
+[45.146011, "o", "d"]
+[45.992691, "o", "i"]
+[46.39531, "o", "f"]
+[46.534912, "o", "f"]
+[47.886703, "o", "/"]
+[48.496094, "o", "t"]
+[48.602386, "o", "e"]
+[49.029299, "o", "s"]
+[49.219879, "o", "t"]
+[50.097242, "o", "s"]
+[51.213026, "o", "/"]
+[53.568671, "o", "f"]
+[53.81422, "o", "i"]
+[54.076531, "o", "l"]
+[54.322691, "o", "e"]
+[55.133976, "o", "2"]
+[55.597233, "o", "."]
+[56.328123, "o", "y"]
+[56.690659, "o", "a"]
+[56.930933, "o", "m"]
+[57.429605, "o", "l"]
+[58.196241, "o", "\r\n"]
+[58.748945, "o", "{\r\n - follow: False\r\n   host: hexlet.io\r\n - proxy: 123.124.53.22\r\n - timeout: 50\r\n + timeout: 20\r\n + verbose: True\r\n}\r\n"]
+[58.793448, "o", "\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007"]
+[58.795027, "o", "[nurzhan@localhost python-project-50]$ "]
+[66.567091, "o", "exit\r\n"]

gendiff/diff_generator.py

@@ -1,6 +1,11 @@
 from gendiff.read import read_file
 
 
+def format_diff(key, value, status):
+    symbols = {'added': '+', 'removed': '-', 'unchanged': ' '}
+    return f" {symbols[status]} {key}: {value}"
+
+
 def generate_diff(file_path1, file_path2):
     data1 = read_file(file_path1)
     data2 = read_file(file_path2)
@@ -9,14 +14,14 @@ def generate_diff(file_path1, file_path2):
     diff = []
 
     for key in keys:
-        if key not in data1:  # Если ключ есть только во втором файле
-            diff.append(f" + {key}: {data2[key]}")
-        elif key not in data2:  # Если ключ есть только в первом файле
-            diff.append(f" - {key}: {data1[key]}")
-        elif data1[key] == data2[key]:  # Если значения равны
-            diff.append(f"   {key}: {data1[key]}")
-        else:  # Если значения отличаются
-            diff.append(f" - {key}: {data1[key]}")
-            diff.append(f" + {key}: {data2[key]}")
+        if key not in data1:
+            diff.append(format_diff(key, data2[key], 'added'))
+        elif key not in data2:
+            diff.append(format_diff(key, data1[key], 'removed'))
+        elif data1[key] == data2[key]:
+            diff.append(format_diff(key, data1[key], 'unchanged'))
+        else:
+            diff.append(format_diff(key, data1[key], 'removed'))
+            diff.append(format_diff(key, data2[key], 'added'))
 
     return "{\n" + "\n".join(diff) + "\n}"

gendiff/parser.py

@@ -1,5 +1,4 @@
 # gendiff/parser.py
-
 import argparse
 from gendiff.diff_generator import generate_diff
 
@@ -8,11 +7,11 @@ def args_parser():
     parser = argparse.ArgumentParser(
         description="Compares two configuration files and shows a difference."
     )
-    parser.add_argument("first_file", help="path to the first file")
-    parser.add_argument("second_file", help="path to the second file")
+    parser.add_argument("first_file", help="Path to the first file")
+    parser.add_argument("second_file", help="Path to the second file")
     parser.add_argument(
         "-f", "--format",
-        help="set format of output",
+        help="Set output format (supported: stylish, plain, json)",
         default="stylish"
     )
     args = parser.parse_args()

gendiff/read.py

@@ -1,8 +1,28 @@
-# gendiff/read.py
-
 import json
+import yaml
+import os
 
 
 def read_file(file_path):
-    with open(file_path, 'r') as file:
-        return json.load(file)
+
+    if not os.path.exists(file_path):
+        raise FileNotFoundError(f"Ошибка: файл не найден: {file_path}")
+
+    extension = os.path.splitext(file_path)[1].lower()
+
+    parsers = {
+        '.json': json.load,
+        '.yaml': yaml.safe_load,
+        '.yml': yaml.safe_load
+    }
+
+    if extension not in parsers:
+        raise ValueError(f"Ошибка: неподдерживаемый формат файла {extension}")
+
+    try:
+        with open(file_path, 'r', encoding='utf-8') as file:
+            return parsers[extension](file) or {}
+    except json.JSONDecodeError as e:
+        raise ValueError(f"Ошибка в JSON-файле {file_path}: {e}")
+    except yaml.YAMLError as e:
+        raise ValueError(f"Ошибка в YAML-файле {file_path}: {e}")

gendiff/scripts/gendiff.py

@@ -1,3 +1,4 @@
+# gendiff/scripts/gendiff.py
 from gendiff.parser import args_parser
 
 

gendiff/tests/diff_generator_test.py

@@ -1,23 +1,30 @@
+import pytest
 from gendiff.diff_generator import generate_diff
 
 
 def normalize_indentation(text):
     return "\n".join(line.strip() for line in text.strip().splitlines())
 
 
-def test_generate_diff():
-    file1 = "gendiff/tests/file1.json"
-    file2 = "gendiff/tests/file2.json"
-
-    expected_result = """{
+@pytest.mark.parametrize("file1, file2, expected_result", [
+    ("gendiff/tests/file1.json", "gendiff/tests/file2.json", """{
       - follow: False
         host: hexlet.io
       - proxy: 123.124.53.22
       - timeout: 50
       + timeout: 20
       + verbose: True
-    }"""
-
+    }"""),
+    ("gendiff/tests/file1.yaml", "gendiff/tests/file2.yaml", """{
+      - follow: False
+        host: hexlet.io
+      - proxy: 123.124.53.22
+      - timeout: 50
+      + timeout: 20
+      + verbose: True
+    }"""),
+])
+def test_generate_diff(file1, file2, expected_result):
     actual_result = generate_diff(file1, file2)
 
     normalized_expected = normalize_indentation(expected_result)

gendiff/tests/file1.yaml

@@ -0,0 +1,5 @@
+# file1.yaml
+follow: false
+host: hexlet.io
+proxy: 123.124.53.22
+timeout: 50

gendiff/tests/file2.yaml

@@ -0,0 +1,4 @@
+# file2.yaml
+host: hexlet.io
+timeout: 20
+verbose: true