step 5

Author: Nurzhan2023

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 79
+exclude = __pycache__,.venv
+ignore = F401, F821, E501

.gitignore

@@ -0,0 +1,6 @@
+*.egg-info
+.venv
+__pycache__/
+generate_diff.py
+dist/
+

.gitignore.swp

@@ -0,0 +1,8 @@
+install:
+		uv sync
+
+build:
+		uv build
+	
+lint:
+		uv run flake8 gendiff

Makefile

@@ -0,0 +1,21 @@
+from gendiff.read import read_file
+
+def generate_diff(file_path1, file_path2):
+    data1 = read_file(file_path1)
+    data2 = read_file(file_path2)
+
+    keys = sorted(set(data1.keys()) | set(data2.keys()))
+    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]}")
+
+    return "{\n" + "\n".join(diff) + "\n}"

gendiff/diff_generator.py

@@ -0,0 +1,21 @@
+# gendiff/parser.py
+
+import argparse
+from gendiff.diff_generator import generate_diff
+
+
+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(
+        "-f", "--format",
+        help="set format of output",
+        default="stylish"
+    )
+    args = parser.parse_args()
+    diff = generate_diff(args.first_file, args.second_file)
+    print(diff)
+

gendiff/parser.py

@@ -1,8 +1,9 @@
-# gendiff/scripts/read.py
+# gendiff/read.py
 
 import json
 import os
 
+
 def read_file(file_path):
     with open(file_path, 'r') as file:
-        return json.load(file)
+        return json.load(file)

gendiff/scripts/read.py renamed to gendiff/read.py

@@ -1,42 +1,9 @@
-import argparse
-import json
-from gendiff.scripts.read import read_file
+from gendiff.parser import args_parser
 
-def generate_diff(file_path1, file_path2):
-    data1 = read_file(file_path1)
-    data2 = read_file(file_path2)
-
-    keys = sorted(set(data1.keys()) | set(data2.keys()))
-    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]}")
-
-    return "{\n" + "\n".join(diff) + "\n}"
 
 def main():
-    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(
-        "-f", "--format",
-        help="set format of output",
-        default="stylish"
-    )
+    print(args_parser())
 
-    args = parser.parse_args()
-    diff = generate_diff(args.first_file, args.second_file)
-    print(diff)
 
 if __name__ == '__main__':
     main()