dop chenches

Author: ttehasi

.gitignore

@@ -2,4 +2,6 @@
 dist/
 __pycache__/
 gendiff1.cast
-gendiff2.cast
+gendiff2.cast
+gendiff11.cast
+gendiff22.cast

README.md

@@ -9,10 +9,14 @@
 
 [![asciicast](https://asciinema.org/a/djCfDR2K0qTnGeiqy4hVWhLO9.svg)](https://asciinema.org/a/djCfDR2K0qTnGeiqy4hVWhLO9)
 
+[![asciicast](https://asciinema.org/a/mkiLw1Llc4brT2wrSHaMW7H4T.svg)](https://asciinema.org/a/mkiLw1Llc4brT2wrSHaMW7H4T)
+
 ## Asciinema YAML file:
 
 [![asciicast](https://asciinema.org/a/H918cvPLQohe9DMY2NDxLKcaU.svg)](https://asciinema.org/a/H918cvPLQohe9DMY2NDxLKcaU)
 
+[![asciicast](https://asciinema.org/a/eqSYOXkzxMhXXDIPTiRrzoWmN.svg)](https://asciinema.org/a/eqSYOXkzxMhXXDIPTiRrzoWmN)
+
 ### Links
 
 This project was built using these tools:

gendiff/gen_diff.py

@@ -27,16 +27,17 @@ def stringify(value, lvl=1):
     return result
 
 
-def generate_diff(file1, file2, lvl=1):
+def generate_diff(file1, file2, lvl=1, format_name='stylish'):
     if isinstance(file1, str) and isinstance(file2, str):
         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)
-    result = '{\n'
+    result = ''
     if isinstance(file1, dict) and isinstance(file2, dict):
+        result += '{\n'
         keys1 = sorted(list(file1.keys()))
         keys2 = sorted(list(file2.keys()))
         keys12 = sorted(set(keys1 + keys2))

tests/test_data/result_file11_file22.txt

@@ -1,9 +1,9 @@
 {
     common: {
-      + follow: False
+      + follow: false
         setting1: Value 1
       - setting2: 200
-      - setting3: True
+      - setting3: true
       + setting3: null
       + setting4: blah blah
       + setting5: {

tests/test_data/result_file1_file2.txt

@@ -1,8 +1,8 @@
 {
-  - follow: False
+  - follow: false
     host: hexlet.io
   - proxy: 123.234.53.22
   - timeout: 50
   + timeout: 20
-  + verbose: True
+  + verbose: true
 }

tests/test_generate_diff.py

@@ -13,9 +13,9 @@ def read_file(filename):
 
 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'))
-    yam_act = generate_diff(get_test_data_path('file1.yml'),
-                           get_test_data_path('file2.yml'))
+    actual = generate_diff(str(get_test_data_path('file1.json')),
+                           str(get_test_data_path('file2.json')))
+    yam_act = generate_diff(str(get_test_data_path('file1.yml')),
+                            str(get_test_data_path('file2.yml')))
     assert actual == result
     assert yam_act == result

tests/test_generate_diff_recurs.py

@@ -4,9 +4,9 @@
 
 def test_generate_diff():
     result = read_file('result_file11_file22.txt')
-    actual = generate_diff(get_test_data_path('file11.json'),
-                           get_test_data_path('file22.json'))
-    yam_act = generate_diff(get_test_data_path('file11.yml'),
-                           get_test_data_path('file22.yml'))
+    actual = generate_diff(str(get_test_data_path('file11.json')),
+                           str(get_test_data_path('file22.json')))
+    yam_act = generate_diff(str(get_test_data_path('file11.yml')),
+                            str(get_test_data_path('file22.yml')))
     assert actual == result
     assert yam_act == result