Merge pull request #59 from arkedge/notalawyer

Integrate with notalawyer

.github/workflows/rust.yml

@@ -33,6 +33,10 @@ jobs:
       - name: cache dependencies
         uses: Swatinem/[email protected]
 
+      - name: install cargo-about
+        run: |
+          cargo install cargo-about
+
       - name: reviewdog / clippy
         uses: sksat/[email protected]
         with:

Cargo.toml

@@ -31,3 +31,6 @@ serde = { version = "1", features = ["derive"]}
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 kble-socket = "0.2.0"
+notalawyer = "0.1.0"
+notalawyer-clap = "0.1.0"
+notalawyer-build = "0.1.0"

about.toml

@@ -0,0 +1,7 @@
+accepted = [
+    "MIT",
+    "Apache-2.0",
+    "Unicode-DFS-2016",
+    "MPL-2.0",
+    "BSD-2-Clause",
+]

kble-c2a/Cargo.toml

@@ -9,6 +9,9 @@ readme.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[build-dependencies]
+notalawyer-build.workspace = true
+
 [dependencies]
 anyhow.workspace = true
 futures.workspace = true
@@ -19,3 +22,5 @@ bytes.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 clap.workspace = true
+notalawyer.workspace = true
+notalawyer-clap.workspace = true

kble-c2a/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    notalawyer_build::build();
+}

kble-c2a/src/main.rs

@@ -3,6 +3,7 @@ use bytes::BytesMut;
 use clap::{Parser, Subcommand};
 use futures::{SinkExt, StreamExt};
 use kble_c2a::{spacepacket, tfsync};
+use notalawyer_clap::*;
 use tokio_util::codec::Decoder;
 use tracing_subscriber::{prelude::*, EnvFilter};
 
@@ -43,7 +44,7 @@ async fn main() -> Result<()> {
         .with(EnvFilter::from_default_env())
         .init();
 
-    let args = Args::parse();
+    let args = Args::parse_with_license_notice(include_notice!());
     match args.command {
         Commands::Tfsync => run_tfsync().await,
         Commands::Spacepacket { command } => run_spacepacket(command).await,

kble-eb90/Cargo.toml

@@ -9,6 +9,9 @@ readme.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[build-dependencies]
+notalawyer-build.workspace = true
+
 [dependencies]
 anyhow.workspace = true
 futures.workspace = true
@@ -20,3 +23,5 @@ tracing.workspace = true
 tracing-subscriber.workspace = true
 clap.workspace = true
 eb90 = "0.1.1"
+notalawyer.workspace = true
+notalawyer-clap.workspace = true

kble-eb90/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    notalawyer_build::build();
+}

kble-eb90/src/main.rs

@@ -4,6 +4,7 @@ use anyhow::Result;
 use bytes::BytesMut;
 use clap::{Parser, Subcommand};
 use futures::{SinkExt, StreamExt};
+use notalawyer_clap::*;
 use tokio_util::codec::{Decoder, Encoder};
 use tracing::warn;
 use tracing_subscriber::{prelude::*, EnvFilter};
@@ -35,7 +36,7 @@ async fn main() -> Result<()> {
         .with(EnvFilter::from_default_env())
         .init();
 
-    let args = Args::parse();
+    let args = Args::parse_with_license_notice(include_notice!());
     match args.command {
         Commands::Encode => run_encode().await,
         Commands::Decode { buffer_size } => run_decode(buffer_size).await,

kble-serialport/Cargo.toml

@@ -9,6 +9,9 @@ readme.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[build-dependencies]
+notalawyer-build.workspace = true
+
 [dependencies]
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
@@ -21,3 +24,5 @@ axum = { workspace = true, default-features = false, features = ["tokio", "tower
 tokio-serial = "5.4"
 serde.workspace = true
 bytes.workspace = true
+notalawyer.workspace = true
+notalawyer-clap.workspace = true

kble-serialport/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    notalawyer_build::build();
+}

kble-serialport/src/main.rs

@@ -12,6 +12,7 @@ use bytes::BytesMut;
 use clap::Parser;
 use futures::{SinkExt, StreamExt};
 use kble_socket::from_axum;
+use notalawyer_clap::*;
 use serde::Deserialize;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio_serial::{DataBits, FlowControl, Parity, SerialPortBuilderExt, SerialStream, StopBits};
@@ -100,7 +101,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let args = Args::parse();
+    let args = Args::parse_with_license_notice(include_notice!());
 
     tracing_subscriber::registry()
         .with(

kble/Cargo.toml

@@ -9,6 +9,9 @@ readme.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[build-dependencies]
+notalawyer-build.workspace = true
+
 [dependencies]
 anyhow.workspace = true
 futures.workspace = true
@@ -21,3 +24,5 @@ clap.workspace = true
 serde.workspace = true
 serde_yaml = "0.9"
 serde_with = "3.4"
+notalawyer.workspace = true
+notalawyer-clap.workspace = true

kble/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    notalawyer_build::build();
+}

kble/src/main.rs

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 
 use anyhow::{Context, Result};
 use clap::Parser;
+use notalawyer_clap::*;
 
 mod plug;
 mod spaghetti;
@@ -27,7 +28,7 @@ impl Args {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let args = Args::parse();
+    let args = Args::parse_with_license_notice(include_notice!());
     let config = args.load_spaghetti_config()?;
     config.run().await?;
     Ok(())