Apply module template updates

Author: SamuelSarle

Cargo.lock

@@ -14,50 +14,52 @@ repository = "https://github.com/asimov-modules/asimov-brightdata-module"
 license = "Unlicense"
 keywords = ["asimov-module", "asimov", "ai"]
 categories = [
-    "command-line-utilities",
-    "api-bindings",
-    "web-programming::http-client",
-    "text-processing",
+  "command-line-utilities",
+  "api-bindings",
+  "web-programming::http-client",
+  "text-processing",
 ]
 publish = true
 
 [features]
 default = ["all", "cli", "std"]
 all = ["tracing"]
-cli = ["pretty", "dep:clientele"]
+cli = ["asimov-module/cli", "pretty", "dep:clap", "dep:clientele"]
 pretty = ["dep:colored_json"]
 std = [
-    "asimov-module/std",
-    "clientele/std",
-    "jq/std",
-    "serde/std",
-    "tracing-subscriber?/fmt",
-    "tracing-subscriber?/std",
+  "asimov-module/std",
+  "clap?/std",
+  "clientele?/std",
+  "jq/std",
+  "serde/std",
+  "tracing-subscriber?/fmt",
+  "tracing-subscriber?/std",
 ]
-tracing = ["dep:tracing-subscriber"]
+tracing = ["asimov-module/tracing", "dep:tracing-subscriber"]
 unstable = []
 
 [dependencies]
 asimov-module = { version = "25.0.0-dev.21", default-features = false, features = [
-	"serde",
+  "serde",
 ] }
+clap = { version = "4.5", default-features = false, optional = true }
 clientele = { version = "0.3", default-features = false, features = [
-    "argfile",
-    "dotenv",
-    "wild",
+  "argfile",
+  "dotenv",
+  "wild",
 ], optional = true }
 colored_json = { version = "5", default-features = false, optional = true }
 jq = { version = "0.1", default-features = false, features = ["all"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 serde_json = { version = "1", default-features = false, features = ["alloc"] }
 tracing-subscriber = { version = "0.3", default-features = false, features = [
-    "alloc",
-    "tracing-log",
+  "alloc",
+  "tracing-log",
 ], optional = true }
 ureq = { version = "3.0", default-features = false, features = [
-    "platform-verifier",
-    "rustls",
-    "json",
+  "platform-verifier",
+  "rustls",
+  "json",
 ] }
 
 [profile.release]

Cargo.toml

@@ -1,5 +1,22 @@
 // This is free and unencumbered software released into the public domain.
 
+use clap::Parser;
+use clientele::StandardOptions;
+
+/// asimov-brightdata-fetcher
+#[derive(Debug, Parser)]
+#[command(arg_required_else_help = true)]
+struct Options {
+    #[clap(flatten)]
+    flags: StandardOptions,
+
+    /// The output format.
+    #[arg(value_name = "FORMAT", short = 'o', long)]
+    output: Option<String>,
+
+    urls: Vec<String>,
+}
+
 #[cfg(feature = "std")]
 fn main() -> Result<clientele::SysexitsError, Box<dyn std::error::Error>> {
     use asimov_brightdata_module::{
@@ -13,22 +30,28 @@ fn main() -> Result<clientele::SysexitsError, Box<dyn std::error::Error>> {
     clientele::dotenv().ok();
 
     // Expand wildcards and @argfiles:
-    let args = clientele::args_os()?;
+    let args = asimov_module::args_os()?;
+
+    // Parse command-line options:
+    let options = Options::parse_from(args);
 
-    // Configure logging:
+    // Handle the `--version` flag:
+    if options.flags.version {
+        println!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
+        return Ok(EX_OK);
+    }
+
+    // Handle the `--license` flag:
+    if options.flags.license {
+        print!("{}", include_str!("../../UNLICENSE"));
+        return Ok(EX_OK);
+    }
+
+    // Configure logging & tracing:
     #[cfg(feature = "tracing")]
-    tracing_subscriber::fmt()
-        .with_writer(std::io::stderr)
-        .with_max_level(tracing_subscriber::filter::LevelFilter::WARN)
-        .init();
-
-    // Parse URLs from command-line arguments:
-    let urls: Vec<String> = args
-        .iter()
-        .skip(1)
-        .map(|arg| String::from_str(&arg.to_string_lossy()).unwrap())
-        .collect();
-    if urls.is_empty() {
+    asimov_module::init_tracing_subscriber(&options.flags).expect("failed to initialize logging");
+
+    if options.urls.is_empty() {
         return Ok(EX_OK);
     }
 
@@ -48,7 +71,7 @@ fn main() -> Result<clientele::SysexitsError, Box<dyn std::error::Error>> {
     let api = BrightData::new(api_key.into());
 
     // Process each of the given URL arguments:
-    for url in urls {
+    for url in options.urls {
         // Find the appropriate dataset ID based on the URL prefix:
         let Some(dataset) = find_dataset_for(&url) else {
             return Ok(EX_UNAVAILABLE); // not supported

src/fetcher/main.rs

@@ -1,5 +1,22 @@
 // This is free and unencumbered software released into the public domain.
 
+use clap::Parser;
+use clientele::StandardOptions;
+
+/// asimov-brightdata-importer
+#[derive(Debug, Parser)]
+#[command(arg_required_else_help = true)]
+struct Options {
+    #[clap(flatten)]
+    flags: StandardOptions,
+
+    /// The output format.
+    #[arg(value_name = "FORMAT", short = 'o', long)]
+    output: Option<String>,
+
+    urls: Vec<String>,
+}
+
 #[cfg(feature = "std")]
 fn main() -> Result<clientele::SysexitsError, Box<dyn std::error::Error>> {
     use asimov_brightdata_module::{
@@ -13,22 +30,28 @@ fn main() -> Result<clientele::SysexitsError, Box<dyn std::error::Error>> {
     clientele::dotenv().ok();
 
     // Expand wildcards and @argfiles:
-    let args = clientele::args_os()?;
+    let args = asimov_module::args_os()?;
+
+    // Parse command-line options:
+    let options = Options::parse_from(args);
 
-    // Configure logging:
+    // Handle the `--version` flag:
+    if options.flags.version {
+        println!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
+        return Ok(EX_OK);
+    }
+
+    // Handle the `--license` flag:
+    if options.flags.license {
+        print!("{}", include_str!("../../UNLICENSE"));
+        return Ok(EX_OK);
+    }
+
+    // Configure logging & tracing:
     #[cfg(feature = "tracing")]
-    tracing_subscriber::fmt()
-        .with_writer(std::io::stderr)
-        .with_max_level(tracing_subscriber::filter::LevelFilter::WARN)
-        .init();
-
-    // Parse URLs from command-line arguments:
-    let urls: Vec<String> = args
-        .iter()
-        .skip(1)
-        .map(|arg| String::from_str(&arg.to_string_lossy()).unwrap())
-        .collect();
-    if urls.is_empty() {
+    asimov_module::init_tracing_subscriber(&options.flags).expect("failed to initialize logging");
+
+    if options.urls.is_empty() {
         return Ok(EX_OK);
     }
 
@@ -48,7 +71,7 @@ fn main() -> Result<clientele::SysexitsError, Box<dyn std::error::Error>> {
     let api = BrightData::new(api_key.into());
 
     // Process each of the given URL arguments:
-    for url in urls {
+    for url in options.urls {
         // Find the appropriate dataset ID based on the URL prefix:
         let Some(dataset) = find_dataset_for(&url) else {
             return Ok(EX_UNAVAILABLE); // not supported