13 files changed
+121
-25
Cargo.lock
+32
-20
@@ -29,6 +29,36 @@ version = "1.0.69"
29
source = "registry+https://github.com/rust-lang/crates.io-index"
30
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
31
32
+[[package]]
33
+name = "app-fun"
34
+version = "0.1.0"
35
+
36
+[[package]]
37
+name = "app-oten"
38
+version = "0.1.0"
39
+dependencies = [
40
+ "anyhow",
41
+ "async-trait",
42
+ "dirs",
43
+ "home",
44
+ "log",
45
+ "maybe-async",
46
+ "reqwest",
47
+ "serde",
48
+ "serde_json",
49
+ "smbpndk-model",
50
+ "smbpndk-networking",
51
+ "thiserror",
52
+]
53
+
54
+[[package]]
55
+name = "app-pkt"
56
+version = "0.1.0"
57
+
58
+[[package]]
59
+name = "app-rdb"
60
+version = "0.1.0"
61
+
62
[[package]]
63
name = "async-trait"
64
version = "0.1.66"
@@ -1067,9 +1097,10 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
1097
1098
[[package]]
1099
name = "smbpndk-cli"
1070
-version = "0.2.1"
1100
+version = "0.2.2"
1101
dependencies = [
1102
"anyhow",
1103
+ "app-oten",
1104
"clap",
1105
"clap_mangen",
1106
"console",
@@ -1085,7 +1116,6 @@ dependencies = [
1116
"serde_json",
1117
"smbpndk-model",
1118
"smbpndk-networking",
1088
- "smbpndk-networking-auth-app",
1119
"smbpndk-networking-project",
1120
"smbpndk-utils",
1121
"spinners",
@@ -1121,24 +1151,6 @@ dependencies = [
1151
"thiserror",
1152
]
1153
1124
-[[package]]
1125
-name = "smbpndk-networking-auth-app"
1126
-version = "0.1.0"
1127
-dependencies = [
1128
- "anyhow",
1129
- "async-trait",
1130
- "dirs",
1131
- "home",
1132
- "log",
1133
- "maybe-async",
1134
- "reqwest",
1135
- "serde",
1136
- "serde_json",
1137
- "smbpndk-model",
1138
- "smbpndk-networking",
1139
- "thiserror",
1140
-]
1141
-
1154
[[package]]
1155
name = "smbpndk-networking-project"
1156
version = "0.1.0"
Cargo.toml
+4
-1
@@ -1,9 +1,12 @@
1
[workspace]
2
members = [
3
+ "app-fun",
4
+ "app-oten",
5
+ "app-pkt",
6
+ "app-rdb",
7
"smbpndk-cli",
8
"smbpndk-model",
9
"smbpndk-networking",
6
- "smbpndk-networking-auth-app",
10
"smbpndk-networking-project",
11
"smbpndk-utils"
12
]
app-fun/Cargo.toml
new
+7
@@ -0,0 +1,7 @@
1
+[package]
2
+name = "app-fun"
3
+version = "0.1.0"
4
+edition = "2021"
5
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
6
+
7
+[dependencies]
app-fun/src/lib.rs
new
+14
@@ -0,0 +1,14 @@
1
+pub fn add(left: usize, right: usize) -> usize {
2
+ left + right
3
+}
4
+
5
+#[cfg(test)]
6
+mod tests {
7
+ use super::*;
8
+
9
+ #[test]
10
+ fn it_works() {
11
+ let result = add(2, 2);
12
+ assert_eq!(result, 4);
13
+ }
14
+}
app-oten/Cargo.toml
renamed
+1
-1
@@ -1,5 +1,5 @@
1
[package]
2
-name = "smbpndk-networking-auth-app"
2
+name = "app-oten"
3
version = "0.1.0"
4
edition = "2021"
5
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
app-oten/src/lib.rs
renamed
app-pkt/Cargo.toml
new
+7
@@ -0,0 +1,7 @@
1
+[package]
2
+name = "app-pkt"
3
+version = "0.1.0"
4
+edition = "2021"
5
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
6
+
7
+[dependencies]
app-pkt/src/lib.rs
new
+14
@@ -0,0 +1,14 @@
1
+pub fn add(left: usize, right: usize) -> usize {
2
+ left + right
3
+}
4
+
5
+#[cfg(test)]
6
+mod tests {
7
+ use super::*;
8
+
9
+ #[test]
10
+ fn it_works() {
11
+ let result = add(2, 2);
12
+ assert_eq!(result, 4);
13
+ }
14
+}
app-rdb/Cargo.toml
new
+7
@@ -0,0 +1,7 @@
1
+[package]
2
+name = "app-rdb"
3
+version = "0.1.0"
4
+edition = "2021"
5
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
6
+
7
+[dependencies]
app-rdb/src/lib.rs
new
+14
@@ -0,0 +1,14 @@
1
+pub fn add(left: usize, right: usize) -> usize {
2
+ left + right
3
+}
4
+
5
+#[cfg(test)]
6
+mod tests {
7
+ use super::*;
8
+
9
+ #[test]
10
+ fn it_works() {
11
+ let result = add(2, 2);
12
+ assert_eq!(result, 4);
13
+ }
14
+}
smbpndk-cli/Cargo.toml
+2
-2
@@ -1,6 +1,6 @@
1
[package]
2
name = "smbpndk-cli"
3
-version = "0.2.1"
3
+version = "0.2.2"
4
edition = "2021"
5
authors = ["Seto Elkahfi <hej@setoelkahfi.se>"]
6
description = "Command line tool for creating and managing SmbPndk resources."
@@ -32,7 +32,7 @@ serde = { version = "1", features = ["derive"] }
32
serde_json = "1.0.82"
33
smbpndk-model = { path = "../smbpndk-model" }
34
smbpndk-networking = { path = "../smbpndk-networking" }
35
-smbpndk-networking-auth-app = { path = "../smbpndk-networking-auth-app" }
35
+app-oten = { path = "../app-oten" }
36
smbpndk-networking-project = { path = "../smbpndk-networking-project" }
37
smbpndk-utils = { path = "../smbpndk-utils" }
38
spinners = "4.1.0"
smbpndk-cli/src/auth_app/mod.rs
+1
-1
@@ -1,9 +1,9 @@
1
use crate::{auth_app::cli::Commands, cli::CommandResult};
2
use anyhow::{anyhow, Result};
3
+use app_oten::{create_auth_app, delete_auth_app, get_auth_app, get_auth_apps};
4
use console::style;
5
use dialoguer::{theme::ColorfulTheme, Confirm, Input};
6
use smbpndk_model::AuthAppCreate;
6
-use smbpndk_networking_auth_app::{create_auth_app, delete_auth_app, get_auth_app, get_auth_apps};
7
use smbpndk_utils::{get_config, write_config};
8
use spinners::Spinner;
9
smbpndk-cli/src/cli/mod.rs
+18
@@ -39,4 +39,22 @@ pub enum Commands {
39
#[clap(subcommand)]
40
command: auth_app::cli::Commands,
41
},
42
+ // Function
43
+ /*
44
+ FunApp {
45
+ #[clap(subcommand)]
46
+ command: fun_app::cli::Commands,
47
+ }, */
48
+ // Package
49
+ /*
50
+ PktApp {
51
+ #[clap(subcommand)]
52
+ command: pkt_app::cli::Commands,
53
+ }, */
54
+ // Relational database
55
+ /*
56
+ RdbApp {
57
+ #[clap(subcommand)]
58
+ command: rdb_app::cli::Commands,
59
+ }, */
60
}