/
files.rs
514 lines (431 loc) · 13.9 KB
/
files.rs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
use crate::{
dep_types::{Req, Version},
util, Config,
};
use crossterm::Color;
use regex::Regex;
use serde::Deserialize;
use std::collections::HashMap;
use std::fs;
use std::io::{BufRead, BufReader};
use std::path::Path;
#[derive(Debug, Deserialize)]
pub struct Pipfile {
// Pipfile doesn't use a prefix; assume `[packages]` and [`dev-packages`] sections
// are from it, and use the same format as this tool and `Poetry`.
pub packages: Option<HashMap<String, DepComponentWrapper>>,
#[serde(rename = "dev-packages")]
pub dev_packages: Option<HashMap<String, DepComponentWrapper>>,
}
/// This nested structure is required based on how the `toml` crate handles dots.
#[derive(Debug, Deserialize)]
pub struct Pyproject {
pub tool: Tool,
}
#[derive(Debug, Deserialize)]
pub struct Tool {
pub pyflow: Option<Pyflow>,
pub poetry: Option<Poetry>,
}
#[serde(untagged)]
#[derive(Debug, Deserialize)]
/// Allows use of both Strings, ie "ipython = "^7.7.0", and maps: "ipython = {version = "^7.7.0", extras=["qtconsole"]}"
pub enum DepComponentWrapper {
A(String),
B(DepComponent),
}
#[serde(untagged)]
#[derive(Debug, Deserialize)]
pub enum DepComponentWrapperPoetry {
A(String),
B(DepComponentPoetry),
}
#[derive(Debug, Deserialize)]
pub struct DepComponent {
#[serde(rename = "version")]
pub constrs: Option<String>,
pub extras: Option<Vec<String>>,
pub path: Option<String>,
pub git: Option<String>,
pub branch: Option<String>,
pub service: Option<String>,
pub python: Option<String>,
}
#[derive(Debug, Deserialize)]
pub struct DepComponentPoetry {
#[serde(rename = "version")]
pub constrs: String,
pub python: Option<String>,
pub extras: Option<Vec<String>>,
pub optional: Option<bool>,
// todo: more fields
// pub repository: Option<String>,
// pub branch: Option<String>,
// pub service: Option<String>,
}
#[derive(Debug, Deserialize)]
pub struct Pyflow {
pub py_version: Option<String>,
pub name: Option<String>,
pub version: Option<String>,
pub authors: Option<Vec<String>>,
pub license: Option<String>,
pub description: Option<String>,
pub classifiers: Option<Vec<String>>, // https://pypi.org/classifiers/
pub keywords: Option<Vec<String>>,
pub homepage: Option<String>,
pub repository: Option<String>,
pub repo_url: Option<String>,
pub package_url: Option<String>,
pub readme: Option<String>,
pub build: Option<String>,
// pub entry_points: Option<HashMap<String, Vec<String>>>,
pub scripts: Option<HashMap<String, String>>,
pub python_requires: Option<String>,
pub dependencies: Option<HashMap<String, DepComponentWrapper>>,
#[serde(rename = "dev-dependencies")]
pub dev_dependencies: Option<HashMap<String, DepComponentWrapper>>,
pub extras: Option<HashMap<String, String>>,
}
#[derive(Debug, Deserialize)]
pub struct Poetry {
pub name: Option<String>,
pub version: Option<String>,
pub description: Option<String>,
pub license: Option<String>,
pub authors: Option<Vec<String>>,
pub homepage: Option<String>,
pub repository: Option<String>,
pub documentation: Option<String>,
pub keywords: Option<Vec<String>>,
pub readme: Option<String>,
pub build: Option<String>,
pub classifiers: Option<Vec<String>>,
pub packages: Option<Vec<HashMap<String, String>>>,
pub include: Option<Vec<String>>,
pub exclude: Option<Vec<String>>,
pub extras: Option<HashMap<String, String>>,
pub dependencies: Option<HashMap<String, DepComponentWrapperPoetry>>,
pub dev_dependencies: Option<HashMap<String, DepComponentWrapperPoetry>>,
// todo: Include these
// pub source: Option<HashMap<String, String>>,
pub scripts: Option<HashMap<String, String>>,
// pub extras: Option<HashMap<String, String>>,
}
/// Split from `add_reqs_to_cfg` to accomodate testing
fn update_cfg(cfg_data: &str, added: &[Req], added_dev: &[Req]) -> String {
let mut result = String::new();
let mut in_dep = false;
let mut in_dev_dep = false;
let sect_re = Regex::new(r"^\[.*\]$").unwrap();
// We collect lines here so we can start the index at a non-0 point.
let lines_vec: Vec<&str> = cfg_data.lines().collect();
// todo: Lots of DRY between dep and dev dep
let mut dep_start = 0;
let mut dev_dep_start = 0;
let mut dep_end = 0;
let mut dev_dep_end = 0;
for (i, line) in cfg_data.lines().enumerate() {
if &line.replace(" ", "") == "[tool.pyflow.dependencies]" {
dep_start = i + 1;
if in_dev_dep {
dev_dep_end = i - 1;
}
in_dep = true;
in_dev_dep = false;
continue; // Continue so this line doesn't trigger the section's end.
}
if &line.replace(" ", "") == "[tool.pyflow.dev-dependencies]" {
dev_dep_start = i + 1;
if in_dep {
dep_end = i - 1;
}
in_dep = false;
in_dev_dep = true;
continue;
}
// We've found the end of the dependencies section.
if in_dep && (sect_re.is_match(line) || i == lines_vec.len() - 1) {
in_dep = false;
dep_end = i - 1;
}
if in_dev_dep && (sect_re.is_match(line) || i == lines_vec.len() - 1) {
in_dev_dep = false;
dev_dep_end = i - 1;
}
}
let mut insertion_pt = dep_start;
if dep_start != 0 {
#[allow(clippy::needless_range_loop)]
for i in dep_start..=dep_end {
let line = lines_vec[i];
if !line.is_empty() {
insertion_pt = i + 1
}
}
}
let mut dev_insertion_pt = dev_dep_start;
if dev_dep_start != 0 {
#[allow(clippy::needless_range_loop)]
for i in dev_dep_start..=dev_dep_end {
let line = lines_vec[i];
if !line.is_empty() {
dev_insertion_pt = i + 1
}
}
}
for (i, line) in cfg_data.lines().enumerate() {
if i == insertion_pt && dep_start != 0 {
for req in added {
result.push_str(&req.to_cfg_string());
result.push_str("\n");
}
}
if i == dev_insertion_pt && dev_dep_start != 0 {
for req in added_dev {
result.push_str(&req.to_cfg_string());
result.push_str("\n");
}
}
result.push_str(line);
result.push_str("\n");
}
// If the sections don't exist, create them.
// todo: Adjust start pad as needed so there's exactly two blank lines before adding the section.
if dep_start == 0 {
// todo: Should add dependencies section before dev deps section.
result.push_str("\n[tool.pyflow.dependencies]\n");
for req in added {
result.push_str(&req.to_cfg_string());
result.push_str("\n");
}
if dev_dep_start != 0 {
// We only need to add one end-of-file pad.
result.push_str("\n");
}
}
if dev_dep_start == 0 {
result.push_str("\n[tool.pyflow.dev-dependencies]\n");
for req in added_dev {
result.push_str(&req.to_cfg_string());
result.push_str("\n");
}
result.push_str("\n");
}
result
}
/// Write dependencies to pyproject.toml. If an entry for that package already exists, ask if
/// we should update the version. Assume we've already parsed the config, and are only
/// adding new reqs, or ones with a changed version.
pub fn add_reqs_to_cfg(cfg_path: &Path, added: &[Req], added_dev: &[Req]) {
let data = fs::read_to_string(cfg_path)
.expect("Unable to read pyproject.toml while attempting to add a dependency");
let updated = update_cfg(&data, added, added_dev);
fs::write(cfg_path, updated)
.expect("Unable to write pyproject.toml while attempting to add a dependency");
}
/// Remove dependencies from pyproject.toml.
pub fn remove_reqs_from_cfg(cfg_path: &Path, reqs: &[String]) {
// todo: Handle removing dev deps.
// todo: DRY from parsing the config.
let mut result = String::new();
let data = fs::read_to_string(cfg_path)
.expect("Unable to read pyproject.toml while attempting to add a dependency");
let mut in_dep = false;
let mut _in_dev_dep = false;
let sect_re = Regex::new(r"^\[.*\]$").unwrap();
for line in data.lines() {
if line.starts_with('#') || line.is_empty() {
// todo handle mid-line comements
result.push_str(line);
result.push_str("\n");
continue;
}
if line == "[tool.pyflow.dependencies]" {
in_dep = true;
_in_dev_dep = false;
result.push_str(line);
result.push_str("\n");
continue;
}
if line == "[tool.pyflow.dev-dependencies]" {
in_dep = true;
_in_dev_dep = false;
result.push_str(line);
result.push_str("\n");
continue;
}
if in_dep {
if sect_re.is_match(line) {
in_dep = false;
}
// todo: handle comments
let req_line = if let Ok(r) = Req::from_str(line, false) {
r
} else {
result.push_str(line);
result.push_str("\n");
continue; // Could be caused by a git etc req.
// util::abort(&format!(
// "Can't parse this line in `pyproject.toml`: {}",
// line
// ));
// unreachable!()
};
if reqs
.iter()
.map(|r| r.to_lowercase())
.any(|x| x == req_line.name.to_lowercase())
{
continue; // ie don't append this line to result.
}
}
result.push_str(line);
result.push_str("\n");
}
fs::write(cfg_path, result)
.expect("Unable to write to pyproject.toml while attempting to add a dependency");
}
pub fn parse_req_dot_text(cfg: &mut Config, path: &Path) {
let file = match fs::File::open(path) {
Ok(f) => f,
Err(_) => return,
};
for line in BufReader::new(file).lines() {
if let Ok(l) = line {
match Req::from_pip_str(&l) {
Some(r) => {
cfg.reqs.push(r.clone());
}
None => util::print_color(
&format!("Problem parsing {} from requirements.txt", l),
Color::Red,
),
};
}
}
}
/// Update the config file with a new version.
pub fn change_py_vers(cfg_path: &Path, specified: &Version) {
let f = fs::File::open(&cfg_path)
.expect("Unable to read pyproject.toml while adding Python version");
let mut new_data = String::new();
for line in BufReader::new(f).lines() {
if let Ok(l) = line {
if l.starts_with("py_version") {
new_data.push_str(&format!(
"py_version = \"{}.{}\"\n",
specified.major, specified.minor
));
} else {
new_data.push_str(&l);
new_data.push_str("\n");
}
}
}
fs::write(cfg_path, new_data)
.expect("Unable to write pyproject.toml while adding Python version");
}
#[cfg(test)]
pub mod tests {
use super::*;
use crate::dep_types::{Constraint, ReqType::Caret};
// We're not concerned with testing formatting in this func.
fn base_constrs() -> Vec<Constraint> {
vec![Constraint::new(Caret, Version::new(0, 0, 1))]
}
const BASELINE: &str = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dependencies]
a = "^0.3.5"
[tool.pyflow.dev-dependencies]
dev_a = "^1.17.2"
"#;
const _BASELINE_NO_DEPS: &str = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dev-dependencies]
dev_a = "^1.17.2"
"#;
const BASELINE_NO_DEV_DEPS: &str = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dependencies]
a = "^0.3.5"
"#;
const BASELINE_EMPTY_DEPS: &str = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dependencies]
[tool.pyflow.dev-dependencies]
dev_a = "^1.17.2"
"#;
#[test]
fn add_deps_baseline() {
let actual = update_cfg(
BASELINE.into(),
&[
Req::new("b".into(), base_constrs()),
Req::new("c".into(), base_constrs()),
],
&[Req::new("dev_b".into(), base_constrs())],
);
let expected = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dependencies]
a = "^0.3.5"
b = "^0.0.1"
c = "^0.0.1"
[tool.pyflow.dev-dependencies]
dev_a = "^1.17.2"
dev_b = "^0.0.1"
"#;
assert_eq!(expected, &actual);
}
#[test]
fn add_deps_no_dev_deps_sect() {
let actual = update_cfg(
BASELINE_NO_DEV_DEPS.into(),
&[
Req::new("b".into(), base_constrs()),
Req::new("c".into(), base_constrs()),
],
&[Req::new("dev_b".into(), base_constrs())],
);
let expected = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dependencies]
a = "^0.3.5"
b = "^0.0.1"
c = "^0.0.1"
[tool.pyflow.dev-dependencies]
dev_b = "^0.0.1"
"#;
assert_eq!(expected, &actual);
}
#[test]
fn add_deps_baseline_empty_deps() {
let actual = update_cfg(
BASELINE_EMPTY_DEPS.into(),
&[
Req::new("b".into(), base_constrs()),
Req::new("c".into(), base_constrs()),
],
&[Req::new("dev_b".into(), base_constrs())],
);
let expected = r#"
[tool.pyflow]
name = ""
[tool.pyflow.dependencies]
b = "^0.0.1"
c = "^0.0.1"
[tool.pyflow.dev-dependencies]
dev_a = "^1.17.2"
dev_b = "^0.0.1"
"#;
assert_eq!(expected, &actual);
}
}