6th step

Author: ttehasi

.coverage

@@ -1,4 +1,5 @@
 .venv/
 dist/
 __pycache__/
-gendiff1.cast
+gendiff1.cast
+gendiff2.cast

.gitignore

@@ -5,10 +5,14 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/88675eaf4e4ca1e04a88/maintainability)](https://codeclimate.com/github/ttehasi/python-project-50/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/88675eaf4e4ca1e04a88/test_coverage)](https://codeclimate.com/github/ttehasi/python-project-50/test_coverage)
 
-## Asciinema:
+## Asciinema JSON file:
 
 [![asciicast](https://asciinema.org/a/djCfDR2K0qTnGeiqy4hVWhLO9.svg)](https://asciinema.org/a/djCfDR2K0qTnGeiqy4hVWhLO9)
 
+## Asciinema YAML file:
+
+[![asciicast](https://asciinema.org/a/H918cvPLQohe9DMY2NDxLKcaU.svg)](https://asciinema.org/a/H918cvPLQohe9DMY2NDxLKcaU)
+
 ### Links
 
 This project was built using these tools:

README.md

@@ -1,14 +1,20 @@
 import json
 
+from gendiff.pars_yaml import open_ymlf
+
 
 def open_f(path_to_file) -> dict:
     with open(path_to_file) as file:
         return json.load(file)
 
 
 def generate_diff(file1, file2):
-    file1 = open_f(file1)
-    file2 = open_f(file2)
+    if str(file1)[-5:] == '.json' and str(file2)[-5:] == '.json':
+        file1 = open_f(file1)
+        file2 = open_f(file2)
+    else:
+        file1 = open_ymlf(file1)
+        file2 = open_ymlf(file2)
     res = '''{
 '''
     for i in sorted(list(file1)):

gendiff/gen_diff.py

@@ -0,0 +1,8 @@
+import yaml
+
+
+def open_ymlf(path) -> dict:
+    with open(path) as file:
+        return yaml.load(file, yaml.Loader)
+
+print(open_ymlf('/home/ttehasi/python-project-50/tests/test_data/file2.yml'))

gendiff/pars_yaml.py

@@ -4,7 +4,9 @@ version = "0.1.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"
-dependencies = []
+dependencies = [
+    "pyyaml>=6.0.2",
+]
 
 [build-system]
 requires = ["hatchling"]

gendiff/scripts/__pycache__/gendiff.cpython-312.pyc

@@ -0,0 +1,4 @@
+host: hexlet.io
+timeout: 50
+proxy: 123.234.53.22
+follow: false

pyproject.toml

@@ -0,0 +1,3 @@
+timeout: 20
+verbose: true
+host: hexlet.io

tests/test_data/file1.yml

@@ -15,4 +15,7 @@ def test_generate_diff():
     result = read_file('result_file1_file2.txt')
     actual = generate_diff(get_test_data_path('file1.json'),
                            get_test_data_path('file2.json'))
-    assert actual == result
+    yam_act = generate_diff(get_test_data_path('file1.yml'),
+                           get_test_data_path('file2.yml'))
+    assert actual == result
+    assert yam_act == result