Skip to content

Commit 4aa6806

Browse files
committed
step4
1 parent 30f53fe commit 4aa6806

File tree

21 files changed

+197
-1
lines changed

21 files changed

+197
-1
lines changed

.gitignore.swp

12 KB
Binary file not shown.

.python-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.9

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
### Hexlet tests and linter status:
2-
[![Actions Status](https://github.com/Nurzhan2023/python-project-50/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/Nurzhan2023/python-project-50/actions)
2+
[![Actions Status](https://github.com/Nurzhan2023/python-project-50/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/Nurzhan2023/python-project-50/actions)
3+
4+
[![asciicast](https://asciinema.org/a/Pe196IZV1YWZEZojjxIbKHeU8.svg)](https://asciinema.org/a/Pe196IZV1YWZEZojjxIbKHeU8)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# gendiff/scripts/gendiff.py
2+
3+
import argparse
4+
5+
6+
def main():
7+
parser = argparse.ArgumentParser(
8+
description = "Compares two configuration files and shows a difference."
9+
)
10+
parser.add_argument("first_file", help="path to the first file")
11+
parser.add_argument("second_file", help="path to the second file")
12+
args = parser.parse_args()
13+
14+
15+
if __name__ == '__main__':
16+
main()

demo.cast

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{"version": 2, "width": 211, "height": 54, "timestamp": 1739452576, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
2+
[2.552884, "o", "\u001b]777;notify;Command completed;uv run gendiff file1.json file2.json \u0007\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007\u001b]7;file://localhost.localdomain/home/nurzhan/Desktop/python-project-50\u0007"]
3+
[2.585045, "o", "[nurzhan@localhost python-project-50]$ "]
4+
[6.630794, "o", "g"]
5+
[6.777772, "o", "e"]
6+
[7.114899, "o", "n"]
7+
[7.52186, "o", "d"]
8+
[7.780345, "o", "i"]
9+
[8.091818, "o", "f"]
10+
[8.24563, "o", "f"]
11+
[8.995399, "o", " "]
12+
[9.614447, "o", "f"]
13+
[9.981022, "o", "i"]
14+
[10.519563, "o", "l"]
15+
[11.796551, "o", "e"]
16+
[12.222475, "o", "1"]
17+
[13.089412, "o", "."]
18+
[14.431126, "o", "j"]
19+
[14.771022, "o", "s"]
20+
[14.981405, "o", "o"]
21+
[15.249069, "o", "n"]
22+
[16.972489, "o", " "]
23+
[17.512285, "o", "f"]
24+
[17.888765, "o", "i"]
25+
[18.135823, "o", "l"]
26+
[18.366417, "o", "e"]
27+
[19.049614, "o", "2"]
28+
[19.511007, "o", "."]
29+
[21.967185, "o", "j"]
30+
[22.393046, "o", "s"]
31+
[22.550775, "o", "o"]
32+
[22.830555, "o", "n"]
33+
[24.327389, "o", "\r\n"]
34+
[24.370116, "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"]
35+
[24.37763, "o", "\u001b]777;notify;Command completed;gendiff file1.json file2.json\u0007\u001b]0;nurzhan@localhost:~/Desktop/python-project-50\u0007\u001b]7;file://localhost.localdomain/home/nurzhan/Desktop/python-project-50\u0007"]
36+
[24.377755, "o", "[nurzhan@localhost python-project-50]$ "]
37+
[31.019816, "o", "exit\r\n"]

file1.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"host": "hexlet.io",
3+
"timeout": 50,
4+
"proxy": "123.124.53.22",
5+
"follow": false
6+
7+
}

file2.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"timeout": 20,
3+
"verbose": true,
4+
"host": "hexlet.io"
5+
}
1.25 KB
Binary file not shown.
678 Bytes
Binary file not shown.
373 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)