Compare commits
620 commits
instaparse
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8052618fa8 | ||
|
|
238a98d9b2 | ||
|
|
57b799e63d | ||
|
|
dad646ce38 | ||
|
|
35696b7c0b | ||
|
|
00d56900e8 | ||
|
|
1fc8ef6adb | ||
|
|
158b36c645 | ||
|
|
b5c65f46e1 | ||
|
|
7e64ce5dd1 | ||
|
|
73b806dbd2 | ||
|
|
0579d6a0ec | ||
|
|
cfee65101f | ||
|
|
4da643cf63 | ||
|
|
aa15e5212a | ||
|
|
e23a222fdb | ||
|
|
6c0cfde92f | ||
|
|
5f6befc577 | ||
|
|
d7b0f9155d | ||
|
|
28c2f6947f | ||
|
|
5c4fb1ccc1 | ||
|
|
5b7678f309 | ||
|
|
f33c68293b | ||
|
|
fd69206933 | ||
|
|
689148b99c | ||
|
|
3db67a5574 | ||
|
|
8191e09314 | ||
|
|
e784f4ae8a | ||
|
|
774fe99a83 | ||
|
|
f9aafc9d96 | ||
|
|
4037154a28 | ||
|
|
35e904b547 | ||
|
|
08d60112ed | ||
|
|
a9060f0027 | ||
|
|
597f180d32 | ||
|
|
007209c0d2 | ||
|
|
1b2682b67a | ||
|
|
4a2a305e38 | ||
|
|
e3908a1306 | ||
|
|
f967e10bdd | ||
|
|
4c6fe98236 | ||
|
|
28c7c42c2a | ||
|
|
6d5fc67467 | ||
|
|
50fc2e2582 | ||
|
|
a45f76b029 | ||
|
|
9ed0507030 | ||
|
|
f9935def7e | ||
|
|
d053a3c0c5 | ||
|
|
cdcf9deb1c | ||
|
|
6f43c47f2a | ||
|
|
63a51ff669 | ||
|
|
d7c80012b1 | ||
|
|
eddf51529f | ||
|
|
d1dbafc49b | ||
|
|
bc8cd6d358 | ||
|
|
b01ee6d87d | ||
|
|
a43b55bf5c | ||
|
|
4358428464 | ||
|
|
7998e50045 | ||
|
|
8d3806a6e7 | ||
|
|
455728092c | ||
|
|
da3eff0305 | ||
|
|
51b44ba2ed | ||
|
|
3cddc33334 | ||
|
|
d8521888cc | ||
|
|
1a62a619e3 | ||
|
|
ecbdbba8d4 | ||
|
|
e186726fd9 | ||
|
|
2a50af8f68 | ||
|
|
c7a5c6c6bc | ||
|
|
024f1d5515 | ||
|
|
142e9eae06 | ||
|
|
3d909f04b8 | ||
|
|
c9b9ad64fc | ||
|
|
9070db46df | ||
|
|
b16ecfdf6c | ||
|
|
1874da1d2d | ||
|
|
c89ac0bd7f | ||
|
|
def5d8fd37 | ||
|
|
2932d82a65 | ||
|
|
d8d6876832 | ||
|
|
c538d5edbd | ||
|
|
a5ec09087e | ||
|
|
5e4ce8e093 | ||
|
|
c1412f9b31 | ||
|
|
f5d7c1bb6e | ||
|
|
1deae725ae | ||
|
|
42b9ff8f25 | ||
|
|
3442f1e505 | ||
|
|
f0943d8a14 | ||
|
|
dff3b526e9 | ||
|
|
afb566f600 | ||
|
|
3cc45ec8a7 | ||
|
|
d670bbb245 | ||
|
|
62cab79ce6 | ||
|
|
f4292e1038 | ||
|
|
286e03ee24 | ||
|
|
cd362fbf01 | ||
|
|
ccebfa630f | ||
|
|
5ab8b3f975 | ||
|
|
2df2e7661b | ||
|
|
7121253f75 | ||
|
|
e5dde61ba8 | ||
|
|
6a5c13a6f8 | ||
|
|
b981921a00 | ||
|
|
eaf760d62f | ||
|
|
b59bfcb7e6 | ||
|
|
0138990139 | ||
|
|
5acf04dcf1 | ||
|
|
aabd35eeaa | ||
|
|
ec6a6a5cdb | ||
|
|
b19d5f9bff | ||
|
|
5902852ff9 | ||
|
|
24c644d9f0 | ||
|
|
01cb6112f9 | ||
|
|
7ff62d91a2 | ||
|
|
89eed2ed44 | ||
|
|
ed8aa97d34 | ||
|
|
34b5e71465 | ||
|
|
1d5a777b81 | ||
|
|
2519a284f4 | ||
|
|
0f9a0fe622 | ||
|
|
b6f844ba0c | ||
|
|
ab1ee96335 | ||
|
|
a535a5faec | ||
|
|
4715d13f71 | ||
|
|
8b46e030ca | ||
|
|
6ca28c642c | ||
|
|
c3c2c8b108 | ||
|
|
bc1c35790e | ||
|
|
50e8a74321 | ||
|
|
70b3e5c999 | ||
|
|
31a5ec5c71 | ||
|
|
96807375e0 | ||
|
|
c402c01861 | ||
|
|
08a08ef957 | ||
|
|
6a420c9bfd | ||
|
|
030d6ba889 | ||
|
|
15f5918e58 | ||
|
|
0c6f8b6806 | ||
|
|
7128d65de7 | ||
|
|
2bf95f60e7 | ||
|
|
0685424ac3 | ||
|
|
ecb0fa5cac | ||
|
|
e0a303c484 | ||
|
|
5bc1df73af | ||
|
|
ca26b22bf9 | ||
|
|
aa566ed15c | ||
|
|
2492e71dcc | ||
|
|
bbf9933941 | ||
|
|
ea660e956f | ||
|
|
bc413b654b | ||
|
|
a415139b3b | ||
|
|
0147195e8c | ||
|
|
d226fe785a | ||
|
|
2bb865917a | ||
|
|
16eebb60a3 | ||
|
|
da9fcbf10d | ||
|
|
cdfc664682 | ||
|
|
93e398f288 | ||
|
|
880b4ebe3f | ||
|
|
366cbed689 | ||
|
|
d17a5342d2 | ||
|
|
1372b3d8a0 | ||
|
|
b144c81fbb | ||
|
|
0527f6a372 | ||
|
|
e258358170 | ||
|
|
58def24712 | ||
|
|
f335fe51ff | ||
|
|
83918c4b80 | ||
|
|
2da875c8f9 | ||
|
|
7abd0000c7 | ||
|
|
19804e4bc7 | ||
|
|
af3ae5fa79 | ||
|
|
bf183a33a8 | ||
|
|
616de196f8 | ||
|
|
c3c0bf3cef | ||
|
|
ea2c3f06ec | ||
|
|
3068428578 | ||
|
|
702fdf8108 | ||
|
|
7e8e51b882 | ||
|
|
976d0fcb6d | ||
|
|
c60d139dbf | ||
|
|
116ee1191c | ||
|
|
035a8268ba | ||
|
|
5cd2b9d6e6 | ||
|
|
82291325de | ||
|
|
fa0be7ecbf | ||
|
|
6d4737ce77 | ||
|
|
da44bd4940 | ||
|
|
b47a5cc21d | ||
|
|
ba35032253 | ||
|
|
11610d6ebe | ||
|
|
37849d72ad | ||
|
|
375c9d3550 | ||
|
|
d7499210ec | ||
|
|
3d671ffcb6 | ||
|
|
4d1984410b | ||
|
|
0d4096dcd1 | ||
|
|
1e4236e22d | ||
|
|
717084a71d | ||
|
|
3608c6ab81 | ||
|
|
67d8e04db5 | ||
|
|
71c5e7c45b | ||
|
|
3cca11f8d1 | ||
|
|
655760d2a9 | ||
|
|
7b84a9d256 | ||
|
|
1a454b10bb | ||
|
|
81819deb0a | ||
|
|
8a0f66f3c1 | ||
|
|
b53e265af3 | ||
|
|
7530e6a57f | ||
|
|
2ee8185269 | ||
|
|
ff59956602 | ||
|
|
a176584eda | ||
|
|
43d9816bd6 | ||
|
|
e1a12037cd | ||
|
|
86ac0c2431 | ||
|
|
67ae82ee18 | ||
|
|
d8e0c6b476 | ||
|
|
12c89f79c6 | ||
|
|
67dc3af22d | ||
|
|
1f0f932c5e | ||
|
|
fa579b74df | ||
|
|
e7d964bb0a | ||
|
|
771f69d922 | ||
|
|
3e4c5861e7 | ||
|
|
68e8ac6e10 | ||
|
|
32078f8259 | ||
|
|
c9a63af40f | ||
|
|
87f9f6f206 | ||
|
|
df477adbb0 | ||
|
|
35e17bd46a | ||
|
|
9da2afc4b5 | ||
|
|
f24c75a054 | ||
|
|
30534691ba | ||
|
|
6dc3110b3c | ||
|
|
ecbbd7ab84 | ||
|
|
4ae9d27171 | ||
|
|
86ec03e2f4 | ||
|
|
39a9ed69d6 | ||
|
|
9653435460 | ||
|
|
d467bf53c8 | ||
|
|
6bfb2374b8 | ||
|
|
fe940c73c9 | ||
|
|
ea2c439369 | ||
|
|
c48d2f7a90 | ||
|
|
b337e032b6 | ||
|
|
2166c42de2 | ||
|
|
d85c86af2c | ||
|
|
5b471cb5e2 | ||
|
|
629c338b14 | ||
|
|
ab28e4c465 | ||
|
|
54ea4b460d | ||
|
|
bf7f42ce73 | ||
|
|
53d16eb9a0 | ||
|
|
eb69baeaa7 | ||
|
|
6052b9ba35 | ||
|
|
4a1b26a6be | ||
|
|
28f9879e40 | ||
|
|
0e1694f586 | ||
|
|
2ee7a0d12e | ||
|
|
4af5f1fd61 | ||
|
|
fc19382b5e | ||
|
|
9e1452867e | ||
|
|
2a432d3e80 | ||
|
|
1dbffac334 | ||
|
|
aa654a9ead | ||
|
|
9ded5fea0d | ||
|
|
6353ab9de9 | ||
|
|
ce403671be | ||
|
|
cedbff7696 | ||
|
|
15cff2eb7b | ||
|
|
2e23471612 | ||
|
|
6b52831a21 | ||
|
|
fdd2d68e1d | ||
|
|
838608647a | ||
|
|
e746593f14 | ||
|
|
3735135c05 | ||
|
|
7ebe96773d | ||
|
|
2fcf9c682a | ||
|
|
36e9732549 | ||
|
|
a5e4dfe663 | ||
|
|
9da7af58b3 | ||
|
|
f1084c1f36 | ||
|
|
e0598470be | ||
|
|
d854de883e | ||
|
|
80a8097a63 | ||
|
|
5bb98159be | ||
|
|
69b83c3678 | ||
|
|
857ecc3111 | ||
|
|
dbc766f58a | ||
|
|
79a133ee13 | ||
|
|
7ecd2fe59e | ||
|
|
0b892ad8e5 | ||
|
|
66b29b9061 | ||
|
|
1dff46699a | ||
|
|
ae01170f92 | ||
|
|
996c96761e | ||
|
|
ef5d2fdf3a | ||
|
|
9ae36491b7 | ||
|
|
d1580f1a72 | ||
|
|
8788a3c482 | ||
|
|
5cab060bbb | ||
|
|
d984eda226 | ||
|
|
c8324ac887 | ||
|
|
e938a58e06 | ||
|
|
c04b83811c | ||
|
|
6c1a66e853 | ||
|
|
ef50677275 | ||
|
|
8a8c2dcb46 | ||
|
|
7c5a2775df | ||
|
|
0b61f4d3ab | ||
|
|
e14af7b629 | ||
|
|
bc5e6b6d52 | ||
|
|
c2c7053120 | ||
|
|
6467316dc8 | ||
|
|
ad4935077d | ||
|
|
ad6cd5989f | ||
|
|
b1d2dc599b | ||
|
|
af507b2894 | ||
|
|
c91ccc7b93 | ||
|
|
2eed1b810b | ||
|
|
ce9a0f71e5 | ||
|
|
0d20cdf696 | ||
|
|
6bee6b6a89 | ||
|
|
dac6dcd6d5 | ||
|
|
d8c41351f5 | ||
|
|
c1b82db587 | ||
|
|
26c6c5ce18 | ||
|
|
3ded3b9546 | ||
|
|
10c315663f | ||
|
|
5f82d40fe6 | ||
|
|
81d260e473 | ||
|
|
1881a75a1d | ||
|
|
f470dba671 | ||
|
|
09bbd9eb34 | ||
|
|
7dc6b713d0 | ||
|
|
42d9d77e76 | ||
|
|
df5b115aab | ||
|
|
2ee0df4909 | ||
|
|
ea4ebab807 | ||
|
|
666ce9adc9 | ||
|
|
601e6e82cd | ||
|
|
6e088272b7 | ||
|
|
2353827e43 | ||
|
|
a8e7d35dfa | ||
|
|
b6e8f86595 | ||
|
|
3370d7a063 | ||
|
|
d1e36be9d9 | ||
|
|
83c02cb58b | ||
|
|
4c7bbeeb3b | ||
|
|
560369e294 | ||
|
|
94c5141a3e | ||
|
|
b749563003 | ||
|
|
af0937f060 | ||
|
|
85ecdab0a5 | ||
|
|
3b251c1b38 | ||
|
|
657adff336 | ||
|
|
a2f70d8324 | ||
|
|
fb3fa03074 | ||
|
|
de06c199f1 | ||
|
|
85eef7d6f7 | ||
|
|
bf306bb407 | ||
|
|
056254dc9d | ||
|
|
e3228fe358 | ||
|
|
1010b7f114 | ||
|
|
bef5ccf229 | ||
|
|
6760a2b844 | ||
|
|
fa10070013 | ||
|
|
fb3e04cffe | ||
|
|
7b7feb7034 | ||
|
|
c3cf8f5330 | ||
|
|
caf05979c3 | ||
|
|
9356653a09 | ||
|
|
aa7fb0c62a | ||
|
|
45ff85e1a0 | ||
|
|
9ff8003c1b | ||
|
|
b46fc49a5d | ||
|
|
9edce22ea7 | ||
|
|
56f5378702 | ||
|
|
a2398705bf | ||
|
|
c74d9a6f0a | ||
|
|
d27287b837 | ||
|
|
d677a2b65a | ||
|
|
efb947ec03 | ||
|
|
a8c9526be1 | ||
|
|
0d1ffd0c9f | ||
|
|
bfcec721c9 | ||
|
|
3ade21918f | ||
|
|
ddfc93d7e5 | ||
|
|
b44167e5c0 | ||
|
|
8a0fe19ab3 | ||
|
|
a3eb37e4a6 | ||
|
|
44465990a8 | ||
|
|
236768cada | ||
|
|
0f85b02a82 | ||
|
|
b1a5f4e8df | ||
|
|
0e47d7f7a6 | ||
|
|
41e5e0c484 | ||
|
|
fe989f7233 | ||
|
|
7f8ec567e6 | ||
|
|
342cedbcfa | ||
|
|
b22092a318 | ||
|
|
3da2c9f75f | ||
|
|
2e3bd2d3f0 | ||
|
|
555c11eca2 | ||
|
|
32a18191dc | ||
|
|
dcb0b45405 | ||
|
|
e84eb29fa1 | ||
|
|
1c425796ae | ||
|
|
4e8d907369 | ||
|
|
f4bc802880 | ||
|
|
c13500cddb | ||
|
|
98aa6b996e | ||
|
|
f2e955cc0b | ||
|
|
5c4eedb12b | ||
|
|
c536d524f8 | ||
|
|
ea57060963 | ||
|
|
430a466a25 | ||
|
|
d27efb137d | ||
|
|
0063196074 | ||
|
|
4db3de5987 | ||
|
|
cd70809b1b | ||
|
|
2b24a84c11 | ||
|
|
7d5cdadbcb | ||
|
|
325e043440 | ||
|
|
4dcc159ed7 | ||
|
|
a9be9d02ea | ||
|
|
d2fece3f80 | ||
|
|
39e4ea71e9 | ||
|
|
4cbdb57ad1 | ||
|
|
2e0bbfb260 | ||
|
|
c1726c3b98 | ||
|
|
0951328270 | ||
|
|
1de5c553ea | ||
|
|
cd4987b005 | ||
|
|
340d24fb07 | ||
|
|
abc102f0b8 | ||
|
|
3f99274978 | ||
|
|
26967df643 | ||
|
|
1644c94fda | ||
|
|
63102eca86 | ||
|
|
f7907be86e | ||
|
|
19bfd172fc | ||
|
|
a945ea8146 | ||
|
|
fcb0b4a1a7 | ||
|
|
6eea167cfe | ||
|
|
307ed36f9c | ||
|
|
99655aa224 | ||
|
|
b7ee49ab8d | ||
|
|
37b5d1d6a3 | ||
|
|
1a54f03ce3 | ||
|
|
9365a24eed | ||
|
|
0b5a281d46 | ||
|
|
c89a396bbd | ||
|
|
905f6365d4 | ||
|
|
c1788da654 | ||
|
|
d3f7a52f65 | ||
|
|
c85e86cb7e | ||
|
|
b4365826ba | ||
|
|
e68eb7a998 | ||
|
|
18b2d54d33 | ||
|
|
43e7b4af0b | ||
|
|
57ebb524b0 | ||
|
|
6ccdfae7bb | ||
|
|
fa34ebfdef | ||
|
|
a66a2f74f5 | ||
|
|
6850caed6e | ||
|
|
29150e6bd3 | ||
|
|
4a45624acd | ||
|
|
cce0a3d378 | ||
|
|
26780fffe5 | ||
|
|
1bc4782d42 | ||
|
|
2c6485b876 | ||
|
|
4fc1d9a815 | ||
|
|
e7521110c9 | ||
|
|
e2f2e9ae4e | ||
|
|
0927a48c50 | ||
|
|
69373fb445 | ||
|
|
7aba75564e | ||
|
|
4438f3bbcf | ||
|
|
1bb7ebe3dc | ||
|
|
9545d23cc4 | ||
|
|
e74e7ed2ca | ||
|
|
5ad161a059 | ||
|
|
68878e7f89 | ||
|
|
84bd66f869 | ||
|
|
5516151132 | ||
|
|
4e52f0d34c | ||
|
|
4a38fdbd07 | ||
|
|
a8d3923262 | ||
|
|
8d8d3a1057 | ||
|
|
d4c4e53c86 | ||
|
|
52a7c205a3 | ||
|
|
9e004edefe | ||
|
|
b8a0520b93 | ||
|
|
1022068624 | ||
|
|
8df7f7c3fe | ||
|
|
f5e2fe0f61 | ||
|
|
abdd068149 | ||
|
|
99ec77afeb | ||
|
|
eba9d0d642 | ||
|
|
9520c5b240 | ||
|
|
9b21986f05 | ||
|
|
076a2774be | ||
|
|
3f4ac12cc4 | ||
|
|
b2d422cacb | ||
|
|
5dc7763325 | ||
|
|
3045cd226e | ||
|
|
187ee7da00 | ||
|
|
cd9a87e75c | ||
|
|
3ad043769c | ||
|
|
332c7c6ac8 | ||
|
|
711bb40480 | ||
|
|
be426ee56d | ||
|
|
9118c43da3 | ||
|
|
c5c8086dfe | ||
|
|
734ca577f6 | ||
|
|
bf3623b596 | ||
|
|
b2f534517c | ||
|
|
ead237eee3 | ||
|
|
30a15e16ae | ||
|
|
42fd5d851f | ||
|
|
6d1f295f47 | ||
|
|
a1858774b6 | ||
|
|
ab0c5bb058 | ||
|
|
920babb56b | ||
|
|
cc0338a1e9 | ||
|
|
a4e791e6ad | ||
|
|
02d300ee3d | ||
|
|
a6d8d0179c | ||
|
|
9441dabf81 | ||
|
|
842c7a0589 | ||
|
|
a19d05b8da | ||
|
|
ca1e2d7769 | ||
|
|
72dbf53df7 | ||
|
|
76e779d0d3 | ||
|
|
bbd1940844 | ||
|
|
0dab6f5f3d | ||
|
|
5a1b6a9f79 | ||
|
|
722812bd61 | ||
|
|
2b575b1ea6 | ||
|
|
e9e906e09f | ||
|
|
d8f50879c8 | ||
|
|
28f72ff4a2 | ||
|
|
32864476e5 | ||
|
|
63abc75cf5 | ||
|
|
b2855d1212 | ||
|
|
bd5597a3cb | ||
|
|
a79c33d7bf | ||
|
|
1452f45cfb | ||
|
|
64dcb3335d | ||
|
|
c053765731 | ||
|
|
314906cb0d | ||
|
|
4220902927 | ||
|
|
4931048284 | ||
|
|
2da873a2c1 | ||
|
|
17adc69abc | ||
|
|
a464b59bc2 | ||
|
|
7c2e8a155f | ||
|
|
fa9103807d | ||
|
|
3610f52c47 | ||
|
|
68d041c892 | ||
|
|
02cdb00e8d | ||
|
|
7f44c272b8 | ||
|
|
5140bd4249 | ||
|
|
0be3c71772 | ||
|
|
77878631e9 | ||
|
|
28ec2c690a | ||
|
|
fe6042a06f | ||
|
|
6feb785cb0 | ||
|
|
eca7847ed9 | ||
|
|
430cbedbe4 | ||
|
|
a5318ea289 | ||
|
|
91413c2803 | ||
|
|
7844039861 | ||
|
|
61851a511f | ||
|
|
09debe0f1d | ||
|
|
71d0a14c26 | ||
|
|
5b42de70d8 | ||
|
|
79a9bc531a | ||
|
|
6b6d403d5e | ||
|
|
843ca4c2d3 | ||
|
|
e43edd8627 | ||
|
|
b2b20e15c1 | ||
|
|
004e99eaa3 | ||
|
|
4d1c05b23d | ||
|
|
6f41179849 | ||
|
|
1810b4bd97 | ||
|
|
e3aa11baa8 | ||
|
|
9b5ec623e4 | ||
|
|
0b4bfdc3ab | ||
|
|
96e70ff7e3 | ||
|
|
eb4e583c97 | ||
|
|
47df0c47a1 | ||
|
|
7de2262585 | ||
|
|
27fad0ac36 | ||
|
|
5b7213822c | ||
|
|
8fa49b940d | ||
|
|
6c1f5f7a4d | ||
|
|
2a943086a6 | ||
|
|
9e1ea1071d | ||
|
|
a0a34dc5d8 | ||
|
|
b9308eddcc | ||
|
|
3aca505790 | ||
|
|
5965e32d26 | ||
|
|
e9b87b0185 | ||
|
|
91b3a962b4 | ||
|
|
d9358f0706 | ||
|
|
8e64ef9df8 | ||
|
|
2ac1428341 | ||
|
|
efe4f214cc | ||
|
|
bdbe5a4548 | ||
|
|
34136173d5 | ||
|
|
1e06b07d0f | ||
|
|
188949d7eb | ||
|
|
073e7e3ce0 | ||
|
|
39c1390085 | ||
|
|
dd77a85893 |
157 changed files with 6058 additions and 2662 deletions
|
|
@ -2,5 +2,5 @@
|
|||
:deps {borkdude/gh-release-artifact
|
||||
#_{:local/root "../gh-release-artifact"}
|
||||
{:git/url "https://github.com/borkdude/gh-release-artifact"
|
||||
:git/sha "ce060c12a25b552b864dc90f8fb344a2eb91ea9d"}}
|
||||
:git/sha "4a9a74f0e50e897c45df8cc70684360eb30fce80"}}
|
||||
:tasks {release-artifact babashka.release-artifact/release}}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ jobs:
|
|||
- run:
|
||||
name: Generate config
|
||||
command: |
|
||||
/tmp/bbb .circleci/script/short_ci.clj > generated_config.yml
|
||||
/tmp/bbb .circleci/script/gen_ci.clj > generated_config.yml
|
||||
- continuation/continue:
|
||||
configuration_path: generated_config.yml
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
(require '[clojure.string :as str]
|
||||
(require '[babashka.fs :as fs]
|
||||
'[babashka.process :as proc]
|
||||
'[babashka.fs :as fs])
|
||||
'[clojure.string :as str])
|
||||
(import '[java.time Instant])
|
||||
|
||||
(defn read-env
|
||||
|
|
@ -12,7 +12,9 @@
|
|||
|
||||
(def image-name "babashka/babashka")
|
||||
|
||||
(def image-tag (slurp "resources/BABASHKA_VERSION"))
|
||||
(def ghcr-image-name "ghcr.io/babashka/babashka")
|
||||
|
||||
(def image-tag (str/trim (slurp "resources/BABASHKA_VERSION")))
|
||||
|
||||
(def latest-tag "latest")
|
||||
|
||||
|
|
@ -46,6 +48,11 @@
|
|||
[username password]
|
||||
(exec ["docker" "login" "-u" username "-p" password]))
|
||||
|
||||
(defn docker-login-ghcr
|
||||
[username password]
|
||||
(exec ["docker" "login" "ghcr.io" "-u" username "-p" password]))
|
||||
|
||||
;; TODO: Remove this when Dockerhub goes off
|
||||
(defn build-push
|
||||
[image-tag platform docker-file]
|
||||
(println (format "Building and pushing %s Docker image(s) %s:%s"
|
||||
|
|
@ -55,6 +62,21 @@
|
|||
(let [base-cmd ["docker" "buildx" "build"
|
||||
"-t" (str image-name ":" image-tag)
|
||||
"--platform" platform
|
||||
"--progress" "plain"
|
||||
"--push"
|
||||
"-f" docker-file]]
|
||||
(exec (concat base-cmd label-args ["."]))))
|
||||
|
||||
(defn build-push-ghcr
|
||||
[image-tag platform docker-file]
|
||||
(println (format "Building and pushing %s Docker image(s) %s:%s to GHCR"
|
||||
platform
|
||||
ghcr-image-name
|
||||
image-tag))
|
||||
(let [base-cmd ["docker" "buildx" "build"
|
||||
"-t" (str ghcr-image-name ":" image-tag)
|
||||
"--platform" platform
|
||||
"--progress" "plain"
|
||||
"--push"
|
||||
"-f" docker-file]]
|
||||
(exec (concat base-cmd label-args ["."]))))
|
||||
|
|
@ -64,7 +86,7 @@
|
|||
(doseq [platform (str/split platforms #",")]
|
||||
(let [tarball-platform (str/replace platform #"\/" "-")
|
||||
tarball-platform (if (= "linux-arm64" tarball-platform)
|
||||
"linux-aarch64"
|
||||
"linux-aarch64-static"
|
||||
tarball-platform)
|
||||
tarball-path (format "/tmp/release/babashka-%s-%s.tar.gz"
|
||||
image-tag
|
||||
|
|
@ -74,16 +96,20 @@
|
|||
; this overwrites, but this is to work around having built the uberjar/metabom multiple times
|
||||
(fs/copy (format "/tmp/release/%s-metabom.jar" tarball-platform) "metabom.jar" {:replace-existing true})))
|
||||
(build-push image-tag platforms "Dockerfile.ci")
|
||||
(build-push-ghcr image-tag platforms "Dockerfile.ci")
|
||||
(when-not snapshot?
|
||||
(build-push latest-tag platforms "Dockerfile.ci")))
|
||||
(build-push latest-tag platforms "Dockerfile.ci")
|
||||
(build-push-ghcr latest-tag platforms "Dockerfile.ci")))
|
||||
|
||||
(defn build-push-alpine-images
|
||||
"Build alpine image for linux-amd64 only (no upstream arm64 support yet)"
|
||||
[]
|
||||
(exec ["tar" "zxvf" (str "/tmp/release/babashka-" image-tag "-linux-amd64-static.tar.gz")])
|
||||
(build-push (str image-tag "-alpine") "linux/amd64" "Dockerfile.alpine")
|
||||
(build-push-ghcr (str image-tag "-alpine") "linux/amd64" "Dockerfile.alpine")
|
||||
(when-not snapshot?
|
||||
(build-push "alpine" "linux/amd64" "Dockerfile.alpine")))
|
||||
(build-push "alpine" "linux/amd64" "Dockerfile.alpine")
|
||||
(build-push-ghcr "alpine" "linux/amd64" "Dockerfile.alpine")))
|
||||
|
||||
(when (= *file* (System/getProperty "babashka.file"))
|
||||
(if (and (nil? (read-env "CIRCLE_PULL_REQUEST"))
|
||||
|
|
@ -93,6 +119,7 @@
|
|||
(println "This is a snapshot version")
|
||||
(println "This is a non-snapshot version"))
|
||||
(docker-login (read-env "DOCKERHUB_USER") (read-env "DOCKERHUB_PASS"))
|
||||
(docker-login-ghcr (read-env "CONTAINER_REGISTRY_USER") (read-env "BB_GHCR_TOKEN"))
|
||||
(build-push-images)
|
||||
(build-push-alpine-images))
|
||||
(println "Not publishing docker image(s).")))
|
||||
|
|
|
|||
281
.circleci/script/gen_ci.clj
Normal file
281
.circleci/script/gen_ci.clj
Normal file
|
|
@ -0,0 +1,281 @@
|
|||
(ns gen-ci
|
||||
(:require
|
||||
[babashka.tasks :as tasks]
|
||||
[clj-yaml.core :as yaml]
|
||||
[clojure.string :as str]
|
||||
[flatland.ordered.map :refer [ordered-map]]))
|
||||
|
||||
(def graalvm-version "24")
|
||||
|
||||
(defn run
|
||||
([cmd-name cmd]
|
||||
(run cmd-name cmd nil))
|
||||
([cmd-name cmd no-output-timeout]
|
||||
(let [base {:run {:name cmd-name
|
||||
:command cmd}}]
|
||||
(if no-output-timeout
|
||||
(assoc-in base [:run :no_output_timeout] no-output-timeout)
|
||||
base))))
|
||||
|
||||
(defn gen-steps
|
||||
[shorted? steps]
|
||||
(if shorted?
|
||||
[(run "Shorted" "echo 'Skipping Run'")]
|
||||
steps))
|
||||
|
||||
(defn gen-job
|
||||
[shorted? conf]
|
||||
(if shorted?
|
||||
(-> conf
|
||||
(dissoc :machine :macos)
|
||||
(assoc :resource_class "small" :docker [{:image "ubuntu:latest"}]))
|
||||
conf))
|
||||
|
||||
(defn pull-submodules
|
||||
[]
|
||||
(run "Pull Submodules" "git submodule init\ngit submodule update"))
|
||||
|
||||
(defn deploy
|
||||
[shorted?]
|
||||
(gen-job shorted?
|
||||
(ordered-map
|
||||
:resource_class "large"
|
||||
:docker [{:image "circleci/clojure:lein-2.9.8"}]
|
||||
:working_directory "~/repo"
|
||||
:environment {:LEIN_ROOT "true"}
|
||||
:steps (gen-steps
|
||||
shorted?
|
||||
[:checkout
|
||||
(pull-submodules)
|
||||
{:restore_cache {:keys ["v1-dependencies-{{ checksum \"project.clj\" }}"
|
||||
"v1-dependencies-"]}}
|
||||
{:run ".circleci/script/deploy"}
|
||||
{:save_cache {:paths ["~/.m2"]
|
||||
:key "v1-dependencies-{{ checksum \"project.clj\" }}"}}]))))
|
||||
|
||||
(defn docker
|
||||
[shorted?]
|
||||
(gen-job
|
||||
shorted?
|
||||
(ordered-map
|
||||
:machine {:image "ubuntu-2004:2024.05.1"}
|
||||
:steps
|
||||
(gen-steps
|
||||
shorted?
|
||||
[:checkout
|
||||
(pull-submodules)
|
||||
"setup-docker-buildx"
|
||||
{:attach_workspace {:at "/tmp"}}
|
||||
(run "Build uberjar" "script/uberjar")
|
||||
{:run
|
||||
{:name "Build Docker image"
|
||||
:environment {:PLATFORMS "linux/amd64,linux/arm64"}
|
||||
:command
|
||||
"java -jar ./target/babashka-$(cat resources/BABASHKA_VERSION)-standalone.jar .circleci/script/docker.clj"}}]))))
|
||||
|
||||
(defn jvm
|
||||
[shorted? graalvm-home]
|
||||
(gen-job
|
||||
shorted?
|
||||
(ordered-map
|
||||
:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]
|
||||
:working_directory "~/repo"
|
||||
:environment {:LEIN_ROOT "true"
|
||||
:BABASHKA_PLATFORM "linux"
|
||||
:GRAALVM_VERSION graalvm-version
|
||||
:GRAALVM_HOME graalvm-home
|
||||
:BABASHKA_TEST_ENV "jvm"
|
||||
:BABASHKA_SHA (System/getenv "CIRCLE_SHA1")}
|
||||
:resource_class "large"
|
||||
:steps
|
||||
(gen-steps
|
||||
shorted?
|
||||
[:checkout
|
||||
(pull-submodules)
|
||||
{:restore_cache {:keys ["v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"
|
||||
"v1-dependencies-"]}}
|
||||
(run "Install Clojure" "sudo script/install-clojure")
|
||||
(run "Download GraalVM" "script/install-graalvm")
|
||||
(run
|
||||
"Run JVM tests"
|
||||
"export BABASHKA_FEATURE_JDBC=true
|
||||
export BABASHKA_FEATURE_POSTGRESQL=true
|
||||
script/test\nscript/run_lib_tests")
|
||||
(run
|
||||
"Create uberjar"
|
||||
"mkdir -p /tmp/release
|
||||
script/uberjar
|
||||
VERSION=$(cat resources/BABASHKA_VERSION)
|
||||
jar=target/babashka-$VERSION-standalone.jar
|
||||
cp $jar /tmp/release
|
||||
export PATH=$GRAALVM_HOME/bin:$PATH
|
||||
export JAVA_HOME=$GRAALVM_HOME
|
||||
java -jar $jar script/reflection.clj
|
||||
reflection=\"babashka-$VERSION-reflection.json\"
|
||||
java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$jar\"
|
||||
java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$reflection\"")
|
||||
{:store_artifacts {:path "/tmp/release"
|
||||
:destination "release"}}
|
||||
{:save_cache {:paths ["~/.m2"]
|
||||
:key "v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"}}]))))
|
||||
|
||||
(defn unix
|
||||
[shorted? static? musl? arch executor-conf resource-class graalvm-home platform]
|
||||
(let [env {:LEIN_ROOT "true"
|
||||
:GRAALVM_VERSION graalvm-version
|
||||
:GRAALVM_HOME graalvm-home
|
||||
:BABASHKA_PLATFORM (if (= "mac" platform)
|
||||
"macos"
|
||||
platform)
|
||||
:BABASHKA_TEST_ENV "native"
|
||||
:BABASHKA_XMX "-J-Xmx6500m"
|
||||
:BABASHKA_SHA (System/getenv "CIRCLE_SHA1")}
|
||||
env (if (= "aarch64" arch)
|
||||
(assoc env :BABASHKA_ARCH arch)
|
||||
env)
|
||||
env (if static?
|
||||
(assoc env :BABASHKA_STATIC "true")
|
||||
env)
|
||||
env (if musl?
|
||||
(assoc env :BABASHKA_MUSL "true")
|
||||
env)
|
||||
env (if (= "mac" platform)
|
||||
(assoc env :MACOSX_DEPLOYMENT_TARGET 10.13)
|
||||
env)
|
||||
base-install-cmd "sudo apt-get update\nsudo apt-get -y install build-essential zlib1g-dev"
|
||||
cache-key (format "%s-%s{{ checksum \"project.clj\" }}-{{ checksum \".circleci/config.yml\" }}"
|
||||
platform
|
||||
(if (= "aarch64" arch)
|
||||
"aarch64-"
|
||||
""))]
|
||||
(gen-job shorted?
|
||||
(merge
|
||||
executor-conf
|
||||
(ordered-map
|
||||
:working_directory "~/repo"
|
||||
:environment env
|
||||
:resource_class resource-class
|
||||
:steps (gen-steps shorted?
|
||||
(filter some?
|
||||
[:checkout
|
||||
(when (contains? #{"linux" "linux-aarch64"} platform)
|
||||
(run "Check max glibc version" "script/check_glibc.sh"))
|
||||
{:attach_workspace {:at "/tmp"}}
|
||||
(run "Pull Submodules" "git submodule init\ngit submodule update")
|
||||
{:restore_cache
|
||||
{:keys [cache-key]}}
|
||||
(when (= "mac" platform)
|
||||
(run "Install Rosetta" "sudo /usr/sbin/softwareupdate --install-rosetta --agree-to-license"))
|
||||
(run "Install Clojure" "sudo script/install-clojure")
|
||||
(when (= "mac" platform)
|
||||
(run "Install Leiningen" "script/install-leiningen"))
|
||||
(when (not= "mac" platform)
|
||||
(run "Install native dev tools"
|
||||
(if (and static? musl? (not= "aarch64" arch))
|
||||
(str base-install-cmd "\nsudo -E script/setup-musl")
|
||||
base-install-cmd)))
|
||||
(run "Download GraalVM" "script/install-graalvm")
|
||||
#_(run "Download iprof" "curl -sLO 'https://github.com/babashka/pgo-profiles/releases/download/2023.10.11/default.iprof'")
|
||||
(run "Build binary" (if (= "aarch64" arch)
|
||||
"script/uberjar\nscript/compile -H:PageSize=64K # --pgo=default.iprof"
|
||||
"script/uberjar\nscript/compile # --pgo=default.iprof") "30m")
|
||||
(run "Release" ".circleci/script/release")
|
||||
{:persist_to_workspace {:root "/tmp"
|
||||
:paths ["release"]}}
|
||||
(run "Run tests" "script/test\nscript/run_lib_tests")
|
||||
(run "Release + publish"
|
||||
(str/join "\n" ["export BABASHKA_RELEASE=true"
|
||||
".circleci/script/release"]))
|
||||
{:save_cache
|
||||
{:paths ["~/.m2" "~/graalvm"]
|
||||
:key cache-key}}
|
||||
{:store_artifacts {:path "/tmp/release"
|
||||
:destination "release"}}
|
||||
(run "Publish artifact link to Slack"
|
||||
"./bb .circleci/script/publish_artifact.clj || true")])))))))
|
||||
|
||||
(defn make-config
|
||||
[shorted?]
|
||||
(let [docker-executor-conf {:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]}
|
||||
machine-executor-conf {:machine {:image "ubuntu-2004:2024.05.1"}}
|
||||
mac-executor-conf {:macos {:xcode "13.4.1"}}
|
||||
linux-graalvm-home (str "/home/circleci/graalvm-" graalvm-version)
|
||||
mac-graalvm-home (format "/Users/distiller/graalvm-%s/Contents/Home" graalvm-version)]
|
||||
(ordered-map
|
||||
:version 2.1
|
||||
:commands
|
||||
{:setup-docker-buildx
|
||||
{:steps
|
||||
[{:run
|
||||
{:name "Create multi-platform capabale buildx builder"
|
||||
:command
|
||||
"docker run --privileged --rm tonistiigi/binfmt --install all\ndocker buildx create --name ci-builder --use"}}]}}
|
||||
:jobs (ordered-map
|
||||
:jvm (jvm shorted? linux-graalvm-home)
|
||||
:linux (unix shorted? false false "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
|
||||
:linux-static
|
||||
(unix shorted? true true "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
|
||||
:linux-aarch64-static
|
||||
(unix shorted? true false "aarch64" machine-executor-conf "arm.large" linux-graalvm-home "linux")
|
||||
:mac (unix shorted? false false "amd64" mac-executor-conf "macos.m1.medium.gen1" mac-graalvm-home "mac")
|
||||
:deploy (deploy shorted?)
|
||||
:docker (docker shorted?))
|
||||
:workflows (ordered-map
|
||||
:version 2
|
||||
:ci {:jobs ["jvm"
|
||||
"linux"
|
||||
"linux-static"
|
||||
"mac"
|
||||
"linux-aarch64-static"
|
||||
{:deploy {:filters {:branches {:only "master"}}
|
||||
:requires ["jvm" "linux"]}}
|
||||
{:docker {:filters {:branches {:only "master"}}
|
||||
:requires ["linux" "linux-static" "linux-aarch64-static"]}}]}))))
|
||||
|
||||
(def skip-config
|
||||
{:skip-if-only [#".*.md$"
|
||||
#"^logo\/.*$"]})
|
||||
|
||||
(defn get-changes
|
||||
[]
|
||||
(-> (tasks/shell {:out :string} "git diff --name-only HEAD~1")
|
||||
(:out)
|
||||
(str/split-lines)))
|
||||
|
||||
(defn irrelevant-change?
|
||||
[change regexes]
|
||||
(some? (some #(re-matches % change) regexes)))
|
||||
|
||||
(defn relevant?
|
||||
[change-set regexes]
|
||||
(some? (some #(not (irrelevant-change? % regexes)) change-set)))
|
||||
|
||||
(defn main
|
||||
[]
|
||||
(let [{:keys [skip-if-only]} skip-config
|
||||
changed-files (get-changes)
|
||||
conf (make-config (not (relevant? changed-files skip-if-only)))]
|
||||
(println (yaml/generate-string conf
|
||||
:dumper-options
|
||||
{:flow-style :block}))))
|
||||
|
||||
(when (= *file* (System/getProperty "babashka.file"))
|
||||
(main))
|
||||
|
||||
(comment
|
||||
(main)
|
||||
|
||||
(def regexes
|
||||
[#".*.md$"
|
||||
#".*.clj$" ; ignore clojure files
|
||||
#"^logo\/.*$"])
|
||||
|
||||
(:out (tasks/shell {:out :string} "ls"))
|
||||
|
||||
(irrelevant-change? "src/file.png" regexes)
|
||||
|
||||
(re-matches #".*.clj$" "src/file.clj.dfff")
|
||||
|
||||
(re-matches #"^logo\/.*$" "logo/foo/bar.jpg")
|
||||
|
||||
(relevant? ["src/file.clj"] regexes))
|
||||
|
|
@ -29,7 +29,9 @@ tar zcvf "$archive" bb # bbk
|
|||
|
||||
cd -
|
||||
|
||||
./bb --config .build/bb.edn --deps-root . release-artifact "/tmp/release/$archive"
|
||||
if [ "$BABASHKA_RELEASE" = "true" ]; then
|
||||
./bb --config .build/bb.edn --deps-root . release-artifact "/tmp/release/$archive"
|
||||
fi
|
||||
|
||||
## cleanup
|
||||
|
||||
|
|
|
|||
|
|
@ -1,276 +0,0 @@
|
|||
(ns short-ci
|
||||
(:require
|
||||
[babashka.tasks :as tasks]
|
||||
[clj-yaml.core :as yaml]
|
||||
[clojure.string :as str]
|
||||
[flatland.ordered.map :refer [ordered-map]]))
|
||||
|
||||
(defn run
|
||||
([cmd-name cmd]
|
||||
(run cmd-name cmd nil))
|
||||
([cmd-name cmd no-output-timeout]
|
||||
(let [base {:run {:name cmd-name
|
||||
:command cmd}}]
|
||||
(if no-output-timeout
|
||||
(assoc-in base [:run :no_output_timeout] no-output-timeout)
|
||||
base))))
|
||||
|
||||
(defn gen-steps
|
||||
[shorted? steps]
|
||||
(if shorted?
|
||||
[(run "Shorted" "echo 'Skipping Run'")]
|
||||
steps))
|
||||
|
||||
(defn gen-job
|
||||
[shorted? conf]
|
||||
(if shorted?
|
||||
(-> conf
|
||||
(dissoc :machine :macos)
|
||||
(assoc :resource_class "small" :docker [{:image "ubuntu:latest"}]))
|
||||
conf))
|
||||
|
||||
(defn pull-submodules
|
||||
[]
|
||||
(run "Pull Submodules" "git submodule init\ngit submodule update"))
|
||||
|
||||
(defn deploy
|
||||
[shorted?]
|
||||
(gen-job shorted?
|
||||
(ordered-map
|
||||
:resource_class "large"
|
||||
:docker [{:image "circleci/clojure:lein-2.9.8"}]
|
||||
:working_directory "~/repo"
|
||||
:environment {:LEIN_ROOT "true"}
|
||||
:steps (gen-steps
|
||||
shorted?
|
||||
[:checkout
|
||||
(pull-submodules)
|
||||
{:restore_cache {:keys ["v1-dependencies-{{ checksum \"project.clj\" }}"
|
||||
"v1-dependencies-"]}}
|
||||
{:run ".circleci/script/deploy"}
|
||||
{:save_cache {:paths ["~/.m2"]
|
||||
:key "v1-dependencies-{{ checksum \"project.clj\" }}"}}]))))
|
||||
|
||||
(defn docker
|
||||
[shorted?]
|
||||
(gen-job
|
||||
shorted?
|
||||
(ordered-map
|
||||
:machine {:image "ubuntu-2004:202111-01"}
|
||||
:steps
|
||||
(gen-steps
|
||||
shorted?
|
||||
[:checkout
|
||||
(pull-submodules)
|
||||
"setup-docker-buildx"
|
||||
{:attach_workspace {:at "/tmp"}}
|
||||
(run "Build uberjar" "script/uberjar")
|
||||
{:run
|
||||
{:name "Build Docker image"
|
||||
:environment {:PLATFORMS "linux/amd64,linux/arm64"}
|
||||
:command
|
||||
"java -jar ./target/babashka-$(cat resources/BABASHKA_VERSION)-standalone.jar .circleci/script/docker.clj"}}]))))
|
||||
|
||||
(defn jvm
|
||||
[shorted? graalvm-home]
|
||||
(gen-job
|
||||
shorted?
|
||||
(ordered-map
|
||||
:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]
|
||||
:working_directory "~/repo"
|
||||
:environment {:LEIN_ROOT "true"
|
||||
:BABASHKA_PLATFORM "linux"
|
||||
:GRAALVM_VERSION "22.3.0"
|
||||
:GRAALVM_HOME graalvm-home}
|
||||
:resource_class "large"
|
||||
:steps
|
||||
(gen-steps
|
||||
shorted?
|
||||
[:checkout
|
||||
(pull-submodules)
|
||||
{:restore_cache {:keys ["v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"
|
||||
"v1-dependencies-"]}}
|
||||
(run "Install Clojure" "sudo script/install-clojure")
|
||||
(run "Download GraalVM" "script/install-graalvm")
|
||||
(run
|
||||
"Run JVM tests"
|
||||
"export BABASHKA_FEATURE_JDBC=true
|
||||
export BABASHKA_FEATURE_POSTGRESQL=true
|
||||
script/test\nscript/run_lib_tests")
|
||||
(run "Run as lein command" ".circleci/script/lein")
|
||||
(run
|
||||
"Create uberjar"
|
||||
"mkdir -p /tmp/release
|
||||
script/uberjar
|
||||
VERSION=$(cat resources/BABASHKA_VERSION)
|
||||
jar=target/babashka-$VERSION-standalone.jar
|
||||
cp $jar /tmp/release
|
||||
export PATH=$GRAALVM_HOME/bin:$PATH
|
||||
export JAVA_HOME=$GRAALVM_HOME
|
||||
java -jar $jar script/reflection.clj
|
||||
reflection=\"babashka-$VERSION-reflection.json\"
|
||||
java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$jar\"
|
||||
java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$reflection\"")
|
||||
{:store_artifacts {:path "/tmp/release"
|
||||
:destination "release"}}
|
||||
{:save_cache {:paths ["~/.m2"]
|
||||
:key "v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"}}]))))
|
||||
|
||||
(defn unix
|
||||
[shorted? static? musl? arch executor-conf resource-class graalvm-home platform]
|
||||
(let [env {:LEIN_ROOT "true"
|
||||
:GRAALVM_VERSION "22.3.0"
|
||||
:GRAALVM_HOME graalvm-home
|
||||
:BABASHKA_PLATFORM (if (= "mac" platform)
|
||||
"macos"
|
||||
platform)
|
||||
:BABASHKA_TEST_ENV "native"
|
||||
:BABASHKA_XMX "-J-Xmx6500m"}
|
||||
env (if (= "aarch64" arch)
|
||||
(assoc env :BABASHKA_ARCH arch)
|
||||
env)
|
||||
env (if static?
|
||||
(assoc env :BABASHKA_STATIC "true")
|
||||
env)
|
||||
env (if musl?
|
||||
(assoc env :BABASHKA_MUSL "true")
|
||||
env)
|
||||
env (if (= "mac" platform)
|
||||
(assoc env :MACOSX_DEPLOYMENT_TARGET 10.13)
|
||||
env)
|
||||
base-install-cmd "sudo apt-get update\nsudo apt-get -y install build-essential zlib1g-dev"
|
||||
cache-key (format "%s-%s{{ checksum \"project.clj\" }}-{{ checksum \".circleci/config.yml\" }}"
|
||||
platform
|
||||
(if (= "aarch64" arch)
|
||||
"aarch64-"
|
||||
""))]
|
||||
(gen-job shorted?
|
||||
(merge
|
||||
executor-conf
|
||||
(ordered-map
|
||||
:working_directory "~/repo"
|
||||
:environment env
|
||||
:resource_class resource-class
|
||||
:steps (gen-steps shorted?
|
||||
(filter some?
|
||||
[:checkout
|
||||
{:attach_workspace {:at "/tmp"}}
|
||||
(run "Pull Submodules" "git submodule init\ngit submodule update")
|
||||
{:restore_cache
|
||||
{:keys [cache-key]}}
|
||||
(run "Install Clojure" "sudo script/install-clojure")
|
||||
(when (= "mac" platform)
|
||||
(run "Install Leiningen" "script/install-leiningen"))
|
||||
(when (not= "mac" platform)
|
||||
(run "Install native dev tools"
|
||||
(if (and static? musl? (not= "aarch64" arch))
|
||||
(str base-install-cmd "\nsudo -E script/setup-musl")
|
||||
base-install-cmd)))
|
||||
(run "Download GraalVM" "script/install-graalvm")
|
||||
(run "Build binary" "script/uberjar\nscript/compile" "30m")
|
||||
(run "Run tests" "script/test\nscript/run_lib_tests")
|
||||
(run "Release" ".circleci/script/release")
|
||||
{:persist_to_workspace {:root "/tmp"
|
||||
:paths ["release"]}}
|
||||
{:save_cache
|
||||
{:paths ["~/.m2" "~/graalvm-ce-java11-22.3.0"]
|
||||
:key cache-key}}
|
||||
{:store_artifacts {:path "/tmp/release"
|
||||
:destination "release"}}
|
||||
(run "Publish artifact link to Slack"
|
||||
"./bb .circleci/script/publish_artifact.clj || true")])))))))
|
||||
|
||||
(defn make-config
|
||||
[shorted?]
|
||||
(let [docker-executor-conf {:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]}
|
||||
machine-executor-conf {:machine {:image "ubuntu-2004:202111-01"}}
|
||||
mac-executor-conf {:macos {:xcode "14.0.0"}}
|
||||
linux-graalvm-home "/home/circleci/graalvm-ce-java11-22.3.0"
|
||||
mac-graalvm-home "/Users/distiller/graalvm-ce-java11-22.3.0/Contents/Home"]
|
||||
(ordered-map
|
||||
:version 2.1
|
||||
:commands
|
||||
{:setup-docker-buildx
|
||||
{:steps
|
||||
[{:run
|
||||
{:name "Create multi-platform capabale buildx builder"
|
||||
:command
|
||||
"docker run --privileged --rm tonistiigi/binfmt --install all\ndocker buildx create --name ci-builder --use"}}]}}
|
||||
:jobs (ordered-map
|
||||
:jvm (jvm shorted? linux-graalvm-home)
|
||||
:linux (unix shorted? false false "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
|
||||
:linux-static
|
||||
(unix shorted? true true "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
|
||||
:linux-aarch64 (unix shorted?
|
||||
false
|
||||
false
|
||||
"aarch64"
|
||||
machine-executor-conf
|
||||
"arm.large"
|
||||
linux-graalvm-home
|
||||
"linux")
|
||||
:linux-aarch64-static
|
||||
(unix shorted? true false "aarch64" machine-executor-conf "arm.large" linux-graalvm-home "linux")
|
||||
:mac (unix shorted? false false "amd64" mac-executor-conf "large" mac-graalvm-home "mac")
|
||||
:deploy (deploy shorted?)
|
||||
:docker (docker shorted?))
|
||||
:workflows (ordered-map
|
||||
:version 2
|
||||
:ci {:jobs ["jvm"
|
||||
"linux"
|
||||
"linux-static"
|
||||
"mac"
|
||||
"linux-aarch64"
|
||||
"linux-aarch64-static"
|
||||
{:deploy {:filters {:branches {:only "master"}}
|
||||
:requires ["jvm" "linux"]}}
|
||||
{:docker {:filters {:branches {:only "master"}}
|
||||
:requires ["linux" "linux-static" "linux-aarch64"]}}]}))))
|
||||
|
||||
(def skip-config
|
||||
{:skip-if-only [#".*.md$"
|
||||
#"^logo\/.*$"]})
|
||||
|
||||
(defn get-changes
|
||||
[]
|
||||
(-> (tasks/shell {:out :string} "git diff --name-only HEAD~1")
|
||||
(:out)
|
||||
(str/split-lines)))
|
||||
|
||||
(defn irrelevant-change?
|
||||
[change regexes]
|
||||
(some? (some #(re-matches % change) regexes)))
|
||||
|
||||
(defn relevant?
|
||||
[change-set regexes]
|
||||
(some? (some #(not (irrelevant-change? % regexes)) change-set)))
|
||||
|
||||
(defn main
|
||||
[]
|
||||
(let [{:keys [skip-if-only]} skip-config
|
||||
changed-files (get-changes)
|
||||
conf (make-config (not (relevant? changed-files skip-if-only)))]
|
||||
(println (yaml/generate-string conf
|
||||
:dumper-options
|
||||
{:flow-style :block}))))
|
||||
|
||||
(when (= *file* (System/getProperty "babashka.file"))
|
||||
(main))
|
||||
|
||||
(comment
|
||||
(main)
|
||||
|
||||
(def regexes
|
||||
[#".*.md$"
|
||||
#".*.clj$" ; ignore clojure files
|
||||
#"^logo\/.*$"])
|
||||
|
||||
(:out (tasks/shell {:out :string} "ls"))
|
||||
|
||||
(irrelevant-change? "src/file.png" regexes)
|
||||
|
||||
(re-matches #".*.clj$" "src/file.clj.dfff")
|
||||
|
||||
(re-matches #"^logo\/.*$" "logo/foo/bar.jpg")
|
||||
|
||||
(relevant? ["src/file.clj"] regexes))
|
||||
|
|
@ -5,8 +5,8 @@ task:
|
|||
skip: "changesIncludeOnly('logo/*', '**.md')"
|
||||
env:
|
||||
LEIN_ROOT: "true"
|
||||
GRAALVM_VERSION: "22.3.0"
|
||||
GRAALVM_HOME: ${HOME}/graalvm-ce-java11-22.3.0/Contents/Home
|
||||
GRAALVM_VERSION: "24"
|
||||
GRAALVM_HOME: ${HOME}/graalvm-${GRAALVM_VERSION}/Contents/Home
|
||||
BABASHKA_PLATFORM: macos # used in release script
|
||||
BABASHKA_ARCH: aarch64
|
||||
BABASHKA_TEST_ENV: native
|
||||
|
|
@ -24,8 +24,11 @@ task:
|
|||
sudo /usr/sbin/softwareupdate --install-rosetta --agree-to-license
|
||||
java -version
|
||||
|
||||
export BABASHKA_SHA=$(git rev-parse HEAD)
|
||||
|
||||
script/uberjar
|
||||
script/compile
|
||||
# curl -sLO 'https://github.com/babashka/pgo-profiles/releases/download/2023.10.11/default.iprof'
|
||||
script/compile # --pgo=default.iprof
|
||||
|
||||
# script/test
|
||||
# script/run_lib_tests
|
||||
|
|
|
|||
99
.github/workflows/build-windows.yml
vendored
Normal file
99
.github/workflows/build-windows.yml
vendored
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
name: build
|
||||
|
||||
on:
|
||||
push:
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
- "logo/**"
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
- "logo/**"
|
||||
|
||||
# TODO: Add deploy if needed
|
||||
jobs:
|
||||
native:
|
||||
if: "!contains(github.event.head_commit.message, 'skip ci')"
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: windows-2022
|
||||
name: windows
|
||||
static: false
|
||||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
LEIN_ROOT: "true"
|
||||
GRAALVM_VERSION: "24"
|
||||
BABASHKA_PLATFORM: ${{ matrix.name }} # used in release script
|
||||
BABASHKA_TEST_ENV: native
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
BABASHKA_SHA: ${{ github.sha }}
|
||||
steps:
|
||||
- name: Git checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 1
|
||||
submodules: 'true'
|
||||
|
||||
- name: Cache deps
|
||||
uses: actions/cache@v4
|
||||
id: cache-deps
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('project.clj') }}
|
||||
restore-keys: ${{ runner.os }}-maven-
|
||||
|
||||
- name: Setup GraalVM
|
||||
if: "matrix.static == false"
|
||||
uses: graalvm/setup-graalvm@v1.3.3
|
||||
with:
|
||||
java-version: '24'
|
||||
distribution: 'graalvm'
|
||||
components: 'native-image'
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Install clojure tools
|
||||
uses: DeLaGuardo/setup-clojure@13.2
|
||||
with:
|
||||
cli: latest
|
||||
# lein: latest -- skipped because this uses some PS bullshit
|
||||
|
||||
- name: Babashka version
|
||||
id: babashka-version
|
||||
shell: bash
|
||||
run: |
|
||||
BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION)
|
||||
echo "##[set-output name=version;]${BABASHKA_VERSION}"
|
||||
|
||||
- name: Build
|
||||
shell: cmd
|
||||
run: |
|
||||
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein.bat', 'lein.bat')"
|
||||
call lein self-install
|
||||
|
||||
set GRAALVM_HOME=%JAVA_HOME%
|
||||
call script/uberjar.bat
|
||||
|
||||
call script/compile.bat
|
||||
|
||||
echo Creating zip archive
|
||||
|
||||
set zip=babashka-%BABASHKA_VERSION%-windows-amd64.zip
|
||||
|
||||
jar -cMf %zip% bb.exe
|
||||
|
||||
bb --config .build/bb.edn --deps-root . release-artifact %zip%
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
path: bb.exe
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64
|
||||
|
||||
- name: Test binary and libs
|
||||
shell: cmd
|
||||
run: |
|
||||
set BABASHKA_CLASSPATH=
|
||||
set BABASHKA_TEST_ENV=native
|
||||
call script/test.bat :windows
|
||||
call script/run_lib_tests.bat
|
||||
55
.github/workflows/build.yml
vendored
55
.github/workflows/build.yml
vendored
|
|
@ -24,6 +24,7 @@ jobs:
|
|||
LEIN_ROOT: "true"
|
||||
BABASHKA_PLATFORM: linux # could be used in jar name
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
BABASHKA_SHA: ${{ github.sha }}
|
||||
steps:
|
||||
- name: Git checkout
|
||||
uses: actions/checkout@v2
|
||||
|
|
@ -32,7 +33,7 @@ jobs:
|
|||
submodules: 'true'
|
||||
|
||||
- name: Cache deps
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v4
|
||||
id: cache-deps
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
|
|
@ -43,7 +44,7 @@ jobs:
|
|||
uses: actions/setup-java@v2
|
||||
with:
|
||||
distribution: 'adopt-hotspot'
|
||||
java-version: '11'
|
||||
java-version: '19'
|
||||
|
||||
- name: Install clojure tools
|
||||
uses: DeLaGuardo/setup-clojure@5.0
|
||||
|
|
@ -59,9 +60,6 @@ jobs:
|
|||
script/test
|
||||
script/run_lib_tests
|
||||
|
||||
- name: Run as lein command
|
||||
run: echo '{:a 1}' | lein bb '(:a *in*)'
|
||||
|
||||
- name: Build uberjar
|
||||
run: |
|
||||
mkdir -p /tmp/release
|
||||
|
|
@ -80,7 +78,7 @@ jobs:
|
|||
BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION)
|
||||
echo "##[set-output name=version;]${BABASHKA_VERSION}"
|
||||
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar
|
||||
path: target/babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar
|
||||
|
|
@ -90,7 +88,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: macos-12
|
||||
- os: macos-13
|
||||
name: macos
|
||||
static: false
|
||||
#- os: ubuntu-latest
|
||||
|
|
@ -102,11 +100,12 @@ jobs:
|
|||
runs-on: ${{ matrix.os }}
|
||||
env:
|
||||
LEIN_ROOT: "true"
|
||||
GRAALVM_VERSION: "22.3.0"
|
||||
GRAALVM_VERSION: "24"
|
||||
BABASHKA_PLATFORM: ${{ matrix.name }} # used in release script
|
||||
BABASHKA_TEST_ENV: native
|
||||
BABASHKA_XMX: "-J-Xmx6500m"
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
BABASHKA_SHA: ${{ github.sha }}
|
||||
steps:
|
||||
- name: Git checkout
|
||||
uses: actions/checkout@v2
|
||||
|
|
@ -115,7 +114,7 @@ jobs:
|
|||
submodules: 'true'
|
||||
|
||||
- name: Cache deps
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v4
|
||||
id: cache-deps
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
|
|
@ -126,8 +125,8 @@ jobs:
|
|||
if: "matrix.static == false"
|
||||
uses: graalvm/setup-graalvm@v1
|
||||
with:
|
||||
version: '22.3.0'
|
||||
java-version: '11'
|
||||
java-version: '24'
|
||||
distribution: 'graalvm'
|
||||
components: 'native-image'
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
|
|
@ -135,8 +134,8 @@ jobs:
|
|||
if: "matrix.static == true"
|
||||
uses: graalvm/setup-graalvm@v1
|
||||
with:
|
||||
version: '22.3.0'
|
||||
java-version: '11'
|
||||
version: '24'
|
||||
distribution: 'graalvm'
|
||||
components: 'native-image'
|
||||
native-image-musl: true
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
@ -173,6 +172,19 @@ jobs:
|
|||
BABASHKA_MUSL: "true"
|
||||
run: script/compile
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
path: bb
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64
|
||||
|
||||
- name: Upload static artifact
|
||||
if: "matrix.static == true"
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
path: bb
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-static-amd64
|
||||
|
||||
- name: Test binary and libs
|
||||
run: |
|
||||
script/test
|
||||
|
|
@ -181,19 +193,6 @@ jobs:
|
|||
- name: Release
|
||||
run: .circleci/script/release
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
path: bb
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64
|
||||
|
||||
- name: Upload static artifact
|
||||
if: "matrix.static == true"
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
path: bb
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-static-amd64
|
||||
|
||||
docker:
|
||||
if: ${{ false }} # Disabled
|
||||
# if: "!contains(github.event.head_commit.message, 'skip ci') && github.event_name == 'push' && github.ref == 'refs/heads/master'"
|
||||
|
|
@ -217,13 +216,13 @@ jobs:
|
|||
run: mkdir -p /tmp/release
|
||||
|
||||
- name: Download linux binary
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v4.1.7
|
||||
with:
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-linux-amd64.zip
|
||||
path: /tmp/release
|
||||
|
||||
- name: Download static linux binary
|
||||
uses: actions/download-artifact@v2
|
||||
uses: actions/download-artifact@v4.1.7
|
||||
with:
|
||||
name: babashka-${{ steps.babashka-version.outputs.version }}-linux-static-amd64.zip
|
||||
path: /tmp/release-static
|
||||
|
|
|
|||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -36,3 +36,6 @@ bb.build_artifacts.txt
|
|||
target
|
||||
.nrepl-port
|
||||
.DS_Store
|
||||
.portal
|
||||
default.iprof
|
||||
scratch.clj
|
||||
|
|
|
|||
416
CHANGELOG.md
416
CHANGELOG.md
|
|
@ -9,6 +9,405 @@ A preview of the next release can be installed from
|
|||
|
||||
## Unreleased
|
||||
|
||||
- [#1818](https://github.com/babashka/babashka/issues/1818): wrong argument order in `clojure.java.io/resource` implementation
|
||||
- Add `java.text.BreakIterator`
|
||||
- Bump `fs` to `0.5.25`
|
||||
- Bump `jsoup` to `1.20.1`
|
||||
- Bump `edamame` to `1.4.30`
|
||||
- [#1815](https://github.com/babashka/babashka/issues/1815): Make install-script wget-compatible ([@eval](https://github.com/eval))
|
||||
|
||||
|
||||
## 1.12.200 (2025-04-26)
|
||||
|
||||
- Improve Java reflection based on provided type hints (read blog post [here](https://blog.michielborkent.nl/babashka-java-reflection-type-hints.html))
|
||||
- Add compatibility with the [fusebox](https://github.com/potetm/fusebox) library
|
||||
- Fix virtual `ThreadBuilder` interop
|
||||
- Add `java.util.concurrent.ThreadLocalRandom`
|
||||
- Add `java.util.concurrent.locks.ReentrantLock`
|
||||
- Add classes:
|
||||
- `java.time.chrono.ChronoLocalDate`
|
||||
- `java.time.temporal.TemporalUnit`
|
||||
- `java.time.chrono.ChronoLocalDateTime`
|
||||
- `java.time.chrono.ChronoZonedDateTime`
|
||||
- `java.time.chrono.Chronology`
|
||||
|
||||
## 1.12.199 (2025-04-18)
|
||||
|
||||
- [#1806](https://github.com/babashka/babashka/issues/1806): Add `cheshire.factory` namespace ([@lread](https://github.com/lread))
|
||||
|
||||
## 1.12.198 (2025-04-17)
|
||||
|
||||
- Bump GraalVM to `24`
|
||||
- Bump SCI to `0.9.45`
|
||||
- Bump edamame to `1.4.28`
|
||||
- [#1801](https://github.com/babashka/babashka/issues/1801): Add `java.util.regex.PatternSyntaxException`
|
||||
- Bump core.async to `1.8.735`
|
||||
- Bump cheshire to `6.0.0`
|
||||
- Bump babashka.cli to `0.8.65`
|
||||
|
||||
## 1.12.197 (2025-02-28)
|
||||
|
||||
- [#1785](https://github.com/babashka/babashka/issues/1785): Allow subclasses of `Throwable` to have instance methods invoked ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1791](https://github.com/babashka/babashka/issues/1791): interop problem on Jsoup form element
|
||||
- [#1793](https://github.com/babashka/babashka/issues/1793): Bump `rewrite-clj` to `1.1.49` (fixes parsing of `foo//` among other things)
|
||||
- Bump `deps.clj`
|
||||
- Bump `fs`
|
||||
|
||||
## 1.12.196 (2024-12-24)
|
||||
|
||||
- [#1771](https://github.com/babashka/babashka/issues/1771): `*e*` in REPL should contain exception thrown by user, not a wrapped one
|
||||
- [#1777](https://github.com/babashka/babashka/issues/1777) Add `java.nio.file.attribute.UserDefinedFileAttributeView`
|
||||
- [#1776](https://github.com/babashka/babashka/issues/1776) `Add java.nio.file.attribute.PosixFileAttributes`
|
||||
- [#1761](https://github.com/babashka/babashka/issues/1761) Support calling `clojure.lang.RT/iter`
|
||||
- [#1760](https://github.com/babashka/babashka/issues/1760) For compatibility with [Fireworks v0.10.3](https://github.com/paintparty/fireworks), added the following to `:instance-checks` entry in `babashka.impl.classes/classes`([@paintparty](https://github.com/paintparty))
|
||||
- `clojure.lang.PersistentArrayMap$TransientArrayMap`
|
||||
- `clojure.lang.PersistentHashMap$TransientHashMap`
|
||||
- `clojure.lang.PersistentVector$TransientVector`
|
||||
- `java.lang.NoSuchFieldException`
|
||||
- `java.util.AbstractMap`
|
||||
- `java.util.AbstractSet`
|
||||
- `java.util.AbstractList`
|
||||
- [#1760](https://github.com/babashka/babashka/issues/1760) For compatibility with [Fireworks v0.10.3](https://github.com/paintparty/fireworks), added `volatile?` entry to `babashka.impl.clojure.core/core-extras`([@paintparty](https://github.com/paintparty))
|
||||
- Bump `babashka.cli` to `0.8.61`
|
||||
- Bump `clj-yaml` to `1.0.29`
|
||||
- [#1768](https://github.com/babashka/babashka/issues/1768): Add `taoensso.timbre` `color-str` function
|
||||
- Add classes:
|
||||
- `javax.crypto.KeyAgreement`
|
||||
- `java.security.KeyPairGenerator`
|
||||
- `java.security.KeyPair`
|
||||
- `java.security.spec.ECGenParameterSpec`
|
||||
- `java.security.spec.PKCS8EncodedKeySpec`
|
||||
- `java.security.spec.X509EncodedKeySpec`
|
||||
- `java.security.Signature`
|
||||
- Add `java.util.concurrent.CompletionStage`
|
||||
- Bump `core.async` to `1.7.701`
|
||||
- Bump `org.babashka/cli` to `0.8.162`
|
||||
|
||||
## 1.12.195 (2024-11-12)
|
||||
|
||||
- Include [jsoup](https://jsoup.org/) for HTML parsing. This makes bb compatible with the [hickory](https://github.com/clj-commons/hickory) library (and possibly other libraries?).
|
||||
- [#1752](https://github.com/babashka/babashka/issues/1752): include `java.lang.SecurityException` for `java.net.http.HttpClient` support ([@grzm](https://github.com/grzm))
|
||||
- [#1748](https://github.com/babashka/babashka/issues/1748): add `clojure.core/ensure`
|
||||
- Upgrade `taoensso/timbre`to `v6.6.0`
|
||||
- Upgrade `babashka.http-client` to `v0.4.22`
|
||||
- Add `:git/sha` from build to `bb describe` output ([@lispyclouds](https://github.com/lispyclouds))
|
||||
- Fix NPE with determining if executing from self-contained executable
|
||||
|
||||
## 1.12.194 (2024-10-12)
|
||||
|
||||
- Upgrade to GraalVM 23
|
||||
- [#1743](https://github.com/babashka/babashka/issues/1743): fix new fully qualified instance method in call position with GraalVM 23
|
||||
|
||||
## 1.12.193 (2024-10-11)
|
||||
|
||||
- Clojure 1.12 interop: method thunks, FI coercion, array notation (see below)
|
||||
- Upgrade SCI reflector based on clojure 1.12 and remove specific workaround for
|
||||
`Thread/sleep` interop
|
||||
- Add `tools.reader.edn/read`
|
||||
- Fix [#1741](https://github.com/babashka/babashka/issues/1741): `(taoensso.timbre/spy)` now relies on macros from `taoensso.encore` previously not available in bb
|
||||
|
||||
Examples of the new Clojure interop:
|
||||
|
||||
``` clojure
|
||||
;; Qualified methods in call position:
|
||||
(String/.length "123") ;;=> 3
|
||||
(String/new "123") ;;=> "123"
|
||||
|
||||
;; Qualified methods in value position, as functions:
|
||||
(map Integer/parseInt ["1" "22" "333"]) ;;=> (1 22 333)
|
||||
(map String/.length ["1" "22" "333"]) ;;=> (1 2 3)
|
||||
(map String/new ["1" "22" "333"]) ;;=> ("1" "22" "333")
|
||||
|
||||
;; Typed multi-dimensional array class notation:
|
||||
long/1 ;;=> 1-dimensional long array class
|
||||
String/2 ;;=> 2-dimensional String array class
|
||||
|
||||
;; Pass Clojure IFn to Java where `java.util.function.Predicate`, etc. is expected:
|
||||
(into [] (doto (java.util.ArrayList. [1 2 3]) (.removeIf even?))) ;;=> [1 3]
|
||||
(.computeIfAbsent (java.util.HashMap.) "abc" #(str % %)) ;;=> "abcabc"
|
||||
```
|
||||
|
||||
## 1.4.192 (2024-09-12)
|
||||
|
||||
- Upgrade Clojure to `1.12.0`
|
||||
- [#1722](https://github.com/babashka/babashka/issues/1722): add new clojure 1.12 vars
|
||||
- [#1720](https://github.com/babashka/babashka/issues/1720): include new clojure 1.12's `clojure.java.process`
|
||||
- [#1719](https://github.com/babashka/babashka/issues/1719): add new clojure 1.12 `clojure.repl.deps` namespace. Only calls with explicit versions are supported.
|
||||
- [#1598](https://github.com/babashka/babashka/issues/1598): use Rosetta on CircleCI to build x64 images
|
||||
- [#1716](https://github.com/babashka/babashka/issues/1716): expose `babashka.http-client.interceptors` namespace
|
||||
- [#1707](https://github.com/babashka/babashka/issues/1707): support `aset` on primitive array
|
||||
- [#1676](https://github.com/babashka/babashka/issues/1676): restore compatibility with newest [at-at](https://github.com/overtone/at-at/) version (1.3.58)
|
||||
- Bump SCI
|
||||
- Bump `fs`
|
||||
- Bump `process`
|
||||
- Bump `deps.clj`
|
||||
- Bump `http-client`
|
||||
- Bump `clj-yaml`
|
||||
- Bump `edamame`
|
||||
- Bump `rewrite-clj`
|
||||
- Add `java.io.LineNumberReader`
|
||||
|
||||
## 1.3.191 (2024-06-19)
|
||||
|
||||
- Fix [#1688](https://github.com/babashka/babashka/issues/1688): `use-fixtures` should add metadata to `*ns*`
|
||||
- Fix [#1692](https://github.com/babashka/babashka/issues/1692): Add support for `ITransientSet` and `org.flatland/ordered-set`
|
||||
- Bump org.flatland/ordered to `1.15.12`.
|
||||
- Partially Fix [#1695](https://github.com/babashka/babashka/issues/1695): `--repl` arg handling should consume only one arg (itself) ([@bobisageek](https://github.com/bobisageek))
|
||||
- Partially Fix [#1695](https://github.com/babashka/babashka/issues/1695): make `*command-line-args*` value available in the REPL ([@bobisageek](https://github.com/bobisageek))
|
||||
- Fix [#1686](https://github.com/babashka/babashka/issues/1686): do not fetch dependencies/invoke java for `version`, `help`, and `describe` options ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1696](https://github.com/babashka/babashka/issues/1696): add `clojure.lang.DynamicClassLoader` constructors ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1696](https://github.com/babashka/babashka/issues/1696): add `clojure.core/*source-path*` (points to the same sci var as `*file*`) ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1696](https://github.com/babashka/babashka/issues/1696): add `clojure.main/with-read-known` ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1696](https://github.com/babashka/babashka/issues/1696): add `clojure.core.server/repl-read` ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1696](https://github.com/babashka/babashka/issues/1696): make the `cognitect-labs/transcriptor` library work ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1700](https://github.com/babashka/babashka/issues/1700): catch exceptions from resolving symbolic links during `bb.edn` lookup ([@bobisageek](https://github.com/bobisageek))
|
||||
- Support `java.nio.channels.ByteChannel` + several other related interop
|
||||
- Bump `nrepl/bencode` to `1.2.0`
|
||||
- Bump `babashka/fs`
|
||||
- Bump `org.babashka/http-client` to `0.4.18`
|
||||
|
||||
## 1.3.190 (2024-04-17)
|
||||
|
||||
- Fix [#1679](https://github.com/babashka/babashka/issues/1679): bump timbre and fix wrapping `timbre/log!`
|
||||
- Add `java.util.concurrent.CountDownLatch`
|
||||
- Add `java.lang.ThreadLocal`
|
||||
- Bump `babashka.process`
|
||||
- Bump httpkit to `2.8.0-RC1`
|
||||
- Bump clojure to `1.11.2`
|
||||
- Bump deps.clj
|
||||
- Bump `babashka.cli`
|
||||
- Bump `cheshire` to `5.13.0`
|
||||
- Bump `http-client` to `0.4.17`
|
||||
|
||||
## 1.3.189 (2024-02-22)
|
||||
|
||||
- [#1660](https://github.com/babashka/babashka/issues/1660): add `:deps-root` as part of hash to avoid caching issue with `deps.clj`
|
||||
- [#1632](https://github.com/babashka/babashka/issues/1632): fix `(.readPassword (System/console))` by upgrading GraalVM to `21.0.2`
|
||||
- [#1661](https://github.com/babashka/babashka/issues/1661): follow symlink when reading adjacent bb.edn
|
||||
- [#1665](https://github.com/babashka/babashka/issues/1665): `read-string` should use non-indexing reader for compatibilty with Clojure
|
||||
- Bump edamame to 1.4.24
|
||||
- Bump http-client to 0.4.16
|
||||
- Bump babashka.cli to 0.8.57
|
||||
- Uberjar task: support reader conditional in .cljc file
|
||||
- Support reader conditional in .cljc file when creating uberjar
|
||||
- Add more `javax.net.ssl` classes
|
||||
- [#1675](https://github.com/babashka/babashka/issues/1675): add `hash-unordered-coll`
|
||||
|
||||
## 1.3.188 (2024-01-12)
|
||||
|
||||
- [#1658](https://github.com/babashka/babashka/issues/1658): fix command line parsing for scripts that parse `--version` or `version` etc
|
||||
|
||||
## 1.3.187 (2024-01-09)
|
||||
|
||||
- Add `clojure.reflect/reflect`
|
||||
- Add `java.util.ScheduledFuture`, `java.time.temporal.WeekFields`
|
||||
- Support `Runnable` to be used without import
|
||||
- Allow `catch` to be used as var name
|
||||
- [#1646](https://github.com/babashka/babashka/issues/1646): command-line-args are dropped when file exists with same name
|
||||
- [#1645](https://github.com/babashka/babashka/issues/1645): Support for `clojure.lang.LongRange`
|
||||
- [#1652](https://github.com/babashka/babashka/issues/1652): allow `bb.edn` to be empty
|
||||
- [#1586](https://github.com/babashka/babashka/issues/1586): warn when config file doesn't exist and `--debug` is enabled
|
||||
- [#1410](https://github.com/babashka/babashka/issues/1410): better error message when exec fn doesn't exist
|
||||
- Bump `babashka.cli` to `0.8.55` which contains subcommand improvements
|
||||
- Bump `deps.clj` to `1.11.1.1435`
|
||||
- Bump `babashka.fs` to `0.5.20`
|
||||
- Compatibility with `plumbing.core`
|
||||
- Compatibility with `shadow.css` by improving `tools.reader` compatibility
|
||||
- [#1647](https://github.com/babashka/babashka/issues/1647): Allow capturing env vars at build time (only relevant for building bb)
|
||||
|
||||
## 1.3.186 (2023-11-02)
|
||||
|
||||
- [Support self-contained binaries as uberjars!](https://github.com/babashka/babashka/wiki/Self-contained-executable#uberjar)
|
||||
- Add `java.security.KeyFactory`, `java.security.spec.PKCS8EncodedKeySpec`, `java.net.URISyntaxException`, `javax.crypto.spec.IvParameterSpec`
|
||||
- Fix babashka.process/exec wrt `babashka.process/*defaults*`
|
||||
- [#1632](https://github.com/babashka/babashka/issues/1632): Partial fix for `(.readPassword (System/console))`
|
||||
- Enable producing self-contained binaries using [uberjars](https://github.com/babashka/babashka/wiki/Self-contained-executable#uberjar)
|
||||
- Bump httpkit to `2.8.0-beta3` (fixes GraalVM issue with virtual threads)
|
||||
- Bump `deps.clj` and `fs`
|
||||
- Expose `taoensso.timbre.appenders.core`
|
||||
- nREPL: implement `ns-list` op
|
||||
- SCI: optimize `swap!`, `deref` and `reset!` for normal atoms (rather than user-created `IAtom`s)
|
||||
- Add test for [#1639](https://github.com/babashka/babashka/issues/1639)
|
||||
- Upgrade to GraalVM 21.0.1
|
||||
|
||||
## 1.3.185 (2023-09-28)
|
||||
|
||||
- [#1624](https://github.com/babashka/babashka/pull/1624): Use Oracle GraalVM 21 ([@lispyclouds](https://github.com/lispyclouds))
|
||||
- Use PGO to speed up loops (now 2-3x faster for `(time (loop [val 0 cnt 10000000] (if (pos? cnt) (recur (inc val) (dec cnt)) val)))`!)
|
||||
- Bump babashka.http-client to v0.4.15
|
||||
- Bump rewrite-clj to v0.1.1.47
|
||||
- [#1619](https://github.com/babashka/babashka/issues/1619): Fix reflection issue with `Thread/sleep` in `core.async/timeout`
|
||||
- Support interop on `java.util.stream.IntStream`
|
||||
- [#1513](https://github.com/babashka/babashka/issues/1513): Fix interop on `Thread/sleep` with numbers that aren't already longs
|
||||
- Bump babashka.cli to 0.7.53
|
||||
- Fix [#babashka.nrepl/66](https://github.com/babashka/babashka.nrepl/issues/66)
|
||||
- Various nREPL server improvements (classpath op, file lookup information for `cider-find-var`)
|
||||
- Bump cheshire to 5.12.0
|
||||
|
||||
## 1.3.184 (2023-08-22)
|
||||
|
||||
- Remove leftover debugging output from deps.clj
|
||||
|
||||
## 1.3.183 (2023-08-22)
|
||||
|
||||
- [#1592](https://github.com/babashka/babashka/issues/1592): expose `sci.core` in babashka
|
||||
- [#1596](https://github.com/babashka/babashka/issues/1596): Fix `clojure.java.browse/browse-url` truncates URLs with multiple query parameters on Windows
|
||||
- [#1599](https://github.com/babashka/babashka/issues/1599): propagate error from `run` when task does not exist
|
||||
- Bump clj-yaml to `1.0.27`
|
||||
- [#1604](https://github.com/babashka/babashka/issues/1604): throw `FileNotFoundException` when requiring namespace whose file cannot be found (as JVM Clojure does)
|
||||
- Bump integrant CI tests
|
||||
- [#1600](https://github.com/babashka/babashka/issues/1600): use pagesize of 64K on linux aarch64, so it works on Asahi linux
|
||||
- Expose `selmer.parser/resolve-arg`
|
||||
- [#1610](https://github.com/babashka/babashka/issues/1610): expose `babashka.http-client.websocket` namespace
|
||||
- Bump `babashka.http-client` to `0.4.14`
|
||||
- [#1568](https://github.com/babashka/babashka/issues/1568): warn when task overrides built-in command
|
||||
|
||||
## 1.3.182 (2023-07-20)
|
||||
|
||||
- [#1579](https://github.com/babashka/babashka/issues/1579): add `clojure.tools.reader/resolve-symbol`
|
||||
- [#1581](https://github.com/babashka/babashka/issues/1581): `bb print-deps`: sort dependencies ([@teodorlu](https://github.com/teodorlu))
|
||||
- Upgrade `babashka.http-client` to `0.4.12`, fixes `:insecure` option
|
||||
- Bump [edamame](https://github.com/borkdude/edamame) to `1.3.23`: fixes infinite loop with reader conditional expression
|
||||
- Bump [Selmer](https://github.com/yogthos/Selmer) to Bumping to `1.12.59`
|
||||
- Bump [deps.clj](https://github.com/borkdude/deps.clj) with more fixes which should make downloading/installation of tools jar more robust
|
||||
- Add `javax.net.ssl.X509ExtendedTrustManager` class
|
||||
- Bump [babashka.process](https://github.com/babashka/process): accept path or file as `:dir` argument
|
||||
- Bump [hiccup](https://github.com/weavejester/hiccup) to `2.0.0-RC1`
|
||||
|
||||
## 1.3.181 (2023-06-13)
|
||||
|
||||
- [#1575](https://github.com/babashka/babashka/issues/1575): fix command line parsing problem with `-e` + `*command-line-args*`
|
||||
- [#1576](https://github.com/babashka/babashka/issues/1576): make downloading/unzipping of deps.clj tools .zip file more robust
|
||||
|
||||
## 1.3.180 (2023-05-28)
|
||||
|
||||
- [#1524](https://github.com/babashka/babashka/issues/1524): Remove dynamic builds for linux-aarch64 ([@lispyclouds](https://github.com/lispyclouds))
|
||||
- [#1577](https://github.com/babashka/babashka/issues/1557): Add support for `babashka.process/exec` after namespace reload of `babashka.process` ([@lread](https://github.com/lread))
|
||||
- [#1548](https://github.com/babashka/babashka/issues/1548): shell and sh should respect `babashka.process/*defaults*`
|
||||
- [#1524](https://github.com/babashka/babashka/issues/1524): deprecate (remove) linux-aarch64 dynamic binary build
|
||||
- Expose `org.graalvm.nativeimage.ProcessProperties/exec`
|
||||
- Bump `babashka.http-client` to `0.3.11`
|
||||
- Bump `babashka.fs` to `0.4.19`
|
||||
- Bump `babashka.process` to `0.5.21`
|
||||
|
||||
## 1.3.179 (2023-04-26)
|
||||
|
||||
- [#1544](https://github.com/babashka/babashka/issues/1544): `:local/root` in script-adjacent bb.edn should resolve relative to script
|
||||
- [#1545](https://github.com/babashka/babashka/issues/1545): Adjacent `bb.edn` not respected with explicit `-f` option
|
||||
- [#1546](https://github.com/babashka/babashka/issues/1546): add `.contains` for vector and lazy-seq
|
||||
|
||||
## 1.3.178 (2023-04-21)
|
||||
|
||||
- Fix regression with [#1541](https://github.com/babashka/babashka/issues/1541)
|
||||
|
||||
## 1.3.177 (2023-04-21)
|
||||
|
||||
- [#1541](https://github.com/babashka/babashka/issues/1541): respect `bb.edn`
|
||||
adjacent to invoked file. This eases writing system-global scripts from
|
||||
projects without using bbin. See [docs](https://book.babashka.org/#_script_adjacent_bb_edn).
|
||||
- [#1523](https://github.com/babashka/babashka/pull/1523): Reduce the size of the Docker images ([@raszi](https://github.com/raszi))
|
||||
- Upgrade deps.clj to v1.11.1.1273
|
||||
- Upgrade transit-clj to 1.0.333
|
||||
- Add `java.security.cert.CertificateFactory`
|
||||
- Bump clj-yaml to 1.0.26
|
||||
- Bump edamame to 1.3.21
|
||||
- Add `UnsupportedOperationException`
|
||||
- Bump babashka CLI to 0.7.51
|
||||
- Bump babashka http-client to 0.2.9
|
||||
- Add `--install-exit-handlers` to native-image build to support shutdown hook + SIGTERM
|
||||
|
||||
## 1.3.176 (2023-03-18)
|
||||
|
||||
- Upgrade http-client to 0.1.8, fixes binary file uploads (which messed up the previous release)
|
||||
- Downgrade org.flatland/ordered to 1.5.9 due to this [issue](https://github.com/clj-commons/ordered/issues/71)
|
||||
|
||||
## 1.3.175 (2023-03-18)
|
||||
|
||||
- [#1507](https://github.com/babashka/babashka/issues/1507): Expose methods on java.lang.VirtualThread ([@lispyclouds](https://github.com/lispyclouds))
|
||||
- [#1510](https://github.com/babashka/babashka/issues/1510): add virtual thread interop on `Thread`
|
||||
- [#1511](https://github.com/babashka/babashka/issues/1511): support for domain sockets
|
||||
- [#1521](https://github.com/babashka/babashka/issues/1521): push images to GHCR ([@lispyclouds](https://github.com/lispyclouds))
|
||||
- Bump edamame to 1.3.20
|
||||
- Bump deps.clj to 1.11.1.1257
|
||||
- Bump org.flatland/ordered to 1.15.10
|
||||
- Support `clojure.lang.MapEntry/create`
|
||||
- clojure.core.async `go` macro now uses virtual threads
|
||||
- Bump babashka.cli to 0.6.50
|
||||
- Bump http-client to 0.1.7
|
||||
|
||||
## 1.2.174 (2023-03-01)
|
||||
|
||||
- Use GraalVM 22.3.1 on JDK 19.0.2. This adds virtual thread support. See [demo](https://twitter.com/borkdude/status/1572222344684531717).
|
||||
- Expose more `jaxax.crypto` classes
|
||||
- Add more `java.time` and related classes with the goal of supporting [juxt.tick](https://github.com/juxt/tick) ([issue](https://github.com/juxt/tick/issues/86))
|
||||
- Compatibility with [kaocha](https://github.com/lambdaisland/kaocha) test runner
|
||||
- [#1000](https://github.com/babashka/babashka/issues/1000): add lib tests for xforms ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1482](https://github.com/babashka/babashka/issues/1482): make loading of libs thread safe
|
||||
- [#1487](https://github.com/babashka/babashka/issues/1487): `babashka.tasks/clojure` should be supported without arguments to start a REPL
|
||||
- [#1496](https://github.com/babashka/babashka/issues/1496): Add `set-agent-send-executor!` and `set-agent-send-off-executor!`
|
||||
- [#1489](https://github.com/babashka/babashka/issues/1489): Don't overwrite non-empty, non-jar files when writing uberscript/uberjar ([@bobisageek](https://github.com/bobisageek))
|
||||
- [#1506](https://github.com/babashka/babashka/issues/1506): `:exec-args` in task should override `:exec-args` on fn metadata
|
||||
- [#1501](https://github.com/babashka/babashka/issues/1501): equals on deftype
|
||||
- Add support for `.getWatches` on atoms
|
||||
- Bump `babashka.fs` to `0.3.17`
|
||||
- Bump `deps.clj` to `1.11.1.1237`
|
||||
- Bump `babashka.http-client` to `0.1.5`
|
||||
- Bump `babashka.cli` to `0.6.46`
|
||||
|
||||
## 1.1.173 (2023-02-04)
|
||||
|
||||
- [#1473](https://github.com/babashka/babashka/issues/1473): support `--config` in other dir + `:local/root` ([@lispyclouds](https://github.com/lispyclouds))
|
||||
- Compatibility with `clojure.tools.namespace.repl/refresh` and `clojure.java.classpath`
|
||||
- `(clojure.lang.RT/baseLoader)` now returns classloader with babashka dependencies on classpath
|
||||
- Support reading tags from `data_readers.clj` and `data_readers.cljc`
|
||||
- Don't exit REPL when `babashka.deps/add-deps` fails
|
||||
- Fix [#1474](https://github.com/babashka/babashka/issues/1474): when `.bb` file is in different artifact, `.clj` file is loaded first if it appears first on classpath
|
||||
- Support for `*loaded-libs*` and `(loaded-libs)`
|
||||
- Bump rewrite-clj to `1.1.46`
|
||||
- Bump http-client to `0.0.3`
|
||||
- Bump fs to `0.2.15`
|
||||
- Bump process to `0.4.16`
|
||||
|
||||
## 1.1.172 (2023-01-23)
|
||||
|
||||
- [#1472](https://github.com/babashka/babashka/issues/1472): fix tokenization of `babashka.tasks/clojure`: command was tokenized twice (regression was introduced in `1.0.168`)
|
||||
- **BREAKING**: Bump `babashka.process`: change default for `:out :append` to `:out :write`. This default is undocumented so the impact should be small.
|
||||
|
||||
## 1.1.171 (2023-01-23)
|
||||
|
||||
- [#1467](https://github.com/babashka/babashka/issues/1467): **BREAKING**: avoid printing results, unless `--prn` is enabled (aside from `-e`, `-o` and `-O`).
|
||||
- Include [http-client](https://github.com/babashka/http-client) as built-in library
|
||||
- SCI: support `add-watch` on vars
|
||||
- Compatibility with [eftest](https://github.com/weavejester/eftest) test runner (see [demo](https://twitter.com/borkdude/status/1616886788898885632))
|
||||
- Add classes:
|
||||
- `java.util.concurrent.Callable`
|
||||
- `java.util.concurrent.ExecutorService`
|
||||
- Expose `clojure.main` `main` and `repl-caught`
|
||||
- Switch `clojure.test/*report-counters*` to ref instead of atom for compatibility with [kaocha](https://github.com/lambdaisland/kaocha)
|
||||
- Allow `java.io.OutputStream` to be proxied, for [kaocha](https://github.com/lambdaisland/kaocha)
|
||||
- Support qualified method names in `proxy` and ignore namespace
|
||||
|
||||
## 1.0.170 (2023-01-19)
|
||||
|
||||
- [#1463](https://github.com/babashka/babashka/issues/1463): Add `java.util.jar.Attributes` class ([@jeroenvandijk](https://github.com/jeroenvandijk))
|
||||
- [#1456](https://github.com/babashka/babashka/issues/1456): allow `*warn-on-reflection*` and `*unchecked-math*` to be set in socket REPL and nREPL ([@axks](https://github.com/axks))
|
||||
- SCI: macroexpansion error location improvement
|
||||
- Add compatibility with [tab](https://github.com/eerohele/tab) and [solenoid](https://github.com/adam-james-v/solenoid)
|
||||
- Bump babashka.cli and babashka.fs
|
||||
- New classes:
|
||||
- `java.util.jar.Attributes`
|
||||
- `java.util.concurrent.ThreadFactory`
|
||||
- `java.lang.Thread$UncaughtExceptionHandler`
|
||||
- `java.lang.Thread$UncaughtExceptionHandler`
|
||||
- `java.util.concurrent.BlockingQueue`
|
||||
- `java.util.concurrent.ArrayBlockingQueue`
|
||||
- `java.util.concurrent.ThreadFactory`
|
||||
- `java.lang.Thread$UncaughtExceptionHandler`
|
||||
- `java.util.concurrent.Semaphore`
|
||||
- Expose more httpkit.server functions: `with-channel`, `on-close`, `close`
|
||||
|
||||
## 1.0.169 (2023-01-03)
|
||||
|
||||
- Implement `ns`, `lazy-seq` as macro
|
||||
- Support `--dev-build` flag in installation script
|
||||
- [#1451](https://github.com/babashka/babashka/issues/1451): Allow passing explicit file and line number to clojure.test ([@matthewdowney](https://github.com/matthewdowney))
|
||||
|
|
@ -16,6 +415,11 @@ A preview of the next release can be installed from
|
|||
- [#1446](https://github.com/babashka/babashka/issues/1446): add `pprint/code-dispatch`
|
||||
- Update zlib to version `1.2.13` ([@thiagokokada](https://github.com/thiagokokada))
|
||||
- [#1454](https://github.com/babashka/babashka/issues/1454): Add `babashka.process` to `print-deps` output
|
||||
- Update `deps.clj` / clojure tools to `1.11.1.1208`
|
||||
- Add `reader-conditional` function
|
||||
- Fix pretty printing (with `clojure.pprint`) of vars
|
||||
- Upgrade built-in `spec.alpha`
|
||||
- SCI performance improvements: faster JVM interop
|
||||
|
||||
## 1.0.168 (2022-12-07)
|
||||
|
||||
|
|
@ -625,7 +1029,7 @@ Babashka.pods:
|
|||
- Add `babashka.task` `System` property [#837](https://github.com/babashka/babashka/issues/837)
|
||||
- Allow thread-first with `shell` like `babashka.process` [#829](https://github.com/babashka/babashka/issues/829)
|
||||
|
||||
## 0.4.0
|
||||
## 0.4.0 (2021-05-08)
|
||||
|
||||
Babashka proper:
|
||||
|
||||
|
|
@ -635,7 +1039,7 @@ Babashka proper:
|
|||
[jasentaa](https://github.com/rm-hull/jasentaa) parser combinator library
|
||||
- Update Selmer to 1.12.40
|
||||
|
||||
Sci:
|
||||
SCI:
|
||||
|
||||
- Better error msg for protocol not found or class
|
||||
|
||||
|
|
@ -1205,6 +1609,14 @@ Details about releases prior to v0.1.0 can be found
|
|||
|
||||
## Breaking changes
|
||||
|
||||
### v1.1.172
|
||||
|
||||
- Bump `babashka.process`: change default for `:out :append` to `:out :write`. This default is undocumented so the impact should be small.
|
||||
|
||||
### v1.1.171
|
||||
|
||||
- [#1467](https://github.com/babashka/babashka/issues/1467): avoid printing results, unless `--prn` is enabled (aside from `-e`, `-o` and `-O`).
|
||||
|
||||
### v0.2.4
|
||||
|
||||
- Remove cheshire smile functions [#658](https://github.com/babashka/babashka/issues/658)
|
||||
|
|
|
|||
18
Dockerfile
18
Dockerfile
|
|
@ -5,25 +5,25 @@ RUN apt update
|
|||
RUN apt install --no-install-recommends -yy build-essential zlib1g-dev
|
||||
WORKDIR "/opt"
|
||||
|
||||
ENV GRAALVM_VERSION="22.3.0"
|
||||
ENV GRAALVM_VERSION="24"
|
||||
ARG TARGETARCH
|
||||
# Do not set those directly, use TARGETARCH instead
|
||||
ENV BABASHKA_ARCH=
|
||||
ENV GRAALVM_ARCH=
|
||||
RUN if [ "${TARGETARCH}" = "" ] || [ "${TARGETARCH}" = "amd64" ]; then \
|
||||
export GRAALVM_ARCH=amd64; export BABASHKA_ARCH=x86_64; \
|
||||
export GRAALVM_ARCH=x64; export BABASHKA_ARCH=x86_64; \
|
||||
elif [ "${TARGETARCH}" = "arm64" ]; then \
|
||||
export GRAALVM_ARCH=aarch64; \
|
||||
fi && \
|
||||
echo "Installing GraalVM for ${GRAALVM_ARCH}" && \
|
||||
curl -sLO https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAALVM_VERSION}/graalvm-ce-java11-linux-${GRAALVM_ARCH}-${GRAALVM_VERSION}.tar.gz && \
|
||||
tar -xzf graalvm-ce-java11-linux-${GRAALVM_ARCH}-${GRAALVM_VERSION}.tar.gz && \
|
||||
rm graalvm-ce-java11-linux-${GRAALVM_ARCH}-${GRAALVM_VERSION}.tar.gz
|
||||
curl -sLO https://download.oracle.com/graalvm/${GRAALVM_VERSION}/archive/graalvm-jdk-${GRAALVM_VERSION}_linux-${GRAALVM_ARCH}_bin.tar.gz && \
|
||||
mkdir "graalvm-$GRAALVM_VERSION" && \
|
||||
tar -xzf graalvm-jdk-${GRAALVM_VERSION}_linux-${GRAALVM_ARCH}_bin.tar.gz -C graalvm-$GRAALVM_VERSION --strip-components 1
|
||||
|
||||
ARG BABASHKA_XMX="-J-Xmx4500m"
|
||||
|
||||
ENV GRAALVM_HOME="/opt/graalvm-ce-java11-${GRAALVM_VERSION}"
|
||||
ENV JAVA_HOME="/opt/graalvm-ce-java11-${GRAALVM_VERSION}/bin"
|
||||
ENV GRAALVM_HOME="/opt/graalvm-$GRAALVM_VERSION"
|
||||
ENV JAVA_HOME="$GRAALVM_HOME/bin"
|
||||
ENV PATH="$JAVA_HOME:$PATH"
|
||||
ENV BABASHKA_XMX=$BABASHKA_XMX
|
||||
|
||||
|
|
@ -73,7 +73,9 @@ RUN ./script/compile
|
|||
|
||||
FROM ubuntu:latest
|
||||
RUN apt-get update && apt-get install -y curl \
|
||||
&& mkdir -p /usr/local/bin
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& mkdir -p /usr/local/bin
|
||||
|
||||
COPY --from=BASE /opt/target/metabom.jar /opt/babashka-metabom.jar
|
||||
COPY --from=BASE /opt/bb /usr/local/bin/bb
|
||||
CMD ["bb"]
|
||||
|
|
|
|||
|
|
@ -13,8 +13,11 @@ RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswit
|
|||
|
||||
# TODO: Run actual native tests when they are ported
|
||||
|
||||
RUN bb -e "(curl/get \"https://httpstat.us/200\")" # cURL http test
|
||||
RUN bb -e "(require '[org.httpkit.client :as http]) (when-let [error (:error @(http/get \"https://httpstat.us/200\"))] (throw error))" # JVM http test
|
||||
RUN curl --version
|
||||
# RUN bb -e '(prn (java.io.File/createTempFile "babashka.curl" ".headers"))'
|
||||
# RUN bb -e '(spit (java.io.File/createTempFile "babashka.curl" ".headers") "hello")'
|
||||
# RUN bb -e "(curl/get \"https://clojure.org\")" # cURL http test
|
||||
RUN bb -e "(require '[org.httpkit.client :as http]) (when-let [error (:error @(http/get \"https://clojure.org\"))] (throw error))" # JVM http test
|
||||
RUN bb -e "(.length \"Hello, Babashka\")" # Java interop test
|
||||
RUN bb -e "(require '[babashka.pods :as pods]) (pods/load-pod 'org.babashka/go-sqlite3 \"0.0.1\") (require '[pod.babashka.go-sqlite3 :as sqlite]) (sqlite/execute! \"/tmp/foo.db\" [\"SELECT 1 + 1\"])" # Pod test
|
||||
|
||||
|
|
@ -23,7 +26,7 @@ FROM alpine:3
|
|||
|
||||
RUN apk --no-cache add curl ca-certificates tar && \
|
||||
curl -Ls https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk > /tmp/glibc-2.28-r0.apk && \
|
||||
apk add --allow-untrusted --force-overwrite /tmp/glibc-2.28-r0.apk
|
||||
apk add --allow-untrusted --force-overwrite /tmp/glibc-2.28-r0.apk && rm /tmp/glibc-2.28-r0.apk
|
||||
RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
|
||||
|
||||
COPY metabom.jar /opt/babashka-metabom.jar
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ FROM ubuntu:latest
|
|||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y curl \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& mkdir -p /usr/local/bin
|
||||
|
||||
ARG TARGETARCH
|
||||
|
|
|
|||
217
README.md
217
README.md
|
|
@ -4,7 +4,7 @@
|
|||
[](https://app.slack.com/client/T03RZGPFR/CLX41ASCS)
|
||||
[](https://opencollective.com/babashka) [](https://clojars.org/babashka/babashka)
|
||||
[](https://twitter.com/search?q=%23babashka&src=typed_query&f=live)
|
||||
[](https://book.babashka.org)
|
||||
[](https://book.babashka.org) [](https://gurubase.io/g/babashka)
|
||||
|
||||
<blockquote class="twitter-tweet" data-lang="en">
|
||||
<p lang="en" dir="ltr">Life's too short to remember how to write Bash code. I feel liberated.</p>
|
||||
|
|
@ -40,10 +40,10 @@ As one user described it:
|
|||
## Quickstart
|
||||
|
||||
For installation options check [Installation](https://github.com/babashka/babashka#installation).
|
||||
For quick installation use:
|
||||
For quick installation using `bash`, use:
|
||||
|
||||
``` shell
|
||||
$ bash < <(curl -s https://raw.githubusercontent.com/babashka/babashka/master/install)
|
||||
bash < <(curl -s https://raw.githubusercontent.com/babashka/babashka/master/install)
|
||||
```
|
||||
|
||||
or grab a binary from [Github
|
||||
|
|
@ -53,11 +53,36 @@ anywhere on the path.
|
|||
Then you're ready to go:
|
||||
|
||||
``` shellsession
|
||||
$ ls | bb -i '(filter fs/directory? *input*)'
|
||||
("doc" "resources" "sci" "script" "src" "target" "test")
|
||||
bb took 4ms.
|
||||
time bb -e '(->> (fs/list-dir ".") (filter fs/directory?) (map fs/normalize) (map str) (take 3))'
|
||||
```
|
||||
|
||||
``` clojure
|
||||
(".build" "feature-lanterna" ".repl")
|
||||
bb -e 0,01s user 0,01s system 70% cpu 0,017 total
|
||||
```
|
||||
|
||||
## Support :heart:
|
||||
|
||||
You can support this project via [Github
|
||||
Sponsors](https://github.com/sponsors/borkdude),
|
||||
[OpenCollective](https://opencollective.com/babashka),
|
||||
[Ko-fi](https://ko-fi.com/borkdude) or indirectly via [Clojurists
|
||||
Together](https://www.clojuriststogether.org/).
|
||||
|
||||
<details>
|
||||
|
||||
<summary>Top sponsors</summary>
|
||||
|
||||
- [Clojurists Together](https://clojuriststogether.org/)
|
||||
- [Roam Research](https://roamresearch.com/)
|
||||
- [Nextjournal](https://nextjournal.com/)
|
||||
- [Toyokumo](https://toyokumo.co.jp/)
|
||||
- [Cognitect](https://www.cognitect.com/)
|
||||
- [Kepler16](https://kepler16.com/)
|
||||
- [Adgoji](https://www.adgoji.com/)
|
||||
|
||||
</details>
|
||||
|
||||
## Babashka users
|
||||
|
||||
See [companies](doc/companies.md) for a list of companies using babashka.
|
||||
|
|
@ -82,7 +107,7 @@ and is unlikely to change. Changes may happen in other parts of babashka,
|
|||
although we will try our best to prevent them. Always check the release notes or
|
||||
[CHANGELOG.md](CHANGELOG.md) before upgrading.
|
||||
|
||||
### Talk
|
||||
## Talk
|
||||
|
||||
To get an overview of babashka, you can watch this talk ([slides](https://speakerdeck.com/borkdude/babashka-and-the-small-clojure-interpreter-at-clojured-2020)):
|
||||
|
||||
|
|
@ -93,45 +118,10 @@ To get an overview of babashka, you can watch this talk ([slides](https://speake
|
|||
The [babashka book](https://book.babashka.org) contains detailed information
|
||||
about how to get the most out of babashka scripting.
|
||||
|
||||
## Examples
|
||||
|
||||
Read the output from a shell command as a lazy seq of strings:
|
||||
|
||||
``` shell
|
||||
$ ls | bb -i '(take 2 *input*)'
|
||||
("CHANGES.md" "Dockerfile")
|
||||
```
|
||||
|
||||
Read EDN from stdin and write the result to stdout:
|
||||
|
||||
``` shell
|
||||
$ bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]'
|
||||
[1 2]
|
||||
```
|
||||
|
||||
Read more about `*input*` and in- and output flags
|
||||
[here](https://book.babashka.org/#_input_and_output_flags).
|
||||
|
||||
Execute a script. E.g. print the current time in California using the
|
||||
`java.time` API:
|
||||
|
||||
File `pst.clj`:
|
||||
``` clojure
|
||||
#!/usr/bin/env bb
|
||||
|
||||
(def now (java.time.ZonedDateTime/now))
|
||||
(def LA-timezone (java.time.ZoneId/of "America/Los_Angeles"))
|
||||
(def LA-time (.withZoneSameInstant now LA-timezone))
|
||||
(def pattern (java.time.format.DateTimeFormatter/ofPattern "HH:mm"))
|
||||
(println (.format LA-time pattern))
|
||||
```
|
||||
|
||||
``` shell
|
||||
$ pst.clj
|
||||
05:17
|
||||
```
|
||||
|
||||
More examples can be found [here](examples/README.md).
|
||||
There is also the book [Babashka Babooka](https://www.braveclojure.com/quests/babooka/),
|
||||
by Daniel Higginbotham, who has also helped a lot of people learn Clojure with
|
||||
[Clojure for the Brave and
|
||||
True](https://www.braveclojure.com/clojure-for-the-brave-and-true/).
|
||||
|
||||
## Try online
|
||||
|
||||
|
|
@ -148,11 +138,6 @@ Install:
|
|||
|
||||
brew install borkdude/brew/babashka
|
||||
|
||||
<!-- On macOS with an M1 processor: -->
|
||||
|
||||
<!-- softwareupdate --install-rosetta -->
|
||||
<!-- arch -x86_64 brew install borkdude/brew/babashka -->
|
||||
|
||||
Upgrade:
|
||||
|
||||
brew upgrade babashka
|
||||
|
|
@ -190,13 +175,25 @@ linux binary.
|
|||
|
||||
### asdf
|
||||
|
||||
[asdf](https://github.com/asdf-vm/asdf) is an extendable version manager for linux and macOS.
|
||||
[asdf](https://github.com/asdf-vm/asdf) is an extendable version manager for linux and macOS. Note that asdf will add significant startup time to any babashka script, consider using [mise](#mise) instead.
|
||||
|
||||
Babashka can be installed using a plugin as follows:
|
||||
|
||||
asdf plugin add babashka
|
||||
asdf plugin add babashka https://github.com/pitch-io/asdf-babashka
|
||||
asdf install babashka latest
|
||||
|
||||
### mise
|
||||
|
||||
[mise](https://mise.jdx.dev/) is a development environment setup tool for linux and macOS.
|
||||
|
||||
Install:
|
||||
|
||||
mise use --global babashka@latest
|
||||
|
||||
Upgrade:
|
||||
|
||||
mise upgrade babashka
|
||||
|
||||
### Windows
|
||||
|
||||
#### Scoop
|
||||
|
|
@ -235,6 +232,8 @@ Install via the installer script for linux and macOS:
|
|||
|
||||
``` shell
|
||||
$ curl -sLO https://raw.githubusercontent.com/babashka/babashka/master/install
|
||||
# or
|
||||
$ wget -qO install https://raw.githubusercontent.com/babashka/babashka/master/install
|
||||
$ chmod +x install
|
||||
$ ./install
|
||||
```
|
||||
|
|
@ -283,6 +282,12 @@ You may also download a binary from
|
|||
[Github](https://github.com/babashka/babashka/releases). For linux there is a
|
||||
static binary available which can be used on Alpine.
|
||||
|
||||
### CI
|
||||
|
||||
- On Github Actions it's recommended to use [setup-clojure](https://github.com/DeLaGuardo/setup-clojure) with `bb: latest`.
|
||||
- You can use the [installer script](https://github.com/babashka/babashka#installer-script) on any non-Windows CI system. CircleCI requires `sudo`.
|
||||
- On Appveyor + Windows you can use a bit of [Powershell](https://github.com/clj-kondo/clj-kondo/blob/39b5cb2b0d3d004c005e8975b6fafe0e314eec68/appveyor.yml#L60-L64).
|
||||
|
||||
## Docker
|
||||
|
||||
Check out the image on [Docker hub](https://hub.docker.com/r/babashka/babashka/).
|
||||
|
|
@ -300,63 +305,20 @@ Go [here](https://book.babashka.org/#built-in-namespaces) to see the full list o
|
|||
A list of projects (scripts, libraries, pods and tools) known to work with babashka.
|
||||
|
||||
## Badges
|
||||
<!-- note to editor: it seems a blank line must appear before code blocks within <details> -->
|
||||
|
||||
[](https://babashka.org)
|
||||
|
||||
The babashka compatible badge indicates that a [library can be used as babashka dependency](doc/projects.md).
|
||||
|
||||
[](https://book.babashka.org#badges)
|
||||
The babashka compatible badge indicates that a library can be used as babashka dependency.
|
||||
If this is the case for your library, we encourage you to proudly display this badge.
|
||||
|
||||
<details><summary>Markdown</summary>
|
||||
|
||||
```markdown
|
||||
[](https://babashka.org)
|
||||
```
|
||||
</details>
|
||||
|
||||
<details><summary>AsciiDoc</summary>
|
||||
|
||||
```asciidoc
|
||||
https://babashka.org[image:https://raw.githubusercontent.com/babashka/babashka/master/logo/badge.svg[bb compatible]]
|
||||
```
|
||||
</details>
|
||||
|
||||
<details><summary>HTML</summary>
|
||||
|
||||
```html
|
||||
<a href="https://babashka.org" rel="nofollow"><img src="https://github.com/babashka/babashka/raw/master/logo/badge.svg" alt="bb compatible" style="max-width: 100%;"></a>
|
||||
```
|
||||
</details>
|
||||
<br/>
|
||||
|
||||
[](https://babashka.org)
|
||||
|
||||
The babashka built-in badge means that a [library has been built directly into babashka](https://book.babashka.org/#built-in-namespaces) and requires no extra dependencies to use it.
|
||||
|
||||
[](https://book.babashka.org#badges)
|
||||
The babashka built-in badge means that a library has been built directly into babashka and requires no extra dependencies to use it.
|
||||
If this rare honor belongs to your library, you should display this badge.
|
||||
|
||||
<details><summary>Markdown</summary>
|
||||
See [the babashka book for details](https://book.babashka.org#badges).
|
||||
|
||||
```markdown
|
||||
[](https://babashka.org)
|
||||
```
|
||||
</details>
|
||||
## Swag
|
||||
|
||||
<details><summary>AsciiDoc</summary>
|
||||
|
||||
```asciidoc
|
||||
https://babashka.org[image:https://raw.githubusercontent.com/babashka/babashka/master/logo/built-in-badge.svg[bb built-in]]
|
||||
```
|
||||
</details>
|
||||
|
||||
<details><summary>HTML</summary>
|
||||
|
||||
```html
|
||||
<a href="https://babashka.org" rel="nofollow"><img src="https://github.com/babashka/babashka/raw/master/logo/built-in-badge.svg" alt="bb built-in" style="max-width: 100%;"></a>
|
||||
```
|
||||
</details>
|
||||
</br>
|
||||
- [t-shirt](https://www.etsy.com/listing/1241766068/babashka-clj-kondo-nbb-shirt)
|
||||
|
||||
## [Pods](https://github.com/babashka/babashka.pods)
|
||||
|
||||
|
|
@ -406,11 +368,21 @@ handling of SIGINT and SIGPIPE. This can be done by setting
|
|||
|
||||
## Articles, podcasts and videos
|
||||
|
||||
- [Babashka: How GraalVM Helped Create a Fast-Starting Scripting Environment for Clojure](https://medium.com/graalvm/babashka-how-graalvm-helped-create-a-fast-starting-scripting-environment-for-clojure-b0fcc38b0746) by Michiel Borkent
|
||||
- [Blambda analyses sites](https://jmglov.net/blog/2023-01-04-blambda-analyses-sites.html) by Josh Glover
|
||||
- [The wizard of HOP - How we built the web based HOP CLI Settings Editor using Babashka and Scittle](https://www.gethop.dev/post/the-wizard-of-hop-how-we-built-the-web-based-hop-cli-settings-editor-using-babashka-and-scittle) by Bingen Galartza
|
||||
- [Simple TUIs with Babashka and Gum](https://rattlin.blog/bbgum.html) by Rattlin.blog
|
||||
- [Babashka And Dialog Part Ii: Announcing The Bb-Dialog Library](https://www.pixelated-noise.com/blog/2023/01/20/bb-dialog-announcement/index.html) by A.C. Danvers
|
||||
- [Babashka Babooka](https://www.braveclojure.com/quests/babooka/): Write Command-Line Clojure by Daniel Higginbotham
|
||||
- [Re-Writing a GlobalProtect OpenConnect VPN Connect script in Babashka](https://tech.toryanderson.com/2023/01/14/re-writing-a-globalprotect-openconnect-vpn-connect-script-in-babashka/) by Tory Anderson
|
||||
- [Babashka: How GraalVM Helped Create a Fast-Starting Scripting Environment for Clojure](https://medium.com/graalvm/babashka-how-graalvm-helped-create-a-fast-starting-scripting-environment-for-clojure-b0fcc38b0746) by Michiel Borkent (Japanese version [here]((https://logico-jp.io/2023/01/07/babashka-how-graalvm-helped-create-a-fast-starting-scripting-environment-for-clojure/)))
|
||||
- [Adding Prompts To Your Babashka Scripts With Dialog](https://www.pixelated-noise.com/blog/2022/12/09/dialog-and-babashka/index.html) by A.C. Danvers
|
||||
- [Scraping an HTML dictionary with Babashka and Bootleg](https://blog.exupero.org/scraping-an-html-dictionary-with-babashka-and-bootleg/) by exupero
|
||||
- [Using Babashka to Get Electricity Prices](https://www.karimarttila.fi/clojure/2022/12/04/using-babashka-to-get-electricity-prices.html) by Kari Marttila
|
||||
- [How to Do Things With Babashka](https://presumably.de/how-to-do-things-with-babashka.html) by Paulus Esterhazy (2022-12)
|
||||
- [Using nREPL as a system interface](https://yogthos.net/posts/2022-11-26-nREPL-system-interaction.html) by Dmitri Sotnikov
|
||||
- [Manage git hooks with babashka tasks](https://blaster.ai/blog/posts/manage-git-hooks-w-babashka.html) by Mykhaylo Bilyanskyy
|
||||
- [Messing around with babashka](https://ian-muge.medium.com/messing-around-with-babashka-f181a9003faa) by Ian Muge
|
||||
- Introducing [bbin](https://radsmith.com/bbin) by Radford Smith (2022-09)
|
||||
- [Deleting AWS Glacier vaults with babashka](https://javahippie.net/clojure/2022/07/23/deleting-aws-glacier-vaults-with-babashka.html) by Tim Zöller
|
||||
- [Recursive document transformations with Pandoc and Clojure](https://play.teod.eu/document-transform-pandoc-clojure/) by Teodor Heggelund
|
||||
- [Blambda!](https://jmglov.net/blog/2022-07-03-blambda.html) by Josh Glover
|
||||
|
|
@ -497,47 +469,10 @@ commit](https://github.com/babashka/babashka/commit/02c7c51ad4b2b1ab9aa95c26a744
|
|||
|
||||
Thanks to all the people that contributed to babashka:
|
||||
|
||||
- [Adgoji](https://www.adgoji.com/) for financial support
|
||||
- [CircleCI](https://circleci.com/) for CI and additional support
|
||||
- [Nikita Prokopov](https://github.com/tonsky) for the logo
|
||||
- [Contributors](https://github.com/babashka/babashka/graphs/contributors) and
|
||||
other users posting issues with bug reports and ideas
|
||||
- [Github sponsors](https://github.com/sponsors/borkdude)
|
||||
- [OpenCollective sponsors](https://opencollective.com/babashka)
|
||||
- [Clojurists Together](https://www.clojuriststogether.org/)
|
||||
|
||||
### Code Contributors
|
||||
|
||||
This project exists thanks to all the people who contribute. [[Contribute](doc/dev.md)].
|
||||
<a href="https://github.com/babashka/babashka/graphs/contributors"><img src="https://opencollective.com/babashka/contributors.svg?width=890&button=false" /></a>
|
||||
|
||||
### Financial Contributors
|
||||
|
||||
#### Github Sponsors
|
||||
|
||||
- [Dig Gashinsky](https://github.com/digash)
|
||||
|
||||
#### OpenCollective
|
||||
Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/babashka/contribute)]
|
||||
|
||||
##### Individuals
|
||||
|
||||
<a href="https://opencollective.com/babashka"><img src="https://opencollective.com/babashka/individuals.svg?width=890"></a>
|
||||
|
||||
##### Organizations
|
||||
|
||||
Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/babashka/contribute)]
|
||||
|
||||
<a href="https://opencollective.com/babashka/organization/0/website"><img src="https://opencollective.com/babashka/organization/0/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/1/website"><img src="https://opencollective.com/babashka/organization/1/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/2/website"><img src="https://opencollective.com/babashka/organization/2/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/3/website"><img src="https://opencollective.com/babashka/organization/3/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/4/website"><img src="https://opencollective.com/babashka/organization/4/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/5/website"><img src="https://opencollective.com/babashka/organization/5/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/6/website"><img src="https://opencollective.com/babashka/organization/6/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/7/website"><img src="https://opencollective.com/babashka/organization/7/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/8/website"><img src="https://opencollective.com/babashka/organization/8/avatar.svg"></a>
|
||||
<a href="https://opencollective.com/babashka/organization/9/website"><img src="https://opencollective.com/babashka/organization/9/avatar.svg"></a>
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
|||
22
appveyor.yml
22
appveyor.yml
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
version: "v-{build}"
|
||||
|
||||
image: Visual Studio 2017
|
||||
image: Visual Studio 2022
|
||||
|
||||
clone_folder: C:\projects\babashka
|
||||
|
||||
environment:
|
||||
GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-22.3.0
|
||||
JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-22.3.0
|
||||
GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-24+36.1
|
||||
JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-24+36.1
|
||||
BABASHKA_XMX: "-J-Xmx5g"
|
||||
|
||||
skip_commits:
|
||||
|
|
@ -23,6 +23,9 @@ cache:
|
|||
|
||||
clone_script:
|
||||
- cmd: git config --global core.autocrlf true
|
||||
|
||||
- cmd: git config --global core.symlinks true
|
||||
|
||||
- ps: >-
|
||||
if(-not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
|
||||
git clone -q --branch=$env:APPVEYOR_REPO_BRANCH https://github.com/$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER
|
||||
|
|
@ -36,9 +39,12 @@ clone_script:
|
|||
}
|
||||
- cmd: git submodule update --init --recursive
|
||||
|
||||
- cmd: git reset --hard
|
||||
|
||||
build_script:
|
||||
# TODO: Extract the zip by removing the top level folder to remove the hardcoded path for GRAALVM_HOME
|
||||
- cmd: >-
|
||||
powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-windows-amd64-22.3.0.zip', 'graalvm.zip') }"
|
||||
powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24_windows-x64_bin.zip', 'graalvm.zip') }"
|
||||
|
||||
powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }"
|
||||
|
||||
|
|
@ -55,7 +61,7 @@ build_script:
|
|||
# see https://github.com/quarkusio/quarkus/pull/7663
|
||||
|
||||
- cmd: >-
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
|
||||
set BABASHKA_SHA=%APPVEYOR_REPO_COMMIT%
|
||||
|
||||
call script/uberjar.bat
|
||||
|
||||
|
|
@ -69,11 +75,15 @@ build_script:
|
|||
|
||||
bb --config .build/bb.edn --deps-root . release-artifact %zip%
|
||||
|
||||
before_test:
|
||||
- cmd: >-
|
||||
set BABASHKA_CLASSPATH=
|
||||
|
||||
set BABASHKA_TEST_ENV=native
|
||||
|
||||
call script/test.bat
|
||||
test_script:
|
||||
- cmd: >-
|
||||
call script/test.bat :windows
|
||||
|
||||
call script/run_lib_tests.bat
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 99e6d3ba7a7252284b43f9de7d91d3433ecfa8f0
|
||||
Subproject commit e936acd40544eb637b6041c7e89454b21eb7ee34
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit ad763a78f1bc327a493ff0b650aa5408ecbf4819
|
||||
Subproject commit edd3d613bfb9bf3adabfd0bda5c3f5c6ee85ec20
|
||||
2
deps.clj
2
deps.clj
|
|
@ -1 +1 @@
|
|||
Subproject commit 2d185718ba2871c96e6cb4a4181d1dcf9d8fde86
|
||||
Subproject commit 976cf7b0e54901ada3f7e83f12a4c0aed039adc9
|
||||
49
deps.edn
49
deps.edn
|
|
@ -17,40 +17,42 @@
|
|||
"depstar/src" "process/src"
|
||||
"deps.clj/src" "deps.clj/resources"
|
||||
"resources" "sci/resources"
|
||||
"reify/src"],
|
||||
:deps {org.clojure/clojure {:mvn/version "1.11.1"},
|
||||
"impl-java/src"],
|
||||
:deps {org.clojure/clojure {:mvn/version "1.12.0"},
|
||||
org.babashka/sci {:local/root "sci"}
|
||||
org.babashka/babashka.impl.reify {:mvn/version "0.1.3"}
|
||||
org.babashka/babashka.impl.java {:mvn/version "0.1.10"}
|
||||
org.babashka/sci.impl.types {:mvn/version "0.0.2"}
|
||||
babashka/babashka.curl {:local/root "babashka.curl"}
|
||||
babashka/fs {:local/root "fs"}
|
||||
babashka/babashka.core {:local/root "babashka.core"}
|
||||
borkdude/graal.locking {:mvn/version "0.0.2"},
|
||||
org.clojure/core.async {:mvn/version "1.6.673"},
|
||||
org.clojure/core.async {:mvn/version "1.8.741"},
|
||||
org.clojure/tools.cli {:mvn/version "1.0.214"},
|
||||
org.clojure/data.csv {:mvn/version "1.0.0"},
|
||||
cheshire/cheshire {:mvn/version "5.11.0"}
|
||||
cheshire/cheshire {:mvn/version "6.0.0"}
|
||||
org.clojure/data.xml {:mvn/version "0.2.0-alpha8"}
|
||||
clj-commons/clj-yaml {:mvn/version "0.7.169"}
|
||||
com.cognitect/transit-clj {:mvn/version "1.0.329"}
|
||||
clj-commons/clj-yaml {:mvn/version "1.0.29"}
|
||||
com.cognitect/transit-clj {:mvn/version "1.0.333"}
|
||||
org.clojure/test.check {:mvn/version "1.1.1"}
|
||||
nrepl/bencode {:mvn/version "1.1.0"}
|
||||
nrepl/bencode {:mvn/version "1.2.0"}
|
||||
seancorfield/next.jdbc {:mvn/version "1.1.610"}
|
||||
org.postgresql/postgresql {:mvn/version "42.2.18"}
|
||||
org.hsqldb/hsqldb {:mvn/version "2.5.1"}
|
||||
datascript/datascript {:mvn/version "1.0.1"}
|
||||
http-kit/http-kit {:mvn/version "2.6.0-RC1"}
|
||||
http-kit/http-kit {:mvn/version "2.8.0-RC1"}
|
||||
babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"}
|
||||
org.clojure/core.match {:mvn/version "1.0.0"}
|
||||
hiccup/hiccup {:mvn/version "2.0.0-alpha2"}
|
||||
rewrite-clj/rewrite-clj {:mvn/version "1.1.45"}
|
||||
selmer/selmer {:mvn/version "1.12.50"}
|
||||
com.taoensso/timbre {:mvn/version "6.0.1"}
|
||||
hiccup/hiccup {:mvn/version "2.0.0-RC1"}
|
||||
rewrite-clj/rewrite-clj {:mvn/version "1.1.49"}
|
||||
selmer/selmer {:mvn/version "1.12.59"}
|
||||
com.taoensso/timbre {:mvn/version "6.6.0"}
|
||||
org.clojure/tools.logging {:mvn/version "1.1.0"}
|
||||
org.clojure/data.priority-map {:mvn/version "1.1.0"}
|
||||
insn/insn {:mvn/version "0.5.2"}
|
||||
org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
|
||||
org.babashka/cli {:mvn/version "0.6.41"}}
|
||||
org.babashka/cli {:mvn/version "0.8.65"}
|
||||
org.babashka/http-client {:mvn/version "0.4.22"}
|
||||
org.flatland/ordered {:mvn/version "1.15.12"}
|
||||
org.jsoup/jsoup {:mvn/version "1.20.1"}}
|
||||
:aliases {:babashka/dev
|
||||
{:main-opts ["-m" "babashka.main"]}
|
||||
:profile
|
||||
|
|
@ -64,7 +66,7 @@
|
|||
{:extra-paths ["process/src" "process/test" "test-resources/lib_tests"]
|
||||
:extra-deps {org.clj-commons/clj-http-lite {:mvn/version "0.4.392"}
|
||||
#_#_org.babashka/spec.alpha {:git/url "https://github.com/babashka/spec.alpha"
|
||||
:sha "0dec1f88cbde74a0470b454396f09a03adb4ae39"}
|
||||
:sha "0dec1f88cbde74a0470b454396f09a03adb4ae39"}
|
||||
lambdaisland/regal {:mvn/version "0.0.143"}
|
||||
cprop/cprop {:mvn/version "0.1.16"}
|
||||
comb/comb {:mvn/version "0.1.1"}
|
||||
|
|
@ -106,7 +108,7 @@
|
|||
exoscale/coax {:mvn/version "1.0.0-alpha14"}
|
||||
orchestra/orchestra {:mvn/version "2021.01.01-1"}
|
||||
expound/expound {:mvn/version "0.8.10"}
|
||||
integrant/integrant {:mvn/version "0.8.0"}
|
||||
integrant/integrant {:git/url "https://github.com/weavejester/integrant", :git/sha "a9fd7c02bd7201f36344b47142badc3c3ef22f88"}
|
||||
com.stuartsierra/dependency {:mvn/version "1.0.0"}
|
||||
listora/again {:mvn/version "1.0.0"}
|
||||
org.clojure/tools.gitlibs {:mvn/version "2.4.172"}
|
||||
|
|
@ -165,7 +167,18 @@
|
|||
:git/sha "1a29775a3d286f9f6fe3f979c78b6e2bf298d5ba"}
|
||||
com.github.rawleyfowler/sluj {:git/url "https://github.com/rawleyfowler/sluj"
|
||||
:git/sha "4a92e772b4e07bf127423448d4140748b5782198"
|
||||
:deps/manifest :deps}}
|
||||
:deps/manifest :deps}
|
||||
net.cgrand/xforms {:git/url "https://github.com/cgrand/xforms"
|
||||
:git/sha "550dbc150a79c6ecc148d8a7e260e10bc36321c6"
|
||||
:deps/manifest :deps}
|
||||
prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing",
|
||||
:git/sha "424bc704f2db422de34269c139a5494314b3a43b"}
|
||||
org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory"
|
||||
:git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"}
|
||||
com.potetm/fusebox {:git/url "https://github.com/potetm/fusebox"
|
||||
:git/sha "ac6d6a0a69510b009b3c1bb2247cd110fd9f7246"}
|
||||
net.sekao/odoyle-rules {:git/url "https://github.com/oakes/odoyle-rules"
|
||||
:git/sha "0b1d825ec45a998c4d3481dfb292e08ce6a47f0b"}}
|
||||
:classpath-overrides {org.clojure/clojure nil
|
||||
org.clojure/spec.alpha nil}}
|
||||
:clj-nvd
|
||||
|
|
|
|||
2
depstar
2
depstar
|
|
@ -1 +1 @@
|
|||
Subproject commit c419b8c82041855d55593c5b561fc7cea8234712
|
||||
Subproject commit 2bf9d3c9f15298d7dd9de033674a42f830e23d6f
|
||||
|
|
@ -3,24 +3,24 @@
|
|||
## Prerequisites
|
||||
|
||||
- Install [lein](https://leiningen.org/) for producing uberjars
|
||||
- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *java11-22.3.0*.
|
||||
- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *Oracle GraalVM 24*.
|
||||
- For Windows, installing Visual Studio 2019 with the "Desktop development
|
||||
with C++" workload is recommended.
|
||||
- Set `$GRAALVM_HOME` to the GraalVM distribution directory. On macOS this can look like:
|
||||
|
||||
``` shell
|
||||
export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-22.3.0/Contents/Home
|
||||
export GRAALVM_HOME=~/Downloads/graalvm-jdk-21.0.0.1/Contents/Home
|
||||
```
|
||||
|
||||
On linux:
|
||||
|
||||
``` shell
|
||||
export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-22.3.0
|
||||
export GRAALVM_HOME=~/Downloads/graalvm-jdk-21.0.0.1
|
||||
```
|
||||
|
||||
On Windows, from the [Visual Studio 2019 x64 Native Tools Command Prompt](https://github.com/oracle/graal/issues/2116#issuecomment-590470806) or `cmd.exe` (not Powershell):
|
||||
```
|
||||
set GRAALVM_HOME=%USERPROFILE%\Downloads\graalvm-ce-java11-22.3.0
|
||||
set GRAALVM_HOME=%USERPROFILE%\Downloads\graalvm-ce-jdk-21.0.0.1
|
||||
```
|
||||
If you are not running from the x64 Native Tools Command Prompt, you will need to set additional environment variables using:
|
||||
```
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ Sponsoring via [Cognitect](https://www.cognitect.com/).
|
|||
- [Fluree](https://flur.ee/)
|
||||
- [Hi](https://www.hi.group/)
|
||||
- [Juxt](https://www.juxt.pro/)
|
||||
- [Kleene](https://www.kleene.ai/)
|
||||
- [Latacora](https://www.latacora.com/)
|
||||
- [Metosin](https://www.metosin.fi/en/)
|
||||
- [Nextdoc](https://www.nextdoc.io/)
|
||||
|
|
|
|||
46
doc/dev.md
46
doc/dev.md
|
|
@ -22,6 +22,9 @@ agreement, the PR will be merged.
|
|||
Each bug fix, change or new feature should be tested well to prevent future
|
||||
regressions.
|
||||
|
||||
If possible, tests should use public APIs. If the bug is in private/internal
|
||||
code, try to trigger it from a public API.
|
||||
|
||||
### Force-push
|
||||
|
||||
Please do not use `git push --force` on your PR branch for the following
|
||||
|
|
@ -37,7 +40,7 @@ reasons:
|
|||
|
||||
## Requirements
|
||||
|
||||
You need [lein](https://leiningen.org/) for running JVM tests and/or producing uberjars. For building binaries you need GraalVM. Currently we use java11-22.3.0.
|
||||
You need [lein](https://leiningen.org/) for running JVM tests and/or producing uberjars. For building binaries you need GraalVM. Currently we use Oracle GraalVM 24.
|
||||
|
||||
## Clone repository
|
||||
|
||||
|
|
@ -111,6 +114,47 @@ If the library you want to add doesn't work automatically, you can manually do t
|
|||
Note: If you have to modify any test file or configuration to have it work with
|
||||
bb, add an inline comment with prefix `BB-TEST-PATCH:` explaining what you did.
|
||||
|
||||
## Windows
|
||||
We have corresponding `.bat` scripts for Windows, examples from a CMD Shell:
|
||||
|
||||
```shell
|
||||
script\test.bat
|
||||
script\run_lib_tests.bat
|
||||
set BABASHKA_TEST_ENV=native
|
||||
script\run_lib_tests.bat
|
||||
```
|
||||
|
||||
### Enable Windows Symbolic Links
|
||||
You'll need to **enable symbolic links**.
|
||||
You must do this before you git clone babashka otherwise some tests will fail.
|
||||
There seems to be many ways to achieve this; I found the following worked from PowerShell:
|
||||
```shell
|
||||
Install-Module -Name Carbon -Force
|
||||
Import-Module Carbon
|
||||
Grant-CPrivilege -Identity lee -Privilege SeCreateSymbolicLinkPrivilege
|
||||
```
|
||||
You'll need to reboot:
|
||||
```shell
|
||||
shutdown /r /t 0
|
||||
```
|
||||
After reboot, verify the new privilege via:
|
||||
```shell
|
||||
whoami /priv
|
||||
```
|
||||
Test if you can create a symbolic link via:
|
||||
```
|
||||
mklink foofoo barbar
|
||||
```
|
||||
|
||||
> **TIP**: Symbolic links are not supported in some folder-sharing technologies.
|
||||
For example, if you are running Windows as a VirtualBox guest, sharing babashka
|
||||
source folders from your host OS will not share the symbolic links as symbolic links.
|
||||
One solution is to re-clone babashka to a non-shared folder on Windows.
|
||||
|
||||
### Git for Windows
|
||||
Install [Git for Windows](https://gitforwindows.org/).
|
||||
It includes a version of `cat` that babashka tests currently rely on.
|
||||
|
||||
## Build
|
||||
|
||||
See [build.md](build.md).
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ borkdude/missing.test.assertions,https://github.com/borkdude/missing.test.assert
|
|||
borkdude/rewrite-edn,https://github.com/borkdude/rewrite-edn
|
||||
camel-snake-kebab/camel-snake-kebab,https://github.com/clj-commons/camel-snake-kebab
|
||||
cc.qbits/auspex,https://github.com/mpenet/auspex
|
||||
cheshire/cheshire,https://github.com/dakrone/cheshire
|
||||
circleci/bond,https://github.com/circleci/bond
|
||||
cli-matic/cli-matic,https://github.com/l3nz/cli-matic.git
|
||||
clj-commons/clj-yaml,https://github.com/clj-commons/clj-yaml
|
||||
|
|
@ -67,6 +68,7 @@ meta-merge/meta-merge,https://github.com/weavejester/meta-merge
|
|||
metosin/malli,https://github.com/metosin/malli
|
||||
minimallist/minimallist,https://github.com/green-coder/minimallist
|
||||
mvxcvi/arrangement,https://github.com/greglook/clj-arrangement
|
||||
net.cgrand/xforms,https://github.com/cgrand/xforms
|
||||
orchestra/orchestra,https://github.com/jeaye/orchestra
|
||||
org.babashka/spec.alpha,https://github.com/babashka/spec.alpha
|
||||
org.clj-commons/clj-http-lite,https://github.com/clj-commons/clj-http-lite
|
||||
|
|
@ -83,7 +85,7 @@ org.clojure/math.combinatorics,https://github.com/clojure/math.combinatorics
|
|||
org.clojure/math.numeric-tower,https://github.com/clojure/math.numeric-tower
|
||||
org.clojure/test.check,https://github.com/clojure/test.check
|
||||
org.clojure/tools.gitlibs,https://github.com/clojure/tools.gitlibs
|
||||
org.clojure/tools.namespace,https://github.com/babashka/tools.namespace
|
||||
org.clojure/tools.namespace,https://github.com/clojure/tools.namespace
|
||||
postmortem/postmortem,https://github.com/athos/Postmortem
|
||||
prismatic/schema,https://github.com/plumatic/schema
|
||||
progrock/progrock,https://github.com/weavejester/progrock
|
||||
|
|
|
|||
|
240
doc/news.md
240
doc/news.md
|
|
@ -5,8 +5,234 @@ you have anything to add. Also see
|
|||
[#babashka](https://twitter.com/hashtag/babashka?src=hashtag_click&f=live) on
|
||||
Twitter.
|
||||
|
||||
## [2022-07](https://twitter.com/search?q=(%23babashka)%20until%3A2022-08-01%20since%3A2022-07-01&src=typed_query&f=live)
|
||||
## 2023-05 ([Twitter](https://twitter.com/search?q=(%23babashka%20OR%20babashka)%20since%3A2023-05-01%20until%3A2023-06-01&src=typed_query&f=live), [Mastodon](https://mastodon.social/tags/babashka))
|
||||
|
||||
### Releases
|
||||
|
||||
1.3.178
|
||||
|
||||
Mostly a boring maintenance release with lib upgrades!
|
||||
|
||||
### Events
|
||||
|
||||
- [Babashka-conf](https://babashka.org/conf/) is happening June 10th in
|
||||
Berlin. Only a few tickets left! See the [schedule](https://babashka.org/conf/schedule.html). Also you can buy a [conf t-shirt](https://www.etsy.com/listing/1475981599/babashka-conf-berlin-2023-t-shirt) now! See Nikita wearing it [here](https://twitter.com/nikitonsky/status/1658066530800742400)!
|
||||
|
||||
Thanks to conference sponsors:
|
||||
|
||||
<img src="https://pbs.twimg.com/media/Fw5h-0_XwA4DTIj?format=jpg&name=medium" width="200px">
|
||||
|
||||
- Babashka is going to the [Strange Loop](https://www.thestrangeloop.com/) conference!
|
||||
|
||||
### Projects
|
||||
|
||||
- [beep-boop](https://github.com/pesterhazy/beep-boop): Audible and visual feedback for test runs
|
||||
- [panas.example](https://github.com/keychera/panas.example): All htmx examples ported to babashka!
|
||||
- [utility-scripts](https://github.com/somecho/utility-scripts): A collection of helper scripts for Clojure, Java, Ledger and Taskwarrior. Written in Clojure
|
||||
- [bb-scripts](https://github.com/techconative/bb-scripts): Babashka scripts for common utilities
|
||||
- [Launching bb tasks from emacs](https://mastodon.social/@mykhaylo@fosstodon.org/110456087708592838)
|
||||
|
||||
### Articles
|
||||
|
||||
- [Clojure in security: Docker](https://www.juxt.pro/blog/clojure-in-docker/): mentions babashka and clj-kondo
|
||||
- [Changing my mind: Converting a script from bash to Babashka](https://blog.agical.se/en/posts/changing-my-mind--converting-a-script-from-bash-to-babashka/)
|
||||
- [How to create a really simple ClojureCLR dependency tool](https://blog.agical.se/en/posts/how-to-create-a-really-simple-clojureclr-dependency-tool/) with babashka
|
||||
- [Making a resume with Node.js babashka (nbb)](https://yogthos.net/posts/2023-05-12-nbb-resume.html)
|
||||
|
||||
## 2023-04 ([Twitter](https://twitter.com/search?q=(%23babashka%20OR%20babashka)%20since%3A2023-04-01%20until%3A2023-05-01&src=typed_query&f=live), [Mastodon](https://mastodon.social/tags/babashka))
|
||||
|
||||
[Babashka-conf](https://babashka.org/conf/) is happening June 10th in
|
||||
Berlin. Save the date and/or submit your babashka/clojure-related talk or workshop
|
||||
in the CfP!
|
||||
|
||||
### Releases
|
||||
|
||||
1.3.177
|
||||
|
||||
Biggest highlight: `bb.edn` is now respected relative of a script, no matter the directory you invoke it from! See [docs](https://book.babashka.org/#_script_adjacent_bb_edn).
|
||||
|
||||
### Projects
|
||||
|
||||
- [babashka-dl](https://github.com/mjhika/babashka-dl): simple install script for babashka on windows
|
||||
- [instaparse-bb](https://github.com/babashka/instaparse-bb): Use instaparse from babashka, a new release
|
||||
|
||||
### Videos
|
||||
|
||||
- [Learning clojure w/ @lispyclouds](https://youtu.be/uBTRLBU-83A): a stream with teej_dv, a neovim core dev
|
||||
|
||||
## 2023-03 ([Twitter](https://twitter.com/search?q=(%23babashka%20OR%20babashka)%20since%3A2023-03-01%20until%3A2023-04-01&src=typed_query&f=top), [Mastodon](https://mastodon.social/tags/babashka))
|
||||
|
||||
### Releases
|
||||
|
||||
1.3.176, 1.3.175, 1.2.174:
|
||||
|
||||
Biggest highlight: Switch to GraalVM 19 and enable virtual threads!
|
||||
|
||||
### Videos
|
||||
|
||||
- [Blambda! The sound of babashka and AWS colliding](https://pitch.com/public/03fa9c7e-2b0e-45fb-8a22-d4a4d4d79d24), by Josh Glover from Pitch!
|
||||
|
||||
### Projects
|
||||
|
||||
- [babashka.json](https://github.com/babashka/json): JSON abstraction library
|
||||
- [martian](https://github.com/oliyh/martian) is now babashka compatible!
|
||||
- [panas.reload](https://github.com/keychera/panas.reload): a hot reload for babashka serving html+css (or htmx)
|
||||
- [cljs-exif-reader](https://git.sr.ht/~rwv/cljs-exif-reader): Extract information from TIFF and JPEG images (works in babashka, despite the name)
|
||||
|
||||
### Jobs
|
||||
|
||||
- Write babashka at [Cognician](https://twitter.com/RobStuttaford/status/1641694501793038336)!
|
||||
|
||||
## 2023-02 ([Twitter](https://twitter.com/search?q=(%23babashka%20OR%20babashka)%20since%3A2023-02-01%20until%3A2023-03-01&src=typed_query&f=live), [Mastodon](https://mastodon.social/tags/babashka))
|
||||
|
||||
## Releases
|
||||
|
||||
1.1.173: mostly bugfixes
|
||||
|
||||
### Articles
|
||||
|
||||
- [A technique for live coding simple web pages](https://github.com/whacked/cow/blob/main/a%20technique%20for%20live%20coding%20simple%20web%20pages.md) with babashka
|
||||
|
||||
### Videos
|
||||
|
||||
- [Stockholm Clojure Meetup Feb 23: Blambda! The sound of Babashka and Lambda colliding](https://www.youtube.com/watch?v=NfgYon96dsE)
|
||||
|
||||
### Projects
|
||||
|
||||
- [debux](https://github.com/philoskim/debux) is now babaskha-compatible
|
||||
- [lines-of-code-bb](https://github.com/matthewdowney/linesofcode-bb): Babashka script to count lines of Clojure code, docs, comments, and more
|
||||
- [deps-try](https://github.com/eval/deps-try): a babashka-script to try out Clojure libraries in rebel-readline
|
||||
- [bb-dialog](https://github.com/pixelated-noise/bb-dialog) adds support for `--treeview`
|
||||
- [A duckduck go CLI with babashka and (bbl)gum](https://mastodon.me.uk/@choffee/109845697304457129)
|
||||
- [babashka http-client](https://github.com/babashka/http-client) now supports multipart uploads
|
||||
- [sublime-pretty-edn](https://github.com/oakmac/sublime-pretty-edn): Format, Validate, Minify EDN files in Sublime Text
|
||||
- [Play console tetris in babashka!](https://twitter.com/borkdude/status/1628473136969576449)
|
||||
- [kaocha test runner](https://github.com/lambdaisland/kaocha) became babashka compatible!
|
||||
|
||||
## 2023-01 ([Twitter](https://twitter.com/search?q=%28%23babashka%20OR%20babashka%29%20until%3A2023-02-01%20since%3A2023-01-01&src=typed_query&f=live), [Mastodon](https://mastodon.social/tags/babashka))
|
||||
|
||||
### Releases
|
||||
|
||||
New releases in the past month: 1.0.170 - 1.1.173
|
||||
Release highlights:
|
||||
|
||||
- Support for `data_readers.clj(c)`
|
||||
- Include [http-client](https://github.com/babashka/http-client) as built-in library
|
||||
- Compatibility with [clojure.tools.namespace.repl/refresh](https://github.com/clojure/tools.namespace)
|
||||
- Compatibility with [clojure.java.classpath](https://github.com/clojure/java.classpath) (and other libraries which rely on `java.class.path` and `RT/baseLoader`)
|
||||
- Compatibility with [eftest](https://github.com/weavejester/eftest) test runner (see demo)
|
||||
- Compatibility with [cljfmt](https://github.com/weavejester/cljfmt)
|
||||
- Support for `*loaded-libs*` and `(loaded-libs)`
|
||||
- Support `add-watch` on vars (which adds compatibility with `potemkin.namespaces`)
|
||||
- BREAKING: make printing of script results explicit with `--prn`
|
||||
|
||||
### Events
|
||||
|
||||
- [Babashka Workshop](https://clojure.stream/workshops/babashka) at ClojureStream with Rahul De
|
||||
- [Blambda! The sound of Babashka and Lambda colliding](https://www.meetup.com/sthlm-clj/events/291204199/?utm_medium=referral&utm_campaign=share-btn_savedevents_share_modal&utm_source=twitter): sthlm.clj (Stockholm, Sweden)
|
||||
|
||||
### Articles
|
||||
|
||||
- [Babooka: write command line Clojure](https://www.braveclojure.com/quests/babooka/) by Daniel Higginbotham
|
||||
- [Blambda analyses sites](https://jmglov.net/blog/2023-01-04-blambda-analyses-sites.html) by Josh Glover
|
||||
- [Babashka: How GraalVM Helped Create a Fast-Starting Scripting Environment for Clojure](https://logico-jp.io/2023/01/07/babashka-how-graalvm-helped-create-a-fast-starting-scripting-environment-for-clojure/) in Japanese
|
||||
- [The wizard of HOP - How we built the web based HOP CLI Settings Editor using Babashka and Scittle](https://www.gethop.dev/post/the-wizard-of-hop-how-we-built-the-web-based-hop-cli-settings-editor-using-babashka-and-scittle) by Bingen Galartza
|
||||
- [Simple TUIs with Babashka and Gum](https://rattlin.blog/bbgum.html) by Rattlin.blog
|
||||
- [Babashka And Dialog Part Ii: Announcing The Bb-Dialog Library](https://www.pixelated-noise.com/blog/2023/01/20/bb-dialog-announcement/index.html) by A.C. Danvers
|
||||
- [Re-Writing a GlobalProtect OpenConnect VPN Connect script in Babashka](https://tech.toryanderson.com/2023/01/14/re-writing-a-globalprotect-openconnect-vpn-connect-script-in-babashka/) by Tory Anderson
|
||||
|
||||
### Projects
|
||||
|
||||
Projects that were new, had updates or were made compatible with babashka:
|
||||
|
||||
- [asdf-babashka](https://github.com/pitch-io/asdf-babashka): babashka plugin for the asdf version manager
|
||||
- [babashka-htmx-todoapp](https://github.com/prestancedesign/babashka-htmx-todoapp): Quick example of a todo list SPA using Babashka and HTMX
|
||||
- [bblgum](https://github.com/lispyclouds/bblgum): An extremely tiny and simple wrapper around charmbracelet/gum
|
||||
- [bb-dialog](https://github.com/pixelated-noise/bb-dialog): A simple wrapper library for working with dialog from Babashka
|
||||
- [carve](https://github.com/borkdude/carve): Remove unused Clojure vars
|
||||
- [chr](https://github.com/ThaddeusJiang/chr): native commands history report for the default terminal users
|
||||
- [clj-kondo-bb](https://github.com/clj-kondo/clj-kondo-bb): Invoke clj-kondo from babashka scripts!
|
||||
- [cljfmt](https://github.com/weavejester/cljfmt): A tool for formatting Clojure code
|
||||
- [drepl](https://github.com/claytn/drepl): Node JS dependency-repl. The node repl you already know with easy library installations
|
||||
- [instaparse-bb](https://github.com/babashka/instaparse-bb): Wrapper library aroud pod-babashka-instaparse
|
||||
- [lein2deps](https://github.com/borkdude/lein2deps): Lein project.clj to deps.edn converter
|
||||
- [neil](https://github.com/babashka/neil): A CLI to add common aliases and features to deps.edn-based projects
|
||||
- [obsidian-babashka](https://github.com/filipesilva/obsidian-babashka): Run Obsidian Clojure(Script) codeblocks in Babashka
|
||||
- [pod-babashka-buddy](https://github.com/babashka/pod-babashka-buddy): A pod around buddy core (Cryptographic Api for Clojure)
|
||||
- [quickblog](https://github.com/borkdude/quickblog): Light-weight static blog engine for Clojure and babashka
|
||||
- [solenoid](https://github.com/adam-james-v/solenoid): A small clojure tool for making little control UIs while using the REPL!
|
||||
- [tools.bbuild](https://github.com/babashka/tools.bbuild): babashka version of tools.build
|
||||
- [weather](https://gist.github.com/yogthos/f86e63b856e1413180b2262024ece977): command line util for grabbing current weather for a city using OpenWeather API
|
||||
|
||||
## [2022-12](https://twitter.com/search?q=%28%23babashka%20OR%20babashka%29%20until%3A2023-01-01%20since%3A2022-12-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [1.0.168](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [How GraalVM Helped Create a Fast-Starting Scripting Environment for Clojure](https://medium.com/graalvm/babashka-how-graalvm-helped-create-a-fast-starting-scripting-environment-for-clojure-b0fcc38b0746)
|
||||
- [http-client](https://github.com/babashka/http-client): a new HTTP client library for babashka
|
||||
- [How to Do Things With Babashka](https://presumably.de/how-to-do-things-with-babashka.html) by Paulus Esterhazy (2022-12)
|
||||
- [Using Babashka to Get Electricity Prices](https://www.karimarttila.fi/clojure/2022/12/04/using-babashka-to-get-electricity-prices) by Kari Marttila
|
||||
- [Adding prompts to your babashka scripts with dialog](https://www.pixelated-noise.com/blog/2022/12/09/dialog-and-babashka/index.html) by A.C. Danvers
|
||||
- [Scraping an HTML dictionary with Babashka and Bootleg](https://blog.exupero.org/scraping-an-html-dictionary-with-babashka-and-bootleg/) by exupero
|
||||
- [quickblog](https://github.com/borkdude/quickblog) v0.1.0: Light-weight static blog engine for Clojure and babashka
|
||||
- [bb-excel](https://github.com/kbosompem/bb-excel): Read Excel Files in babashka scripts
|
||||
- [Get paginated list of issues from gitlab with clojure/babashka](https://gist.github.com/MrGung/29d0547fe45316c3438032fd164d42c6) by Steffen Glückselig
|
||||
- Install development builds: `bash <(curl https://raw.githubusercontent.com/babashka/babashka/master/install) --dev-build --dir /tmp`
|
||||
- [JVM interop improvements in bb](https://twitter.com/borkdude/status/1606280110692352001)
|
||||
- [A little trick to have conditional code for babashka in a .clj file without resorting to .cljc reader conditionals](https://twitter.com/borkdude/status/1599067149187764224)
|
||||
- [Get Advent of Code input in babashka](https://gist.github.com/jeeger/6e39fea94ce49e33d1fa43f40cc36630) by Jan Seeger
|
||||
- [Grabbing current weather for a city using OpenWeather API](https://gist.github.com/yogthos/f86e63b856e1413180b2262024ece977) by Dmitri Sotnikov
|
||||
|
||||
## [2022-11](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-12-01%20since%3A2022-11-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [1.0.165 - 1.0.167](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- Registration for a [Babashka workshop](https://clojure.stream/workshops/babashka) with Rahul De at ClojureStream is now open!
|
||||
- [Tutkain, a Sublime plugin for clojure based on socket REPL now with support for babashka](https://github.com/eerohele/Tutkain)
|
||||
- [Manage git hooks in babashka](https://blaster.ai/blog/posts/manage-git-hooks-w-babashka.html) by Mykhaylo Bilyanskyy
|
||||
- [Messing around with babashka](Messing around with Babashka) by Ian Muge
|
||||
- [A babashka one liner to inspect data in portal](https://twitter.com/borkdude/status/1597505695800516609)
|
||||
- [Using nREPL as a system interface](https://yogthos.net/posts/2022-11-26-nREPL-system-interaction.html) by Dmitri Sotnikov
|
||||
- [deep-diff2](https://github.com/lambdaisland/deep-diff2) is now babashka-compatible!
|
||||
- [A script to normalize auto-resolved keywords](https://github.com/babashka/babashka/blob/master/examples/normalize-keywords.clj)
|
||||
- [Sum up page counts of books from Calibre library with babashka](https://gist.github.com/jeeger/d13159fefaee33c771be979639900ebc) by Jan Seeger
|
||||
- [Tiny babashka script that returns a random clojure doc](https://gist.github.com/CarnunMP/c592cd3b6e711d56ddd4ca7832b9b251) by Carnun Marcus-Page
|
||||
|
||||
|
||||
## [2022-10](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-11-01%20since%3A2022-10-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [1.0.164](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [bb-pod-racer](https://github.com/justone/bb-pod-racer): Speed up development of Babashka pods by Nate Jones
|
||||
- [Babashka tasks VSCode plugin](https://marketplace.visualstudio.com/items?itemName=fbeyer.babashka-tasks) by Ferdinand Beyer
|
||||
- A [PR](https://github.com/nextjournal/clerk/pull/232) to get Clerk working in babashka
|
||||
- [lein2deps](https://github.com/borkdude/lein2deps): lein to deps.edn converter
|
||||
- [awyeah-api](https://github.com/grzm/awyeah-api) by Michael Glaesemann v0.8.41 is now available! aws-api for Babashka. Aw yeah!
|
||||
- [bbssh](https://github.com/epiccastle/bbssh/releases/tag/v0.2.0) by Crispin Wellington, v0.2.0 released
|
||||
- [safely use rsync --archive --delete to backup a directory](https://gist.github.com/stelcodes/ddc8ff53de2192dca7d3fee1081ddb77) by Stel Abrego
|
||||
|
||||
## [2022-09](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-10-01%20since%3A2022-09-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.9.162 - 0.10.163](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- Introducing [bbin](https://radsmith.com/bbin): a tool to install babashka scripts on your system by Radford Smith
|
||||
- [bbssh](https://github.com/epiccastle/bbssh): Babashka pod for SSH support by [Epic Castle](https://github.com/epiccastle)
|
||||
- [Loom virtual threads are coming to babashka](https://twitter.com/borkdude/status/1572222344684531717)
|
||||
- [Tiny script to cycle through pulseaudio outputs (aka sinks)](https://gist.github.com/stelcodes/7d9136a5839b645b6cd5bc829a9fe541) by Stel Abrego
|
||||
- [Tetris in the console via pod-babashka-lantera](https://twitter.com/borkdude/status/1569351199404576770)
|
||||
- [org-mode gets support for babashka](https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=764642f55b7a9821acbabcfa1e2d354afab99be7)
|
||||
- [docs for combining babashka process with promesa](https://github.com/babashka/process#promesa)
|
||||
[exoscale/interceptor](https://github.com/exoscale/interceptor) became babashka-compatible!
|
||||
- [Tutkain, socket REPL Sublime plugin, gets better support for babashka](https://twitter.com/borkdude/status/1568315151404924933)
|
||||
- [babashka tweepy](https://github.com/davclark/babashka-tweepy): kicking the tires on using the tweepy library from a babashka task by Dav Clark
|
||||
- [aoc helper](https://github.com/jjcomer/aoc-helper) by Josh Comer
|
||||
- [Dogfooding blambda part 5](https://jmglov.net/blog/2022-09-02-dogfooding-blambda-logs.html) by Josh Glover
|
||||
|
||||
## [2022-08](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-09-01%20since%3A2022-08-01&src=typed_query&f=live)
|
||||
- It's babashka's third birthday on August 9th 2022!
|
||||
- [etaoin](https://github.com/clj-commons/etaoin), Pure Clojure Webdriver protocol implementation, is now babashka-compatible!
|
||||
- [xforms](https://github.com/cgrand/xforms) is now babashka-compatible!
|
||||
- [squint](https://github.com/squint-cljs/squint) and [cherry](https://github.com/squint-cljs/cherry) are CLJS-compilers that work with babashka!
|
||||
|
||||
## [2022-07](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-08-01%20since%3A2022-07-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.8.157 - 0.9.161](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [Recursive document transformations with Pandoc and Clojure](https://play.teod.eu/document-transform-pandoc-clojure/) by Teodor Heggelund
|
||||
- [Babashka toolbox](https://babashka.org/toolbox/): A categorised directory of libraries and tools for Babashka
|
||||
- [Quickblog](https://github.com/borkdude/quickblog): Light-weight static blog engine for Clojure and babashka
|
||||
|
|
@ -23,7 +249,7 @@ Twitter.
|
|||
- [Deleting AWS Glacier vaults with babashka](https://javahippie.net/clojure/2022/07/23/deleting-aws-glacier-vaults-with-babashka.html) by Tim Zöller
|
||||
|
||||
|
||||
## [2022-06](https://twitter.com/search?q=(%23babashka)%20until%3A2022-07-01%20since%3A2022-06-01&src=typed_query&f=live)
|
||||
## [2022-06](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-07-01%20since%3A2022-06-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.8.156](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [AWS wiki page](https://github.com/babashka/babashka/wiki/AWS)
|
||||
|
|
@ -37,7 +263,7 @@ Twitter.
|
|||
- [Logseq bb tasks](https://github.com/logseq/bb-tasks): Reusable babashka tasks used by logseq team
|
||||
- [Breakneck Babashka on K8s](Breakneck Babashka on K8s) by Heow Goodman
|
||||
|
||||
## [2022-05](https://twitter.com/search?q=(%23babashka)%20until%3A2022-06-01%20since%3A2022-05-01&src=typed_query&f=live)
|
||||
## [2022-05](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-06-01%20since%3A2022-05-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.8.2](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [Etaoin](https://github.com/clj-commons/etaoin) moved to clj-commons and now works with babashka as well.
|
||||
|
|
@ -47,7 +273,7 @@ Twitter.
|
|||
- [Quickdoc](https://github.com/borkdude/quickdoc): (Quick and minimal API doc generation for Clojure
|
||||
- [Awyeah-api](https://github.com/grzm/awyeah-api) - Cognitect's aws-api for babashka
|
||||
|
||||
## [2022-04](https://twitter.com/search?q=(%23babashka)%20until%3A2022-05-01%20since%3A2022-04-01&src=typed_query&f=live)
|
||||
## [2022-04](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-05-01%20since%3A2022-04-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.8.0 - 0.8.1](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [Babashka and Clojure](https://youtu.be/ZvOs5Ele6VE) by Rahul Dé at North Virginia Linux Users Group
|
||||
|
|
@ -55,7 +281,7 @@ Twitter.
|
|||
- Control Chrome via devtools using [clj-chrome-devtools](https://github.com/tatut/clj-chrome-devtools/blob/master/bb.clj) which runs with bb!
|
||||
- Use pods directly in `bb.edn`: [tweet](https://twitter.com/borkdude/status/1510995356229767172)
|
||||
|
||||
## [2022-03](https://twitter.com/search?q=(%23babashka)%20until%3A2022-04-01%20since%3A2022-03-01&src=typed_query&f=live)
|
||||
## [2022-03](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-04-01%20since%3A2022-03-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.7.7 - 0.7.8](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [Create a password manager with Clojure using Babashka, sqlite, honeysql and stash](https://youtu.be/jm0RXmyjRJ8) by Daniel Amber
|
||||
|
|
@ -65,7 +291,7 @@ Twitter.
|
|||
- The [loom](https://github.com/aysylu/loom) library is now compatible [(tweet)](https://twitter.com/borkdude/status/1502237220811550723)
|
||||
- The [at-at](https://github.com/overtone/at-at) library is now compatible
|
||||
|
||||
## [2022-02](https://twitter.com/search?q=(%23babashka)%20until%3A2022-03-01%20since%3A2022-02-01&src=typed_query&f=live)
|
||||
## [2022-02](https://twitter.com/search?q=%28%23babashka%29%20until%3A2022-03-01%20since%3A2022-02-01&src=typed_query&f=live)
|
||||
|
||||
- Releases: [0.7.5 - 0.7.6](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [Spire is available as a babashka pod](https://twitter.com/epic_castle/status/1496784352256008194)
|
||||
|
|
@ -78,7 +304,7 @@ Twitter.
|
|||
- [Apptemplate](https://github.com/redstarssystems/apptemplate): Application project template for Clojure featuring bb tasks
|
||||
|
||||
|
||||
## [2022-01](https://twitter.com/search?f=live&q=(%23babashka)%20until%3A2022-02-01%20since%3A2022-01-01&src=typed_query)
|
||||
## [2022-01](https://twitter.com/search?f=live&q=%28%23babashka%29%20until%3A2022-02-01%20since%3A2022-01-01&src=typed_query)
|
||||
|
||||
- Releases: [0.7.4](https://github.com/babashka/babashka/blob/master/CHANGELOG.md).
|
||||
- [Babashka dev builds](https://github.com/babashka/babashka-dev-builds)
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ The following libraries and projects are known to work with babashka.
|
|||
- [Meander](#meander)
|
||||
- [Schema](#schema)
|
||||
- [Sluj](#sluj)
|
||||
- [malli-cli](#malli-cli)
|
||||
- [Pods](#pods)
|
||||
- [Projects](#projects-1)
|
||||
- [babashka-test-action](#babashka-test-action)
|
||||
|
|
@ -833,6 +834,10 @@ Clojure(Script) library for declarative data description and validation
|
|||
|
||||
Sluj is a very small library for converting strings of UTF-16 text to slugs. A slug is a piece of text that is URL safe.
|
||||
|
||||
### [malli-cli](https://github.com/piotr-yuxuan/malli-cli)
|
||||
|
||||
Configuration and CLI powertool with `metosin/malli`.
|
||||
|
||||
## Pods
|
||||
|
||||
[Babashka pods](https://github.com/babashka/babashka.pods) are programs that can
|
||||
|
|
|
|||
|
|
@ -15,4 +15,8 @@
|
|||
'send-checked-websocket-handshake! (copy-var server/send-checked-websocket-handshake! sns)
|
||||
'send-websocket-handshake! (copy-var server/send-websocket-handshake! sns)
|
||||
'as-channel (copy-var server/as-channel sns)
|
||||
'send! (copy-var server/send! sns)})
|
||||
'send! (copy-var server/send! sns)
|
||||
'with-channel (copy-var server/with-channel sns)
|
||||
'on-close (copy-var server/on-close sns)
|
||||
'close (copy-var server/close sns)}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,9 +3,8 @@
|
|||
[clojure.tools.logging.impl :as impl]
|
||||
[clojure.tools.logging.readable]
|
||||
[sci.core :as sci]
|
||||
[taoensso.encore :as enc :refer [have]]
|
||||
[taoensso.timbre :as timbre]
|
||||
[taoensso.timbre.appenders.core :as appenders]))
|
||||
[taoensso.encore :as encore :refer [have]]
|
||||
[taoensso.timbre :as timbre]))
|
||||
|
||||
;;;; timbre
|
||||
|
||||
|
|
@ -13,56 +12,80 @@
|
|||
|
||||
(defn- fline [and-form] (:line (meta and-form)))
|
||||
|
||||
(defonce callsite-counter
|
||||
(encore/counter))
|
||||
|
||||
(defmacro log! ; Public wrapper around `-log!`
|
||||
"Core low-level log macro. Useful for tooling, etc.
|
||||
* `level` - must eval to a valid logging level
|
||||
* `msg-type` - must eval to e/o #{:p :f nil}
|
||||
* `opts` - ks e/o #{:config :?err :?ns-str :?file :?line :?base-data :spying?}
|
||||
Supports compile-time elision when compile-time const vals
|
||||
provided for `level` and/or `?ns-str`."
|
||||
[level msg-type args & [opts]]
|
||||
(have [:or nil? sequential?] args) ; To allow -> (delay [~@args])
|
||||
(let [{:keys [?ns-str] :or {?ns-str (str @sci/ns)}} opts]
|
||||
;; level, ns may/not be compile-time consts:
|
||||
(when-not (timbre/-elide? level ?ns-str)
|
||||
(let [{:keys [config ?err ?file ?line ?base-data spying?]
|
||||
:or {config 'taoensso.timbre/*config*
|
||||
?err :auto ; => Extract as err-type v0
|
||||
?file @sci/file
|
||||
;; NB waiting on CLJ-865:
|
||||
?line (fline &form)}} opts
|
||||
"Core low-level log macro. Useful for tooling/library authors, etc.
|
||||
|
||||
?file (when (not= ?file "NO_SOURCE_PATH") ?file)
|
||||
* `level` - must eval to a valid logging level
|
||||
* `msg-type` - must eval to e/o #{:p :f nil}
|
||||
* `args` - arguments seq (ideally vec) for logging call
|
||||
* `opts` - ks e/o #{:config ?err ?base-data spying?
|
||||
:?ns-str :?file :?line :?column}
|
||||
|
||||
;; Identifies this particular macro expansion; note that this'll
|
||||
;; be fixed for any fns wrapping `log!` (notably `tools.logging`,
|
||||
;; `slf4j-timbre`, etc.):
|
||||
callsite-id
|
||||
(hash [level msg-type args ; Unevaluated args (arg forms)
|
||||
?ns-str ?file ?line (rand)])]
|
||||
Supports compile-time elision when compile-time const vals
|
||||
provided for `level` and/or `?ns-str`.
|
||||
|
||||
`(taoensso.timbre/-log! ~config ~level ~?ns-str ~?file ~?line ~msg-type ~?err
|
||||
(delay [~@args]) ~?base-data ~callsite-id ~spying?)))))
|
||||
Logging wrapper examples:
|
||||
|
||||
(defn log-wrapper-fn [& args] (timbre/log! :info :p args))
|
||||
(defmacro log-wrapper-macro [& args] (timbre/keep-callsite `(timbre/log! :info :p ~args)))"
|
||||
|
||||
([{:as opts
|
||||
:keys [loc level msg-type args vargs
|
||||
config ?err ?base-data spying?]
|
||||
:or
|
||||
{config 'taoensso.timbre/*config*
|
||||
?err :auto}}]
|
||||
|
||||
(have [:or nil? sequential? symbol?] args)
|
||||
(let [callsite-id (callsite-counter)
|
||||
{:keys [line column]} (merge (meta &form) loc)
|
||||
{:keys [ns file line column]} {:ns @sci/ns :file @sci/file :line line :column column}
|
||||
ns (or (get opts :?ns-str) ns)
|
||||
file (or (get opts :?file) file)
|
||||
line (or (get opts :?line) line)
|
||||
column (or (get opts :?column) column)
|
||||
|
||||
elide? (and #_(enc/const-forms? level ns) (timbre/-elide? level ns))]
|
||||
|
||||
(when-not elide?
|
||||
(let [vargs-form
|
||||
(or vargs
|
||||
(if (symbol? args)
|
||||
`(taoensso.timbre/-ensure-vec ~args)
|
||||
`[ ~@args]))]
|
||||
|
||||
;; Note pre-resolved expansion
|
||||
`(taoensso.timbre/-log! ~config ~level ~ns ~file ~line ~column ~msg-type ~?err
|
||||
(delay ~vargs-form) ~?base-data ~callsite-id ~spying?
|
||||
~(get opts :instant)
|
||||
~(get opts :may-log?))))))
|
||||
|
||||
([level msg-type args & [opts]]
|
||||
(let [{:keys [line column]} (merge (meta &form))
|
||||
{:keys [ns file line column]} {:ns @sci/ns :file @sci/file :line line :column column}
|
||||
loc {:ns ns :file file :line line :column column}
|
||||
opts (assoc (conj {:loc loc} opts)
|
||||
:level level, :msg-type msg-type, :args args)]
|
||||
`(taoensso.timbre/log! ~opts))))
|
||||
|
||||
(defn make-ns [ns sci-ns ks]
|
||||
(reduce (fn [ns-map [var-name var]]
|
||||
(let [m (meta var)
|
||||
no-doc (:no-doc m)
|
||||
doc (:doc m)
|
||||
arglists (:arglists m)]
|
||||
(if no-doc ns-map
|
||||
(assoc ns-map var-name
|
||||
(sci/new-var (symbol var-name) @var
|
||||
(cond-> {:ns sci-ns
|
||||
:name (:name m)}
|
||||
(:macro m) (assoc :macro true)
|
||||
doc (assoc :doc doc)
|
||||
arglists (assoc :arglists arglists)))))))
|
||||
(assoc ns-map var-name
|
||||
(sci/new-var (symbol var-name) @var
|
||||
(cond-> {:ns sci-ns
|
||||
:name (:name m)}
|
||||
(:macro m) (assoc :macro true)
|
||||
doc (assoc :doc doc)
|
||||
arglists (assoc :arglists arglists))))))
|
||||
{}
|
||||
(select-keys (ns-publics ns) ks)))
|
||||
|
||||
(def atomic-println @#'appenders/atomic-println)
|
||||
|
||||
(defn println-appender
|
||||
"Returns a simple `println` appender for Clojure/Script.
|
||||
Use with ClojureScript requires that `cljs.core/*print-fn*` be set.
|
||||
|
|
@ -92,7 +115,7 @@
|
|||
:*err* @sci/err
|
||||
stream)]
|
||||
(binding [*out* stream]
|
||||
(atomic-println (force output_)))))}))
|
||||
(encore/println-atomic (force output_)))))}))
|
||||
|
||||
(def default-config (assoc-in timbre/*config* [:appenders :println]
|
||||
(println-appender {:stream :auto})))
|
||||
|
|
@ -105,7 +128,7 @@
|
|||
|
||||
(defn set-level! [level] (swap-config! (fn [m] (assoc m :min-level level))))
|
||||
|
||||
(defn merge-config! [m] (swap-config! (fn [old] (enc/nested-merge old m))))
|
||||
(defn merge-config! [m] (swap-config! (fn [old] (encore/nested-merge old m))))
|
||||
|
||||
(defmacro -log-and-rethrow-errors [?line & body]
|
||||
`(try (do ~@body)
|
||||
|
|
@ -120,14 +143,27 @@
|
|||
'info 'infof 'warn 'warnf
|
||||
'error 'errorf
|
||||
'-log! 'with-level
|
||||
'spit-appender '-spy 'spy])
|
||||
'spit-appender '-spy 'spy
|
||||
'color-str])
|
||||
'log! (sci/copy-var log! tns)
|
||||
'*config* config
|
||||
'swap-config! (sci/copy-var swap-config! tns)
|
||||
'merge-config! (sci/copy-var merge-config! tns)
|
||||
'set-level! (sci/copy-var set-level! tns)
|
||||
'println-appender (sci/copy-var println-appender tns)
|
||||
'-log-and-rethrow-errors (sci/copy-var -log-and-rethrow-errors tns)))
|
||||
'-log-and-rethrow-errors (sci/copy-var -log-and-rethrow-errors tns)
|
||||
'-ensure-vec (sci/copy-var encore/ensure-vec tns)))
|
||||
|
||||
(def enc-ns (sci/create-ns 'taoensso.encore))
|
||||
|
||||
(def encore-namespace
|
||||
{'catching (sci/copy-var encore/catching enc-ns)
|
||||
'try* (sci/copy-var encore/try* enc-ns)})
|
||||
|
||||
(def timbre-appenders-namespace
|
||||
(let [tan (sci/create-ns 'taoensso.timbre.appenders.core nil)]
|
||||
{'println-appender (sci/copy-var println-appender tan)
|
||||
'spit-appender (sci/copy-var #_:clj-kondo/ignore timbre/spit-appender tan)}))
|
||||
|
||||
;;;; clojure.tools.logging
|
||||
|
||||
|
|
@ -160,7 +196,7 @@
|
|||
#'clojure.tools.logging/*logger-factory*
|
||||
(fn [_]
|
||||
(LoggerFactory.
|
||||
(enc/memoize (fn [logger-ns] (Logger. (str logger-ns) config))))))
|
||||
(encore/memoize (fn [logger-ns] (Logger. (str logger-ns) config))))))
|
||||
|
||||
(def lns (sci/create-ns 'clojure.tools.logging nil))
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
[babashka.impl.common :refer [ctx]]
|
||||
[sci.core :as sci]
|
||||
[selmer.filters :as filters]
|
||||
[selmer.filter-parser :as fp]
|
||||
[selmer.parser]
|
||||
[selmer.tags :as tags]
|
||||
[selmer.util :as util]
|
||||
|
|
@ -83,12 +84,31 @@
|
|||
(apply merge)
|
||||
(selmer.parser/render ~s)))
|
||||
|
||||
(defn resolve-arg
|
||||
"Resolves an arg as passed to an add-tag! handler using the provided
|
||||
context-map.
|
||||
|
||||
A custom tag handler will receive a seq of args as its first argument.
|
||||
With this function, you can selectively resolve one or more of those args
|
||||
so that if they contain literals, the literal value is returned, and if they
|
||||
contain templates of any sort, which can itself have variables, filters or
|
||||
tags in it, they will be returned resolved, applied and rendered.
|
||||
|
||||
Example:
|
||||
(resolve-arg {{header-name|upper}} {:header-name \"My Page\"})
|
||||
=> \"MY PAGE\""
|
||||
[arg context-map]
|
||||
(if (fp/literal? arg)
|
||||
(fp/parse-literal arg)
|
||||
(render arg context-map)))
|
||||
|
||||
(def selmer-parser-namespace
|
||||
(-> selmer-parser-ns
|
||||
(assoc 'render-file (sci/copy-var render-file spns)
|
||||
'render (sci/copy-var render spns)
|
||||
'render-template (sci/copy-var render-template spns)
|
||||
'resolve-var-from-kw (sci/copy-var resolve-var-from-kw spns)
|
||||
'resolve-arg (sci/copy-var resolve-arg spns )
|
||||
'<< (sci/copy-var << spns))))
|
||||
|
||||
(def stns (sci/create-ns 'selmer.tags nil))
|
||||
|
|
@ -105,7 +125,9 @@
|
|||
|
||||
(def selmer-filters-namespace
|
||||
{'add-filter! (sci/copy-var filters/add-filter! sfns)
|
||||
'remove-filter! (sci/copy-var filters/remove-filter! sfns)})
|
||||
'remove-filter! (sci/copy-var filters/remove-filter! sfns)
|
||||
'get-filter (sci/copy-var filters/get-filter sfns)
|
||||
'filters (sci/copy-var filters/filters sfns)})
|
||||
|
||||
(defn turn-off-escaping! []
|
||||
(sci/alter-var-root escape-variables (constantly false)))
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
(ns babashka.impl.ordered
|
||||
{:no-doc true}
|
||||
(:require [flatland.ordered.map :as omap]
|
||||
[flatland.ordered.set :as oset]
|
||||
[sci.core :as sci]))
|
||||
|
||||
(def omap-ns (sci/create-ns 'flatland.ordered.map nil))
|
||||
(def oset-ns (sci/create-ns 'flatland.ordered.set nil))
|
||||
|
||||
(def ordered-map-ns
|
||||
{'ordered-map (sci/copy-var omap/ordered-map omap-ns)})
|
||||
|
||||
(def ordered-set-ns
|
||||
{'ordered-set (sci/copy-var oset/ordered-set oset-ns)})
|
||||
|
|
|
|||
2
fs
2
fs
|
|
@ -1 +1 @@
|
|||
Subproject commit d3226cccd9898eba5adb50dfcc30a7223ff5c8cc
|
||||
Subproject commit fdd5780bc4df4931332b56082c6c3a5c3c85066d
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
(:require [build.reify2 :as reify2]
|
||||
[clojure.tools.build.api :as b]))
|
||||
|
||||
(def lib 'org.babashka/babashka.impl.reify)
|
||||
(def version "0.1.3")
|
||||
(def lib 'org.babashka/babashka.impl.java)
|
||||
(def version "0.1.10")
|
||||
(def class-dir "target/classes")
|
||||
(def basis (b/create-basis {:project "deps.edn"}))
|
||||
(def jar-file (format "target/%s-%s.jar" (name lib) version))
|
||||
|
|
@ -14,13 +14,25 @@
|
|||
(defn gen-classes [_]
|
||||
(reify2/gen-classes nil))
|
||||
|
||||
(defn compile-java [_]
|
||||
(b/javac {:src-dirs ["src-java"]
|
||||
:class-dir class-dir
|
||||
:basis basis
|
||||
:javac-opts ["--release" "8"]}))
|
||||
|
||||
(defn jar [_]
|
||||
(compile-java nil)
|
||||
(gen-classes nil)
|
||||
(b/write-pom {:class-dir class-dir
|
||||
:lib lib
|
||||
:version version
|
||||
:basis basis
|
||||
:src-dirs ["src"]})
|
||||
:src-dirs ["src"]
|
||||
:pom-data
|
||||
[[:licenses
|
||||
[:license
|
||||
[:name "MIT License"]
|
||||
[:url "https://opensource.org/license/mit/"]]]]})
|
||||
(b/copy-dir {:src-dirs ["src"]
|
||||
:target-dir class-dir})
|
||||
(b/jar {:class-dir class-dir
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
:aliases
|
||||
{:build ;; added by neil
|
||||
{:paths ["." "build" "src"]
|
||||
:deps {io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}
|
||||
:deps {io.github.clojure/tools.build {:git/tag "v0.9.6" :git/sha "8e78bcc"}
|
||||
slipset/deps-deploy {:mvn/version "0.2.0"}
|
||||
org.babashka/sci.impl.types {:mvn/version "0.0.2"}
|
||||
;; insn/insn {:mvn/version "0.5.3"}
|
||||
94
impl-java/src-java/babashka/impl/URLClassLoader.java
Normal file
94
impl-java/src-java/babashka/impl/URLClassLoader.java
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
// This file is mostly a workaround for https://github.com/oracle/graal/issues/1956
|
||||
|
||||
package babashka.impl;
|
||||
|
||||
import java.util.WeakHashMap;
|
||||
import java.io.*;
|
||||
import java.util.Objects;
|
||||
import java.net.*;
|
||||
import java.util.jar.*;
|
||||
|
||||
public class URLClassLoader extends java.net.URLClassLoader implements Closeable {
|
||||
|
||||
private WeakHashMap<Closeable,Void>
|
||||
closeables = new WeakHashMap<>();
|
||||
|
||||
public URLClassLoader(java.net.URL[] urls) {
|
||||
super(urls);
|
||||
}
|
||||
|
||||
public URLClassLoader(java.net.URL[] urls, java.net.URLClassLoader parent) {
|
||||
super(urls, parent);
|
||||
}
|
||||
|
||||
public void _addURL(java.net.URL url) {
|
||||
super.addURL(url);
|
||||
}
|
||||
|
||||
// calling super.getResource() returned nil in native-image
|
||||
public java.net.URL getResource(String name) {
|
||||
return findResource(name);
|
||||
}
|
||||
|
||||
// calling super.getResourceAsStream() returned nil in native-image
|
||||
public InputStream getResourceAsStream(String name) {
|
||||
Objects.requireNonNull(name);
|
||||
URL url = getResource(name);
|
||||
try {
|
||||
if (url == null) {
|
||||
return null;
|
||||
}
|
||||
URLConnection urlc = url.openConnection();
|
||||
InputStream is = urlc.getInputStream();
|
||||
if (urlc instanceof JarURLConnection) {
|
||||
JarFile jar = ((JarURLConnection)urlc).getJarFile();
|
||||
synchronized (closeables) {
|
||||
if (!closeables.containsKey(jar)) {
|
||||
closeables.put(jar, null);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
synchronized (closeables) {
|
||||
closeables.put(is, null);
|
||||
}
|
||||
}
|
||||
return is;
|
||||
} catch (IOException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public java.util.Enumeration<java.net.URL> getResources(String name) throws java.io.IOException {
|
||||
return findResources(name);
|
||||
}
|
||||
|
||||
public void close() throws IOException {
|
||||
super.close();
|
||||
|
||||
java.util.List<IOException> errors = new java.util.ArrayList<IOException>();
|
||||
|
||||
synchronized (closeables) {
|
||||
java.util.Set<Closeable> keys = closeables.keySet();
|
||||
for (Closeable c : keys) {
|
||||
try {
|
||||
c.close();
|
||||
} catch (IOException ex) {
|
||||
errors.add(ex);
|
||||
}
|
||||
}
|
||||
closeables.clear();
|
||||
}
|
||||
|
||||
if (errors.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
IOException firstEx = errors.remove(0);
|
||||
|
||||
for (IOException error: errors) {
|
||||
firstEx.addSuppressed(error);
|
||||
}
|
||||
throw firstEx;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
(ns babashka.impl.reify2.interfaces)
|
||||
|
||||
(def interfaces [java.nio.file.FileVisitor
|
||||
java.nio.file.DirectoryStream$Filter
|
||||
java.io.FileFilter
|
||||
java.io.FilenameFilter
|
||||
clojure.lang.Associative
|
||||
|
|
@ -31,4 +32,7 @@
|
|||
java.lang.Comparable
|
||||
javax.net.ssl.X509TrustManager
|
||||
clojure.lang.LispReader$Resolver
|
||||
sun.misc.SignalHandler])
|
||||
sun.misc.SignalHandler
|
||||
java.util.concurrent.ThreadFactory
|
||||
java.lang.Thread$UncaughtExceptionHandler
|
||||
java.util.concurrent.Callable])
|
||||
42
install
42
install
|
|
@ -29,6 +29,32 @@ print_help() {
|
|||
exit 1
|
||||
}
|
||||
|
||||
has() {
|
||||
command -v "$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
fetch() {
|
||||
local url=$1
|
||||
local outfile=${2:-}
|
||||
|
||||
if has wget; then
|
||||
if [[ -n $outfile ]]; then
|
||||
wget -qO "$outfile" "$url"
|
||||
else
|
||||
wget -qO - "$url"
|
||||
fi
|
||||
elif has curl; then
|
||||
if [[ -n $outfile ]]; then
|
||||
curl -fsSL "$url" -o "$outfile"
|
||||
else
|
||||
curl -fsSL "$url"
|
||||
fi
|
||||
else
|
||||
>&2 echo "Either 'wget' or 'curl' needs to be on PATH!"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
while [[ $# -gt 0 ]]
|
||||
do
|
||||
key="$1"
|
||||
|
|
@ -80,9 +106,9 @@ fi
|
|||
|
||||
if [[ "$version" == "" ]]; then
|
||||
if [[ "$dev_build" == "true" ]]; then
|
||||
version="$(curl -sL https://raw.githubusercontent.com/babashka/babashka/master/resources/BABASHKA_VERSION)"
|
||||
version="$(fetch https://raw.githubusercontent.com/babashka/babashka/master/resources/BABASHKA_VERSION)"
|
||||
else
|
||||
version="$(curl -sL https://raw.githubusercontent.com/babashka/babashka/master/resources/BABASHKA_RELEASED_VERSION)"
|
||||
version="$(fetch https://raw.githubusercontent.com/babashka/babashka/master/resources/BABASHKA_RELEASED_VERSION)"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -96,7 +122,11 @@ IFS='.' read -ra VER <<< "${version//-SNAPSHOT/}"
|
|||
vernum=$(printf "%03d%03d%03d" "${VER[0]}" "${VER[1]}" "${VER[2]}")
|
||||
|
||||
case "$(uname -m)" in
|
||||
aarch64) arch=aarch64;;
|
||||
aarch64) arch=aarch64
|
||||
if [[ "$platform" == "linux" ]]; then
|
||||
static_binary="true"
|
||||
fi
|
||||
;;
|
||||
arm64) if [[ 10#$vernum -le 10#000008002 ]]; then
|
||||
arch="amd64"
|
||||
else
|
||||
|
|
@ -140,9 +170,9 @@ download_url="https://github.com/babashka/$repo/releases/download/v$version/$fil
|
|||
|
||||
# macOS only have shasum available by default
|
||||
# Some Linux distros (RHEL-like) only have sha256sum available by default (others have both)
|
||||
if command -v sha256sum >/dev/null; then
|
||||
if has sha256sum; then
|
||||
sha256sum_cmd="sha256sum"
|
||||
elif command -v shasum >/dev/null; then
|
||||
elif has shasum; then
|
||||
sha256sum_cmd="shasum -a 256"
|
||||
else
|
||||
>&2 echo "Either 'sha256sum' or 'shasum' needs to be on PATH for '--checksum' flag!"
|
||||
|
|
@ -155,7 +185,7 @@ mkdir -p "$download_dir" && (
|
|||
cd "$download_dir"
|
||||
echo -e "Downloading $download_url to $download_dir"
|
||||
|
||||
curl -o "$filename" -sL "$download_url"
|
||||
fetch "$download_url" "$filename"
|
||||
if [[ -n "$checksum" ]]; then
|
||||
if ! echo "$checksum *$filename" | $sha256sum_cmd --check --status; then
|
||||
>&2 echo "Failed checksum on $filename"
|
||||
|
|
|
|||
2
pods
2
pods
|
|
@ -1 +1 @@
|
|||
Subproject commit decf791000081ca9e6d2fbea9f20a0aa3fae902e
|
||||
Subproject commit 717cef7af5cb1c1b091bd10e012b2e71b7b8b9bc
|
||||
2
process
2
process
|
|
@ -1 +1 @@
|
|||
Subproject commit 90e4cf0b0cc7856f8c39591c3350cdf156d11042
|
||||
Subproject commit 2058c79fb63f80ca71917432eddea73e0c58717c
|
||||
51
project.clj
51
project.clj
|
|
@ -11,35 +11,41 @@
|
|||
"babashka.core/src"
|
||||
"babashka.nrepl/src" "depstar/src" "process/src"
|
||||
"deps.clj/src" "deps.clj/resources"
|
||||
"reify/src"]
|
||||
"impl-java/src"]
|
||||
;; for debugging Reflector.java code:
|
||||
;; :java-source-paths ["sci/reflector/src-java"]
|
||||
:java-source-paths ["src-java"]
|
||||
:resource-paths ["resources" "sci/resources"]
|
||||
:test-selectors {:default (complement :windows-only)
|
||||
:windows (complement :skip-windows)}
|
||||
:dependencies [[org.clojure/clojure "1.11.1"]
|
||||
[borkdude/edamame "1.0.16"]
|
||||
[borkdude/graal.locking "0.0.2"]
|
||||
:test-selectors {:default (complement (some-fn :windows-only :flaky))
|
||||
:windows (complement (some-fn :skip-windows :flaky))
|
||||
:non-flaky (complement :flaky)
|
||||
:flaky :flaky}
|
||||
:jvm-opts ["--enable-preview"]
|
||||
:dependencies [[org.clojure/clojure "1.12.0"]
|
||||
[borkdude/edamame "1.4.30"]
|
||||
[org.clojure/tools.cli "1.0.214"]
|
||||
[cheshire "5.11.0"]
|
||||
[nrepl/bencode "1.1.0"]
|
||||
[borkdude/sci.impl.reflector "0.0.1"]
|
||||
[cheshire "6.0.0"]
|
||||
[nrepl/bencode "1.2.0"]
|
||||
[borkdude/sci.impl.reflector "0.0.4"]
|
||||
[org.babashka/sci.impl.types "0.0.2"]
|
||||
[org.babashka/babashka.impl.reify "0.1.3"]
|
||||
[org.clojure/core.async "1.6.673"]
|
||||
[org.babashka/babashka.impl.java "0.1.10"]
|
||||
[org.clojure/core.async "1.8.741"]
|
||||
[org.clojure/test.check "1.1.1"]
|
||||
[com.github.clj-easy/graal-build-time "0.1.0"]
|
||||
[rewrite-clj/rewrite-clj "1.1.45"]
|
||||
[rewrite-clj/rewrite-clj "1.1.49"]
|
||||
[insn/insn "0.5.2"]
|
||||
[org.babashka/cli "0.6.41"]]
|
||||
[org.babashka/cli "0.8.65"]
|
||||
[org.babashka/http-client "0.4.22"]
|
||||
[org.jsoup/jsoup "1.20.1"]
|
||||
[borkdude/graal.locking "0.0.2"]]
|
||||
:plugins [[org.kipz/lein-meta-bom "0.1.1"]]
|
||||
:metabom {:jar-name "metabom.jar"}
|
||||
:profiles {:feature/xml {:source-paths ["feature-xml"]
|
||||
:dependencies [[org.clojure/data.xml "0.2.0-alpha8"]]}
|
||||
:feature/yaml {:source-paths ["feature-yaml"]
|
||||
:dependencies [[clj-commons/clj-yaml "0.7.169"
|
||||
#_#_clj-commons/clj-yaml "0.7.110"]]}
|
||||
:dependencies [[clj-commons/clj-yaml "1.0.29"
|
||||
:exclusions [org.flatland/ordered]#_#_clj-commons/clj-yaml "0.7.110"]
|
||||
[org.flatland/ordered "1.15.12"]]}
|
||||
:feature/jdbc {:source-paths ["feature-jdbc"]
|
||||
:dependencies [[seancorfield/next.jdbc "1.1.610"]]}
|
||||
:feature/sqlite [:feature/jdbc {:dependencies [[org.xerial/sqlite-jdbc "3.36.0.3"]]}]
|
||||
|
|
@ -50,25 +56,25 @@
|
|||
:feature/csv {:source-paths ["feature-csv"]
|
||||
:dependencies [[org.clojure/data.csv "1.0.0"]]}
|
||||
:feature/transit {:source-paths ["feature-transit"]
|
||||
:dependencies [[com.cognitect/transit-clj "1.0.329"]]}
|
||||
:dependencies [[com.cognitect/transit-clj "1.0.333"]]}
|
||||
:feature/datascript {:source-paths ["feature-datascript"]
|
||||
:dependencies [[datascript "1.3.10"]]}
|
||||
:feature/httpkit-client {:source-paths ["feature-httpkit-client"]
|
||||
:dependencies [[http-kit "2.6.0-RC1"]]}
|
||||
:dependencies [[http-kit "2.8.0-RC1"]]}
|
||||
:feature/httpkit-server {:source-paths ["feature-httpkit-server"]
|
||||
:dependencies [[http-kit "2.6.0-RC1"]]}
|
||||
:dependencies [[http-kit "2.8.0-RC1"]]}
|
||||
:feature/lanterna {:source-paths ["feature-lanterna"]
|
||||
:dependencies [[babashka/clojure-lanterna "0.9.8-SNAPSHOT"]]}
|
||||
:feature/core-match {:source-paths ["feature-core-match"]
|
||||
:dependencies [[org.clojure/core.match "1.0.0"]]}
|
||||
:feature/hiccup {:source-paths ["feature-hiccup"]
|
||||
:dependencies [[hiccup/hiccup "2.0.0-alpha2"]]}
|
||||
:dependencies [[hiccup/hiccup "2.0.0-RC1"]]}
|
||||
:feature/test-check {:source-paths ["feature-test-check"]}
|
||||
:feature/spec-alpha {:source-paths ["feature-spec-alpha"]}
|
||||
:feature/selmer {:source-paths ["feature-selmer"]
|
||||
:dependencies [[selmer/selmer "1.12.50"]]}
|
||||
:dependencies [[selmer/selmer "1.12.59"]]}
|
||||
:feature/logging {:source-paths ["feature-logging"]
|
||||
:dependencies [[com.taoensso/timbre "6.0.1"]
|
||||
:dependencies [[com.taoensso/timbre "6.6.0"]
|
||||
[org.clojure/tools.logging "1.1.0"]]}
|
||||
:feature/priority-map {:source-paths ["feature-priority-map"]
|
||||
:dependencies [[org.clojure/data.priority-map "1.1.0"]]}
|
||||
|
|
@ -92,7 +98,8 @@
|
|||
:feature/logging
|
||||
:feature/priority-map
|
||||
:feature/rrb-vector
|
||||
{:dependencies [[com.clojure-goes-fast/clj-async-profiler "0.5.0"]
|
||||
{:dependencies [[borkdude/rewrite-edn "0.4.6"]
|
||||
[com.clojure-goes-fast/clj-async-profiler "0.5.0"]
|
||||
[com.opentable.components/otj-pg-embedded "0.13.3"]
|
||||
[nubank/matcher-combinators "3.6.0"]]}]
|
||||
:uberjar {:global-vars {*assert* false}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
1.0.168
|
||||
1.12.200
|
||||
|
|
@ -1 +1 @@
|
|||
1.0.169-SNAPSHOT
|
||||
1.12.201-SNAPSHOT
|
||||
|
|
@ -17,40 +17,42 @@
|
|||
"depstar/src" "process/src"
|
||||
"deps.clj/src" "deps.clj/resources"
|
||||
"resources" "sci/resources"
|
||||
"reify/src"],
|
||||
:deps {org.clojure/clojure {:mvn/version "1.11.1"},
|
||||
"impl-java/src"],
|
||||
:deps {org.clojure/clojure {:mvn/version "1.12.0"},
|
||||
org.babashka/sci {:local/root "sci"}
|
||||
org.babashka/babashka.impl.reify {:mvn/version "0.1.3"}
|
||||
org.babashka/babashka.impl.java {:mvn/version "0.1.10"}
|
||||
org.babashka/sci.impl.types {:mvn/version "0.0.2"}
|
||||
babashka/babashka.curl {:local/root "babashka.curl"}
|
||||
babashka/fs {:local/root "fs"}
|
||||
babashka/babashka.core {:local/root "babashka.core"}
|
||||
borkdude/graal.locking {:mvn/version "0.0.2"},
|
||||
org.clojure/core.async {:mvn/version "1.6.673"},
|
||||
org.clojure/core.async {:mvn/version "1.8.741"},
|
||||
org.clojure/tools.cli {:mvn/version "1.0.214"},
|
||||
org.clojure/data.csv {:mvn/version "1.0.0"},
|
||||
cheshire/cheshire {:mvn/version "5.11.0"}
|
||||
cheshire/cheshire {:mvn/version "6.0.0"}
|
||||
org.clojure/data.xml {:mvn/version "0.2.0-alpha8"}
|
||||
clj-commons/clj-yaml {:mvn/version "0.7.169"}
|
||||
com.cognitect/transit-clj {:mvn/version "1.0.329"}
|
||||
clj-commons/clj-yaml {:mvn/version "1.0.29"}
|
||||
com.cognitect/transit-clj {:mvn/version "1.0.333"}
|
||||
org.clojure/test.check {:mvn/version "1.1.1"}
|
||||
nrepl/bencode {:mvn/version "1.1.0"}
|
||||
nrepl/bencode {:mvn/version "1.2.0"}
|
||||
seancorfield/next.jdbc {:mvn/version "1.1.610"}
|
||||
org.postgresql/postgresql {:mvn/version "42.2.18"}
|
||||
org.hsqldb/hsqldb {:mvn/version "2.5.1"}
|
||||
datascript/datascript {:mvn/version "1.0.1"}
|
||||
http-kit/http-kit {:mvn/version "2.6.0-RC1"}
|
||||
http-kit/http-kit {:mvn/version "2.8.0-RC1"}
|
||||
babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"}
|
||||
org.clojure/core.match {:mvn/version "1.0.0"}
|
||||
hiccup/hiccup {:mvn/version "2.0.0-alpha2"}
|
||||
rewrite-clj/rewrite-clj {:mvn/version "1.1.45"}
|
||||
selmer/selmer {:mvn/version "1.12.50"}
|
||||
com.taoensso/timbre {:mvn/version "6.0.1"}
|
||||
hiccup/hiccup {:mvn/version "2.0.0-RC1"}
|
||||
rewrite-clj/rewrite-clj {:mvn/version "1.1.49"}
|
||||
selmer/selmer {:mvn/version "1.12.59"}
|
||||
com.taoensso/timbre {:mvn/version "6.6.0"}
|
||||
org.clojure/tools.logging {:mvn/version "1.1.0"}
|
||||
org.clojure/data.priority-map {:mvn/version "1.1.0"}
|
||||
insn/insn {:mvn/version "0.5.2"}
|
||||
org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
|
||||
org.babashka/cli {:mvn/version "0.6.41"}}
|
||||
org.babashka/cli {:mvn/version "0.8.65"}
|
||||
org.babashka/http-client {:mvn/version "0.4.22"}
|
||||
org.flatland/ordered {:mvn/version "1.15.12"}
|
||||
org.jsoup/jsoup {:mvn/version "1.20.1"}}
|
||||
:aliases {:babashka/dev
|
||||
{:main-opts ["-m" "babashka.main"]}
|
||||
:profile
|
||||
|
|
@ -64,7 +66,7 @@
|
|||
{:extra-paths ["process/src" "process/test" "test-resources/lib_tests"]
|
||||
:extra-deps {org.clj-commons/clj-http-lite {:mvn/version "0.4.392"}
|
||||
#_#_org.babashka/spec.alpha {:git/url "https://github.com/babashka/spec.alpha"
|
||||
:sha "0dec1f88cbde74a0470b454396f09a03adb4ae39"}
|
||||
:sha "0dec1f88cbde74a0470b454396f09a03adb4ae39"}
|
||||
lambdaisland/regal {:mvn/version "0.0.143"}
|
||||
cprop/cprop {:mvn/version "0.1.16"}
|
||||
comb/comb {:mvn/version "0.1.1"}
|
||||
|
|
@ -106,7 +108,7 @@
|
|||
exoscale/coax {:mvn/version "1.0.0-alpha14"}
|
||||
orchestra/orchestra {:mvn/version "2021.01.01-1"}
|
||||
expound/expound {:mvn/version "0.8.10"}
|
||||
integrant/integrant {:mvn/version "0.8.0"}
|
||||
integrant/integrant {:git/url "https://github.com/weavejester/integrant", :git/sha "a9fd7c02bd7201f36344b47142badc3c3ef22f88"}
|
||||
com.stuartsierra/dependency {:mvn/version "1.0.0"}
|
||||
listora/again {:mvn/version "1.0.0"}
|
||||
org.clojure/tools.gitlibs {:mvn/version "2.4.172"}
|
||||
|
|
@ -165,7 +167,18 @@
|
|||
:git/sha "1a29775a3d286f9f6fe3f979c78b6e2bf298d5ba"}
|
||||
com.github.rawleyfowler/sluj {:git/url "https://github.com/rawleyfowler/sluj"
|
||||
:git/sha "4a92e772b4e07bf127423448d4140748b5782198"
|
||||
:deps/manifest :deps}}
|
||||
:deps/manifest :deps}
|
||||
net.cgrand/xforms {:git/url "https://github.com/cgrand/xforms"
|
||||
:git/sha "550dbc150a79c6ecc148d8a7e260e10bc36321c6"
|
||||
:deps/manifest :deps}
|
||||
prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing",
|
||||
:git/sha "424bc704f2db422de34269c139a5494314b3a43b"}
|
||||
org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory"
|
||||
:git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"}
|
||||
com.potetm/fusebox {:git/url "https://github.com/potetm/fusebox"
|
||||
:git/sha "ac6d6a0a69510b009b3c1bb2247cd110fd9f7246"}
|
||||
net.sekao/odoyle-rules {:git/url "https://github.com/oakes/odoyle-rules"
|
||||
:git/sha "0b1d825ec45a998c4d3481dfb292e08ce6a47f0b"}}
|
||||
:classpath-overrides {org.clojure/clojure nil
|
||||
org.clojure/spec.alpha nil}}
|
||||
:clj-nvd
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Args=-H:+ReportExceptionStackTraces \
|
|||
-H:IncludeResources=src/babashka/.* \
|
||||
-H:IncludeResources=SCI_VERSION \
|
||||
-H:Log=registerResource:3 \
|
||||
-H:EnableURLProtocols=http,https,jar \
|
||||
--enable-url-protocols=http,https,jar,unix \
|
||||
--enable-all-security-services \
|
||||
-H:+JNI \
|
||||
--no-server \
|
||||
|
|
@ -26,4 +26,32 @@ Args=-H:+ReportExceptionStackTraces \
|
|||
-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.SoundbankReader \
|
||||
-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileWriter \
|
||||
-H:ServiceLoaderFeatureExcludeServices=java.net.ContentHandlerFactory \
|
||||
-H:ServiceLoaderFeatureExcludeServices=java.nio.charset.spi.CharsetProvider
|
||||
-H:ServiceLoaderFeatureExcludeServices=java.nio.charset.spi.CharsetProvider \
|
||||
-EBABASHKA_STATIC \
|
||||
-EBABASHKA_MUSL \
|
||||
-EBABASHKA_FEATURE_YAML \
|
||||
-EBABASHKA_FEATURE_XML \
|
||||
-EBABASHKA_FEATURE_CSV \
|
||||
-EBABASHKA_FEATURE_TRANSIT \
|
||||
-EBABASHKA_FEATURE_JAVA_TIME \
|
||||
-EBABASHKA_FEATURE_JAVA_NET_HTTP \
|
||||
-EBABASHKA_FEATURE_JAVA_NIO \
|
||||
-EBABASHKA_FEATURE_HTTPKIT_CLIENT \
|
||||
-EBABASHKA_FEATURE_HTTPKIT_SERVER \
|
||||
-EBABASHKA_FEATURE_CORE_MATCH \
|
||||
-EBABASHKA_FEATURE_HICCUP \
|
||||
-EBABASHKA_FEATURE_TEST_CHECK \
|
||||
-EBABASHKA_FEATURE_SELMER \
|
||||
-EBABASHKA_FEATURE_LOGGING \
|
||||
-EBABASHKA_FEATURE_PRIORITY_MAP \
|
||||
-EBABASHKA_FEATURE_JDBC \
|
||||
-EBABASHKA_FEATURE_SQLITE \
|
||||
-EBABASHKA_FEATURE_POSTGRESQL \
|
||||
-EBABASHKA_FEATURE_ORACLEDB \
|
||||
-EBABASHKA_FEATURE_HSQLDB \
|
||||
-EBABASHKA_FEATURE_DATASCRIPT \
|
||||
-EBABASHKA_FEATURE_LANTERNA \
|
||||
-EBABASHKA_FEATURE_SPEC_ALPHA \
|
||||
-EBABASHKA_FEATURE_RRB_VECTOR \
|
||||
-EBABASHKA_REQUIRE_SCAN \
|
||||
-EBABASHKA_SHA
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
[{
|
||||
"interfaces": [
|
||||
"java.util.function.Predicate"
|
||||
]
|
||||
},
|
||||
{
|
||||
"interfaces": [
|
||||
"java.util.function.Function"
|
||||
]
|
||||
},
|
||||
{
|
||||
"interfaces": [
|
||||
"java.io.FileFilter"
|
||||
]
|
||||
},
|
||||
{
|
||||
"interfaces": [
|
||||
"java.nio.file.DirectoryStream$Filter"
|
||||
]
|
||||
},
|
||||
{
|
||||
"interfaces": [
|
||||
"java.util.function.Supplier"
|
||||
]
|
||||
},
|
||||
{
|
||||
"interfaces": [
|
||||
"java.util.function.UnaryOperator"
|
||||
]
|
||||
}
|
||||
]
|
||||
55
resources/UrlClassLoaderSubstitutions.java
Normal file
55
resources/UrlClassLoaderSubstitutions.java
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
/*
|
||||
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.security.AccessControlContext;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashMap;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
import com.oracle.svm.core.annotate.Alias;
|
||||
import com.oracle.svm.core.annotate.RecomputeFieldValue;
|
||||
import com.oracle.svm.core.annotate.Substitute;
|
||||
import com.oracle.svm.core.annotate.TargetClass;
|
||||
|
||||
@TargetClass(URLClassLoader.class)
|
||||
@SuppressWarnings({"unused", "static-method"})
|
||||
final class Target_java_net_URLClassLoader {
|
||||
@Alias//
|
||||
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = WeakHashMap.class)//
|
||||
private WeakHashMap<Closeable, Void> closeables;
|
||||
|
||||
@Substitute
|
||||
public InputStream getResourceAsStream(String name) throws IOException {
|
||||
System.out.println("getResource");
|
||||
return null;
|
||||
// return Resources.createInputStream(name);
|
||||
}
|
||||
}
|
||||
31
resources/src/babashka/clojure/repl/deps.clj
Normal file
31
resources/src/babashka/clojure/repl/deps.clj
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
(ns clojure.repl.deps
|
||||
(:require [babashka.deps :as deps]))
|
||||
|
||||
(defn add-libs
|
||||
"Given lib-coords, a map of lib to coord, will resolve all transitive deps for the libs
|
||||
together and add them to the repl classpath, unlike separate calls to add-lib."
|
||||
{:added "1.12"}
|
||||
[lib-coords]
|
||||
(deps/add-deps {:deps lib-coords})
|
||||
nil)
|
||||
|
||||
(defn add-lib
|
||||
"Given a lib that is not yet on the repl classpath, make it available by
|
||||
downloading the library if necessary and adding it to the classloader.
|
||||
Libs already on the classpath are not updated. Requires a valid parent
|
||||
DynamicClassLoader.
|
||||
|
||||
lib - symbol identifying a library, for Maven: groupId/artifactId
|
||||
coord - optional map of location information specific to the procurer,
|
||||
or latest if not supplied
|
||||
|
||||
Returns coll of libs loaded, including transitive (or nil if none).
|
||||
|
||||
For info on libs, coords, and versions, see:
|
||||
https://clojure.org/reference/deps_and_cli"
|
||||
{:added "1.12"}
|
||||
([lib coord]
|
||||
(add-libs {lib coord}))
|
||||
([lib]
|
||||
(throw (ex-info "add-lib without explicit version isn't supported in babashka (yet)" {:lib lib}))))
|
||||
|
||||
|
|
@ -322,10 +322,7 @@
|
|||
"Returns a symbol from a symbol or var"
|
||||
[x]
|
||||
(if (var? x)
|
||||
(let [m (meta x)
|
||||
n (:name m)
|
||||
ns (:ns m)]
|
||||
(symbol (str ns) (str n)))
|
||||
(symbol x)
|
||||
x))
|
||||
|
||||
(defn- unfn [expr]
|
||||
|
|
@ -339,10 +336,7 @@
|
|||
(defn- res [form]
|
||||
(cond
|
||||
(keyword? form) form
|
||||
(symbol? form) (cond
|
||||
(= 'fn form) 'clojure.core/fn ;; make tests pass, fn is not a macro in SCI
|
||||
(= 'not form) 'clojure.core/not ;; make tests pass, not is not a macro in SCI
|
||||
:else (c/or (-> form resolve ->sym) form))
|
||||
(symbol? form) (c/or (-> form resolve ->sym) form)
|
||||
(sequential? form) (walk/postwalk #(if (symbol? %) (res %) %) (unfn form))
|
||||
:else form))
|
||||
|
||||
|
|
|
|||
2
sci
2
sci
|
|
@ -1 +1 @@
|
|||
Subproject commit 92a071269f1a4e3f4fda262b33b47ec827be3d4e
|
||||
Subproject commit e85433a0214114fdceb4ca896e1b9c27b1bdf713
|
||||
|
|
@ -9,7 +9,8 @@
|
|||
(let [tmp-dir (fs/file tmp-dir)]
|
||||
(shell {:dir tmp-dir} "git clone https://github.com/babashka/spec.alpha")
|
||||
(let [spec-dir (fs/file tmp-dir "spec.alpha")]
|
||||
(shell {:dir spec-dir} "git reset 1d9df099be4fbfd30b9b903642ad376373c16298 --hard")
|
||||
(fs/copy-tree (fs/file spec-dir "src" "main" "clojure") (fs/file "resources" "src" "babashka")))))
|
||||
(shell {:dir spec-dir} "git reset 951b49b8c173244e66443b8188e3ff928a0a71e7 --hard")
|
||||
(fs/copy-tree (fs/file spec-dir "src" "main" "clojure") (fs/file "resources" "src" "babashka")
|
||||
{:replace-existing true}))))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
;; GraalVM Community Edition 19.3.2 based on OpenJDK 8u252
|
||||
;; GraalVM Community Edition 19.3.2 based on OpenJDK 11.0.7
|
||||
;;
|
||||
;; Currently we use GraalVM java11-20.1.0
|
||||
;; Currently we use GraalVM java19-20.1.0
|
||||
|
||||
(ns bump-graal-version
|
||||
(:require [clojure.string :as str]
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
""
|
||||
"./bump_graal_version.clj -g 19.3.2 (the new version)"
|
||||
"or"
|
||||
"./bump_graal_version.clj -g 19.3.2 --java java11"
|
||||
"(for GraalVM java11-19.3.2)"
|
||||
"./bump_graal_version.clj -g 19.3.2 --java java19"
|
||||
"(for GraalVM java19-19.3.2)"
|
||||
""]
|
||||
(str/join \newline))))
|
||||
|
||||
|
|
@ -45,8 +45,8 @@
|
|||
"appveyor.yml"
|
||||
"project.clj"
|
||||
"script/bump_graal_version.clj"
|
||||
".circleci/script/short_ci.clj"
|
||||
".cirrus.yml"])
|
||||
".cirrus.yml"
|
||||
"script/install-graalvm"])
|
||||
|
||||
;; We might have to keep changing these from
|
||||
;; time to time whenever the version is bumped
|
||||
|
|
@ -54,8 +54,7 @@
|
|||
;; OR
|
||||
;;
|
||||
;; We could have them as environment variables
|
||||
(def current-graal-version "22.3.0")
|
||||
(def current-java-version "java11")
|
||||
(def current-graal-version "24")
|
||||
|
||||
(def cl-options
|
||||
[["-g" "--graal VERSION" "graal version"]
|
||||
|
|
@ -91,19 +90,12 @@
|
|||
[args]
|
||||
(when (empty? args)
|
||||
(display-help))
|
||||
(let [new-graal-version (:graal args)
|
||||
new-java-version (:java args)]
|
||||
(let [new-graal-version (:graal args)]
|
||||
(when (not (nil? new-graal-version))
|
||||
(if (is-valid-bump? new-graal-version nil)
|
||||
(do
|
||||
(println "Performing Graal bump...")
|
||||
(bump-current current-graal-version new-graal-version))
|
||||
(show-error new-graal-version)))
|
||||
(when (not (nil? new-java-version))
|
||||
(if (is-valid-bump? new-java-version nil)
|
||||
(do
|
||||
(println "Performing Java bump...")
|
||||
(bump-current current-java-version new-java-version))
|
||||
(show-error new-java-version)))))
|
||||
(show-error new-graal-version)))))
|
||||
|
||||
(exec-script cl-args)
|
||||
|
|
|
|||
15
script/check_glibc.sh
Executable file
15
script/check_glibc.sh
Executable file
|
|
@ -0,0 +1,15 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
function ver_lte() {
|
||||
printf '%s\n%s' "$1" "$2" | sort -C -V
|
||||
}
|
||||
|
||||
max_glibc_version="2.31"
|
||||
current_glibc_version=$(ldd --version | head -1 | awk '{print $4}' | cut -d "-" -f 1)
|
||||
|
||||
function bail() {
|
||||
echo "glibc greater than max version ${max_glibc_version}: ${current_glibc_version}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
ver_lte "${current_glibc_version}" "${max_glibc_version}" || bail
|
||||
|
|
@ -26,17 +26,6 @@ fi
|
|||
export JAVA_HOME=$GRAALVM_HOME
|
||||
export PATH=$GRAALVM_HOME/bin:$PATH
|
||||
|
||||
rm -rf resources/*.class
|
||||
# SVM_JAR=$(find -L "$GRAALVM_HOME" | grep svm.jar)
|
||||
# "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/CutOffCoreServicesDependencies.java
|
||||
# "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/CutOffSunAwtWwwContentAudioAiff.java
|
||||
# "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/CutOffMisc.java
|
||||
if [ -z "$BABASHKA_JAR" ]; then
|
||||
lein with-profiles +reflection,+native-image "do" run
|
||||
lein "do" clean, uberjar, metabom
|
||||
BABASHKA_JAR=${BABASHKA_JAR:-"target/babashka-$BABASHKA_VERSION-standalone.jar"}
|
||||
fi
|
||||
|
||||
# because script/test cleans target during ci before the jar can we saved
|
||||
cp target/metabom.jar .
|
||||
|
||||
|
|
@ -50,24 +39,29 @@ args=("-jar" "$BABASHKA_JAR"
|
|||
# "-H:DashboardDump=reports/dump"
|
||||
# "-H:+DashboardPretty"
|
||||
# "-H:+DashboardJson"
|
||||
"-H:ReportAnalysisForbiddenType=java.awt.Toolkit:InHeap,Allocated"
|
||||
# "-H:ReportAnalysisForbiddenType=java.awt.Toolkit:Instantiated"
|
||||
"--verbose"
|
||||
"--no-fallback"
|
||||
"--native-image-info"
|
||||
"--install-exit-handlers"
|
||||
# --trace-class-initialization=jdk.internal.net.http.common.DebugLogger,jdk.internal.net.http.websocket.WebSocketImpl,jdk.internal.net.http.common.Utils
|
||||
"$BABASHKA_XMX")
|
||||
"$BABASHKA_XMX"
|
||||
"--enable-preview"
|
||||
"-march=compatibility" # necessary for compatibility with older machines, e.g. see https://github.com/borkdude/deps.clj/actions/runs/6337277754/job/17212028399
|
||||
"-O1")
|
||||
|
||||
BABASHKA_STATIC=${BABASHKA_STATIC:-}
|
||||
BABASHKA_MUSL=${BABASHKA_MUSL:-}
|
||||
|
||||
if [ "$BABASHKA_STATIC" = "true" ]; then
|
||||
args+=("--static")
|
||||
if [ "$BABASHKA_MUSL" = "true" ]; then
|
||||
args+=("--static")
|
||||
args+=("--libc=musl"
|
||||
# see https://github.com/oracle/graal/issues/3398
|
||||
"-H:CCompilerOption=-Wl,-z,stack-size=2097152")
|
||||
else
|
||||
# see https://github.com/oracle/graal/issues/3737
|
||||
args+=("-H:+UnlockExperimentalVMOptions")
|
||||
args+=("-H:+StaticExecutableWithDynamicLibC")
|
||||
fi
|
||||
fi
|
||||
|
|
@ -113,4 +107,14 @@ then
|
|||
export BABASHKA_FEATURE_PRIORITY_MAP="${BABASHKA_FEATURE_PRIORITY_MAP:-false}"
|
||||
fi
|
||||
|
||||
"$GRAALVM_HOME/bin/native-image" "${args[@]}"
|
||||
if [[ -z "${BABASHKA_SHA:-}" ]]
|
||||
then
|
||||
sha=$(git rev-parse HEAD)
|
||||
if [[ $? -eq 0 ]]; then
|
||||
export BABASHKA_SHA=$sha
|
||||
fi
|
||||
fi
|
||||
|
||||
"$GRAALVM_HOME/bin/native-image" "${args[@]}" "$@"
|
||||
|
||||
./"$BABASHKA_BINARY" describe
|
||||
|
|
|
|||
|
|
@ -23,14 +23,27 @@ Rem -H:EnableURLProtocols=jar,http,https is also not supported.
|
|||
|
||||
call %GRAALVM_HOME%\bin\gu.cmd install native-image
|
||||
|
||||
if "%BABASHKA_SHA%"=="" (
|
||||
for /f %%i in ('git rev-parse HEAD') do set sha=%%i
|
||||
if not errorlevel 1 (
|
||||
set BABASHKA_SHA=%sha%
|
||||
)
|
||||
)
|
||||
|
||||
call %GRAALVM_HOME%\bin\native-image.cmd ^
|
||||
"-jar" "target/babashka-%BABASHKA_VERSION%-standalone.jar" ^
|
||||
"-H:Name=bb" ^
|
||||
"-H:+ReportExceptionStackTraces" ^
|
||||
"--verbose" ^
|
||||
"--no-fallback" ^
|
||||
"%BABASHKA_XMX%"
|
||||
"--enable-preview" ^
|
||||
"--install-exit-handlers" ^
|
||||
"-march=compatibility" ^
|
||||
"-O1" ^
|
||||
"%BABASHKA_XMX%" ^
|
||||
%*
|
||||
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call bb "(+ 1 2 3)"
|
||||
call bb describe
|
||||
|
|
|
|||
|
|
@ -4,34 +4,33 @@ set -euo pipefail
|
|||
|
||||
INSTALL_DIR="${1:-$HOME}"
|
||||
|
||||
GRAALVM_VERSION="${GRAALVM_VERSION:-21.2.0}"
|
||||
GRAALVM_VERSION="${GRAALVM_VERSION:-24}"
|
||||
|
||||
case "$BABASHKA_PLATFORM" in
|
||||
macos)
|
||||
GRAALVM_PLATFORM="darwin"
|
||||
;;
|
||||
linux)
|
||||
GRAALVM_PLATFORM="linux"
|
||||
;;
|
||||
esac
|
||||
GRAALVM_PLATFORM=$BABASHKA_PLATFORM
|
||||
|
||||
case "${BABASHKA_ARCH:-}" in
|
||||
aarch64)
|
||||
GRAALVM_ARCH="aarch64"
|
||||
;;
|
||||
*)
|
||||
GRAALVM_ARCH="amd64"
|
||||
;;
|
||||
aarch64)
|
||||
GRAALVM_ARCH="aarch64"
|
||||
;;
|
||||
*)
|
||||
GRAALVM_ARCH="x64"
|
||||
;;
|
||||
esac
|
||||
|
||||
GRAALVM_FILENAME="graalvm-ce-java11-$GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION.tar.gz"
|
||||
GRAALVM_DIR_NAME="graalvm-$GRAALVM_VERSION"
|
||||
GRAALVM_FILENAME="graalvm-jdk-${GRAALVM_VERSION}_${GRAALVM_PLATFORM}-${GRAALVM_ARCH}_bin.tar.gz"
|
||||
DOWNLOAD_URL="https://download.oracle.com/graalvm/${GRAALVM_VERSION}/archive/${GRAALVM_FILENAME}"
|
||||
|
||||
pushd "$INSTALL_DIR" >/dev/null
|
||||
|
||||
if ! [ -d "graalvm-ce-java11-$GRAALVM_VERSION" ]; then
|
||||
echo "Downloading GraalVM $GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION on '$PWD'..."
|
||||
curl -O -sL "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$GRAALVM_VERSION/$GRAALVM_FILENAME"
|
||||
tar xzf "$GRAALVM_FILENAME"
|
||||
if ! [ -d "$GRAALVM_DIR_NAME" ]; then
|
||||
echo "Downloading GraalVM $GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION on '$PWD'..."
|
||||
echo "$DOWNLOAD_URL"
|
||||
curl --fail -LO "$DOWNLOAD_URL"
|
||||
ls -la
|
||||
mkdir "$GRAALVM_DIR_NAME"
|
||||
tar xzvf "$GRAALVM_FILENAME" -C "$GRAALVM_DIR_NAME" --strip-components 1
|
||||
ls -la "$GRAALVM_DIR_NAME"
|
||||
fi
|
||||
|
||||
popd >/dev/null
|
||||
|
|
|
|||
|
|
@ -2,12 +2,18 @@
|
|||
|
||||
set -eo pipefail
|
||||
|
||||
: "${BABASHKA_TEST_ENV:=jvm}"
|
||||
export BABASHKA_TEST_ENV
|
||||
|
||||
if [ "$BABASHKA_TEST_ENV" = "native" ]; then
|
||||
BB_CMD="./bb"
|
||||
else
|
||||
BB_CMD="lein bb"
|
||||
fi
|
||||
|
||||
export PATH
|
||||
PATH=$(pwd)/process/target/test/on-path:$PATH
|
||||
|
||||
export BABASHKA_CLASSPATH
|
||||
BABASHKA_CLASSPATH=$(clojure -Spath -A:lib-tests)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
if not defined BABASHKA_TEST_ENV set BABASHKA_TEST_ENV=jvm
|
||||
|
||||
if "%BABASHKA_TEST_ENV%" EQU "native" (set BB_CMD=.\bb) else (set BB_CMD=lein bb)
|
||||
|
||||
set EDN=lib_tests.edn
|
||||
|
||||
set PATH=%CD%\process\target\test\on-path;%PATH%
|
||||
|
||||
.\bb -f script/lib_tests/bb_edn_from_deps.clj %EDN%
|
||||
|
||||
%BB_CMD% --config %EDN% --deps-root . -f test-resources/lib_tests/babashka/run_all_libtests.clj %*
|
||||
|
|
|
|||
16
script/test
16
script/test
|
|
@ -1,5 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
if [ "$GRAALVM_HOME" != "" ]
|
||||
then
|
||||
export JAVA_HOME=$GRAALVM_HOME
|
||||
|
|
@ -8,7 +10,6 @@ fi
|
|||
|
||||
java -version
|
||||
|
||||
set -eo pipefail
|
||||
unset BABASHKA_PRELOADS
|
||||
unset BABASHKA_CLASSPATH
|
||||
unset BABASHKA_PRELOADS_TEST
|
||||
|
|
@ -16,6 +17,9 @@ unset BABASHKA_PRELOADS_TEST
|
|||
echo "running tests part 1"
|
||||
lein "do" clean, test "$@"
|
||||
|
||||
echo "running flaky tests"
|
||||
lein "do" clean, test :flaky || true
|
||||
|
||||
export BABASHKA_PRELOADS='(defn __bb__foo [] "foo") (defn __bb__bar [] "bar")'
|
||||
export BABASHKA_PRELOADS_TEST=true
|
||||
echo "running tests part 2"
|
||||
|
|
@ -37,3 +41,13 @@ lein test :only babashka.pod-test
|
|||
|
||||
export BABASHKA_SOCKET_REPL_TEST=true
|
||||
lein test :only babashka.impl.socket-repl-test
|
||||
|
||||
# test invoking script in subdir with bb.edn in parent dir
|
||||
unset BABASHKA_PRELOADS
|
||||
unset BABASHKA_CLASSPATH
|
||||
pushd test-resources/bb_in_root_script_in_other_dir
|
||||
if [[ $BABASHKA_TEST_ENV = "native" ]]
|
||||
then
|
||||
../../bb dir/script.clj
|
||||
fi
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@ set BABASHKA_POD_TEST=
|
|||
set BABASHKA_SOCKET_REPL_TEST=
|
||||
|
||||
echo "running tests part 1"
|
||||
call lein do clean, test :windows || exit /B 1
|
||||
call lein do clean, test %* || exit /B 1
|
||||
|
||||
echo "running flaky tests"
|
||||
REM there's no "or exit" here because we don't want flaky tests to fail the script
|
||||
call lein do clean, test :flaky
|
||||
|
||||
set BABASHKA_PRELOADS=(defn __bb__foo [] "foo") (defn __bb__bar [] "bar")
|
||||
set BABASHKA_PRELOADS_TEST=true
|
||||
|
|
|
|||
|
|
@ -175,8 +175,18 @@ else
|
|||
BABASHKA_LEIN_PROFILES+=",-feature/rrb-vector"
|
||||
fi
|
||||
|
||||
#lein with-profiles "$BABASHKA_LEIN_PROFILES,+reflection,-uberjar" deps :tree
|
||||
#exit 0
|
||||
|
||||
mkdir -p resources/META-INF/babashka
|
||||
cp deps.edn resources/META-INF/babashka/deps.edn
|
||||
|
||||
rm -rf resources/*.class
|
||||
# SVM_JAR=$(find -L "$GRAALVM_HOME" | grep svm.jar)
|
||||
# "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/UrlClassLoaderSubstitutions.java
|
||||
# "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/CutOffSunAwtWwwContentAudioAiff.java
|
||||
# "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/CutOffMisc.java
|
||||
|
||||
if [ -z "$BABASHKA_JAR" ]; then
|
||||
lein with-profiles "$BABASHKA_LEIN_PROFILES,+reflection,-uberjar" do run
|
||||
lein with-profiles "$BABASHKA_LEIN_PROFILES" do clean, uberjar, metabom
|
||||
|
|
|
|||
|
|
@ -1,30 +1,49 @@
|
|||
(ns aaaa-this-has-to-be-first.because-patches
|
||||
;; we need pprint loaded first, it patches pprint to not bloat the GraalVM binary
|
||||
(:require [babashka.impl.patches.datafy]
|
||||
[babashka.impl.pprint]))
|
||||
[babashka.impl.pprint]
|
||||
))
|
||||
|
||||
;; Enable this for scanning requiring-resolve usage:
|
||||
;; ---
|
||||
;; (def old-requiring-resolve requiring-resolve)
|
||||
|
||||
;; (defmacro static-requiring-resolve [sym]
|
||||
;; (prn :sym sym)
|
||||
;; `(old-requiring-resolve ~sym))
|
||||
|
||||
;; (alter-var-root #'requiring-resolve (constantly @#'static-requiring-resolve))
|
||||
;; (doto #'requiring-resolve (.setMacro))
|
||||
;; ---
|
||||
|
||||
;; ((requiring-resolve 'clojure.pprint/pprint) (range 20))
|
||||
|
||||
;; Enable this for detecting literal usages of require
|
||||
;; ---
|
||||
;; (def old-require require)
|
||||
|
||||
;; (defmacro static-require [& syms]
|
||||
;; (when (meta &form)
|
||||
;; (prn :require &form ))
|
||||
;; `(old-require ~@syms))
|
||||
;; (alter-var-root #'require (constantly @#'static-require))
|
||||
;; (doto #'require (.setMacro))
|
||||
;; Enable this for scanning requiring usage:
|
||||
(def enable-require-scan
|
||||
"(do
|
||||
(def old-require require)
|
||||
(def old-resolve resolve)
|
||||
|
||||
(def our-requiring-resolve (fn [sym]
|
||||
(let [ns (symbol (namespace sym))]
|
||||
(old-require ns)
|
||||
(old-resolve sym))))
|
||||
|
||||
(defn static-requiring-resolve [form _ _]
|
||||
(prn :req-resolve form :args (rest form))
|
||||
`(let [res# (our-requiring-resolve ~@(rest form))]
|
||||
res#))
|
||||
|
||||
(alter-var-root #'requiring-resolve (constantly @#'static-requiring-resolve))
|
||||
(doto #'requiring-resolve (.setMacro))
|
||||
|
||||
(defn static-require [& [&form _bindings & syms]]
|
||||
(when (meta &form)
|
||||
(prn :require &form (meta &form) *file*))
|
||||
`(old-require ~@syms))
|
||||
(alter-var-root #'require (constantly @#'static-require))
|
||||
(doto #'require (.setMacro))
|
||||
|
||||
(alter-var-root #'clojure.core/serialized-require (constantly (fn [& args]
|
||||
(prn :serialized-req args)))))
|
||||
|
||||
|
||||
|
||||
(defn static-resolve [& [&form _bindings & syms]]
|
||||
(when (meta &form)
|
||||
(prn :require &form (meta &form) *file*))
|
||||
`(old-resolve ~@syms))
|
||||
(alter-var-root #'resolve (constantly @#'static-resolve))
|
||||
(doto #'resolve (.setMacro))
|
||||
")
|
||||
|
||||
|
||||
(when (System/getenv "BABASHKA_REQUIRE_SCAN")
|
||||
(load-string enable-require-scan))
|
||||
;; ---
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
Examples:
|
||||
|
||||
(-> (clojure '[-M -e (+ 1 2 3)] {:out :string}) deref :out) returns
|
||||
(-> (clojure {:out :string} '-M '-e '(+ 1 2 3)]) deref :out) returns
|
||||
\"6\n\".
|
||||
|
||||
(-> @(clojure) :exit) starts a clojure REPL, waits for it
|
||||
|
|
@ -38,17 +38,13 @@
|
|||
*out* @sci/out
|
||||
*err* @sci/err
|
||||
deps/*dir* (:dir opts)
|
||||
deps/*env* (:env opts)
|
||||
deps/*extra-env* (:extra-env opts)
|
||||
deps/*process-fn* (fn
|
||||
([cmd] (pp/process* {:cmd cmd
|
||||
:prev prev
|
||||
:opts opts}))
|
||||
([cmd _] (pp/process* {:cmd cmd
|
||||
:prev prev
|
||||
:opts opts})))
|
||||
deps/*exit-fn* (fn
|
||||
([_])
|
||||
([_exit-code msg]
|
||||
(throw (Exception. msg))))]
|
||||
deps/*aux-process-fn* (fn [{:keys [cmd out]}]
|
||||
(pp/shell (assoc opts :out out :cmd cmd)))
|
||||
deps/*clojure-process-fn* (fn [{:keys [cmd]}]
|
||||
(pp/process* {:cmd cmd
|
||||
:prev prev
|
||||
:opts opts}))
|
||||
deps/*exit-fn* (fn [{:keys [message]}]
|
||||
(when message
|
||||
(throw (Exception. message))))]
|
||||
(apply deps/-main cmd))))
|
||||
|
|
|
|||
8
src/babashka/dude.clj
Normal file
8
src/babashka/dude.clj
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
(ns babashka.dude
|
||||
(:require [clojure-csv.core :as csv]
|
||||
[clojure.java.io :as io]
|
||||
[clojure.string :as string]))
|
||||
|
||||
csv/x
|
||||
io/x
|
||||
string/x
|
||||
|
|
@ -1,25 +1,120 @@
|
|||
(ns babashka.impl.cheshire
|
||||
{:no-doc true}
|
||||
(:require [cheshire.core :as json]
|
||||
[cheshire.factory :as fact]
|
||||
[sci.core :as sci :refer [copy-var]]))
|
||||
|
||||
(def tns (sci/create-ns 'cheshire.core nil))
|
||||
(def fns (sci/create-ns 'cheshire.factory nil))
|
||||
|
||||
(def json-factory (sci/new-dynamic-var '*json-factory* nil {:ns fns}))
|
||||
|
||||
;; wrap cheshire fns to support `*json-factory*` dynamic var
|
||||
|
||||
(defn generate-string
|
||||
([obj]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/generate-string obj)))
|
||||
([obj opt-map]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/generate-string obj opt-map))))
|
||||
|
||||
(defn generate-stream
|
||||
([obj writer]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/generate-stream obj writer)))
|
||||
([obj writer opt-map]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/generate-stream obj writer opt-map))))
|
||||
|
||||
(defn parse-string
|
||||
([string]
|
||||
(when string
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-string string))))
|
||||
([string key-fn]
|
||||
(when string
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-string string key-fn))))
|
||||
([^String string key-fn array-coerce-fn]
|
||||
(when string
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-string string key-fn array-coerce-fn)))))
|
||||
|
||||
(defn parse-string-strict
|
||||
([string]
|
||||
(when string
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-string-strict string))))
|
||||
([string key-fn]
|
||||
(when string
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-string-strict string key-fn))))
|
||||
([^String string key-fn array-coerce-fn]
|
||||
(when string
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-string-strict string key-fn array-coerce-fn)))))
|
||||
|
||||
(defn parse-stream
|
||||
([rdr]
|
||||
(when rdr
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-stream rdr))))
|
||||
([rdr key-fn]
|
||||
(when rdr
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-stream rdr key-fn))))
|
||||
([rdr key-fn array-coerce-fn]
|
||||
(when rdr
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-stream rdr key-fn array-coerce-fn)))))
|
||||
|
||||
(defn parse-stream-strict
|
||||
([rdr]
|
||||
(when rdr
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-stream-strict rdr))))
|
||||
([rdr key-fn]
|
||||
(when rdr
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-stream-strict rdr key-fn))))
|
||||
([rdr key-fn array-coerce-fn]
|
||||
(when rdr
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parse-stream-strict rdr key-fn array-coerce-fn)))))
|
||||
|
||||
(defn parsed-seq
|
||||
([reader]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parsed-seq reader)))
|
||||
([reader key-fn]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parsed-seq reader key-fn)))
|
||||
([reader key-fn array-coerce-fn]
|
||||
(binding [fact/*json-factory* @json-factory]
|
||||
(json/parsed-seq reader key-fn array-coerce-fn))))
|
||||
|
||||
(def cheshire-core-namespace
|
||||
{'encode (copy-var json/encode tns)
|
||||
'generate-string (copy-var json/generate-string tns)
|
||||
'encode-stream (copy-var json/encode-stream tns)
|
||||
'generate-stream (copy-var json/generate-stream tns)
|
||||
{'encode (copy-var generate-string tns)
|
||||
'generate-string (copy-var generate-string tns)
|
||||
'encode-stream (copy-var generate-stream tns)
|
||||
'generate-stream (copy-var generate-stream tns)
|
||||
;;'encode-smile (copy-var json/encode-smile tns)
|
||||
;;'generate-smile (copy-var json/generate-smile tns)
|
||||
'decode (copy-var json/decode tns)
|
||||
'parse-string (copy-var json/parse-string tns)
|
||||
'parse-string-strict (copy-var json/parse-string-strict tns)
|
||||
'decode (copy-var parse-string tns)
|
||||
'parse-string (copy-var parse-string tns)
|
||||
'parse-string-strict (copy-var parse-string-strict tns)
|
||||
;;'parse-smile (copy-var json/parse-smile tns)
|
||||
'parse-stream (copy-var json/parse-stream tns)
|
||||
'parse-stream-strict (copy-var json/parse-stream-strict tns)
|
||||
'parsed-seq (copy-var json/parsed-seq tns)
|
||||
'parse-stream (copy-var parse-stream tns)
|
||||
'parse-stream-strict (copy-var parse-stream-strict tns)
|
||||
'parsed-seq (copy-var parsed-seq tns)
|
||||
;;'parsed-smile-seq (copy-var json/parsed-smile-seq tns)
|
||||
;;'decode-smile (copy-var json/decode-smile tns)
|
||||
'default-pretty-print-options (copy-var json/default-pretty-print-options tns)
|
||||
'create-pretty-printer (copy-var json/create-pretty-printer tns)})
|
||||
|
||||
(def cheshire-factory-namespace
|
||||
{'*json-factory* json-factory
|
||||
'default-factory-options (copy-var fact/default-factory-options fns)
|
||||
'json-factory (copy-var fact/json-factory fns)
|
||||
'make-json-factory (copy-var fact/make-json-factory fns)})
|
||||
|
|
|
|||
|
|
@ -8,6 +8,18 @@
|
|||
[sci.core :as sci]
|
||||
[sci.impl.types :as t]))
|
||||
|
||||
(set! *warn-on-reflection* true)
|
||||
|
||||
(def has-of-virtual?
|
||||
(some #(= "ofVirtual" (.getName ^java.lang.reflect.Method %))
|
||||
(.getMethods Thread)))
|
||||
|
||||
(def has-domain-sockets?
|
||||
(resolve 'java.net.UnixDomainSocketAddress))
|
||||
|
||||
(def has-graal-process-properties?
|
||||
(resolve 'org.graalvm.nativeimage.ProcessProperties))
|
||||
|
||||
(def base-custom-map
|
||||
`{clojure.lang.LineNumberingPushbackReader {:allPublicConstructors true
|
||||
:allPublicMethods true}
|
||||
|
|
@ -47,7 +59,10 @@
|
|||
{:name "sleep"}
|
||||
{:name "start"}
|
||||
{:name "toString"}
|
||||
{:name "yield"}]}
|
||||
{:name "yield"}
|
||||
~@(when has-of-virtual? [{:name "ofVirtual"}
|
||||
{:name "startVirtualThread"}
|
||||
{:name "isVirtual"}])]}
|
||||
java.net.URL
|
||||
{:allPublicConstructors true
|
||||
:allPublicFields true
|
||||
|
|
@ -76,7 +91,8 @@
|
|||
java.util.Arrays
|
||||
{:methods [{:name "copyOf"}
|
||||
{:name "copyOfRange"}
|
||||
{:name "equals"}]}
|
||||
{:name "equals"}
|
||||
{:name "fill"}]}
|
||||
;; this fixes clojure.lang.Reflector for Java 11
|
||||
java.lang.reflect.AccessibleObject
|
||||
{:methods [{:name "canAccess"}]}
|
||||
|
|
@ -111,17 +127,22 @@
|
|||
clojure.lang.RT
|
||||
{:methods [{:name "aget"}
|
||||
{:name "aset"}
|
||||
{:name "aclone"}]}
|
||||
{:name "aclone"}
|
||||
{:name "iter"}
|
||||
;; we expose this via the Compiler/LOADER dynamic var
|
||||
{:name "baseLoader"}]}
|
||||
clojure.lang.Compiler
|
||||
{:fields [{:name "specials"}
|
||||
{:name "CHAR_MAP"}]}
|
||||
clojure.lang.PersistentHashMap
|
||||
{:fields [{:name "EMPTY"}]}
|
||||
clojure.lang.APersistentVector
|
||||
{:methods [{:name "indexOf"}]}
|
||||
{:methods [{:name "indexOf"}
|
||||
{:name "contains"}]}
|
||||
clojure.lang.LazySeq
|
||||
{:allPublicConstructors true,
|
||||
:methods [{:name "indexOf"}]}
|
||||
:methods [{:name "indexOf"}
|
||||
{:name "contains"}]}
|
||||
clojure.lang.ILookup
|
||||
{:methods [{:name "valAt"}]}
|
||||
clojure.lang.IPersistentMap
|
||||
|
|
@ -140,19 +161,39 @@
|
|||
{:methods [{:name "hasNext"}
|
||||
{:name "next"}]}
|
||||
java.util.TimeZone
|
||||
{:methods [{:name "getTimeZone"}]}})
|
||||
{:methods [{:name "getTimeZone"}]}
|
||||
java.net.URLClassLoader
|
||||
{:methods [{:name "close"}
|
||||
{:name "findResource"}
|
||||
{:name "findResources"}
|
||||
{:name "getResourceAsStream"}
|
||||
{:name "getURLs"}]}
|
||||
java.lang.ClassLoader
|
||||
{:methods [{:name "getResource"}
|
||||
{:name "getResources"}
|
||||
{:name "getResourceAsStream"}
|
||||
{:name "getParent"}]}
|
||||
clojure.lang.ARef
|
||||
{:methods [{:name "getWatches"}]}
|
||||
clojure.lang.MapEntry
|
||||
{:allPublicConstructors true
|
||||
:methods [{:name "create"}]}})
|
||||
|
||||
(def custom-map
|
||||
(cond->
|
||||
(merge base-custom-map
|
||||
proxy/custom-reflect-map)
|
||||
(merge base-custom-map
|
||||
proxy/custom-reflect-map)
|
||||
features/hsqldb? (assoc `org.hsqldb.dbinfo.DatabaseInformationFull
|
||||
{:methods [{:name "<init>"
|
||||
:parameterTypes ["org.hsqldb.Database"]}]}
|
||||
`java.util.ResourceBundle
|
||||
{:methods [{:name "getBundle"
|
||||
:parameterTypes ["java.lang.String","java.util.Locale",
|
||||
"java.lang.ClassLoader"]}]})))
|
||||
"java.lang.ClassLoader"]}]})
|
||||
|
||||
has-graal-process-properties?
|
||||
(assoc `org.graalvm.nativeimage.ProcessProperties
|
||||
{:methods [{:name "exec"}]})))
|
||||
|
||||
(def java-net-http-classes
|
||||
"These classes must be initialized at run time since GraalVM 22.1"
|
||||
|
|
@ -182,7 +223,16 @@
|
|||
java.net.http.WebSocket$Builder
|
||||
java.net.http.WebSocket$Listener
|
||||
java.security.cert.X509Certificate
|
||||
java.security.cert.CertificateFactory
|
||||
java.security.Signature
|
||||
javax.crypto.Cipher
|
||||
javax.crypto.KeyAgreement
|
||||
javax.crypto.Mac
|
||||
javax.crypto.SecretKey
|
||||
javax.crypto.SecretKeyFactory
|
||||
javax.crypto.spec.GCMParameterSpec
|
||||
javax.crypto.spec.IvParameterSpec
|
||||
javax.crypto.spec.PBEKeySpec
|
||||
javax.crypto.spec.SecretKeySpec
|
||||
javax.net.ssl.HostnameVerifier ;; clj-http-lite
|
||||
javax.net.ssl.HttpsURLConnection ;; clj-http-lite
|
||||
|
|
@ -194,6 +244,9 @@
|
|||
javax.net.ssl.TrustManager
|
||||
javax.net.ssl.TrustManagerFactory
|
||||
javax.net.ssl.X509TrustManager
|
||||
javax.net.ssl.X509ExtendedTrustManager
|
||||
javax.net.ssl.SSLSocket
|
||||
javax.net.ssl.SSLSocketFactory
|
||||
jdk.internal.net.http.HttpClientBuilderImpl
|
||||
jdk.internal.net.http.HttpClientFacade
|
||||
jdk.internal.net.http.HttpRequestBuilderImpl
|
||||
|
|
@ -202,6 +255,10 @@
|
|||
jdk.internal.net.http.websocket.BuilderImpl
|
||||
jdk.internal.net.http.websocket.WebSocketImpl])
|
||||
|
||||
(def thread-builder
|
||||
(try (Class/forName "java.lang.Thread$Builder")
|
||||
(catch Exception _ nil)))
|
||||
|
||||
(def classes
|
||||
`{:all [clojure.lang.ArityException
|
||||
clojure.lang.BigInt
|
||||
|
|
@ -226,6 +283,7 @@
|
|||
java.io.FileOutputStream
|
||||
java.io.FileReader
|
||||
java.io.FileWriter
|
||||
java.io.LineNumberReader
|
||||
java.io.RandomAccessFile
|
||||
java.io.InputStream
|
||||
java.io.IOException
|
||||
|
|
@ -277,13 +335,18 @@
|
|||
java.lang.ProcessBuilder$Redirect
|
||||
java.lang.Runtime
|
||||
java.lang.RuntimeException
|
||||
java.lang.SecurityException
|
||||
java.lang.Short
|
||||
java.lang.StackTraceElement
|
||||
java.lang.String
|
||||
java.lang.StringBuilder
|
||||
java.lang.System
|
||||
java.lang.Throwable
|
||||
;; java.lang.UnsupportedOperationException
|
||||
java.lang.ThreadLocal
|
||||
java.lang.Thread$UncaughtExceptionHandler
|
||||
~@(when thread-builder
|
||||
'[java.lang.Thread$Builder])
|
||||
java.lang.UnsupportedOperationException
|
||||
java.lang.ref.WeakReference
|
||||
java.lang.ref.ReferenceQueue
|
||||
java.lang.ref.Cleaner
|
||||
|
|
@ -298,11 +361,15 @@
|
|||
java.net.HttpURLConnection
|
||||
java.net.InetAddress
|
||||
java.net.InetSocketAddress
|
||||
java.net.StandardProtocolFamily
|
||||
java.net.ServerSocket
|
||||
java.net.Socket
|
||||
java.net.SocketException
|
||||
~@(when has-domain-sockets?
|
||||
'[java.net.UnixDomainSocketAddress])
|
||||
java.net.UnknownHostException
|
||||
java.net.URI
|
||||
java.net.URISyntaxException
|
||||
;; java.net.URL, see custom map
|
||||
java.net.URLConnection
|
||||
java.net.URLEncoder
|
||||
|
|
@ -316,8 +383,14 @@
|
|||
java.nio.MappedByteBuffer
|
||||
java.nio.file.OpenOption
|
||||
java.nio.file.StandardOpenOption
|
||||
java.nio.channels.ByteChannel
|
||||
java.nio.channels.Channels
|
||||
java.nio.channels.FileChannel
|
||||
java.nio.channels.FileChannel$MapMode
|
||||
java.nio.channels.ReadableByteChannel
|
||||
java.nio.channels.WritableByteChannel
|
||||
java.nio.channels.ServerSocketChannel
|
||||
java.nio.channels.SocketChannel
|
||||
java.nio.charset.Charset
|
||||
java.nio.charset.CoderResult
|
||||
java.nio.charset.CharsetEncoder
|
||||
|
|
@ -331,6 +404,7 @@
|
|||
java.nio.file.FileVisitOption
|
||||
java.nio.file.FileVisitResult
|
||||
java.nio.file.Files
|
||||
java.nio.file.DirectoryStream$Filter
|
||||
java.nio.file.LinkOption
|
||||
java.nio.file.NoSuchFileException
|
||||
java.nio.file.Path
|
||||
|
|
@ -340,18 +414,28 @@
|
|||
java.nio.file.attribute.BasicFileAttributes
|
||||
java.nio.file.attribute.FileAttribute
|
||||
java.nio.file.attribute.FileTime
|
||||
java.nio.file.attribute.PosixFileAttributes
|
||||
java.nio.file.attribute.PosixFilePermission
|
||||
java.nio.file.attribute.PosixFilePermissions])
|
||||
java.security.MessageDigest
|
||||
java.nio.file.attribute.PosixFilePermissions
|
||||
java.nio.file.attribute.UserDefinedFileAttributeView])
|
||||
java.security.DigestInputStream
|
||||
java.security.Provider
|
||||
java.security.KeyFactory
|
||||
java.security.KeyPairGenerator
|
||||
java.security.KeyPair
|
||||
java.security.KeyStore
|
||||
java.security.MessageDigest
|
||||
java.security.Provider
|
||||
java.security.SecureRandom
|
||||
java.security.Security
|
||||
java.security.spec.ECGenParameterSpec
|
||||
java.security.spec.PKCS8EncodedKeySpec
|
||||
java.security.spec.X509EncodedKeySpec
|
||||
java.sql.Date
|
||||
java.text.ParseException
|
||||
java.text.ParsePosition
|
||||
;; adds about 200kb, same functionality provided by java.time:
|
||||
java.text.SimpleDateFormat
|
||||
java.text.BreakIterator
|
||||
~@(when features/java-time?
|
||||
`[java.time.format.DateTimeFormatter
|
||||
java.time.Clock
|
||||
|
|
@ -377,6 +461,7 @@
|
|||
java.time.format.DateTimeFormatterBuilder
|
||||
java.time.format.DateTimeParseException
|
||||
java.time.format.DecimalStyle
|
||||
java.time.format.FormatStyle
|
||||
java.time.format.ResolverStyle
|
||||
java.time.format.SignStyle
|
||||
java.time.temporal.ChronoField
|
||||
|
|
@ -385,31 +470,53 @@
|
|||
java.time.temporal.TemporalAdjusters
|
||||
java.time.temporal.TemporalAmount
|
||||
java.time.temporal.TemporalField
|
||||
java.time.temporal.WeekFields
|
||||
~(symbol "[Ljava.time.temporal.TemporalField;")
|
||||
java.time.format.TextStyle
|
||||
java.time.temporal.Temporal
|
||||
java.time.temporal.TemporalAccessor
|
||||
java.time.temporal.TemporalAdjuster])
|
||||
java.time.temporal.TemporalAdjuster
|
||||
java.time.temporal.TemporalQuery
|
||||
~(symbol "[Ljava.time.temporal.TemporalQuery;")
|
||||
java.time.chrono.ChronoLocalDate
|
||||
java.time.temporal.TemporalUnit
|
||||
java.time.chrono.ChronoLocalDateTime
|
||||
java.time.chrono.ChronoZonedDateTime
|
||||
java.time.chrono.Chronology])
|
||||
java.util.concurrent.atomic.AtomicInteger
|
||||
java.util.concurrent.atomic.AtomicLong
|
||||
java.util.concurrent.atomic.AtomicReference
|
||||
java.util.concurrent.Callable
|
||||
java.util.concurrent.CancellationException
|
||||
java.util.concurrent.CompletionException
|
||||
java.util.concurrent.CountDownLatch
|
||||
java.util.concurrent.ExecutionException
|
||||
java.util.concurrent.Executor
|
||||
java.util.concurrent.ExecutorService
|
||||
java.util.concurrent.BlockingQueue
|
||||
java.util.concurrent.ArrayBlockingQueue
|
||||
java.util.concurrent.LinkedBlockingQueue
|
||||
java.util.concurrent.ScheduledFuture
|
||||
java.util.concurrent.ScheduledThreadPoolExecutor
|
||||
java.util.concurrent.Semaphore
|
||||
java.util.concurrent.ThreadFactory
|
||||
java.util.concurrent.ThreadPoolExecutor
|
||||
java.util.concurrent.ThreadPoolExecutor$AbortPolicy
|
||||
java.util.concurrent.ThreadPoolExecutor$CallerRunsPolicy
|
||||
java.util.concurrent.ThreadPoolExecutor$DiscardOldestPolicy
|
||||
java.util.concurrent.ThreadPoolExecutor$DiscardPolicy
|
||||
java.util.concurrent.ExecutorService
|
||||
java.util.concurrent.ScheduledExecutorService
|
||||
java.util.concurrent.Future
|
||||
java.util.concurrent.FutureTask
|
||||
java.util.concurrent.CompletableFuture
|
||||
java.util.concurrent.Executors
|
||||
java.util.concurrent.TimeUnit
|
||||
java.util.concurrent.CompletionStage
|
||||
java.util.concurrent.locks.ReentrantLock
|
||||
java.util.concurrent.ThreadLocalRandom
|
||||
java.util.concurrent.ConcurrentHashMap
|
||||
java.util.jar.Attributes
|
||||
java.util.jar.Attributes$Name
|
||||
java.util.jar.JarFile
|
||||
java.util.jar.JarEntry
|
||||
|
|
@ -419,9 +526,11 @@
|
|||
java.util.jar.Manifest
|
||||
java.util.stream.BaseStream
|
||||
java.util.stream.Stream
|
||||
java.util.stream.IntStream
|
||||
java.util.Random
|
||||
java.util.regex.Matcher
|
||||
java.util.regex.Pattern
|
||||
java.util.regex.PatternSyntaxException
|
||||
java.util.ArrayDeque
|
||||
java.util.ArrayList
|
||||
java.util.Collections
|
||||
|
|
@ -431,6 +540,7 @@
|
|||
java.util.Base64$Encoder
|
||||
java.util.Date
|
||||
java.util.HashMap
|
||||
java.util.HashSet
|
||||
java.util.IdentityHashMap
|
||||
java.util.InputMismatchException
|
||||
java.util.List
|
||||
|
|
@ -451,6 +561,8 @@
|
|||
java.util.function.BiFunction
|
||||
java.util.function.Predicate
|
||||
java.util.function.Supplier
|
||||
java.util.zip.CheckedInputStream
|
||||
java.util.zip.CRC32
|
||||
java.util.zip.Inflater
|
||||
java.util.zip.InflaterInputStream
|
||||
java.util.zip.Deflater
|
||||
|
|
@ -480,9 +592,22 @@
|
|||
~(symbol "[Ljava.util.regex.Pattern;")
|
||||
~(symbol "[Lclojure.core$range;")])
|
||||
~@(when features/yaml? '[org.yaml.snakeyaml.error.YAMLException])
|
||||
~@(when features/hsqldb? '[org.hsqldb.jdbcDriver])]
|
||||
~@(when features/hsqldb? '[org.hsqldb.jdbcDriver])
|
||||
org.jsoup.Jsoup
|
||||
org.jsoup.nodes.Attribute
|
||||
org.jsoup.nodes.Attributes
|
||||
org.jsoup.nodes.Comment
|
||||
org.jsoup.nodes.DataNode
|
||||
org.jsoup.nodes.Document
|
||||
org.jsoup.nodes.DocumentType
|
||||
org.jsoup.nodes.Element
|
||||
org.jsoup.nodes.Node
|
||||
org.jsoup.nodes.TextNode
|
||||
org.jsoup.nodes.XmlDeclaration
|
||||
org.jsoup.parser.Tag
|
||||
org.jsoup.parser.Parser]
|
||||
:constructors [clojure.lang.Delay
|
||||
clojure.lang.MapEntry
|
||||
clojure.lang.DynamicClassLoader
|
||||
clojure.lang.LineNumberingPushbackReader
|
||||
java.io.EOFException]
|
||||
:methods [borkdude.graal.LockFix] ;; support for locking
|
||||
|
|
@ -522,19 +647,27 @@
|
|||
clojure.lang.IRef
|
||||
clojure.lang.ISeq
|
||||
clojure.lang.IPersistentVector
|
||||
clojure.lang.ITransientSet
|
||||
clojure.lang.ITransientVector
|
||||
clojure.lang.Iterate
|
||||
clojure.lang.LispReader$Resolver
|
||||
clojure.lang.LongRange
|
||||
clojure.lang.Named
|
||||
clojure.lang.Keyword
|
||||
clojure.lang.PersistentArrayMap
|
||||
clojure.lang.PersistentArrayMap$TransientArrayMap
|
||||
clojure.lang.PersistentHashMap$TransientHashMap
|
||||
clojure.lang.PersistentHashSet
|
||||
clojure.lang.PersistentHashSet$TransientHashSet
|
||||
clojure.lang.PersistentList
|
||||
clojure.lang.PersistentList$EmptyList
|
||||
clojure.lang.PersistentQueue
|
||||
clojure.lang.PersistentStructMap
|
||||
clojure.lang.PersistentTreeMap
|
||||
clojure.lang.PersistentTreeSet
|
||||
clojure.lang.PersistentVector
|
||||
clojure.lang.PersistentVector$TransientVector
|
||||
clojure.lang.Range
|
||||
clojure.lang.Ratio
|
||||
clojure.lang.ReaderConditional
|
||||
clojure.lang.Repeat
|
||||
|
|
@ -552,11 +685,14 @@
|
|||
java.lang.LinkageError
|
||||
java.lang.ThreadDeath
|
||||
java.lang.VirtualMachineError
|
||||
java.net.URLClassLoader
|
||||
java.lang.NoSuchFieldException
|
||||
java.sql.Timestamp
|
||||
java.util.concurrent.TimeoutException
|
||||
java.util.Collection
|
||||
java.util.Map$Entry
|
||||
java.util.AbstractMap
|
||||
java.util.AbstractSet
|
||||
java.util.AbstractList
|
||||
~@(when features/xml? ['clojure.data.xml.node.Element])]
|
||||
:custom ~custom-map})
|
||||
|
||||
|
|
@ -569,70 +705,132 @@
|
|||
(:instance-checks classes))
|
||||
m (apply hash-map
|
||||
(for [c classes
|
||||
c [(list 'quote c) c]]
|
||||
c [(list 'quote c) (cond-> `{:class ~c}
|
||||
(= 'java.lang.Class c)
|
||||
(assoc :static-methods
|
||||
{(list 'quote 'forName)
|
||||
`(fn
|
||||
([_# ^String class-name#]
|
||||
(Class/forName class-name#))
|
||||
([_# ^String class-name# initialize# ^java.lang.ClassLoader clazz-loader#]
|
||||
(Class/forName class-name#)))}))]]
|
||||
c))
|
||||
m (assoc m :public-class
|
||||
(fn [v]
|
||||
;; (prn :v v)
|
||||
;; NOTE: a series of instance check, so far, is still cheaper
|
||||
;; than piggybacking on defmulti or defprotocol
|
||||
(cond (instance? java.lang.Process v)
|
||||
java.lang.Process
|
||||
(instance? java.lang.ProcessHandle v)
|
||||
java.lang.ProcessHandle
|
||||
(instance? java.lang.ProcessHandle$Info v)
|
||||
java.lang.ProcessHandle$Info
|
||||
;; added for calling .put on .environment from ProcessBuilder
|
||||
(instance? java.util.Map v)
|
||||
java.util.Map
|
||||
;; added for issue #239 regarding clj-http-lite
|
||||
;; can potentially be removed due to fix for #1061
|
||||
(instance? java.io.ByteArrayOutputStream v)
|
||||
java.io.ByteArrayOutputStream
|
||||
(instance? java.security.MessageDigest v)
|
||||
java.security.MessageDigest
|
||||
;; streams
|
||||
(instance? java.io.InputStream v)
|
||||
java.io.InputStream
|
||||
(instance? java.io.OutputStream v)
|
||||
java.io.OutputStream
|
||||
;; java nio
|
||||
(instance? java.nio.file.Path v)
|
||||
java.nio.file.Path
|
||||
(instance? java.nio.file.FileSystem v)
|
||||
java.nio.file.FileSystem
|
||||
(instance? java.nio.file.PathMatcher v)
|
||||
java.nio.file.PathMatcher
|
||||
(instance? java.util.stream.BaseStream v)
|
||||
java.util.stream.BaseStream
|
||||
(instance? java.nio.ByteBuffer v)
|
||||
java.nio.ByteBuffer
|
||||
(instance? java.nio.charset.Charset v)
|
||||
java.nio.charset.Charset
|
||||
(instance? java.nio.charset.CharsetEncoder v)
|
||||
java.nio.charset.CharsetEncoder
|
||||
(instance? java.nio.CharBuffer v)
|
||||
java.nio.CharBuffer
|
||||
(instance? java.nio.channels.FileChannel v)
|
||||
java.nio.channels.FileChannel
|
||||
(instance? java.net.CookieStore v)
|
||||
java.net.CookieStore
|
||||
;; this makes interop on reified classes work
|
||||
;; see java_net_http_test/interop-test
|
||||
(instance? sci.impl.types.IReified v)
|
||||
(first (t/getInterfaces v))
|
||||
;; fix for #1061
|
||||
(instance? java.io.Closeable v)
|
||||
java.io.Closeable
|
||||
(instance? java.nio.file.attribute.BasicFileAttributes v)
|
||||
java.nio.file.attribute.BasicFileAttributes
|
||||
(instance? java.util.concurrent.Future v)
|
||||
java.util.concurrent.Future
|
||||
(instance? java.util.concurrent.ScheduledExecutorService v)
|
||||
java.util.concurrent.ScheduledExecutorService
|
||||
(instance? java.util.Iterator v)
|
||||
java.util.Iterator
|
||||
;; keep commas for merge friendliness
|
||||
,,,)))
|
||||
(let [res (cond (instance? java.lang.Process v)
|
||||
java.lang.Process
|
||||
(instance? java.lang.ProcessHandle v)
|
||||
java.lang.ProcessHandle
|
||||
(instance? java.lang.ProcessHandle$Info v)
|
||||
java.lang.ProcessHandle$Info
|
||||
;; added for calling .put on .environment from ProcessBuilder
|
||||
(instance? java.util.Map v)
|
||||
java.util.Map
|
||||
;; added for issue #239 regarding clj-http-lite
|
||||
;; can potentially be removed due to fix for #1061
|
||||
(instance? java.io.ByteArrayOutputStream v)
|
||||
java.io.ByteArrayOutputStream
|
||||
(instance? java.security.MessageDigest v)
|
||||
java.security.MessageDigest
|
||||
;; streams
|
||||
(instance? java.io.InputStream v)
|
||||
java.io.InputStream
|
||||
(instance? java.io.OutputStream v)
|
||||
java.io.OutputStream
|
||||
;; java nio
|
||||
(instance? java.nio.file.Path v)
|
||||
java.nio.file.Path
|
||||
(instance? java.nio.file.FileSystem v)
|
||||
java.nio.file.FileSystem
|
||||
(instance? java.nio.file.PathMatcher v)
|
||||
java.nio.file.PathMatcher
|
||||
(instance? java.util.stream.Stream v)
|
||||
java.util.stream.Stream
|
||||
(instance? java.util.stream.IntStream v)
|
||||
java.util.stream.IntStream
|
||||
(instance? java.util.stream.BaseStream v)
|
||||
java.util.stream.BaseStream
|
||||
(instance? java.nio.ByteBuffer v)
|
||||
java.nio.ByteBuffer
|
||||
(instance? java.nio.charset.Charset v)
|
||||
java.nio.charset.Charset
|
||||
(instance? java.nio.charset.CharsetEncoder v)
|
||||
java.nio.charset.CharsetEncoder
|
||||
(instance? java.nio.CharBuffer v)
|
||||
java.nio.CharBuffer
|
||||
(instance? java.nio.channels.FileChannel v)
|
||||
java.nio.channels.FileChannel
|
||||
(instance? java.nio.channels.ServerSocketChannel v)
|
||||
java.nio.channels.ServerSocketChannel
|
||||
(instance? java.nio.channels.SocketChannel v)
|
||||
java.nio.channels.SocketChannel
|
||||
(instance? java.net.CookieStore v)
|
||||
java.net.CookieStore
|
||||
;; this makes interop on reified classes work
|
||||
;; see java_net_http_test/interop-test
|
||||
(instance? sci.impl.types.IReified v)
|
||||
(first (t/getInterfaces v))
|
||||
;; fix for #1061
|
||||
(instance? java.net.URLClassLoader v)
|
||||
java.net.URLClassLoader
|
||||
(instance? java.lang.ClassLoader v)
|
||||
java.lang.ClassLoader
|
||||
(instance? java.nio.file.attribute.PosixFileAttributes v)
|
||||
java.nio.file.attribute.PosixFileAttributes
|
||||
(instance? java.nio.file.attribute.BasicFileAttributes v)
|
||||
java.nio.file.attribute.BasicFileAttributes
|
||||
(instance? java.nio.file.attribute.UserDefinedFileAttributeView v)
|
||||
java.nio.file.attribute.UserDefinedFileAttributeView
|
||||
(instance? java.util.concurrent.Future v)
|
||||
java.util.concurrent.Future
|
||||
(instance? java.util.concurrent.ScheduledExecutorService v)
|
||||
java.util.concurrent.ScheduledExecutorService
|
||||
(instance? java.util.concurrent.ExecutorService v)
|
||||
java.util.concurrent.ExecutorService
|
||||
(instance? java.util.Iterator v)
|
||||
java.util.Iterator
|
||||
(instance? javax.crypto.SecretKey v)
|
||||
javax.crypto.SecretKey
|
||||
(instance? javax.net.ssl.SSLSocketFactory v)
|
||||
javax.net.ssl.SSLSocketFactory
|
||||
(instance? javax.net.ssl.SSLSocket v)
|
||||
javax.net.ssl.SSLSocket
|
||||
(instance? java.lang.Thread v)
|
||||
java.lang.Thread
|
||||
(instance? java.util.concurrent.ThreadFactory v)
|
||||
java.util.concurrent.ThreadFactory
|
||||
(instance? java.security.cert.X509Certificate v)
|
||||
java.security.cert.X509Certificate
|
||||
(instance? java.io.Console v)
|
||||
java.io.Console
|
||||
(instance? java.security.KeyPairGenerator v)
|
||||
java.security.KeyPairGenerator
|
||||
(instance? java.security.Signature v)
|
||||
java.security.Signature
|
||||
(instance? java.security.Key v)
|
||||
java.security.Key
|
||||
(instance? java.util.Set v)
|
||||
java.util.Set
|
||||
(instance? java.io.Closeable v)
|
||||
java.io.Closeable
|
||||
(instance? java.util.Collection v)
|
||||
java.util.Collection
|
||||
(instance? java.lang.Throwable v)
|
||||
java.lang.Throwable
|
||||
(instance? org.jsoup.nodes.Element v)
|
||||
org.jsoup.nodes.Element
|
||||
(and thread-builder
|
||||
(instance? thread-builder v))
|
||||
thread-builder
|
||||
(instance? java.text.BreakIterator v)
|
||||
java.text.BreakIterator
|
||||
;; keep commas for merge friendliness
|
||||
,)]
|
||||
;; (prn :res res)
|
||||
res)))
|
||||
m (assoc m (list 'quote 'clojure.lang.Var) 'sci.lang.Var)
|
||||
m (assoc m (list 'quote 'clojure.lang.Namespace) 'sci.lang.Namespace)]
|
||||
m))
|
||||
|
|
@ -643,6 +841,14 @@
|
|||
allowed to be initialized at build time."
|
||||
(gen-class-map))
|
||||
|
||||
#_(let [class-name (str c)]
|
||||
(cond-> (Class/forName class-name)
|
||||
(= "java.lang.Class" class-name)
|
||||
(->> (hash-map :static-methods {'forName (fn [class-name]
|
||||
(prn :class-for)
|
||||
(Class/forName class-name))}
|
||||
:class))))
|
||||
|
||||
(def class-map
|
||||
"A delay to delay initialization of java-net-http classes to run time, since GraalVM 22.1"
|
||||
(delay (persistent! (reduce (fn [acc c]
|
||||
|
|
@ -659,6 +865,7 @@
|
|||
BigInteger java.math.BigInteger
|
||||
Boolean java.lang.Boolean
|
||||
Byte java.lang.Byte
|
||||
Callable java.util.concurrent.Callable
|
||||
Character java.lang.Character
|
||||
CharSequence java.lang.CharSequence
|
||||
Class java.lang.Class
|
||||
|
|
@ -675,6 +882,8 @@
|
|||
Integer java.lang.Integer
|
||||
InterruptedException java.lang.InterruptedException
|
||||
Iterable java.lang.Iterable
|
||||
;; NOTE: in hindsight File never belonged to the default imports of Clojure,
|
||||
;; but it's been here to long to remove probably
|
||||
File java.io.File
|
||||
Float java.lang.Float
|
||||
Long java.lang.Long
|
||||
|
|
@ -684,21 +893,26 @@
|
|||
Number java.lang.Number
|
||||
NumberFormatException java.lang.NumberFormatException
|
||||
Object java.lang.Object
|
||||
Runnable java.lang.Runnable
|
||||
Runtime java.lang.Runtime
|
||||
RuntimeException java.lang.RuntimeException
|
||||
Process java.lang.Process
|
||||
Process java.lang.Process
|
||||
ProcessBuilder java.lang.ProcessBuilder
|
||||
SecurityException java.lang.SecurityException
|
||||
Short java.lang.Short
|
||||
StackTraceElement java.lang.StackTraceElement
|
||||
String java.lang.String
|
||||
StringBuilder java.lang.StringBuilder
|
||||
System java.lang.System
|
||||
Thread java.lang.Thread
|
||||
ThreadLocal java.lang.ThreadLocal
|
||||
Thread$UncaughtExceptionHandler java.lang.Thread$UncaughtExceptionHandler
|
||||
Throwable java.lang.Throwable
|
||||
VirtualMachineError java.lang.VirtualMachineError
|
||||
ThreadDeath java.lang.ThreadDeath
|
||||
;; UnsupportedOperationException java.lang.UnsupportedOperationException
|
||||
})
|
||||
UnsupportedOperationException java.lang.UnsupportedOperationException})
|
||||
|
||||
;; (eval (vec (keys imports)))
|
||||
|
||||
(defn reflection-file-entries []
|
||||
(let [entries (vec (for [c (sort (concat (:all classes)
|
||||
|
|
@ -740,13 +954,13 @@
|
|||
"resources/META-INF/native-image/babashka/babashka/reflect-config.json")
|
||||
(json/generate-string all-entries {:pretty true}))))
|
||||
|
||||
(defn public-declared-method? [c m]
|
||||
(defn public-declared-method? [^Class c ^java.lang.reflect.Method m]
|
||||
(and (= c (.getDeclaringClass m))
|
||||
(not (.getAnnotation m Deprecated))))
|
||||
|
||||
(defn public-declared-method-names [c]
|
||||
(defn public-declared-method-names [^Class c]
|
||||
(->> (.getMethods c)
|
||||
(keep (fn [m]
|
||||
(keep (fn [^java.lang.reflect.Method m]
|
||||
(when (public-declared-method? c m)
|
||||
{:class c
|
||||
:name (.getName m)})))
|
||||
|
|
@ -754,8 +968,9 @@
|
|||
(sort-by :name)
|
||||
(vec)))
|
||||
|
||||
(defn all-classes []
|
||||
(defn all-classes
|
||||
"Returns every java.lang.Class instance Babashka supports."
|
||||
[]
|
||||
(->> (reflection-file-entries)
|
||||
(map :name)
|
||||
(map #(Class/forName %))))
|
||||
|
|
@ -773,6 +988,4 @@
|
|||
(public-declared-method-names java.net.URL)
|
||||
(public-declared-method-names java.util.Properties)
|
||||
|
||||
(all-classes)
|
||||
|
||||
)
|
||||
(all-classes))
|
||||
|
|
|
|||
|
|
@ -5,66 +5,51 @@
|
|||
[clojure.java.io :as io]
|
||||
[clojure.string :as str]
|
||||
[sci.core :as sci])
|
||||
(:import [java.util.jar JarFile Manifest]
|
||||
(:import [java.util.jar Manifest]
|
||||
(java.net URL)))
|
||||
|
||||
(set! *warn-on-reflection* true)
|
||||
|
||||
(defprotocol IResourceResolver
|
||||
(getResource [this paths opts])
|
||||
(getResources [this paths opts]))
|
||||
|
||||
(deftype DirectoryResolver [path]
|
||||
IResourceResolver
|
||||
(getResource [_ resource-paths url?]
|
||||
(some
|
||||
(fn [resource-path]
|
||||
(let [f (io/file path resource-path)]
|
||||
(when (.exists f)
|
||||
(if url?
|
||||
;; manual conversion, faster than going through .toURI
|
||||
(java.net.URL. "file" nil (.getAbsolutePath f))
|
||||
{:file (.getAbsolutePath f)
|
||||
:source (slurp f)}))))
|
||||
resource-paths)))
|
||||
|
||||
(defn path-from-jar
|
||||
[^java.io.File jar-file resource-paths url?]
|
||||
(with-open [jar (JarFile. jar-file)]
|
||||
(some (fn [path]
|
||||
(when-let [entry (.getEntry jar path)]
|
||||
(if url?
|
||||
;; manual conversion, faster than going through .toURI
|
||||
(java.net.URL. "jar" nil
|
||||
(str "file:" (.getAbsolutePath jar-file) "!/" path))
|
||||
{:file path
|
||||
:source (slurp (.getInputStream jar entry))})))
|
||||
resource-paths)))
|
||||
|
||||
(deftype JarFileResolver [jar-file]
|
||||
IResourceResolver
|
||||
(getResource [_ resource-paths url?]
|
||||
(path-from-jar jar-file resource-paths url?)))
|
||||
|
||||
(defn part->entry [part]
|
||||
(when-not (str/blank? part)
|
||||
(if (str/ends-with? part ".jar")
|
||||
(JarFileResolver. (io/file part))
|
||||
(DirectoryResolver. (io/file part)))))
|
||||
|
||||
(deftype Loader [entries]
|
||||
IResourceResolver
|
||||
(getResource [_ resource-paths opts]
|
||||
(some #(getResource % resource-paths opts) entries))
|
||||
(getResources [_ resource-paths opts]
|
||||
(keep #(getResource % resource-paths opts) entries)))
|
||||
(defn getResource [^babashka.impl.URLClassLoader class-loader resource-paths url?]
|
||||
(some (fn [resource]
|
||||
(when-let [^java.net.URL res (.findResource class-loader resource)]
|
||||
(if url?
|
||||
res
|
||||
{:file (if (= "jar" (.getProtocol res))
|
||||
resource
|
||||
(.getFile res))
|
||||
:source (slurp res)})))
|
||||
resource-paths))
|
||||
|
||||
(def path-sep (System/getProperty "path.separator"))
|
||||
|
||||
(defn loader [^String classpath]
|
||||
(let [parts (.split classpath path-sep)
|
||||
entries (keep part->entry parts)]
|
||||
(Loader. entries)))
|
||||
(defn ->url ^java.net.URL [^String s]
|
||||
(.toURL (java.io.File. s)))
|
||||
|
||||
(defn new-loader ^babashka.impl.URLClassLoader
|
||||
([paths]
|
||||
(babashka.impl.URLClassLoader. (into-array java.net.URL (map ->url paths)))))
|
||||
|
||||
(def ^babashka.impl.URLClassLoader the-url-loader (delay (new-loader [])))
|
||||
|
||||
(defn add-classpath
|
||||
"Adds extra-classpath, a string as for example returned by clojure
|
||||
-Spath, to the current classpath."
|
||||
[^String extra-classpath]
|
||||
(let [paths (.split extra-classpath path-sep)
|
||||
paths (map ->url paths)
|
||||
loader @the-url-loader]
|
||||
(run! (fn [path]
|
||||
(._addURL ^babashka.impl.URLClassLoader loader path)
|
||||
loader)
|
||||
paths)
|
||||
;; (run! prn (.getURLs the-url-loader))
|
||||
(System/setProperty "java.class.path"
|
||||
(let [system-cp (System/getProperty "java.class.path")]
|
||||
(-> (cond-> system-cp
|
||||
(not (str/blank? system-cp)) (str path-sep))
|
||||
(str extra-classpath)))))
|
||||
nil)
|
||||
|
||||
(defn resource-paths [namespace]
|
||||
(let [ns-str (name namespace)
|
||||
|
|
@ -86,34 +71,21 @@
|
|||
(.getValue "Main-Class")
|
||||
(demunge))))
|
||||
|
||||
(def cp-state (atom nil))
|
||||
|
||||
(defn add-classpath
|
||||
"Adds extra-classpath, a string as for example returned by clojure
|
||||
-Spath, to the current classpath."
|
||||
[extra-classpath]
|
||||
(swap! cp-state
|
||||
(fn [{:keys [:cp]}]
|
||||
(let [new-cp
|
||||
(if-not cp extra-classpath
|
||||
(str cp path-sep extra-classpath))]
|
||||
{:loader (loader new-cp)
|
||||
:cp new-cp})))
|
||||
nil)
|
||||
|
||||
(defn split-classpath
|
||||
"Returns the classpath as a seq of strings, split by the platform
|
||||
specific path separator."
|
||||
([^String cp] (vec (.split cp path-sep))))
|
||||
([^String cp] (vec (when cp (.split cp path-sep)))))
|
||||
|
||||
(defn get-classpath
|
||||
"Returns the current classpath as set by --classpath, BABASHKA_CLASSPATH and add-classpath."
|
||||
[]
|
||||
(:cp @cp-state))
|
||||
(let [cp (System/getProperty "java.class.path")]
|
||||
(when-not (str/blank? cp)
|
||||
cp)))
|
||||
|
||||
(defn resource
|
||||
(^URL [path] (when-let [st @cp-state] (resource (:loader st) path)))
|
||||
(^URL [loader path]
|
||||
(^URL [path] (resource path @the-url-loader))
|
||||
(^URL [path loader]
|
||||
(if (str/starts-with? path "/") nil ;; non-relative paths always return nil
|
||||
(getResource loader [path] true))))
|
||||
|
||||
|
|
@ -132,4 +104,3 @@
|
|||
(def l (loader cp))
|
||||
(source-for-namespace l 'babashka.impl.cheshire nil)
|
||||
(time (:file (source-for-namespace l 'cheshire.core nil)))) ;; 20ms -> 2.25ms
|
||||
|
||||
|
|
|
|||
|
|
@ -17,18 +17,22 @@
|
|||
(let [extra-opts '%s
|
||||
sym `%s
|
||||
the-var (requiring-resolve sym)
|
||||
_ (when-not the-var
|
||||
(throw (ex-info (str \"Could not resolve sym to a function: \" sym) {:babashka/exit 1})))
|
||||
the-var-meta (meta the-var)
|
||||
ns (:ns (meta the-var))
|
||||
ns-meta (meta ns)
|
||||
ct (babashka.tasks/current-task)
|
||||
exec-args (babashka.cli/merge-opts (:exec-args (:org.babashka/cli ns-meta))
|
||||
(:exec-args (:org.babashka/cli the-var-meta))
|
||||
(:exec-args (:org.babashka/cli ct))
|
||||
(:exec-args ct)
|
||||
(:exec-args extra-opts))
|
||||
cli-opts (babashka.cli/merge-opts (:org.babashka/cli ns-meta)
|
||||
(:org.babashka/cli the-var-meta)
|
||||
(:org.babashka/cli ct)
|
||||
extra-opts)
|
||||
task-exec-args (:exec-args ct)
|
||||
cli-exec-args (:exec-args cli-opts)
|
||||
exec-args {:exec-args (babashka.cli/merge-opts cli-exec-args task-exec-args)}
|
||||
cli-opts (babashka.cli/merge-opts exec-args cli-opts)
|
||||
cli-opts (assoc cli-opts :exec-args exec-args)
|
||||
opts (babashka.cli/parse-opts *command-line-args* cli-opts)]
|
||||
(the-var opts))"
|
||||
(random-uuid)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
(:refer-clojure :exclude [future read+string clojure-version with-precision
|
||||
send-via send send-off sync into-array])
|
||||
(:require [babashka.impl.common :as common]
|
||||
[borkdude.graal.locking :as locking]
|
||||
[clojure.core :as c]
|
||||
[clojure.string :as str]
|
||||
[sci.core :as sci]
|
||||
|
|
@ -12,18 +11,6 @@
|
|||
[sci.impl.utils :refer [clojure-core-ns]]
|
||||
[sci.impl.vars :as vars]))
|
||||
|
||||
(defn locking* [form bindings v f & args]
|
||||
(apply @#'locking/locking form bindings v f args))
|
||||
|
||||
(defn time*
|
||||
"Evaluates expr and prints the time it took. Returns the value of
|
||||
expr."
|
||||
[_ _ expr]
|
||||
`(let [start# (. System (nanoTime))
|
||||
ret# ~expr]
|
||||
(prn (str "Elapsed time: " (/ (double (- (. System (nanoTime)) start#)) 1000000.0) " msecs"))
|
||||
ret#))
|
||||
|
||||
(defn core-dynamic-var
|
||||
([sym] (core-dynamic-var sym nil))
|
||||
([sym init-val] (sci/new-dynamic-var sym init-val {:ns clojure-core-ns})))
|
||||
|
|
@ -34,6 +21,9 @@
|
|||
(def compile-files (core-dynamic-var '*compile-files* false))
|
||||
(def unchecked-math (core-dynamic-var '*unchecked-math* false))
|
||||
(def math-context (core-dynamic-var '*math-context*))
|
||||
(def compile-path (core-dynamic-var '*compile-path* *compile-path*))
|
||||
(def compiler-options (core-dynamic-var '*compiler-options*))
|
||||
(def repl (core-dynamic-var '*repl* true)) ;; set to true, basically just a dummy for now
|
||||
|
||||
(defn read+string
|
||||
"Added for compatibility. Must be used with
|
||||
|
|
@ -62,7 +52,7 @@
|
|||
The rounding mode is one of CEILING, FLOOR, HALF_UP, HALF_DOWN,
|
||||
HALF_EVEN, UP, DOWN and UNNECESSARY; it defaults to HALF_UP."
|
||||
[precision & exprs]
|
||||
(let [[body rm] (if (= (first exprs) :rounding)
|
||||
(let [[body rm] (if (= :rounding (first exprs))
|
||||
[(next (next exprs))
|
||||
`((. java.math.RoundingMode ~(second exprs)))]
|
||||
[exprs nil])]
|
||||
|
|
@ -128,7 +118,7 @@
|
|||
:static true}
|
||||
([aseq]
|
||||
(try (clojure.lang.RT/seqToTypedArray (seq aseq))
|
||||
(catch IllegalArgumentException _
|
||||
(catch Throwable _
|
||||
(clojure.lang.RT/seqToTypedArray Object (seq aseq)))))
|
||||
([type aseq]
|
||||
(clojure.lang.RT/seqToTypedArray type (seq aseq))))
|
||||
|
|
@ -154,11 +144,9 @@
|
|||
'file-seq (copy-core-var file-seq)
|
||||
'promise (copy-core-var promise)
|
||||
'deliver (copy-core-var deliver)
|
||||
'locking (macrofy 'locking locking*)
|
||||
'shutdown-agents (copy-core-var shutdown-agents)
|
||||
'slurp (copy-core-var slurp)
|
||||
'spit (copy-core-var spit)
|
||||
'time (macrofy 'time time*)
|
||||
'Throwable->map (copy-core-var Throwable->map)
|
||||
'tap> (copy-core-var tap>)
|
||||
'add-tap (copy-core-var add-tap)
|
||||
|
|
@ -173,6 +161,9 @@
|
|||
'*compile-files* compile-files
|
||||
'*unchecked-math* unchecked-math
|
||||
'*math-context* math-context
|
||||
'*compiler-options* compiler-options
|
||||
'*compile-path* compile-path
|
||||
'*source-path* sci/file
|
||||
'with-precision (sci/copy-var with-precision clojure-core-ns)
|
||||
'-with-precision (sci/copy-var -with-precision clojure-core-ns)
|
||||
;; STM
|
||||
|
|
@ -183,6 +174,8 @@
|
|||
'sync (sci/copy-var sync clojure-core-ns)
|
||||
'ref (sci/copy-var ref clojure-core-ns)
|
||||
'ref-set (sci/copy-var ref-set clojure-core-ns)
|
||||
'ensure (sci/copy-var ensure clojure-core-ns)
|
||||
;; end STM
|
||||
'update-vals (sci/copy-var update-vals clojure-core-ns)
|
||||
'update-keys (sci/copy-var update-keys clojure-core-ns)
|
||||
'parse-boolean (sci/copy-var parse-boolean clojure-core-ns)
|
||||
|
|
@ -198,5 +191,17 @@
|
|||
'into-array (sci/copy-var into-array clojure-core-ns)
|
||||
'print-method (sci/copy-var print-method clojure-core-ns)
|
||||
'print-dup (sci/copy-var print-dup clojure-core-ns)
|
||||
'PrintWriter-on (sci/copy-var PrintWriter-on clojure-core-ns)}
|
||||
'PrintWriter-on (sci/copy-var PrintWriter-on clojure-core-ns)
|
||||
'set-agent-send-executor! (sci/copy-var set-agent-send-executor! clojure-core-ns)
|
||||
'set-agent-send-off-executor! (sci/copy-var set-agent-send-off-executor! clojure-core-ns)
|
||||
;; 1.12
|
||||
'splitv-at (sci/copy-var splitv-at clojure-core-ns)
|
||||
'stream-transduce! (sci/copy-var stream-transduce! clojure-core-ns)
|
||||
'partitionv (sci/copy-var partitionv clojure-core-ns)
|
||||
'stream-into! (sci/copy-var stream-into! clojure-core-ns)
|
||||
'stream-reduce! (sci/copy-var stream-reduce! clojure-core-ns)
|
||||
'stream-seq! (sci/copy-var stream-seq! clojure-core-ns)
|
||||
'partitionv-all (sci/copy-var partitionv-all clojure-core-ns)
|
||||
'*repl* repl
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,33 +2,94 @@
|
|||
{:no-doc true}
|
||||
(:require [clojure.core.async :as async]
|
||||
[clojure.core.async.impl.protocols :as protocols]
|
||||
[clojure.core.async.impl.dispatch :as dispatch]
|
||||
[sci.core :as sci :refer [copy-var]]
|
||||
[sci.impl.copy-vars :refer [macrofy]]
|
||||
[sci.impl.vars :as vars]))
|
||||
[sci.impl.vars :as vars])
|
||||
(:import [java.util.concurrent Executors ExecutorService ThreadFactory]))
|
||||
|
||||
(def ^java.util.concurrent.Executor executor @#'async/thread-macro-executor)
|
||||
(set! *warn-on-reflection* true)
|
||||
|
||||
#_(def ^java.util.concurrent.Executor executor @#'async/thread-macro-executor)
|
||||
(def executor-for
|
||||
"Given a workload tag, returns an ExecutorService instance and memoizes the result. By
|
||||
default, core.async will defer to a user factory (if provided via sys prop) or construct
|
||||
a specialized ExecutorService instance for each tag :io, :compute, and :mixed. When
|
||||
given the tag :core-async-dispatch it will default to the executor service for :io."
|
||||
(memoize
|
||||
(fn ^ExecutorService [workload]
|
||||
(let [sysprop-factory nil #_(when-let [esf (System/getProperty "clojure.core.async.executor-factory")]
|
||||
(requiring-resolve (symbol esf)))
|
||||
sp-exec (and sysprop-factory (sysprop-factory workload))]
|
||||
(or sp-exec
|
||||
(if (= workload :core-async-dispatch)
|
||||
(executor-for :io)
|
||||
(@#'dispatch/create-default-executor workload)))))))
|
||||
|
||||
(alter-var-root #'dispatch/executor-for (constantly executor-for))
|
||||
|
||||
#_#_(defn exec
|
||||
[^Runnable r workload]
|
||||
(prn :r r :w workload)
|
||||
(let [^ExecutorService e (executor-for workload)]
|
||||
(.execute e r)))
|
||||
|
||||
(alter-var-root #'dispatch/exec (constantly exec))
|
||||
|
||||
(def ^java.util.concurrent.Executor virtual-executor
|
||||
(try (eval '(java.util.concurrent.Executors/newVirtualThreadPerTaskExecutor))
|
||||
(catch Exception _ nil)))
|
||||
|
||||
(defn thread-call
|
||||
"Executes f in another thread, returning immediately to the calling
|
||||
thread. Returns a channel which will receive the result of calling
|
||||
f when completed, then close. workload is a keyword that describes
|
||||
the work performed by f, where:
|
||||
|
||||
:io - may do blocking I/O but must not do extended computation
|
||||
:compute - must not ever block
|
||||
:mixed - anything else (default)
|
||||
|
||||
when workload not supplied, defaults to :mixed"
|
||||
([f] (thread-call f :mixed))
|
||||
([f workload]
|
||||
(let [c (async/chan 1)
|
||||
returning-to-chan (fn [bf]
|
||||
#(try
|
||||
(when-some [ret (bf)]
|
||||
(async/>!! c ret))
|
||||
(finally (async/close! c))))
|
||||
f (vars/binding-conveyor-fn f)]
|
||||
(-> f #_bound-fn* returning-to-chan (dispatch/exec workload))
|
||||
c)))
|
||||
|
||||
(defn -vthread-call
|
||||
"Executes f in another virtual thread, returning immediately to the calling
|
||||
thread. Returns a channel which will receive the result of calling
|
||||
f when completed, then close."
|
||||
[f]
|
||||
(let [c (async/chan 1)]
|
||||
(let [binds (vars/get-thread-binding-frame)]
|
||||
(.execute executor
|
||||
(fn []
|
||||
(vars/reset-thread-binding-frame binds)
|
||||
(try
|
||||
(let [ret (f)]
|
||||
(when-not (nil? ret)
|
||||
(async/>!! c ret)))
|
||||
(finally
|
||||
(async/close! c))))))
|
||||
(let [returning-to-chan (fn [bf]
|
||||
#(try
|
||||
(when-some [ret (bf)]
|
||||
(async/>!! c ret))
|
||||
(finally (async/close! c))))
|
||||
f (vars/binding-conveyor-fn f)]
|
||||
(.execute virtual-executor
|
||||
(-> f returning-to-chan)))
|
||||
c))
|
||||
|
||||
(defn thread
|
||||
[_ _ & body]
|
||||
`(~'clojure.core.async/thread-call (fn [] ~@body)))
|
||||
`(~'clojure.core.async/thread-call (fn [] ~@body) :mixed))
|
||||
|
||||
(defn io-thread
|
||||
[_ _ & body]
|
||||
`(~'clojure.core.async/thread-call (fn [] ~@body) :io))
|
||||
|
||||
(defn -vthread
|
||||
[_ _ & body]
|
||||
`(~'clojure.core.async/-vthread-call (fn [] ~@body)))
|
||||
|
||||
(defn alt!!
|
||||
"Like alt!, except as if by alts!!, will block until completed, and
|
||||
|
|
@ -38,10 +99,19 @@
|
|||
|
||||
(defn go-loop
|
||||
[_ _ bindings & body]
|
||||
(list 'clojure.core.async/thread (list* 'loop bindings body)))
|
||||
(list 'clojure.core.async/go (list* 'loop bindings body)))
|
||||
|
||||
(def core-async-namespace (sci/create-ns 'clojure.core.async nil))
|
||||
|
||||
(defn timeout [ms]
|
||||
(if virtual-executor
|
||||
(let [chan (async/chan nil)]
|
||||
(.execute virtual-executor (fn []
|
||||
(Thread/sleep (long ms))
|
||||
(async/close! chan)))
|
||||
chan)
|
||||
(async/timeout ms)))
|
||||
|
||||
(def async-namespace
|
||||
{:obj core-async-namespace
|
||||
'<!! (copy-var async/<!! core-async-namespace)
|
||||
|
|
@ -91,8 +161,10 @@
|
|||
'take! (copy-var async/take! core-async-namespace)
|
||||
'tap (copy-var async/tap core-async-namespace)
|
||||
'thread (macrofy 'thread thread core-async-namespace)
|
||||
'io-thread (macrofy 'io-thread io-thread core-async-namespace)
|
||||
'thread-call (copy-var thread-call core-async-namespace)
|
||||
'timeout (copy-var async/timeout core-async-namespace)
|
||||
'-vthread-call (copy-var -vthread-call core-async-namespace)
|
||||
'timeout (copy-var timeout core-async-namespace)
|
||||
'to-chan (copy-var async/to-chan core-async-namespace)
|
||||
'to-chan! (copy-var async/to-chan! core-async-namespace)
|
||||
'to-chan!! (copy-var async/to-chan!! core-async-namespace)
|
||||
|
|
@ -107,7 +179,9 @@
|
|||
'untap (copy-var async/untap core-async-namespace)
|
||||
'untap-all (copy-var async/untap-all core-async-namespace)
|
||||
;; polyfill
|
||||
'go (macrofy 'go thread core-async-namespace)
|
||||
'go (if virtual-executor
|
||||
(macrofy 'go -vthread core-async-namespace)
|
||||
(macrofy 'go thread core-async-namespace))
|
||||
'<! (copy-var async/<!! core-async-namespace {:name '<!})
|
||||
'>! (copy-var async/>!! core-async-namespace {:name '>!})
|
||||
'alt! (macrofy 'alt! alt!! core-async-namespace)
|
||||
|
|
@ -119,3 +193,4 @@
|
|||
(def async-protocols-namespace
|
||||
{:obj async-protocols-ns
|
||||
'ReadPort (copy-var protocols/ReadPort async-protocols-ns)})
|
||||
;; trigger CI
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
(case os
|
||||
:mac (sh "open" url)
|
||||
:linux (sh "xdg-open" url)
|
||||
:windows (sh "cmd" "/C" "start" url)))))
|
||||
:windows (sh "cmd" "/C" "start" (.replace url "&" "^&"))))))
|
||||
|
||||
(def browse-namespace
|
||||
{'*open-url-script* open-url-script
|
||||
|
|
|
|||
6
src/babashka/impl/clojure/java/process.clj
Normal file
6
src/babashka/impl/clojure/java/process.clj
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
(ns babashka.impl.clojure.java.process
|
||||
(:require [clojure.java.process]
|
||||
[sci.core :as sci]))
|
||||
|
||||
(def cjp (sci/create-ns 'clojure.java.process nil))
|
||||
(def cjp-namespace (sci/copy-ns clojure.java.process cjp))
|
||||
|
|
@ -55,6 +55,13 @@ by default when a new command-line REPL is started."} repl-requires
|
|||
'[[clojure.repl :refer (source apropos pst dir doc find-doc)]
|
||||
[clojure.pprint :refer (pp pprint)]])
|
||||
|
||||
(defmacro with-read-known
|
||||
"Evaluates body with *read-eval* set to a \"known\" value,
|
||||
i.e. substituting true for :unknown if necessary."
|
||||
[& body]
|
||||
`(binding [*read-eval* (if (= :unknown *read-eval*) true *read-eval*)]
|
||||
~@body))
|
||||
|
||||
(defn repl
|
||||
"Generic, reusable, read-eval-print loop. By default, reads from *in*,
|
||||
writes to *out*, and prints exception summaries to *err*. If you use the
|
||||
|
|
@ -111,8 +118,9 @@ by default when a new command-line REPL is started."} repl-requires
|
|||
:file "<repl>"
|
||||
:type :sci/error) e)))))))
|
||||
(catch Throwable e
|
||||
(caught e)
|
||||
(set! *e e))))]
|
||||
(let [e' (ex-cause e)]
|
||||
(caught e)
|
||||
(set! *e e')))))]
|
||||
(with-bindings
|
||||
(try
|
||||
(init)
|
||||
|
|
|
|||
7
src/babashka/impl/clojure/reflect.clj
Normal file
7
src/babashka/impl/clojure/reflect.clj
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
(ns babashka.impl.clojure.reflect
|
||||
(:require [clojure.reflect]
|
||||
[sci.core :as sci]))
|
||||
|
||||
(def rns (sci/create-ns 'clojure.reflect))
|
||||
|
||||
(def reflect-namespace {'reflect (sci/copy-var clojure.reflect/reflect rns)})
|
||||
|
|
@ -316,8 +316,8 @@
|
|||
Does nothing if *report-counters* is nil."
|
||||
{:added "1.1"}
|
||||
[name]
|
||||
(when @report-counters
|
||||
(swap! @report-counters update-in [name] (fnil inc 0))))
|
||||
(when-let [rc @report-counters]
|
||||
(dosync (commute rc update-in [name] (fnil inc 0)))))
|
||||
|
||||
;;; TEST RESULT REPORTING
|
||||
|
||||
|
|
@ -660,14 +660,12 @@
|
|||
|
||||
;;; DEFINING FIXTURES
|
||||
|
||||
(def ^:private ns->fixtures (atom {}))
|
||||
|
||||
(defn- add-ns-meta
|
||||
"Adds elements in coll to the current namespace metadata as the
|
||||
value of key."
|
||||
{:added "1.1"}
|
||||
[key coll]
|
||||
(swap! ns->fixtures assoc-in [(sci-namespaces/sci-ns-name @sci/ns) key] coll))
|
||||
(alter-meta! @sci/ns assoc key coll))
|
||||
|
||||
(defmulti use-fixtures
|
||||
"Wrap test runs in a fixture function to perform setup and
|
||||
|
|
@ -677,10 +675,10 @@
|
|||
(fn [fixture-type & args] fixture-type))
|
||||
|
||||
(defmethod use-fixtures :each [fixture-type & args]
|
||||
(add-ns-meta ::each-fixtures args))
|
||||
(add-ns-meta :clojure.test/each-fixtures args))
|
||||
|
||||
(defmethod use-fixtures :once [fixture-type & args]
|
||||
(add-ns-meta ::once-fixtures args))
|
||||
(add-ns-meta :clojure.test/once-fixtures args))
|
||||
|
||||
(defn- default-fixture
|
||||
"The default, empty, fixture function. Just calls its argument."
|
||||
|
|
@ -731,10 +729,8 @@
|
|||
[vars]
|
||||
(doseq [[ns vars] (group-by (comp :ns meta) vars)
|
||||
:when ns]
|
||||
(let [ns-name (sci-namespaces/sci-ns-name ns)
|
||||
fixtures (get @ns->fixtures ns-name)
|
||||
once-fixture-fn (join-fixtures (::once-fixtures fixtures))
|
||||
each-fixture-fn (join-fixtures (::each-fixtures fixtures))]
|
||||
(let [once-fixture-fn (join-fixtures (:clojure.test/once-fixtures (meta ns)))
|
||||
each-fixture-fn (join-fixtures (:clojure.test/each-fixtures (meta ns)))]
|
||||
(once-fixture-fn
|
||||
(fn []
|
||||
(doseq [v vars]
|
||||
|
|
@ -758,7 +754,7 @@
|
|||
*report-counters*."
|
||||
{:added "1.1"}
|
||||
[ctx ns]
|
||||
(sci/binding [report-counters (atom @initial-report-counters)]
|
||||
(sci/binding [report-counters (ref @initial-report-counters)]
|
||||
(let [ns-obj (sci-namespaces/sci-the-ns ctx ns)]
|
||||
(do-report {:type :begin-test-ns, :ns ns-obj})
|
||||
;; If the namespace has a test-ns-hook function, call that:
|
||||
|
|
@ -809,7 +805,7 @@
|
|||
"Runs the tests for a single Var, with fixtures executed around the test, and summary output after."
|
||||
{:added "1.11"}
|
||||
[v]
|
||||
(sci/binding [report-counters (atom @initial-report-counters)]
|
||||
(sci/binding [report-counters (ref @initial-report-counters)]
|
||||
(let [ns-obj (-> v meta :ns)
|
||||
summary (do
|
||||
(do-report {:type :begin-test-ns
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
(ns babashka.impl.clojure.tools.reader
|
||||
(:refer-clojure :exclude [read])
|
||||
(:refer-clojure :exclude [read read-string])
|
||||
(:require
|
||||
[clojure.tools.reader.reader-types :as rt]
|
||||
[edamame.core :as e]
|
||||
[sci.core :as sci]
|
||||
[clojure.tools.reader.reader-types :as rt]))
|
||||
[sci.ctx-store :as ctx]
|
||||
[sci.impl.parser :as p]))
|
||||
|
||||
(def rns (sci/create-ns 'clojure.tools.reader))
|
||||
|
||||
|
|
@ -15,6 +17,15 @@
|
|||
:location? seq?
|
||||
:end-location false}))
|
||||
|
||||
(def default-data-reader-fn (sci/new-dynamic-var '*default-data-reader-fn* nil {:ns rns}))
|
||||
(def alias-map (sci/new-dynamic-var '*alias-map* nil {:ns rns}))
|
||||
|
||||
(defn resolve-tag [sym]
|
||||
;; https://github.com/clojure/tools.reader/blob/ff18b1b872398a99e3e2941a0ed9abc0c2dec151/src/main/clojure/clojure/tools/reader.clj#L858
|
||||
(or (default-data-readers sym)
|
||||
(when-let [f @default-data-reader-fn]
|
||||
(f sym))))
|
||||
|
||||
;; Added for compatibility with tools.namespace
|
||||
(defn read
|
||||
"Reads the first object from an IPushbackReader or a java.io.PushbackReader.
|
||||
|
|
@ -38,7 +49,17 @@
|
|||
([{eof :eof :as opts :or {eof :eofthrow}} reader]
|
||||
(let [opts (assoc default-opts
|
||||
:read-cond (:read-cond opts)
|
||||
:features (:features opts))
|
||||
:features (:features opts)
|
||||
:readers (fn [sym]
|
||||
(resolve-tag sym))
|
||||
:auto-resolve (fn [alias]
|
||||
(if (= :current alias)
|
||||
(symbol (str @sci/ns))
|
||||
(or (when-let [alias-map @alias-map]
|
||||
(@alias-map alias))
|
||||
(sci/eval-form (ctx/get-ctx)
|
||||
(list 'get '(ns-aliases *ns*)
|
||||
(list 'quote alias)))))))
|
||||
v (e/parse-next reader opts)]
|
||||
(if (identical? ::e/eof v)
|
||||
(if (identical? :eofthrow eof)
|
||||
|
|
@ -53,4 +74,18 @@
|
|||
sentinel)
|
||||
v))))
|
||||
|
||||
(def reader-namespace {'read (sci/copy-var read rns)})
|
||||
(defn read-string
|
||||
([s] (read-string nil s))
|
||||
([opts s]
|
||||
(when (and s (not (identical? s "")))
|
||||
(read opts (rt/string-push-back-reader s)))))
|
||||
|
||||
(defn resolve-symbol [sym]
|
||||
(p/fully-qualify (ctx/get-ctx) sym))
|
||||
|
||||
(def reader-namespace
|
||||
{'read (sci/copy-var read rns)
|
||||
'read-string (sci/copy-var read-string rns)
|
||||
'resolve-symbol (sci/copy-var resolve-symbol rns)
|
||||
'*default-data-reader-fn* default-data-reader-fn
|
||||
'*alias-map* alias-map})
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@
|
|||
[clojure.tools.reader.reader-types :as rt]
|
||||
[sci.core :as sci]))
|
||||
|
||||
(def edn-namespace {'read-string (sci/copy-var edn/read-string (sci/create-ns 'clojure.tools.reader.edn))})
|
||||
(def tr-edn-ns (sci/create-ns 'clojure.tools.reader.edn))
|
||||
|
||||
(def edn-namespace {'read-string (sci/copy-var edn/read-string tr-edn-ns)
|
||||
'read (sci/copy-var edn/read tr-edn-ns)})
|
||||
|
||||
(def rtns (sci/create-ns 'clojure.tools.reader.reader-types))
|
||||
|
||||
|
|
@ -14,4 +17,5 @@
|
|||
'read-char (sci/copy-var rt/read-char rtns)
|
||||
'unread (sci/copy-var rt/unread rtns)
|
||||
'source-logging-push-back-reader (sci/copy-var rt/source-logging-push-back-reader rtns)
|
||||
'source-logging-reader? (sci/copy-var rt/source-logging-reader? rtns)})
|
||||
'source-logging-reader? (sci/copy-var rt/source-logging-reader? rtns)
|
||||
'string-push-back-reader (sci/copy-var rt/string-push-back-reader rtns)})
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
[babashka.fs :as fs]
|
||||
[babashka.impl.classpath :as cp]
|
||||
[babashka.impl.common :refer [bb-edn]]
|
||||
[babashka.process :as process]
|
||||
[borkdude.deps :as deps]
|
||||
[clojure.string :as str]
|
||||
[sci.core :as sci]))
|
||||
|
|
@ -59,42 +60,61 @@
|
|||
then used to resolve dependencies in babashka."
|
||||
([deps-map] (add-deps deps-map nil))
|
||||
([deps-map {:keys [:aliases :env :extra-env :force]}]
|
||||
(when-let [paths (:paths deps-map)]
|
||||
(let [paths (if-let [deps-root (:deps-root @bb-edn)]
|
||||
(let [deps-root (fs/absolutize deps-root)
|
||||
paths (mapv #(str (fs/file deps-root %)) paths)]
|
||||
paths)
|
||||
paths)]
|
||||
(cp/add-classpath (str/join cp/path-sep paths))))
|
||||
(let [need-deps? (or (seq (:deps deps-map))
|
||||
(and (:aliases deps-map)
|
||||
aliases))]
|
||||
(when need-deps?
|
||||
(let [deps-map (dissoc deps-map
|
||||
;; paths are added manually above
|
||||
;; extra-paths are added as :paths in tasks
|
||||
:paths :tasks :raw :file :deps-root
|
||||
:min-bb-version)]
|
||||
(binding [*print-namespace-maps* false]
|
||||
(let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]
|
||||
{:replace-paths [] ;; babashka sets paths manually
|
||||
:classpath-overrides (cond->
|
||||
'{org.clojure/clojure ""
|
||||
org.clojure/spec.alpha ""}
|
||||
;; only remove core specs when they are not mentioned in deps map
|
||||
(not (str/includes? (str deps-map) "org.clojure/core.specs.alpha"))
|
||||
(assoc 'org.clojure/core.specs.alpha ""))})
|
||||
args (list "-Srepro" ;; do not include deps.edn from user config
|
||||
"-Spath" "-Sdeps" (str deps-map)
|
||||
"-Sdeps-file" "") ;; we reset deps file so the local deps.edn isn't used
|
||||
args (if force (cons "-Sforce" args) args)
|
||||
args (concat args [(str "-A:" (str/join ":" (cons ":org.babashka/defaults" aliases)))])
|
||||
cp (with-out-str (binding [deps/*env* env
|
||||
deps/*extra-env* extra-env]
|
||||
(apply deps/-main args)))
|
||||
cp (str/trim cp)
|
||||
cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")]
|
||||
(cp/add-classpath cp))))))))
|
||||
(let [deps-root (:deps-root @bb-edn)]
|
||||
(when-let [paths (:paths deps-map)]
|
||||
(let [paths (if deps-root
|
||||
(let [deps-root (fs/absolutize deps-root)
|
||||
paths (mapv #(str (fs/file deps-root %)) paths)]
|
||||
paths)
|
||||
paths)]
|
||||
(cp/add-classpath (str/join cp/path-sep paths))))
|
||||
(let [need-deps? (or (seq (:deps deps-map))
|
||||
(and (:aliases deps-map)
|
||||
aliases))]
|
||||
(when need-deps?
|
||||
(let [deps-map (dissoc deps-map
|
||||
;; paths are added manually above
|
||||
;; extra-paths are added as :paths in tasks
|
||||
:paths :tasks :raw :file :deps-root
|
||||
:min-bb-version)
|
||||
;; associate deps-root to avoid cache conflict between different
|
||||
;; bb.edns with relative local/roots by the same name NOTE:
|
||||
;; deps-root is nil when bb.edn isn't used, so clashes may still
|
||||
;; happen with dynamic add-deps, but at least we don't invoke
|
||||
;; clojure CLI's java process each time we call a script from a
|
||||
;; different directory.
|
||||
deps-map (assoc deps-map :deps-root (str deps-root))]
|
||||
(binding [*print-namespace-maps* false]
|
||||
(let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]
|
||||
{:replace-paths [] ;; babashka sets paths manually
|
||||
:classpath-overrides (cond->
|
||||
'{org.clojure/clojure ""
|
||||
org.clojure/spec.alpha ""}
|
||||
;; only remove core specs when they are not mentioned in deps map
|
||||
(not (str/includes? (str deps-map) "org.clojure/core.specs.alpha"))
|
||||
(assoc 'org.clojure/core.specs.alpha ""))})
|
||||
args (list "-Srepro" ;; do not include deps.edn from user config
|
||||
"-Spath" "-Sdeps" (str deps-map)
|
||||
"-Sdeps-file" "__babashka_no_deps_file__.edn") ;; we reset deps file so the local deps.edn isn't used
|
||||
args (if force (cons "-Sforce" args) args)
|
||||
args (concat args [(str "-A:" (str/join ":" (cons ":org.babashka/defaults" aliases)))])
|
||||
bindings (cond->
|
||||
{#'deps/*aux-process-fn* (fn [{:keys [cmd out]}]
|
||||
(process/shell
|
||||
{:cmd cmd
|
||||
:out out
|
||||
:env env
|
||||
:dir (when deps-root (str deps-root))
|
||||
:extra-env extra-env}))
|
||||
#'deps/*exit-fn* (fn [{:keys [message]}]
|
||||
(when message
|
||||
(throw (Exception. message))))}
|
||||
deps-root (assoc #'deps/*dir* (str deps-root)))
|
||||
cp (with-out-str (with-bindings bindings
|
||||
(apply deps/-main args)))
|
||||
cp (str/trim cp)
|
||||
cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")]
|
||||
(cp/add-classpath cp)))))))))
|
||||
|
||||
(def deps-namespace
|
||||
{'add-deps (sci/copy-var add-deps dns)
|
||||
|
|
|
|||
19
src/babashka/impl/http_client.clj
Normal file
19
src/babashka/impl/http_client.clj
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
(ns babashka.impl.http-client
|
||||
(:require
|
||||
[babashka.http-client]
|
||||
[babashka.http-client.interceptors]
|
||||
[babashka.http-client.websocket]
|
||||
[sci.core :as sci]))
|
||||
|
||||
(def hns (sci/create-ns 'babashka.http-client))
|
||||
(def wns (sci/create-ns 'babashka.http-client.websocket))
|
||||
(def ins (sci/create-ns 'babashka.http-client.interceptors))
|
||||
|
||||
(def http-client-namespace
|
||||
(sci/copy-ns babashka.http-client hns))
|
||||
|
||||
(def http-client-websocket-namespace
|
||||
(sci/copy-ns babashka.http-client.websocket wns))
|
||||
|
||||
(def http-client-interceptors-namespace
|
||||
(sci/copy-ns babashka.http-client.interceptors ins))
|
||||
|
|
@ -1,11 +1,18 @@
|
|||
(ns babashka.impl.nrepl-server
|
||||
{:no-doc true}
|
||||
(:require
|
||||
[babashka.impl.clojure.core]
|
||||
[babashka.impl.classpath :as cp]
|
||||
[babashka.impl.clojure.core :as core-extras]
|
||||
[babashka.impl.common :as common]
|
||||
[babashka.nrepl.impl.server :refer [process-msg]]
|
||||
[babashka.nrepl.server :as server]
|
||||
[sci.core :as sci]))
|
||||
|
||||
(defmethod process-msg :classpath [rf result m]
|
||||
(rf result {:response {"status" ["done"]
|
||||
"classpath" (cp/split-classpath (cp/get-classpath))}
|
||||
:response-for (:msg m)}))
|
||||
|
||||
(defn start-server!
|
||||
([]
|
||||
(start-server! nil))
|
||||
|
|
@ -13,7 +20,11 @@
|
|||
(let [dev? (= "true" (System/getenv "BABASHKA_DEV"))
|
||||
opts (merge {:debug dev?
|
||||
:describe {"versions" {"babashka" common/version}}
|
||||
:thread-bind [babashka.impl.clojure.core/warn-on-reflection]}
|
||||
:thread-bind [core-extras/warn-on-reflection
|
||||
core-extras/unchecked-math
|
||||
core-extras/data-readers
|
||||
sci/ns
|
||||
sci/print-length]}
|
||||
opts)]
|
||||
(server/start-server! (common/ctx) opts))))
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
{:no-doc true}
|
||||
(:require [clojure.pprint :as pprint]
|
||||
[sci.core :as sci]
|
||||
[sci.pprint]))
|
||||
[sci.pprint]
|
||||
[babashka.impl.clojure.core.async]))
|
||||
|
||||
(defonce patched? (volatile! false))
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
edn/read-string)
|
||||
deps (:deps deps)
|
||||
deps (assoc deps
|
||||
'babashka/fs {:mvn/version "0.2.12"}
|
||||
'babashka/fs {:mvn/version "0.5.25"}
|
||||
'babashka/babashka.curl {:mvn/version "0.1.2"}
|
||||
'babashka/babashka.core {:git/url "https://github.com/babashka/babashka.core"
|
||||
:git/sha "52a6037bd4b632bffffb04394fb4efd0cdab6b1e"}
|
||||
'babashka/process {:mvn/version "0.4.13"})
|
||||
'babashka/process {:mvn/version "0.6.23"})
|
||||
deps (dissoc deps
|
||||
'borkdude/sci
|
||||
'org.babashka/sci
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
'org.hsqldb/hsqldb)
|
||||
bb-edn-deps (:deps @common/bb-edn)
|
||||
deps (merge deps bb-edn-deps)
|
||||
deps (into (sorted-map) deps)
|
||||
paths (:paths @common/bb-edn)
|
||||
deps {:deps deps}
|
||||
deps (cond-> deps
|
||||
|
|
|
|||
|
|
@ -20,6 +20,18 @@
|
|||
(binding [process/*defaults* @defaults]
|
||||
(apply process/pb args)))
|
||||
|
||||
(defn sh [& args]
|
||||
(binding [process/*defaults* @defaults]
|
||||
(apply process/sh args)))
|
||||
|
||||
(defn shell [& args]
|
||||
(binding [process/*defaults* @defaults]
|
||||
(apply process/shell args)))
|
||||
|
||||
(defn exec [& args]
|
||||
(binding [process/*defaults* @defaults]
|
||||
(apply process/exec args)))
|
||||
|
||||
(def process-namespace
|
||||
{'parse-args (copy-var process/parse-args tns)
|
||||
'process* (copy-var process/process* tns)
|
||||
|
|
@ -29,11 +41,11 @@
|
|||
'start (copy-var process/start tns)
|
||||
'pipeline (copy-var process/pipeline tns)
|
||||
'$ (copy-var process/$ tns)
|
||||
'sh (copy-var process/sh tns)
|
||||
'sh (copy-var sh tns)
|
||||
'tokenize (copy-var process/tokenize tns)
|
||||
'*defaults* defaults
|
||||
'destroy (copy-var process/destroy tns)
|
||||
'destroy-tree (copy-var process/destroy-tree tns)
|
||||
'exec (copy-var process/exec tns)
|
||||
'shell (copy-var process/shell tns)
|
||||
'exec (copy-var exec tns)
|
||||
'shell (copy-var shell tns)
|
||||
'alive? (copy-var process/alive? tns)})
|
||||
|
|
|
|||
|
|
@ -79,6 +79,18 @@
|
|||
(handle [sig]
|
||||
((method-or-bust methods 'handle) this sig)))
|
||||
|
||||
["java.io.InputStream" #{}]
|
||||
(proxy [java.io.InputStream] []
|
||||
(available [] ((method-or-bust methods 'available) this))
|
||||
(close [] ((method-or-bust methods 'close) this))
|
||||
(read
|
||||
([]
|
||||
((method-or-bust methods 'read) this))
|
||||
([bs]
|
||||
((method-or-bust methods 'read) this bs))
|
||||
([bs off len]
|
||||
((method-or-bust methods 'read) this bs off len))))
|
||||
|
||||
["java.io.PipedInputStream" #{}]
|
||||
(proxy [java.io.PipedInputStream] []
|
||||
(available [] ((method-or-bust methods 'available) this))
|
||||
|
|
@ -100,6 +112,36 @@
|
|||
(write
|
||||
([b] ((method-or-bust methods 'write) this b))
|
||||
([b off len] ((method-or-bust methods 'write) this b off len))))
|
||||
|
||||
["java.io.OutputStream" #{}]
|
||||
(proxy [java.io.OutputStream] []
|
||||
(close [] (when-let [m (get methods 'close)]
|
||||
(m this)))
|
||||
(flush [] (when-let [m (get methods 'flush)]
|
||||
(m this)))
|
||||
(write
|
||||
([b]
|
||||
((method-or-bust methods 'write) this b))
|
||||
([b off len]
|
||||
((method-or-bust methods 'write) this b off len))))
|
||||
["javax.net.ssl.X509ExtendedTrustManager" #{}]
|
||||
(proxy [javax.net.ssl.X509ExtendedTrustManager] []
|
||||
(checkClientTrusted
|
||||
([x y]
|
||||
((method-or-bust methods 'checkClientTrusted) this x y))
|
||||
([x y z]
|
||||
((method-or-bust methods 'checkClientTrusted) this x y z)))
|
||||
(checkServerTrusted
|
||||
([x y]
|
||||
((method-or-bust methods 'checkServerTrusted) this x y))
|
||||
([x y z]
|
||||
((method-or-bust methods 'checkServerTrusted) this x y z)))
|
||||
(getAcceptedIssuers [] ((method-or-bust methods 'getAcceptedIssuers) this)))
|
||||
|
||||
["java.lang.ThreadLocal" #{}]
|
||||
(proxy [java.lang.ThreadLocal] []
|
||||
(initialValue []
|
||||
((method-or-bust methods 'initialValue) this)))
|
||||
, ;; keep this for merge friendliness
|
||||
)))
|
||||
|
||||
|
|
@ -112,7 +154,9 @@
|
|||
{:methods [{:name "connectFailed"}
|
||||
{:name "select"}]}
|
||||
(class-sym (class (proxy-fn {:class javax.net.ssl.HostnameVerifier})))
|
||||
{:methods [{:name "verify"}]}})
|
||||
{:methods [{:name "verify"}]}
|
||||
(class-sym (class (proxy-fn {:class java.lang.ThreadLocal})))
|
||||
{:methods [{:name "get"}]}})
|
||||
|
||||
;;; Scratch
|
||||
|
||||
|
|
|
|||
|
|
@ -187,5 +187,4 @@
|
|||
|
||||
sun.misc.SignalHandler
|
||||
{handle [[this signal]]}
|
||||
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
(ns babashka.impl.repl
|
||||
{:no-doc true}
|
||||
(:require
|
||||
[babashka.impl.clojure.core :as core-extras]
|
||||
[babashka.impl.clojure.main :as m]
|
||||
[clojure.java.io :as io]
|
||||
[clojure.string :as str]
|
||||
|
|
@ -42,49 +43,57 @@
|
|||
"Inspired by skip-if-eol from clojure.main."
|
||||
[s]
|
||||
(let [c (r/read-char s)]
|
||||
(when-not (= c \newline)
|
||||
(when-not (= \newline c )
|
||||
(r/unread s c))))
|
||||
|
||||
(defn repl-read [sci-ctx in-stream _request-prompt request-exit]
|
||||
(if (nil? (r/peek-char in-stream))
|
||||
request-exit
|
||||
(let [v (parser/parse-next sci-ctx in-stream)]
|
||||
(skip-if-eol in-stream)
|
||||
(if (or (identical? :repl/quit v)
|
||||
(identical? :repl/exit v))
|
||||
request-exit
|
||||
v))))
|
||||
|
||||
(defn repl
|
||||
"REPL with predefined hooks for attachable socket server."
|
||||
([sci-ctx] (repl sci-ctx nil))
|
||||
([sci-ctx {:keys [:init :read :eval :need-prompt :prompt :flush :print :caught]}]
|
||||
(let [in @sci/in]
|
||||
(m/repl
|
||||
:init (or init
|
||||
(fn []
|
||||
(sci/with-bindings {sci/out @sci/err}
|
||||
(sio/println "Babashka"
|
||||
(str "v" (str/trim (slurp (io/resource "BABASHKA_VERSION"))))
|
||||
"REPL.")
|
||||
(sio/println "Use :repl/quit or :repl/exit to quit the REPL.")
|
||||
(sio/println "Clojure rocks, Bash reaches.")
|
||||
(sio/println))
|
||||
(eval-form sci-ctx `(apply require (quote ~m/repl-requires)))))
|
||||
:read (or read
|
||||
(fn [_request-prompt request-exit]
|
||||
(if (nil? (r/peek-char in))
|
||||
request-exit
|
||||
(let [v (parser/parse-next sci-ctx in)]
|
||||
(skip-if-eol in)
|
||||
(if (or (identical? :repl/quit v)
|
||||
(identical? :repl/exit v))
|
||||
request-exit
|
||||
v)))))
|
||||
:eval (or eval
|
||||
(fn [expr]
|
||||
(sci/with-bindings {sci/file "<repl>"
|
||||
sci/*1 *1
|
||||
sci/*2 *2
|
||||
sci/*3 *3
|
||||
sci/*e *e}
|
||||
(let [ret (eval-form sci-ctx expr)]
|
||||
ret))))
|
||||
:need-prompt (or need-prompt (fn [] true))
|
||||
:prompt (or prompt #(sio/printf "%s=> " (utils/current-ns-name)))
|
||||
:flush (or flush sio/flush)
|
||||
:print (or print sio/prn)
|
||||
:caught (or caught repl-caught)))))
|
||||
(sci/binding [core-extras/warn-on-reflection @core-extras/warn-on-reflection
|
||||
core-extras/unchecked-math @core-extras/unchecked-math
|
||||
core-extras/data-readers @core-extras/data-readers
|
||||
sci/ns @sci/ns
|
||||
sci/print-length @sci/print-length]
|
||||
(m/repl
|
||||
:init (or init
|
||||
(fn []
|
||||
(sci/with-bindings {sci/out @sci/err}
|
||||
(sio/println "Babashka"
|
||||
(str "v" (str/trim (slurp (io/resource "BABASHKA_VERSION"))))
|
||||
"REPL.")
|
||||
(sio/println "Use :repl/quit or :repl/exit to quit the REPL.")
|
||||
(sio/println "Clojure rocks, Bash reaches.")
|
||||
(sio/println))
|
||||
(eval-form sci-ctx `(apply require (quote ~m/repl-requires)))))
|
||||
:read (or read
|
||||
(fn [request-prompt request-exit]
|
||||
(repl-read sci-ctx in request-prompt request-exit)))
|
||||
:eval (or eval
|
||||
(fn [expr]
|
||||
(sci/with-bindings {sci/file "<repl>"
|
||||
sci/*1 *1
|
||||
sci/*2 *2
|
||||
sci/*3 *3
|
||||
sci/*e *e}
|
||||
(let [ret (eval-form sci-ctx expr)]
|
||||
ret))))
|
||||
:need-prompt (or need-prompt (fn [] true))
|
||||
:prompt (or prompt #(sio/printf "%s=> " (utils/current-ns-name)))
|
||||
:flush (or flush sio/flush)
|
||||
:print (or print sio/prn)
|
||||
:caught (or caught repl-caught))))))
|
||||
|
||||
(defn start-repl!
|
||||
([sci-ctx] (start-repl! sci-ctx nil))
|
||||
|
|
|
|||
52
src/babashka/impl/sci.clj
Normal file
52
src/babashka/impl/sci.clj
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
(ns babashka.impl.sci
|
||||
{:no-doc true}
|
||||
(:require [sci.core :as sci]
|
||||
[sci.ctx-store :as store]))
|
||||
|
||||
(def sns (sci/create-ns 'sci.core nil))
|
||||
|
||||
(defmacro copy-ns
|
||||
"Returns map of names to SCI vars as a result of copying public
|
||||
Clojure vars from ns-sym (a symbol). Attaches sci-ns (result of
|
||||
sci/create-ns) to meta. Copies :name, :macro :doc, :no-doc
|
||||
and :argslists metadata.
|
||||
|
||||
Options:
|
||||
|
||||
- :exclude: a seqable of names to exclude from the
|
||||
namespace. Defaults to none.
|
||||
|
||||
- :copy-meta: a seqable of keywords to copy from the original var
|
||||
meta. Use :all instead of a seqable to copy all. Defaults
|
||||
to [:doc :arglists :macro].
|
||||
|
||||
- :exclude-when-meta: seqable of keywords; vars with meta matching
|
||||
these keys are excluded. Defaults to [:no-doc :skip-wiki]
|
||||
|
||||
The selection of vars is done at compile time which is mostly
|
||||
important for ClojureScript to not pull in vars into the compiled
|
||||
JS. Any additional vars can be added after the fact with sci/copy-var
|
||||
manually."
|
||||
([ns-sym sci-ns] `(sci.core/copy-ns ~ns-sym ~sci-ns nil))
|
||||
([ns-sym sci-ns opts]
|
||||
;; this branch is hit by macroexpanding in JVM Clojure, not in the CLJS compiler
|
||||
(let [publics-map (sci/eval-form (store/get-ctx) (list 'ns-publics (list 'quote ns-sym)))
|
||||
publics-map (#'sci/process-publics publics-map opts)
|
||||
mf (#'sci/meta-fn (:copy-meta opts))
|
||||
publics-map (#'sci/exclude-when-meta
|
||||
publics-map
|
||||
meta
|
||||
(fn [k]
|
||||
(list 'quote k))
|
||||
(fn [var m]
|
||||
{:name (list 'quote (:name m))
|
||||
:var var
|
||||
:meta (list 'quote (mf m))})
|
||||
(or (:exclude-when-meta opts)
|
||||
[:no-doc :skip-wiki]))]
|
||||
`(sci.core/-copy-ns ~publics-map ~sci-ns))))
|
||||
|
||||
(def sci-core-namespace
|
||||
(assoc (sci/copy-ns sci.core sns {:exclude [copy-ns]})
|
||||
'copy-ns (sci/copy-var copy-ns sns)
|
||||
'-copy-ns (sci/copy-var sci/-copy-ns sns)))
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
(ns babashka.impl.server
|
||||
(:require [babashka.impl.clojure.core.server :as server]
|
||||
[babashka.impl.common :as common]
|
||||
[babashka.impl.repl :as repl]
|
||||
[babashka.impl.socket-repl :as socket-repl]
|
||||
[sci.core :as sci]))
|
||||
|
||||
|
|
@ -17,9 +18,14 @@
|
|||
(fn [& args]
|
||||
(apply server/start-server (common/ctx) args)))
|
||||
|
||||
(def repl-read
|
||||
(fn [& args]
|
||||
(apply repl/repl-read (common/ctx) @sci/in args)))
|
||||
|
||||
(def clojure-core-server-namespace
|
||||
{'repl (sci/copy-var socket-repl/repl sns)
|
||||
'prepl (sci/copy-var prepl sns)
|
||||
'io-prepl (sci/copy-var io-prepl sns)
|
||||
'start-server (sci/copy-var start-server sns)
|
||||
'stop-server (sci/copy-var server/stop-server sns)})
|
||||
'stop-server (sci/copy-var server/stop-server sns)
|
||||
'repl-read (sci/copy-var repl-read sns)})
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
[babashka.impl.process :as pp]
|
||||
[babashka.process :as p]
|
||||
[clojure.core.async :refer [<!!]]
|
||||
[clojure.java.io :as io]
|
||||
[clojure.string :as str]
|
||||
[rewrite-clj.node :as node]
|
||||
[rewrite-clj.parser :as parser]
|
||||
|
|
@ -30,7 +29,7 @@
|
|||
(let [log-level @log-level]
|
||||
(when
|
||||
;; do not log when level is :error
|
||||
(identical? :info log-level)
|
||||
(identical? :info log-level)
|
||||
(binding [*out* *err*]
|
||||
(println (format "[bb %s]" (:name @task)) (str/join " " strs))))))
|
||||
|
||||
|
|
@ -67,29 +66,18 @@
|
|||
(apply log-info args)
|
||||
(handle-non-zero (pp/process* {:opts opts :cmd cmd :prev prev}) opts))))
|
||||
|
||||
(defn clojure [cmd & args]
|
||||
(let [[opts cmd args]
|
||||
(defn clojure [& args]
|
||||
(let [[cmd & args] args
|
||||
[opts cmd args]
|
||||
(if (map? cmd)
|
||||
[cmd (first args) (rest args)]
|
||||
[nil cmd args])
|
||||
opts (if-let [o (:out opts)]
|
||||
(if (string? o)
|
||||
(update opts :out io/file)
|
||||
opts)
|
||||
opts)
|
||||
opts (if-let [o (:err opts)]
|
||||
(if (string? o)
|
||||
(update opts :err io/file)
|
||||
opts)
|
||||
opts)
|
||||
cmd (if (.exists (io/file cmd))
|
||||
[cmd]
|
||||
(p/tokenize cmd))
|
||||
cmd (into cmd args)
|
||||
cmd (cond-> args
|
||||
cmd (->> (cons cmd)))
|
||||
local-log-level (:log-level opts)]
|
||||
(sci/binding [log-level (or local-log-level @log-level)]
|
||||
(apply log-info (cons "clojure" cmd))
|
||||
(handle-non-zero (deps/clojure cmd (merge default-opts opts)) opts))))
|
||||
(handle-non-zero (apply deps/clojure (merge default-opts opts) cmd) opts))))
|
||||
|
||||
(defn -wait [res]
|
||||
(when res
|
||||
|
|
@ -139,7 +127,7 @@
|
|||
"Used internally for debugging"
|
||||
[& strs]
|
||||
(locking o
|
||||
(apply prn strs)))
|
||||
(apply prn strs)))
|
||||
|
||||
(defn wait-tasks [deps]
|
||||
(if deps
|
||||
|
|
@ -397,7 +385,7 @@
|
|||
loc (zip/down loc)]
|
||||
(into []
|
||||
(comp
|
||||
(take-nth 2 )
|
||||
(take-nth 2)
|
||||
(take-while #(not (zip/end? %)))
|
||||
(filter zip/sexpr-able?)
|
||||
(map zip/sexpr)
|
||||
|
|
@ -437,8 +425,11 @@
|
|||
([task] (run task nil))
|
||||
([task {:keys [:parallel]
|
||||
:or {parallel (:parallel (current-task))}}]
|
||||
(let [[[expr]] (assemble-task task parallel)]
|
||||
(sci/eval-string* (ctx) expr))))
|
||||
(let [[[expr] exit-code] (assemble-task task parallel)]
|
||||
(if (or (nil? exit-code) (zero? exit-code))
|
||||
(sci/eval-string* (ctx) expr)
|
||||
(throw (ex-info nil
|
||||
{:babashka/exit exit-code}))))))
|
||||
|
||||
(defn exec
|
||||
([sym]
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
[babashka.deps :as bdeps]
|
||||
[babashka.fs :as fs]
|
||||
[babashka.impl.bencode :refer [bencode-namespace]]
|
||||
[babashka.impl.cheshire :refer [cheshire-core-namespace]]
|
||||
[babashka.impl.cheshire :refer [cheshire-core-namespace cheshire-factory-namespace]]
|
||||
[babashka.impl.classes :as classes :refer [classes-namespace]]
|
||||
[babashka.impl.classpath :as cp :refer [classpath-namespace]]
|
||||
[babashka.impl.cli :as cli]
|
||||
|
|
@ -16,16 +16,18 @@
|
|||
[babashka.impl.clojure.instant :as instant]
|
||||
[babashka.impl.clojure.java.browse :refer [browse-namespace]]
|
||||
[babashka.impl.clojure.java.io :refer [io-namespace]]
|
||||
[babashka.impl.clojure.java.process :refer [cjp-namespace]]
|
||||
[babashka.impl.clojure.java.shell :refer [shell-namespace]]
|
||||
[babashka.impl.clojure.main :as clojure-main :refer [demunge]]
|
||||
[babashka.impl.clojure.math :refer [math-namespace]]
|
||||
[babashka.impl.clojure.reflect :refer [reflect-namespace]]
|
||||
[babashka.impl.clojure.stacktrace :refer [stacktrace-namespace]]
|
||||
[babashka.impl.clojure.tools.reader :refer [reader-namespace]]
|
||||
[babashka.impl.clojure.tools.reader-types :refer [edn-namespace
|
||||
reader-types-namespace]]
|
||||
[babashka.impl.clojure.zip :refer [zip-namespace]]
|
||||
[babashka.impl.common :as common]
|
||||
[babashka.impl.core :as bbcore]
|
||||
[babashka.impl.core :as bbcore]
|
||||
[babashka.impl.curl :refer [curl-namespace]]
|
||||
[babashka.impl.data :as data]
|
||||
[babashka.impl.datafy :refer [datafy-namespace]]
|
||||
|
|
@ -34,6 +36,9 @@
|
|||
[babashka.impl.error-handler :refer [error-handler]]
|
||||
[babashka.impl.features :as features]
|
||||
[babashka.impl.fs :refer [fs-namespace]]
|
||||
[babashka.impl.http-client :refer [http-client-namespace
|
||||
http-client-websocket-namespace
|
||||
http-client-interceptors-namespace]]
|
||||
[babashka.impl.nrepl-server :refer [nrepl-server-namespace]]
|
||||
[babashka.impl.pods :as pods]
|
||||
[babashka.impl.pprint :refer [pprint-namespace]]
|
||||
|
|
@ -44,6 +49,7 @@
|
|||
[babashka.impl.reify2 :refer [reify-fn]]
|
||||
[babashka.impl.repl :as repl]
|
||||
[babashka.impl.rewrite-clj :as rewrite]
|
||||
[babashka.impl.sci :refer [sci-core-namespace]]
|
||||
[babashka.impl.server :refer [clojure-core-server-namespace]]
|
||||
[babashka.impl.socket-repl :as socket-repl]
|
||||
[babashka.impl.tasks :as tasks :refer [tasks-namespace]]
|
||||
|
|
@ -55,6 +61,7 @@
|
|||
[clojure.edn :as edn]
|
||||
[clojure.java.io :as io]
|
||||
[clojure.string :as str]
|
||||
[edamame.core :as edamame]
|
||||
[hf.depstar.uberjar :as uberjar]
|
||||
[sci.addons :as addons]
|
||||
[sci.core :as sci]
|
||||
|
|
@ -62,6 +69,7 @@
|
|||
[sci.impl.copy-vars :as sci-copy-vars]
|
||||
[sci.impl.io :as sio]
|
||||
[sci.impl.namespaces :as sci-namespaces]
|
||||
[sci.impl.parser]
|
||||
[sci.impl.types :as sci-types]
|
||||
[sci.impl.unrestrict :refer [*unrestricted*]]
|
||||
[sci.impl.vars :as vars])
|
||||
|
|
@ -102,6 +110,8 @@
|
|||
|
||||
(def version common/version)
|
||||
|
||||
(def build-commit-sha (or (System/getenv "BABASHKA_SHA") ""))
|
||||
|
||||
(defn parse-version [version]
|
||||
(mapv #(Integer/parseInt %)
|
||||
(-> version
|
||||
|
|
@ -134,11 +144,12 @@
|
|||
(binding [*out* *err*]
|
||||
(apply println msgs)))
|
||||
|
||||
(defn print-help [_ctx _command-line-args]
|
||||
(defn print-help []
|
||||
(println (str "Babashka v" version))
|
||||
(println "
|
||||
Usage: bb [svm-opts] [global-opts] [eval opts] [cmdline args]
|
||||
or: bb [svm-opts] [global-opts] file [cmdline args]
|
||||
or: bb [svm-opts] [global-opts] task [cmdline args]
|
||||
or: bb [svm-opts] [global-opts] subcommand [subcommand opts] [cmdline args]
|
||||
|
||||
Substrate VM opts:
|
||||
|
|
@ -151,10 +162,13 @@ Global opts:
|
|||
-cp, --classpath Classpath to use. Overrides bb.edn classpath.
|
||||
--debug Print debug information and internal stacktrace in case of exception.
|
||||
--init <file> Load file after any preloads and prior to evaluation/subcommands.
|
||||
--config <file> Replacing bb.edn with file. Relative paths are resolved relative to file.
|
||||
--config <file> Replace bb.edn with file. Defaults to bb.edn adjacent to invoked file or bb.edn in current dir. Relative paths are resolved relative to bb.edn.
|
||||
--deps-root <dir> Treat dir as root of relative paths in config.
|
||||
--prn Print result via clojure.core/prn
|
||||
-Sforce Force recalculation of the classpath (don't use the cache)
|
||||
-Sdeps Deps data to use as the last deps file to be merged
|
||||
-f, --file <path> Run file
|
||||
--jar <path> Run uberjar
|
||||
|
||||
Help:
|
||||
|
||||
|
|
@ -166,7 +180,6 @@ Help:
|
|||
Evaluation:
|
||||
|
||||
-e, --eval <expr> Evaluate an expression.
|
||||
-f, --file <path> Evaluate a file.
|
||||
-m, --main <ns|var> Call the -main function from a namespace or call a fully qualified var.
|
||||
-x, --exec <var> Call the fully qualified var. Args are parsed by babashka CLI.
|
||||
|
||||
|
|
@ -207,8 +220,7 @@ Tooling:
|
|||
File names take precedence over subcommand names.
|
||||
Remaining arguments are bound to *command-line-args*.
|
||||
Use -- to separate script command line args from bb command line args.
|
||||
When no eval opts or subcommand is provided, the implicit subcommand is repl.")
|
||||
[nil 0])
|
||||
When no eval opts or subcommand is provided, the implicit subcommand is repl."))
|
||||
|
||||
(defn print-doc [ctx command-line-args]
|
||||
(let [arg (first command-line-args)
|
||||
|
|
@ -232,8 +244,7 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
|
|||
(clojure.repl/doc %1$s)
|
||||
true)" arg)))
|
||||
[nil 0]
|
||||
[nil 1]))
|
||||
,)
|
||||
[nil 1])))
|
||||
|
||||
(defn print-run-help []
|
||||
(println (str/trim "
|
||||
|
|
@ -252,6 +263,7 @@ Use bb run --help to show this help output.
|
|||
(format
|
||||
(str/trim "
|
||||
{:babashka/version \"%s\"
|
||||
:git/sha \"%s\"
|
||||
:feature/csv %s
|
||||
:feature/java-nio %s
|
||||
:feature/java-time %s
|
||||
|
|
@ -272,6 +284,7 @@ Use bb run --help to show this help output.
|
|||
:feature/logging %s
|
||||
:feature/priority-map %s}")
|
||||
version
|
||||
build-commit-sha
|
||||
features/csv?
|
||||
features/java-nio?
|
||||
features/java-time?
|
||||
|
|
@ -334,11 +347,11 @@ Use bb run --help to show this help output.
|
|||
bencode bencode.core
|
||||
deps babashka.deps
|
||||
async clojure.core.async}
|
||||
features/xml? (assoc 'xml 'clojure.data.xml)
|
||||
features/yaml? (assoc 'yaml 'clj-yaml.core)
|
||||
features/jdbc? (assoc 'jdbc 'next.jdbc)
|
||||
features/csv? (assoc 'csv 'clojure.data.csv)
|
||||
features/transit? (assoc 'transit 'cognitect.transit)))
|
||||
features/xml? (assoc 'xml 'clojure.data.xml)
|
||||
features/yaml? (assoc 'yaml 'clj-yaml.core)
|
||||
features/jdbc? (assoc 'jdbc 'next.jdbc)
|
||||
features/csv? (assoc 'csv 'clojure.data.csv)
|
||||
features/transit? (assoc 'transit 'cognitect.transit)))
|
||||
|
||||
;;(def ^:private server-ns-obj (sci/create-ns 'clojure.core.server nil))
|
||||
|
||||
|
|
@ -349,7 +362,7 @@ Use bb run --help to show this help output.
|
|||
(defn catvec [& xs]
|
||||
(into [] cat xs))
|
||||
|
||||
(def sci-ns (sci/create-ns 'sci.core))
|
||||
(def main-var (sci/new-var 'main nil {:ns clojure-main-ns}))
|
||||
|
||||
(def namespaces
|
||||
(cond->
|
||||
|
|
@ -357,6 +370,7 @@ Use bb run --help to show this help output.
|
|||
sci-types/Eval
|
||||
(eval [_ _ctx _bindings]
|
||||
(force @input-var)))}
|
||||
'clojure.core core-extras
|
||||
'clojure.tools.cli tools-cli-namespace
|
||||
'clojure.java.shell shell-namespace
|
||||
'babashka.core bbcore/core-namespace
|
||||
|
|
@ -365,6 +379,7 @@ Use bb run --help to show this help output.
|
|||
'babashka.signal signal-ns
|
||||
'clojure.java.io io-namespace
|
||||
'cheshire.core cheshire-core-namespace
|
||||
'cheshire.factory cheshire-factory-namespace
|
||||
'clojure.data data/data-namespace
|
||||
'clojure.instant instant/instant-namespace
|
||||
'clojure.stacktrace stacktrace-namespace
|
||||
|
|
@ -376,9 +391,13 @@ Use bb run --help to show this help output.
|
|||
(fn [& opts]
|
||||
(let [opts (apply hash-map opts)]
|
||||
(repl/start-repl! (common/ctx) opts))) {:ns clojure-main-ns})
|
||||
'with-bindings (sci/copy-var clojure-main/with-bindings clojure-main-ns)}
|
||||
'with-bindings (sci/copy-var clojure-main/with-bindings clojure-main-ns)
|
||||
'repl-caught (sci/copy-var repl/repl-caught clojure-main-ns)
|
||||
'with-read-known (sci/copy-var clojure-main/with-read-known clojure-main-ns)
|
||||
'main main-var}
|
||||
'clojure.test t/clojure-test-namespace
|
||||
'clojure.math math-namespace
|
||||
'clojure.java.process cjp-namespace
|
||||
'babashka.classpath classpath-namespace
|
||||
'babashka.classes classes-namespace
|
||||
'clojure.pprint pprint-namespace
|
||||
|
|
@ -398,6 +417,7 @@ Use bb run --help to show this help output.
|
|||
'clojure.tools.reader reader-namespace
|
||||
'clojure.core.async async-namespace
|
||||
'clojure.core.async.impl.protocols async-protocols-namespace
|
||||
'clojure.reflect reflect-namespace
|
||||
'rewrite-clj.node rewrite/node-namespace
|
||||
'rewrite-clj.paredit rewrite/paredit-namespace
|
||||
'rewrite-clj.parser rewrite/parser-namespace
|
||||
|
|
@ -408,24 +428,21 @@ Use bb run --help to show this help output.
|
|||
{'catvec (sci/copy-var catvec
|
||||
(sci/create-ns 'clojure.core.rrb-vector))})
|
||||
'edamame.core edamame-namespace
|
||||
'sci.core {'format-stacktrace (sci/copy-var sci/format-stacktrace sci-ns)
|
||||
'stacktrace (sci/copy-var sci/stacktrace sci-ns)
|
||||
;; 'eval-string (sci/copy-var sci/eval-string sci-ns)
|
||||
;; 'eval-string* (sci/copy-var sci/eval-string* sci-ns)
|
||||
;; 'init (sci/copy-var sci/init sci-ns)
|
||||
;; 'fork (sci/copy-var sci/fork sci-ns)
|
||||
}
|
||||
'sci.core sci-core-namespace
|
||||
'babashka.cli cli/cli-namespace
|
||||
}
|
||||
features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace)
|
||||
'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace)
|
||||
'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))
|
||||
'babashka.http-client http-client-namespace
|
||||
'babashka.http-client.websocket http-client-websocket-namespace
|
||||
'babashka.http-client.interceptors http-client-interceptors-namespace}
|
||||
features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace)
|
||||
'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace)
|
||||
'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))
|
||||
features/yaml? (assoc 'clj-yaml.core @(resolve 'babashka.impl.yaml/yaml-namespace)
|
||||
'flatland.ordered.map @(resolve 'babashka.impl.ordered/ordered-map-ns))
|
||||
'flatland.ordered.map @(resolve 'babashka.impl.ordered/ordered-map-ns)
|
||||
'flatland.ordered.set @(resolve 'babashka.impl.ordered/ordered-set-ns))
|
||||
features/jdbc? (assoc 'next.jdbc @(resolve 'babashka.impl.jdbc/njdbc-namespace)
|
||||
'next.jdbc.sql @(resolve 'babashka.impl.jdbc/next-sql-namespace)
|
||||
'next.jdbc.result-set @(resolve 'babashka.impl.jdbc/result-set-namespace))
|
||||
features/csv? (assoc 'clojure.data.csv @(resolve 'babashka.impl.csv/csv-namespace))
|
||||
features/csv? (assoc 'clojure.data.csv @(resolve 'babashka.impl.csv/csv-namespace))
|
||||
features/transit? (assoc 'cognitect.transit @(resolve 'babashka.impl.transit/transit-namespace))
|
||||
features/datascript? (assoc 'datascript.core @(resolve 'babashka.impl.datascript/datascript-namespace)
|
||||
'datascript.db @(resolve 'babashka.impl.datascript/datascript-db-namespace))
|
||||
|
|
@ -454,7 +471,7 @@ Use bb run --help to show this help output.
|
|||
;; it's better to load this from source by adding the clojure.test.check dependency
|
||||
#_#_'clojure.test.check.clojure-test
|
||||
@(resolve 'babashka.impl.clojure.test.check/test-check-clojure-test-namespace))
|
||||
features/spec-alpha? (-> (assoc ;; spec
|
||||
features/spec-alpha? (-> (assoc ;; spec
|
||||
'clojure.spec.alpha @(resolve 'babashka.impl.spec/spec-namespace)
|
||||
'clojure.spec.gen.alpha @(resolve 'babashka.impl.spec/gen-namespace)
|
||||
'clojure.spec.test.alpha @(resolve 'babashka.impl.spec/test-namespace)))
|
||||
|
|
@ -469,6 +486,8 @@ Use bb run --help to show this help output.
|
|||
'selmer.validator
|
||||
@(resolve 'babashka.impl.selmer/selmer-validator-namespace))
|
||||
features/logging? (assoc 'taoensso.timbre @(resolve 'babashka.impl.logging/timbre-namespace)
|
||||
'taoensso.timbre.appenders.core @(resolve 'babashka.impl.logging/timbre-appenders-namespace)
|
||||
'taoensso.encore @(resolve 'babashka.impl.logging/encore-namespace)
|
||||
'clojure.tools.logging
|
||||
@(resolve 'babashka.impl.logging/tools-logging-namespace)
|
||||
'clojure.tools.logging.impl
|
||||
|
|
@ -480,7 +499,8 @@ Use bb run --help to show this help output.
|
|||
|
||||
(def edn-readers (cond-> {}
|
||||
features/yaml?
|
||||
(assoc 'ordered/map @(resolve 'flatland.ordered.map/ordered-map))
|
||||
(assoc 'ordered/map @(resolve 'flatland.ordered.map/ordered-map)
|
||||
'ordered/set @(resolve 'flatland.ordered.set/ordered-set))
|
||||
features/xml?
|
||||
(assoc 'xml/ns @(resolve 'clojure.data.xml.name/uri-symbol)
|
||||
'xml/element @(resolve 'clojure.data.xml.node/tagged-element))))
|
||||
|
|
@ -568,10 +588,10 @@ Use bb run --help to show this help output.
|
|||
:edn-in true))
|
||||
("-o") (recur (next options)
|
||||
(assoc opts-map
|
||||
:shell-out true))
|
||||
:shell-out true :prn true))
|
||||
("-O") (recur (next options)
|
||||
(assoc opts-map
|
||||
:edn-out true))
|
||||
:edn-out true :prn true))
|
||||
("-io") (recur (next options)
|
||||
(assoc opts-map
|
||||
:shell-in true
|
||||
|
|
@ -602,19 +622,9 @@ Use bb run --help to show this help output.
|
|||
(recur (next options)
|
||||
(assoc opts-map
|
||||
:uberjar (first options))))
|
||||
("-f" "--file")
|
||||
(let [options (next options)]
|
||||
(recur (next options)
|
||||
(assoc opts-map
|
||||
:file (first options))))
|
||||
("--jar" "-jar")
|
||||
(let [options (next options)]
|
||||
(recur (next options)
|
||||
(assoc opts-map
|
||||
:jar (first options))))
|
||||
("--repl")
|
||||
(let [options (next options)]
|
||||
(recur (next options)
|
||||
(recur options
|
||||
(assoc opts-map
|
||||
:repl true)))
|
||||
("--socket-repl")
|
||||
|
|
@ -638,16 +648,17 @@ Use bb run --help to show this help output.
|
|||
(assoc opts-map
|
||||
:nrepl (or opt "1667"))))
|
||||
("--eval", "-e")
|
||||
(let [options (next options)]
|
||||
(let [options (next options)
|
||||
opts-map (assoc opts-map :prn true)]
|
||||
(recur (next options)
|
||||
(update opts-map :expressions (fnil conj []) (first options))))
|
||||
("--main", "-m",)
|
||||
("--main", "-m")
|
||||
(let [options (next options)]
|
||||
(assoc opts-map :main (first options)
|
||||
:command-line-args (if (= "--" (second options))
|
||||
(nthrest options 2)
|
||||
(rest options))))
|
||||
("--exec", "-x",)
|
||||
("--exec", "-x")
|
||||
(let [options (next options)]
|
||||
(assoc opts-map :exec (first options)
|
||||
:command-line-args (if (= "--" (second options))
|
||||
|
|
@ -674,6 +685,7 @@ Use bb run --help to show this help output.
|
|||
(case c
|
||||
(\( \{ \[ \* \@ \#)
|
||||
(-> opts-map
|
||||
(assoc :prn true)
|
||||
(update :expressions (fnil conj []) (first options))
|
||||
(assoc :command-line-args (next options)))
|
||||
(assoc opts-map
|
||||
|
|
@ -709,36 +721,49 @@ Use bb run --help to show this help output.
|
|||
|
||||
("--deps-root")
|
||||
(recur (nnext options) (assoc opts-map :deps-root (second options)))
|
||||
("--prn")
|
||||
(recur (next options) (assoc opts-map :prn true))
|
||||
("-f" "--file")
|
||||
(recur (nnext options) (assoc opts-map :file (second options)))
|
||||
("-jar" "--jar")
|
||||
(recur (nnext options) (assoc opts-map :jar (second options)))
|
||||
[options opts-map])
|
||||
[options opts-map])))
|
||||
|
||||
(defn parse-file-opt
|
||||
[options opts-map]
|
||||
(let [opt (first options)
|
||||
opts-key (if (str/ends-with? opt ".jar")
|
||||
:jar :file)]
|
||||
(assoc opts-map
|
||||
opts-key opt
|
||||
:command-line-args (next options))))
|
||||
(let [opt (first options)]
|
||||
(if (and opt (and (fs/exists? opt)
|
||||
(not (fs/directory? opt))))
|
||||
[nil (assoc opts-map
|
||||
(if (str/ends-with? opt ".jar")
|
||||
:jar :file) opt
|
||||
:command-line-args (next options))]
|
||||
[options opts-map])))
|
||||
|
||||
(defn parse-opts
|
||||
([options] (parse-opts options nil))
|
||||
([options opts-map]
|
||||
(let [opt (first options)
|
||||
tasks (into #{} (map str) (keys (:tasks @common/bb-edn)))]
|
||||
task-map (:tasks @common/bb-edn)
|
||||
tasks (into #{} (map str) (keys task-map))]
|
||||
(when-let [commands (seq (filter (fn [task]
|
||||
(and (command? task)
|
||||
(not (:override-builtin (get task-map (symbol task))))))
|
||||
tasks))]
|
||||
(binding [*out* *err*]
|
||||
(println "[babashka] WARNING: task(s)" (str/join ", " (map #(format "'%s'" %) commands)) "override built-in command(s). Use :override-builtin true to disable warning.")))
|
||||
(if-not opt opts-map
|
||||
;; FILE > TASK > SUBCOMMAND
|
||||
(cond
|
||||
(.isFile (io/file opt))
|
||||
(if (or (:file opts-map) (:jar opts-map))
|
||||
opts-map ; we've already parsed the file opt
|
||||
(parse-file-opt options opts-map))
|
||||
|
||||
(and (not (or (:file opts-map)
|
||||
(:jar opts-map)))
|
||||
(.isFile (io/file opt)))
|
||||
(parse-file-opt options opts-map)
|
||||
(contains? tasks opt)
|
||||
(assoc opts-map
|
||||
:run opt
|
||||
:command-line-args (next options))
|
||||
|
||||
(command? opt)
|
||||
(recur (cons (str "--" opt) (next options)) opts-map)
|
||||
|
||||
|
|
@ -768,25 +793,68 @@ Use bb run --help to show this help output.
|
|||
env-os-name-present? (not= env-os-name sys-os-name)
|
||||
env-os-arch-present? (not= env-os-arch sys-os-arch))))
|
||||
|
||||
(defn file-write-allowed?
|
||||
"For output file of uberscript/uberjar, allow writing of jar files
|
||||
and files that are empty/don't exist."
|
||||
[path]
|
||||
(or (= "jar" (fs/extension path))
|
||||
(not (fs/exists? path))))
|
||||
|
||||
(def seen-urls (atom nil))
|
||||
|
||||
(defn read-data-readers [url]
|
||||
(edamame/parse-string (slurp url)
|
||||
{:read-cond :allow
|
||||
:features #{:bb :clj}
|
||||
:eof nil}))
|
||||
|
||||
(defn readers-fn
|
||||
"Lazy reading of data reader functions"
|
||||
[ctx t]
|
||||
(or (@core/data-readers t)
|
||||
(default-data-readers t)
|
||||
(when (simple-symbol? t)
|
||||
(when-let [the-var (sci/resolve ctx t)]
|
||||
(some-> the-var meta :sci.impl.record/map-constructor)))
|
||||
(when-let [f @sci.impl.parser/default-data-reader-fn]
|
||||
(fn [form]
|
||||
(f t form)))
|
||||
(let [;; urls is a vector for equality check
|
||||
urls (vec (.getURLs ^java.net.URLClassLoader @cp/the-url-loader))
|
||||
parsed-resources (or (get @seen-urls urls)
|
||||
(let [^java.net.URLClassLoader cl @cp/the-url-loader
|
||||
resources (concat (enumeration-seq (.getResources cl "data_readers.clj"))
|
||||
(enumeration-seq (.getResources cl "data_readers.cljc")))
|
||||
parsed-resources (apply merge (map read-data-readers resources))
|
||||
_ (swap! seen-urls assoc urls parsed-resources)]
|
||||
parsed-resources))]
|
||||
(when-let [var-sym (get parsed-resources t)]
|
||||
(when-let [the-var (sci/resolve ctx var-sym)]
|
||||
(sci/eval-form ctx (list 'clojure.core/var-set core/data-readers (list 'quote (assoc @core/data-readers t the-var))))
|
||||
the-var)))))
|
||||
|
||||
(defn exec [cli-opts]
|
||||
(binding [*unrestricted* true]
|
||||
(with-bindings {#'*unrestricted* true
|
||||
clojure.lang.Compiler/LOADER @cp/the-url-loader}
|
||||
(sci/binding [core/warn-on-reflection @core/warn-on-reflection
|
||||
core/unchecked-math @core/unchecked-math
|
||||
core/data-readers @core/data-readers
|
||||
sci/ns @sci/ns
|
||||
sci/print-length @sci/print-length]
|
||||
(let [{version-opt :version
|
||||
:keys [:shell-in :edn-in :shell-out :edn-out
|
||||
:help :file :command-line-args
|
||||
sci/print-length @sci/print-length
|
||||
;; when adding vars here, also add them to repl.clj and nrepl_server.clj
|
||||
]
|
||||
(let [{:keys [:shell-in :edn-in :shell-out :edn-out
|
||||
:file :command-line-args
|
||||
:expressions :stream? :init
|
||||
:repl :socket-repl :nrepl
|
||||
:debug :classpath :force?
|
||||
:main :uberscript :describe?
|
||||
:main :uberscript
|
||||
:jar :uberjar :clojure
|
||||
:doc :run :list-tasks
|
||||
:print-deps :prepare]
|
||||
exec-fn :exec}
|
||||
cli-opts
|
||||
print-result? (:prn cli-opts)
|
||||
_ (when debug (vreset! common/debug true))
|
||||
_ (do ;; set properties
|
||||
(when main (System/setProperty "babashka.main" main))
|
||||
|
|
@ -821,9 +889,8 @@ Use bb run --help to show this help output.
|
|||
abs-path))
|
||||
_ (when jar
|
||||
(cp/add-classpath jar))
|
||||
load-fn (fn [{:keys [:namespace :reload]}]
|
||||
(let [{:keys [loader]}
|
||||
@cp/cp-state]
|
||||
load-fn (fn [{:keys [namespace reload ctx]}]
|
||||
(let [loader @cp/the-url-loader]
|
||||
(or
|
||||
(when ;; ignore built-in namespaces when uberscripting, unless with :reload
|
||||
(and uberscript
|
||||
|
|
@ -855,7 +922,7 @@ Use bb run --help to show this help output.
|
|||
res)))
|
||||
(let [rps (cp/resource-paths namespace)
|
||||
rps (mapv #(str "src/babashka/" %) rps)]
|
||||
(when-let [url (some #(io/resource %) rps)]
|
||||
(when-let [url (some io/resource rps)]
|
||||
(let [source (slurp url)]
|
||||
{:file (str url)
|
||||
:source source})))
|
||||
|
|
@ -866,19 +933,18 @@ Use bb run --help to show this help output.
|
|||
clojure.core.specs.alpha
|
||||
(binding [*out* *err*]
|
||||
(println "[babashka] WARNING: clojure.core.specs.alpha is removed from the classpath, unless you explicitly add the dependency."))
|
||||
nil))))
|
||||
(when-not (sci/find-ns ctx namespace)
|
||||
(let [file (str/replace (namespace-munge namespace) "." "/")]
|
||||
(throw (new java.io.FileNotFoundException (format "Could not locate %s.bb, %s.clj or %s.cljc on classpath." file file file)))))))))
|
||||
main (if (and jar (not main))
|
||||
(when-let [res (cp/getResource
|
||||
(cp/loader jar)
|
||||
(cp/new-loader [jar])
|
||||
["META-INF/MANIFEST.MF"] {:url? true})]
|
||||
(cp/main-ns res))
|
||||
main)
|
||||
;; TODO: pull more of these values to compile time
|
||||
opts {:aliases aliases
|
||||
:namespaces (-> namespaces
|
||||
(assoc 'clojure.core
|
||||
(assoc core-extras
|
||||
'load-file (sci-copy-vars/new-var 'load-file load-file*))))
|
||||
:namespaces (assoc-in namespaces ['clojure.core 'load-file] (sci-copy-vars/new-var 'load-file load-file*))
|
||||
:env env
|
||||
:features #{:bb :clj}
|
||||
:classes @classes/class-map
|
||||
|
|
@ -887,13 +953,14 @@ Use bb run --help to show this help output.
|
|||
:uberscript uberscript
|
||||
;; :readers core/data-readers
|
||||
:reify-fn reify-fn
|
||||
:proxy-fn proxy-fn}
|
||||
:proxy-fn proxy-fn
|
||||
:readers #(readers-fn (common/ctx) %)}
|
||||
opts (addons/future opts)
|
||||
sci-ctx (sci/init opts)
|
||||
_ (ctx-store/reset-ctx! sci-ctx)
|
||||
_ (when-let [pods (:pods @common/bb-edn)]
|
||||
(when-let [pod-metadata (pods/load-pods-metadata
|
||||
pods {:download-only (download-only?)})]
|
||||
pods {:download-only (download-only?)})]
|
||||
(vreset! pod-namespaces pod-metadata)))
|
||||
preloads (some-> (System/getenv "BABASHKA_PRELOADS") (str/trim))
|
||||
[expressions exit-code]
|
||||
|
|
@ -922,7 +989,7 @@ Use bb run --help to show this help output.
|
|||
:debug debug
|
||||
:preloads preloads
|
||||
:init init
|
||||
:loader (:loader @cp/cp-state)}))))
|
||||
:loader @cp/the-url-loader}))))
|
||||
expression (str/join " " expressions) ;; this might mess with the locations...
|
||||
exit-code
|
||||
;; handle preloads
|
||||
|
|
@ -936,7 +1003,7 @@ Use bb run --help to show this help output.
|
|||
:debug debug
|
||||
:preloads preloads
|
||||
:init init
|
||||
:loader (:loader @cp/cp-state)})))))
|
||||
:loader @cp/the-url-loader})))))
|
||||
nil))
|
||||
exit-code
|
||||
;; handle --init
|
||||
|
|
@ -949,7 +1016,7 @@ Use bb run --help to show this help output.
|
|||
:debug debug
|
||||
:preloads preloads
|
||||
:init init
|
||||
:loader (:loader @cp/cp-state)}))))
|
||||
:loader @cp/the-url-loader}))))
|
||||
nil))
|
||||
;; socket REPL is start asynchronously. when no other args are
|
||||
;; provided, a normal REPL will be started as well, which causes the
|
||||
|
|
@ -958,13 +1025,9 @@ Use bb run --help to show this help output.
|
|||
exit-code
|
||||
(or exit-code
|
||||
(second
|
||||
(cond version-opt
|
||||
[(print-version) 0]
|
||||
help (print-help sci-ctx command-line-args)
|
||||
doc (print-doc sci-ctx command-line-args)
|
||||
describe?
|
||||
[(print-describe) 0]
|
||||
repl [(repl/start-repl! sci-ctx) 0]
|
||||
(cond doc (print-doc sci-ctx command-line-args)
|
||||
repl (sci/binding [core/command-line-args command-line-args]
|
||||
[(repl/start-repl! sci-ctx) 0])
|
||||
nrepl [(start-nrepl! nrepl) 0]
|
||||
uberjar [nil 0]
|
||||
list-tasks [(tasks/list-tasks sci-ctx) 0]
|
||||
|
|
@ -992,8 +1055,7 @@ Use bb run --help to show this help output.
|
|||
(sci/eval-string* sci-ctx expression))]
|
||||
;; return value printing
|
||||
(when (and (some? res)
|
||||
(or (not run)
|
||||
(:prn cli-opts)))
|
||||
print-result?)
|
||||
(if-let [pr-f (cond shell-out println
|
||||
edn-out sio/prn)]
|
||||
(if (sequential? res)
|
||||
|
|
@ -1009,39 +1071,58 @@ Use bb run --help to show this help output.
|
|||
(error-handler e {:expression expression
|
||||
:debug debug
|
||||
:preloads preloads
|
||||
:loader (:loader @cp/cp-state)}))))
|
||||
:loader @cp/the-url-loader}))))
|
||||
clojure [nil (if-let [proc (bdeps/clojure command-line-args)]
|
||||
(-> @proc :exit)
|
||||
0)]
|
||||
:else [(repl/start-repl! sci-ctx) 0]))
|
||||
:else (sci/binding [core/command-line-args command-line-args]
|
||||
[(repl/start-repl! sci-ctx) 0])))
|
||||
1)]
|
||||
(flush)
|
||||
(when uberscript
|
||||
(let [uberscript-out uberscript]
|
||||
(spit uberscript-out "") ;; reset file
|
||||
(doseq [s (distinct @uberscript-sources)]
|
||||
(spit uberscript-out s :append true))
|
||||
(spit uberscript-out preloads :append true)
|
||||
(spit uberscript-out expression :append true)))
|
||||
(if (file-write-allowed? uberscript)
|
||||
(do
|
||||
(spit uberscript "") ;; reset file
|
||||
(doseq [s (distinct @uberscript-sources)]
|
||||
(spit uberscript s :append true))
|
||||
(spit uberscript preloads :append true)
|
||||
(spit uberscript expression :append true))
|
||||
(throw (Exception. (str "Uberscript target file '" uberscript
|
||||
"' exists and is not empty. Overwrite prohibited.")))))
|
||||
(when uberjar
|
||||
(if-let [cp (cp/get-classpath)]
|
||||
(let [uber-params {:dest uberjar
|
||||
:jar :uber
|
||||
:classpath cp
|
||||
:main-class main
|
||||
:verbose debug}]
|
||||
(if-let [bb-edn-pods (:pods @common/bb-edn)]
|
||||
(fs/with-temp-dir [bb-edn-dir {}]
|
||||
(let [bb-edn-resource (fs/file bb-edn-dir "META-INF" "bb.edn")]
|
||||
(fs/create-dirs (fs/parent bb-edn-resource))
|
||||
(->> {:pods bb-edn-pods} pr-str (spit bb-edn-resource))
|
||||
(let [cp-with-bb-edn (str bb-edn-dir cp/path-sep cp)]
|
||||
(uberjar/run (assoc uber-params
|
||||
:classpath cp-with-bb-edn)))))
|
||||
(uberjar/run uber-params)))
|
||||
(throw (Exception. "The uberjar task needs a classpath."))))
|
||||
(let [cp (cp/get-classpath)]
|
||||
(cond
|
||||
(not (file-write-allowed? uberjar))
|
||||
(throw (Exception. (str "Uberjar target file '" uberjar
|
||||
"' exists and is not empty. Overwrite prohibited.")))
|
||||
(not cp)
|
||||
(throw (Exception. "The uberjar task needs a classpath."))
|
||||
:else
|
||||
(let [uber-params {:dest uberjar
|
||||
:jar :uber
|
||||
:classpath cp
|
||||
:main-class main
|
||||
:verbose debug}]
|
||||
(if-let [bb-edn-pods (:pods @common/bb-edn)]
|
||||
(fs/with-temp-dir [bb-edn-dir {}]
|
||||
(let [bb-edn-resource (fs/file bb-edn-dir "META-INF" "bb.edn")]
|
||||
(fs/create-dirs (fs/parent bb-edn-resource))
|
||||
(->> {:pods bb-edn-pods} pr-str (spit bb-edn-resource))
|
||||
(let [cp-with-bb-edn (str bb-edn-dir cp/path-sep cp)]
|
||||
(uberjar/run (assoc uber-params
|
||||
:classpath cp-with-bb-edn)))))
|
||||
(uberjar/run uber-params))))))
|
||||
exit-code))))
|
||||
|
||||
(defn exec-without-deps [cli-opts]
|
||||
(let [{version-opt :version
|
||||
:keys [help describe?]} cli-opts]
|
||||
(cond
|
||||
version-opt (print-version)
|
||||
help (print-help)
|
||||
describe? (print-describe)))
|
||||
0)
|
||||
|
||||
(defn satisfies-min-version? [min-version]
|
||||
(let [[major-current minor-current patch-current] version-data
|
||||
[major-min minor-min patch-min] (parse-version min-version)]
|
||||
|
|
@ -1051,8 +1132,8 @@ Use bb run --help to show this help output.
|
|||
(and (= minor-current minor-min)
|
||||
(>= patch-current patch-min)))))))
|
||||
|
||||
(defn load-bb-edn [string]
|
||||
(try (edn/read-string {:default tagged-literal} string)
|
||||
(defn read-bb-edn [string]
|
||||
(try (edn/read-string {:default tagged-literal :eof nil} string)
|
||||
(catch java.lang.RuntimeException e
|
||||
(if (re-find #"No dispatch macro for: \"" (.getMessage e))
|
||||
(throw (ex-info "Invalid regex literal found in EDN config, use re-pattern instead" {}))
|
||||
|
|
@ -1060,40 +1141,94 @@ Use bb run --help to show this help output.
|
|||
(println "Error during loading bb.edn:"))
|
||||
(throw e))))))
|
||||
|
||||
(defn binary-invoked-as-jar []
|
||||
(and (= "executable" (System/getProperty "org.graalvm.nativeimage.kind"))
|
||||
(when-let [bin (-> (java.lang.ProcessHandle/current)
|
||||
.info
|
||||
.command
|
||||
(.orElse nil))]
|
||||
(let [fn (fs/file-name bin)]
|
||||
(if (= "bb" fn)
|
||||
false
|
||||
(if (and (fs/windows?)
|
||||
(= "bb.exe" fn))
|
||||
false
|
||||
(when (try (with-open [_ (java.util.zip.ZipFile. (fs/file bin))])
|
||||
true
|
||||
(catch Exception _ false))
|
||||
bin)))))))
|
||||
|
||||
(defn resolve-symbolic-link [f]
|
||||
(if (and f (fs/exists? f))
|
||||
(try
|
||||
(str (fs/real-path f))
|
||||
(catch Exception _
|
||||
f))
|
||||
f))
|
||||
|
||||
(defn deps-not-needed [opts]
|
||||
(let [fast-path-opts [:version :help :describe?]]
|
||||
(some #(contains? opts %) fast-path-opts)))
|
||||
|
||||
(defn main [& args]
|
||||
(let [[args global-opts] (parse-global-opts args)
|
||||
{:keys [:jar] :as file-opt} (when (some-> args first io/file .isFile)
|
||||
(parse-file-opt args global-opts))
|
||||
config (:config global-opts)
|
||||
merge-deps (:merge-deps global-opts)
|
||||
abs-path #(-> % io/file .getAbsolutePath)
|
||||
bb-edn-file (cond
|
||||
config (when (fs/exists? config) (abs-path config))
|
||||
jar (some-> jar cp/loader (cp/resource "META-INF/bb.edn") .toString)
|
||||
:else (when (fs/exists? "bb.edn") (abs-path "bb.edn")))
|
||||
bb-edn (when (or bb-edn-file merge-deps)
|
||||
(when bb-edn-file (System/setProperty "babashka.config" bb-edn-file))
|
||||
(let [raw-string (when bb-edn-file (slurp bb-edn-file))
|
||||
edn (when bb-edn-file (load-bb-edn raw-string))
|
||||
(let [bin-jar (binary-invoked-as-jar)
|
||||
args (if bin-jar
|
||||
(list* "--jar" bin-jar "--" args)
|
||||
args)
|
||||
[args opts] (parse-global-opts args)
|
||||
[args {:keys [config merge-deps debug] :as opts}]
|
||||
(if-not (or (:file opts)
|
||||
(:jar opts))
|
||||
(parse-file-opt args opts)
|
||||
[args opts])
|
||||
{:keys [jar file]} opts
|
||||
abs-path resolve-symbolic-link
|
||||
config (cond
|
||||
config (if (fs/exists? config) (abs-path config)
|
||||
(when debug
|
||||
(binding [*out* *err*]
|
||||
(println "[babashka] WARNING: config file does not exist:" config))
|
||||
nil))
|
||||
jar (let [jar (resolve-symbolic-link jar)]
|
||||
(some->> [jar] cp/new-loader (cp/resource "META-INF/bb.edn") .toString))
|
||||
:else (if (and file (fs/exists? file))
|
||||
;; file relative to bb.edn
|
||||
(let [file (abs-path file) ;; follow symlink
|
||||
rel-bb-edn (fs/file (fs/parent file) "bb.edn")]
|
||||
(if (fs/exists? rel-bb-edn)
|
||||
(abs-path rel-bb-edn)
|
||||
;; fall back to local bb.edn
|
||||
(when (fs/exists? "bb.edn")
|
||||
(abs-path "bb.edn"))))
|
||||
;; default to local bb.edn
|
||||
(when (fs/exists? "bb.edn")
|
||||
(abs-path "bb.edn"))))
|
||||
bb-edn (when (or config merge-deps)
|
||||
(when config (System/setProperty "babashka.config" config))
|
||||
(let [raw-string (when config (slurp config))
|
||||
edn (when config (read-bb-edn raw-string))
|
||||
edn (if merge-deps
|
||||
(deps/merge-deps [edn (load-bb-edn merge-deps)])
|
||||
(deps/merge-deps [edn (read-bb-edn merge-deps)])
|
||||
edn)
|
||||
edn (assoc edn
|
||||
:raw raw-string
|
||||
:file bb-edn-file)
|
||||
edn (if-let [deps-root (or (:deps-root global-opts)
|
||||
:file config)
|
||||
edn (if-let [deps-root (or (:deps-root opts)
|
||||
(some-> config fs/parent))]
|
||||
(assoc edn :deps-root deps-root)
|
||||
edn)]
|
||||
(vreset! common/bb-edn edn)))
|
||||
;; _ (.println System/err (str bb-edn))
|
||||
opts (parse-opts args opts)
|
||||
min-bb-version (:min-bb-version bb-edn)]
|
||||
(System/setProperty "java.class.path" "")
|
||||
(when min-bb-version
|
||||
(when-not (satisfies-min-version? min-bb-version)
|
||||
(binding [*out* *err*]
|
||||
(println (str "WARNING: this project requires babashka "
|
||||
min-bb-version " or newer, but you have: " version)))))
|
||||
(exec (parse-opts args (merge global-opts file-opt)))))
|
||||
(if (deps-not-needed opts)
|
||||
(exec-without-deps opts)
|
||||
(exec opts))))
|
||||
|
||||
(def musl?
|
||||
"Captured at compile time, to know if we are running inside a
|
||||
|
|
@ -1132,6 +1267,7 @@ Use bb run --help to show this help output.
|
|||
(let [exit-code (run args)]
|
||||
(System/exit exit-code))))
|
||||
|
||||
(sci/alter-var-root main-var (constantly -main))
|
||||
;;;; Scratch
|
||||
|
||||
(comment)
|
||||
|
|
|
|||
2
test-resources/adjacent_bb/bb.edn
Normal file
2
test-resources/adjacent_bb/bb.edn
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
{:deps {medley/medley {:mvn/version "1.3.0"}
|
||||
my-local/dep {:local/root "../local-dep"}}}
|
||||
10
test-resources/adjacent_bb/medley.bb
Executable file
10
test-resources/adjacent_bb/medley.bb
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
#!/usr/bin/env bb
|
||||
|
||||
(require '[local-dep])
|
||||
|
||||
(assert (= :foo local-dep/local-dep-var))
|
||||
|
||||
(ns medley
|
||||
(:require [medley.core :as medley]))
|
||||
|
||||
(prn (medley/index-by :id [{:id 1}]))
|
||||
|
|
@ -2,7 +2,9 @@
|
|||
{:org.babashka/cli {:coerce {:foo []}}})
|
||||
|
||||
(defn exec-test
|
||||
{:org.babashka/cli {:coerce {:bar :keyword}}}
|
||||
{:org.babashka/cli
|
||||
{:exec-args {:foo :foo}
|
||||
:coerce {:bar :keyword}}}
|
||||
[m]
|
||||
(if (:meta m)
|
||||
(prn (meta m))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
{r/reverse reader/reversev}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{r/distinct reader/distinctv}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
(ns reader)
|
||||
|
||||
(defn reversev [data]
|
||||
(vec (reverse data)))
|
||||
|
||||
(defn distinctv [data]
|
||||
(vec (distinct data)))
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
(ns my.main-main
|
||||
(:require [my.impl :as impl])
|
||||
(:require [my.impl2 :as impl2]))
|
||||
(:require [my.impl2]))
|
||||
|
||||
(defn -main [& args]
|
||||
(impl/impl-fn args))
|
||||
(prn (impl/impl-fn args)))
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue