Skip to content

Commit 211f878

Browse files
DashProshDashProsh
committed
added asciinema and delete hexlet-check
1 parent af2c652 commit 211f878

File tree

3 files changed

+130
-35
lines changed

3 files changed

+130
-35
lines changed

‎.github/workflows/hexlet-check.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎app/demo2.cast‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
{"version": 2, "width": 168, "height": 36, "timestamp": 1742559080, "env": {"SHELL": "/bin/zsh", "TERM": "xterm-256color"}}
2+
[0.046821, "o", "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m \r \r"]
3+
[0.052042, "o", "\r\u001b[0m\u001b[27m\u001b[24m\u001b[Jdaria@Air-Daria app main $ \u001b[K\u001b[?2004h"]
4+
[3.896003, "o", "exit"]
5+
[4.054134, "o", "\b\b\b\b./build/install/app/bin/app -h"]
6+
[5.011263, "o", "\u001b[?2004l\r\r\n"]
7+
[5.276864, "o", "Usage: \u001b[1mgendiff\u001b[21m\u001b[0m [\u001b[33m-hV\u001b[39m\u001b[0m] [\u001b[33m-f\u001b[39m\u001b[0m=\u001b[3mformat\u001b[23m\u001b[0m] \u001b[33mfilePath1\u001b[39m\u001b[0m \u001b[33mfilePath2\u001b[39m\u001b[0m\r\nCompares two configuration files and shows a difference.\r\n\u001b[33m \u001b[39m\u001b[0m \u001b[33mfilePath1\u001b[39m\u001b[0m path to first file\r\n\u001b[33m \u001b[39m\u001b[0m \u001b[33mfilePath2\u001b[39m\u001b[0m path to second file\r\n \u001b[33m-f\u001b[39m\u001b[0m, \u001b[33m--format\u001b[39m\u001b[0m=\u001b[3mformat\u001b[23m\u001b[0m output format [default: stylish]\r\n \u001b[33m-h\u001b[39m\u001b[0m, \u001b[33m--help\u001b[39m\u001b[0m Show this help message and exit.\r\n \u001b[33m-V\u001b[39m\u001b[0m, \u001b[33m--version\u001b[39m\u001b[0m Print version information and exit.\r\n"]
8+
[5.279845, "o", "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m \r \r"]
9+
[5.285994, "o", "\r\u001b[0m\u001b[27m\u001b[24m\u001b[Jdaria@Air-Daria app main $ \u001b[K\u001b[?2004h"]
10+
[6.789028, "o", "./build/install/app/bin/app -h"]
11+
[7.335557, "o", "\u001b[30Dexit \u001b[26D"]
12+
[7.709498, "o", "\b\b\b\b./build/install/app/bin/app -h"]
13+
[8.251483, "o", "\u001b[30Dnano README.md \u001b[16D"]
14+
[8.639098, "o", "\u001b[14Dls -al \u001b[8D"]
15+
[9.001874, "o", "\b\b\b\b\b\bpwd \b\b\b"]
16+
[9.294794, "o", "\b\b\bexit"]
17+
[9.629159, "o", "\b\b\b\bпарарар"]
18+
[9.821595, "o", "\b\b\b\b\b\b\bgit diff"]
19+
[10.140618, "o", "\b\b\b\bstatus"]
20+
[10.790023, "o", "\b \b"]
21+
[10.906755, "o", "\b \b"]
22+
[11.034658, "o", "\b \b"]
23+
[11.160879, "o", "\b \b"]
24+
[11.283131, "o", "\b \b"]
25+
[11.406624, "o", "\b \b"]
26+
[11.534588, "o", "\b"]
27+
[11.657631, "o", "\b \b"]
28+
[11.784735, "o", "\b\bg \b"]
29+
[12.128367, "o", "\b \b"]
30+
[12.541036, "o", "\u001b[7m./build/install/app/bin/app file1.json file2.json\u001b[27m\r\r\n\u001b[K"]
31+
[13.60704, "o", "\u001b[A\u001b[27C\u001b[27m.\u001b[27m/\u001b[27mb\u001b[27mu\u001b[27mi\u001b[27ml\u001b[27md\u001b[27m/\u001b[27mi\u001b[27mn\u001b[27ms\u001b[27mt\u001b[27ma\u001b[27ml\u001b[27ml\u001b[27m/\u001b[27ma\u001b[27mp\u001b[27mp\u001b[27m/\u001b[27mb\u001b[27mi\u001b[27mn\u001b[27m/\u001b[27ma\u001b[27mp\u001b[27mp\u001b[27m \u001b[27mf\u001b[27mi\u001b[27ml\u001b[27me\u001b[27m1\u001b[27m.\u001b[27mj\u001b[27ms\u001b[27mo\u001b[27mn\u001b[27m \u001b[27mf\u001b[27mi\u001b[27ml\u001b[27me\u001b[27m2\u001b[27m.\u001b[27mj\u001b[27ms\u001b[27mo\u001b[27mn\u001b[1B\r\u001b[K\u001b[?2004l\r\r\n"]
32+
[13.786154, "o", "{\r\n chars1: [a, b, c]\r\n - chars2: [d, e, f]\r\n + chars2: false\r\n - checked: false\r\n + checked: true\r\n - default: null\r\n + default: [value1, value2]\r\n - id: 45\r\n + id: null\r\n - key1: value1\r\n + key2: value2\r\n numbers1: [1, 2, 3, 4]\r\n - numbers2: [2, 3, 4, 5]\r\n + numbers2: [22, 33, 44, 55]\r\n - numbers3: [3, 4, 5]\r\n + numbers4: [4, 5, 6]\r\n + obj1: {nestedKey=value, isNested=true}\r\n - setting1: Some value\r\n + setting1: Another value\r\n - setting2: 200\r\n + setting2: 300\r\n - setting3: true\r\n + setting3: none\r\n}\r\n\r\n"]
33+
[13.788981, "o", "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m \r \r"]
34+
[13.794707, "o", "\r\u001b[0m\u001b[27m\u001b[24m\u001b[Jdaria@Air-Daria app main $ \u001b[K\u001b[?2004h"]
35+
[16.461767, "o", "\u001b[7m./build/install/app/bin/app file1.json file2.json\u001b[27m\r\r\n\u001b[K"]
36+
[17.569742, "o", "\u001b[A\u001b[27C\u001b[27m.\u001b[27m/\u001b[27mb\u001b[27mu\u001b[27mi\u001b[27ml\u001b[27md\u001b[27m/\u001b[27mi\u001b[27mn\u001b[27ms\u001b[27mt\u001b[27ma\u001b[27ml\u001b[27ml\u001b[27m/\u001b[27ma\u001b[27mp\u001b[27mp\u001b[27m/\u001b[27mb\u001b[27mi\u001b[27mn\u001b[27m/\u001b[27ma\u001b[27mp\u001b[27mp\u001b[27m \u001b[27mf\u001b[27mi\u001b[27ml\u001b[27me\u001b[27m1\u001b[27m.\u001b[27mj\u001b[27ms\u001b[27mo\u001b[27mn\u001b[27m \u001b[27mf\u001b[27mi\u001b[27ml\u001b[27me\u001b[27m2\u001b[27m.\u001b[27mj\u001b[27ms\u001b[27mo\u001b[27mn\u001b[1B\r\u001b[K\u001b[A\u001b[76C"]
37+
[17.716755, "o", "\b"]
38+
[17.847952, "o", "\b"]
39+
[17.966051, "o", "\b"]
40+
[18.467523, "o", "\b"]
41+
[18.551534, "o", "\b"]
42+
[18.63482, "o", "\b"]
43+
[18.719581, "o", "\b"]
44+
[18.803337, "o", "\b"]
45+
[18.88718, "o", "\b"]
46+
[18.97076, "o", "\b"]
47+
[19.055082, "o", "\b"]
48+
[19.138607, "o", "\b"]
49+
[19.221928, "o", "\b"]
50+
[19.305583, "o", "\b"]
51+
[19.389725, "o", "\b"]
52+
[19.473435, "o", "\b"]
53+
[19.556352, "o", "\b"]
54+
[19.639916, "o", "\b"]
55+
[19.723251, "o", "\b"]
56+
[19.806176, "o", "\b"]
57+
[20.057369, "o", "\b"]
58+
[20.802906, "o", "-file1.json file2.json\u001b[21D"]
59+
[21.798323, "o", "аfile1.json file2.json\u001b[21D"]
60+
[21.907983, "o", " file1.json file2.json\u001b[21D"]
61+
[22.291024, "o", "зfile1.json file2.json\u001b[21D"]
62+
[22.441471, "o", "дfile1.json file2.json\u001b[21D"]
63+
[22.543712, "o", "фfile1.json file2.json\u001b[21D"]
64+
[22.800732, "o", "шfile1.json file2.json\u001b[21D"]
65+
[23.047371, "o", "тfile1.json file2.json\u001b[21D"]
66+
[23.195579, "o", " file1.json file2.json\u001b[21D"]
67+
[23.716719, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
68+
[24.216734, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
69+
[24.301306, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
70+
[24.385484, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
71+
[24.469137, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
72+
[24.552907, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
73+
[24.684472, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
74+
[24.826443, "o", "\b\u001b[P\u001b[21C \u001b[22D"]
75+
[26.341691, "o", "\u001b[1Cfile1.json file2.json\u001b[21D"]
76+
[26.442429, "o", " file1.json file2.json\u001b[21D"]
77+
[26.854315, "o", "pfile1.json file2.json\u001b[21D"]
78+
[26.997891, "o", "lfile1.json file2.json\u001b[21D"]
79+
[27.092639, "o", "afile1.json file2.json\u001b[21D"]
80+
[27.267116, "o", "ifile1.json file2.json\u001b[21D"]
81+
[27.478715, "o", "nfile1.json file2.json\u001b[21D"]
82+
[27.781791, "o", " file1.json file2.json\u001b[21D"]
83+
[29.161831, "o", "\u001b[?2004l\u001b[1B\r\r\n"]
84+
[29.338739, "o", "Property 'chars2' was updated. From [complex value] to false\r\nProperty 'checked' was updated. From false to true\r\nProperty 'default' was updated. From null to [complex value]\r\nProperty 'id' was updated. From 45 to null\r\nProperty 'key1' was removed\r\nProperty 'key2' was added with value: 'value2'\r\nProperty 'numbers2' was updated. From [complex value] to [complex value]\r\nProperty 'numbers3' was removed\r\nProperty 'numbers4' was added with value: [complex value]\r\nProperty 'obj1' was added with value: [complex value]\r\nProperty 'setting1' was updated. From 'Some value' to 'Another value'\r\nProperty 'setting2' was updated. From 200 to 300\r\nProperty 'setting3' was updated. From true to 'none'\r\n\r\n"]
85+
[29.341571, "o", "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m \r \r"]
86+
[29.347282, "o", "\r\u001b[0m\u001b[27m\u001b[24m\u001b[Jdaria@Air-Daria app main $ \u001b[K\u001b[?2004h"]
87+
[31.854765, "o", "./build/install/app/bin/app -f plain file1.json file2.json\r\r\n\u001b[K"]
88+
[32.935339, "o", "\u001b[K\u001b[A\u001b[85C"]
89+
[33.435897, "o", "\b"]
90+
[33.519412, "o", "\b"]
91+
[33.603005, "o", "\b"]
92+
[33.685395, "o", "\b"]
93+
[33.770352, "o", "\b"]
94+
[33.854296, "o", "\b"]
95+
[33.938331, "o", "\b"]
96+
[34.022384, "o", "\b"]
97+
[34.105763, "o", "\b"]
98+
[34.190081, "o", "\b"]
99+
[34.272886, "o", "\b"]
100+
[34.356683, "o", "\b"]
101+
[34.439741, "o", "\b"]
102+
[34.523024, "o", "\b"]
103+
[34.606839, "o", "\b"]
104+
[34.689748, "o", "\b"]
105+
[34.773246, "o", "\b"]
106+
[34.856802, "o", "\b"]
107+
[34.940041, "o", "\b"]
108+
[35.023479, "o", "\b"]
109+
[35.106442, "o", "\b"]
110+
[35.189757, "o", "\b"]
111+
[35.688113, "o", "\b\u001b[P\u001b[22C \u001b[23D"]
112+
[35.800753, "o", "\b\u001b[P\u001b[22C \u001b[23D"]
113+
[35.917827, "o", "\b\u001b[P\u001b[22C \u001b[23D"]
114+
[36.040971, "o", "\b\u001b[P\u001b[22C \u001b[23D"]
115+
[36.39104, "o", "\b\u001b[P\u001b[22C \u001b[23D"]
116+
[37.949022, "o", "j file1.json file2.json\u001b[22D"]
117+
[38.288297, "o", "s file1.json file2.json\u001b[22D"]
118+
[38.480302, "o", "o file1.json file2.json\u001b[22D"]
119+
[38.938742, "o", "n file1.json file2.json\u001b[22D"]
120+
[39.240426, "o", "\u001b[?2004l\u001b[1B\r\r\n"]
121+
[39.420098, "o", "[ {\r\n \"type\" : \"unchanged\",\r\n \"value\" : [ \"a\", \"b\", \"c\" ],\r\n \"key\" : \"chars1\"\r\n}, {\r\n \"newValue\" : false,\r\n \"oldValue\" : [ \"d\", \"e\", \"f\" ],\r\n \"type\" : \"updated\",\r\n \"key\" : \"chars2\"\r\n}, {\r\n \"newValue\" : true,\r\n \"oldValue\" : false,\r\n \"type\" : \"updated\",\r\n \"key\" : \"checked\"\r\n}, {\r\n \"newValue\" : [ \"value1\", \"value2\" ],\r\n \"oldValue\" : null,\r\n \"type\" : \"updated\",\r\n \"key\" : \"default\"\r\n}, {\r\n \"newValue\" : null,\r\n \"oldValue\" : 45,\r\n \"type\" : \"updated\",\r\n \"key\" : \"id\"\r\n}, {\r\n \"oldValue\" : \"value1\",\r\n \"type\" : \"removed\",\r\n \"key\" : \"key1\"\r\n}, {\r\n \"newValue\" : \"value2\",\r\n \"type\" : \"added\",\r\n \"key\" : \"key2\"\r\n}, {\r\n \"type\" : \"unchanged\",\r\n \"value\" : [ 1, 2, 3, 4 ],\r\n \"key\" : \"numbers1\"\r\n}, {\r\n \"newValue\" : [ 22, 33, 44, 55 ],\r\n \"oldValue\" : [ 2, 3, 4, 5 ],\r\n \"type\" : \"updated\",\r\n \"key\" : \"numbers2\"\r\n}, {\r\n \"oldValue\" : [ 3, 4, 5 ],\r\n \"type\" : \"removed\",\r\n \"key\" : \"numbers3\"\r\n}, {\r\n \"newValue\" : [ 4, 5, 6 ],\r\n \"type\" : \"added\",\r\n \"key\" : \"numbers4\"\r\n}, {\r\n \"newValue\" : {\r\n \"nestedKey"]
122+
[39.4202, "o", "\" : \"value\",\r\n \"isNested\" : true\r\n },\r\n \"type\" : \"added\",\r\n \"key\" : \"obj1\"\r\n}, {\r\n \"newValue\" : \"Another value\",\r\n \"oldValue\" : \"Some value\",\r\n \"type\" : \"updated\",\r\n \"key\" : \"setting1\"\r\n}, {\r\n \"newValue\" : 300,\r\n \"oldValue\" : 200,\r\n \"type\" : \"updated\",\r\n \"key\" : \"setting2\"\r\n}, {\r\n \"newValue\" : \"none\",\r\n \"oldValue\" : true,\r\n \"type\" : \"updated\",\r\n \"key\" : \"setting3\"\r\n} ]\r\n"]
123+
[39.423017, "o", "\u001b[1m\u001b[7m%\u001b[27m\u001b[1m\u001b[0m \r \r"]
124+
[39.43016, "o", "\r\u001b[0m\u001b[27m\u001b[24m\u001b[Jdaria@Air-Daria app main $ \u001b[K\u001b[?2004h"]
125+
[42.736419, "o", "e"]
126+
[43.101718, "o", "\bex"]
127+
[43.445527, "o", "i"]
128+
[43.739573, "o", "t"]
129+
[43.919204, "o", "\u001b[?2004l\r\r\n"]

‎app/src/test/java/hexlet/code/DifferTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,6 @@ void testGenerateDiffForJsonJson() throws IOException {
154154
String format3 = "json";
155155
String actualJson = Differ.generate(filePath1, filePath2, format3 );
156156
assertEquals(EXPECTED_JSON.trim(), actualJson.trim());
157-
System.out.println("ВСЕ РАБОТАЕТ! аддада");
157+
System.out.println("ВСЕ РАБОТАЕТ! дада");
158158
}
159159
}

0 commit comments

Comments
 (0)