Skip to content

Commit b5c2e50

Browse files
committed
refactor dfiles lib into dfiles-core, create dfiles bin
1 parent 0332889 commit b5c2e50

File tree

31 files changed

+87
-130
lines changed

31 files changed

+87
-130
lines changed

Cargo.lock

Lines changed: 15 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "dfiles"
33
version = "0.1.0"
44
authors = ["Wayne Warren <wayne.warren.s@gmail.com>"]
5-
edition = "2018"
5+
edition = "2021"
66

77
[workspace]
88
members = [
@@ -15,28 +15,12 @@ members = [
1515
"dfiles-apps/steam",
1616
"dfiles-apps/thinkorswim",
1717
"dfiles-apps/zoom",
18+
19+
"dfiles-core",
1820
]
1921

20-
[lib]
22+
[[bin]]
2123
name = "dfiles"
22-
path = "src/dfiles/mod.rs"
24+
path = "src/main.rs"
2325

2426
[dependencies]
25-
dockworker = "0.1"
26-
tar = "0.4.26"
27-
28-
log = "0.4"
29-
pretty_env_logger = "0.4"
30-
31-
clap = { version = "4.2", features = ["string"] }
32-
serde = { version = "1.0", features = ["derive"] }
33-
serde_json = "1.0"
34-
serde_yaml = "0.8"
35-
36-
thiserror = "1.0"
37-
38-
tempfile = "3.1.0"
39-
users = "0.10.0"
40-
chrono-tz = "0.8"
41-
directories-next = "1.0"
42-
dyn-clone = "1.0"

dfiles-apps/chrome/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ name = "chrome"
55
# current datetime
66
version = "2023.2.17"
77
authors = ["Wayne Warren <wayne.warren.s@gmail.com>"]
8-
edition = "2018"
8+
edition = "2021"
99

1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

1212
[dependencies]
1313

14-
dfiles = { path = "../../" }
15-
clap = "2.33"
14+
dfiles-core = { path = "../../dfiles-core" }
1615
anyhow = "1.0"

dfiles-apps/chrome/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::env;
22

33
use anyhow::{Context, Result};
44

5-
use dfiles::aspects;
6-
use dfiles::containermanager::ContainerManager;
5+
use dfiles_core::aspects;
6+
use dfiles_core::containermanager::ContainerManager;
77

88
#[derive(Clone)]
99
pub struct Chrome {}

dfiles-apps/discord/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
name = "discord"
33
version = "0.1.0"
44
authors = ["Wayne Warren <wayne.warren.s@gmail.com>"]
5-
edition = "2018"
5+
edition = "2021"
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
1010

11-
dfiles = { path = "../../" }
12-
clap = "2.33"
11+
dfiles-core = { path = "../../dfiles-core" }
1312
anyhow = "1.0"

dfiles-apps/discord/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::env;
22

33
use anyhow::{Context, Result};
44

5-
use dfiles::aspects;
6-
use dfiles::containermanager::ContainerManager;
5+
use dfiles_core::aspects;
6+
use dfiles_core::containermanager::ContainerManager;
77

88
#[derive(Clone)]
99
struct Discord {}

dfiles-apps/drawio/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ edition = "2021"
77

88
[dependencies]
99

10-
dfiles = { path = "../../" }
11-
clap = "2.33"
10+
dfiles-core = { path = "../../dfiles-core" }
1211
anyhow = "1.0"

dfiles-apps/drawio/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::env;
22

33
use anyhow::{Context, Result};
44

5-
use dfiles::aspects;
6-
use dfiles::containermanager::ContainerManager;
5+
use dfiles_core::aspects;
6+
use dfiles_core::containermanager::ContainerManager;
77

88
#[derive(Clone)]
99
struct Drawio {}

dfiles-apps/firefox/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
name = "firefox"
33
version = "107.0.1"
44
authors = ["Wayne Warren <wayne.warren.s@gmail.com>"]
5-
edition = "2018"
5+
edition = "2021"
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
1010

11-
dfiles = { path = "../../" }
12-
clap = "2.33"
11+
dfiles-core = { path = "../../dfiles-core" }
1312
anyhow = "1.0"

dfiles-apps/firefox/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::env;
22

33
use anyhow::{Context, Result};
44

5-
use dfiles::aspects;
6-
use dfiles::containermanager::ContainerManager;
5+
use dfiles_core::aspects;
6+
use dfiles_core::containermanager::ContainerManager;
77

88
#[derive(Clone)]
99
struct Firefox {}

0 commit comments

Comments
 (0)