Upgrade cli to cling 0.1.0

clients/rust/src/client.rs

@@ -240,8 +240,8 @@ pub(crate) struct ClientConfig {
 
 // Ensure that Client is Send + Sync. Compiler will fail if it's not.
 const _: () = {
-    fn assert_send<T: Send + Sync>() {}
-    let _ = assert_send::<Client>;
+    const fn assert_send<T: Send + Sync>() {}
+    assert_send::<Client>();
 };
 
 #[async_trait]

cronback-cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cronback-cli"
 description = "Cronback CLI"
-version = "0.1.0"
+version = "0.1.1"
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
@@ -26,7 +26,7 @@ admin = ["cronback-client/admin", "cronback-api-model/admin"]
 [dependencies]
 cronback-client = { workspace = true }
 cronback-api-model = { workspace = true, features = ["client", "clap"] }
-cling = { version = "0.0.1-alpha.1" }
+cling = { version = "0.1.0" }
 
 anyhow = { version = "1.0.71" }
 async-trait = { workspace = true }

cronback-cli/src/admin/api_keys/create.rs

@@ -4,7 +4,7 @@ use cronback_api_model::admin::APIKeyMetaData;
 
 use crate::args::CommonOptions;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Clone, Debug, Parser)]
 #[cling(run = "create")]
 pub struct Create {
     /// The name of the key to be created

cronback-cli/src/admin/api_keys/list.rs

@@ -4,7 +4,7 @@ use prettytable::{row, Table};
 
 use crate::args::CommonOptions;
 
-#[derive(CliRunnable, Clone, Debug, Parser)]
+#[derive(Run, Args, Clone, Debug)]
 #[cling(run = "list")]
 pub struct List;
 

cronback-cli/src/admin/api_keys/mod.rs

@@ -4,7 +4,7 @@ mod create;
 mod list;
 mod revoke;
 
-#[derive(CliRunnable, Subcommand, Debug, Clone)]
+#[derive(Run, Subcommand, Debug, Clone)]
 pub enum ApiKeysCommand {
     /// List API keys
     #[command(visible_alias = "ls")]

cronback-cli/src/admin/api_keys/revoke.rs

@@ -4,7 +4,7 @@ use cling::prelude::*;
 use crate::args::CommonOptions;
 use crate::confirm::confirm_or_abort;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "revoke")]
 pub struct Revoke {
     /// The Id of the key to be revoked

cronback-cli/src/admin/mod.rs

@@ -3,7 +3,7 @@ use cling::prelude::*;
 mod api_keys;
 mod projects;
 
-#[derive(CliRunnable, Subcommand, Debug, Clone)]
+#[derive(Run, Subcommand, Debug, Clone)]
 pub enum AdminCommand {
     /// Commands for api key management. This subcommand requires admin
     /// privilliages.

cronback-cli/src/admin/projects/create.rs

@@ -3,7 +3,7 @@ use cling::prelude::*;
 
 use crate::args::CommonOptions;
 
-#[derive(CliRunnable, Clone, Debug, Parser)]
+#[derive(Run, Args, Clone, Debug)]
 #[cling(run = "create")]
 pub struct Create;
 

cronback-cli/src/admin/projects/mod.rs

@@ -1,7 +1,7 @@
 use cling::prelude::*;
 mod create;
 
-#[derive(CliRunnable, Subcommand, Debug, Clone)]
+#[derive(Run, Subcommand, Debug, Clone)]
 pub enum ProjectsCommand {
     /// Create a new API key
     Create(create::Create),

cronback-cli/src/args.rs

@@ -19,7 +19,7 @@ const CRONBACK_SECRET_TOKEN_VAR: &str = "CRONBACK_SECRET_TOKEN";
 #[cfg(feature = "admin")]
 const CRONBACK_PROJECT_ID_VAR: &str = "CRONBACK_PROJECT_ID";
 
-#[derive(CliRunnable, Parser, Debug, Clone)]
+#[derive(Run, Parser, Debug, Clone)]
 #[cling(run = "crate::init")]
 /// Command-line utility to manage cronback projects
 pub struct Cli {
@@ -33,7 +33,7 @@ pub struct Cli {
     pub command: CliCommand,
 }
 
-#[derive(CliParam, Parser, Debug, Clone)]
+#[derive(Collect, Args, Debug, Clone)]
 pub struct CommonOptions {
     #[arg(long, global = true)]
     /// Connect to a local cronback service (http://localhost:8888)
@@ -65,7 +65,7 @@ pub struct CommonOptions {
     pub yes: bool,
 }
 
-#[derive(CliRunnable, Subcommand, Debug, Clone)]
+#[derive(Run, Subcommand, Debug, Clone)]
 pub enum CliCommand {
     /// Commands for triggers
     #[command(subcommand)]
@@ -83,7 +83,7 @@ pub enum CliCommand {
     Admin(admin::AdminCommand),
 }
 
-#[derive(CliRunnable, Subcommand, Debug, Clone)]
+#[derive(Run, Subcommand, Debug, Clone)]
 pub enum TriggerCommand {
     /// List triggers
     #[command(visible_alias = "ls")]
@@ -108,7 +108,7 @@ pub enum TriggerCommand {
     Delete(triggers::Delete),
 }
 
-#[derive(CliRunnable, Subcommand, Debug, Clone)]
+#[derive(Run, Subcommand, Debug, Clone)]
 pub enum RunsCommand {
     /// View details about a given trigger run
     View(runs::View),

cronback-cli/src/runs/view.rs

@@ -3,7 +3,7 @@ use cling::prelude::*;
 
 use crate::args::CommonOptions;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "view")]
 pub struct View {
     /// Run Id

cronback-cli/src/triggers/cancel.rs

@@ -5,7 +5,7 @@ use crate::args::CommonOptions;
 use crate::confirm_or_abort;
 use crate::ui::FancyToString;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "cancel")]
 pub struct Cancel {
     /// Trigger name

cronback-cli/src/triggers/create.rs

@@ -5,7 +5,7 @@ use cling::prelude::*;
 use crate::args::CommonOptions;
 use crate::confirm_or_abort;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "create")]
 pub struct Create {
     /// JSON file name with the trigger definition, or use - for stdin

cronback-cli/src/triggers/delete.rs

@@ -4,7 +4,7 @@ use cling::prelude::*;
 use crate::args::CommonOptions;
 use crate::confirm_or_abort;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "delete")]
 pub struct Delete {
     /// Trigger name

cronback-cli/src/triggers/list.rs

@@ -2,7 +2,6 @@ use std::fmt::Write as FmtWrite;
 
 use anyhow::Result;
 use chrono::{DateTime, Utc};
-use clap::Parser;
 use cling::prelude::*;
 use colored::Colorize;
 use cronback_client::{
@@ -18,7 +17,7 @@ use prettytable::{row, Table};
 use crate::args::CommonOptions;
 use crate::ui::FancyToString;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "list")]
 pub struct List {
     /// Cursor to start listing from

cronback-cli/src/triggers/pause.rs

@@ -5,7 +5,7 @@ use crate::args::CommonOptions;
 use crate::confirm_or_abort;
 use crate::ui::FancyToString;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "pause")]
 pub struct Pause {
     /// Trigger name

cronback-cli/src/triggers/resume.rs

@@ -1,11 +1,10 @@
 use anyhow::Result;
-use clap::Parser;
 use cling::prelude::*;
 
 use crate::args::CommonOptions;
 use crate::ui::FancyToString;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "resume")]
 pub struct Resume {
     /// Trigger name

cronback-cli/src/triggers/run.rs

@@ -6,7 +6,7 @@ use spinners::{Spinner, Spinners};
 use crate::args::CommonOptions;
 use crate::confirm_or_abort;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "run")]
 pub struct RunArgs {
     /// Trigger name

cronback-cli/src/triggers/runs.rs

@@ -7,7 +7,7 @@ use prettytable::{row, Table};
 use crate::args::CommonOptions;
 use crate::ui::FancyToString;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "list_runs")]
 pub struct ListRuns {
     /// Cursor to start listing from

cronback-cli/src/triggers/view.rs

@@ -3,7 +3,7 @@ use cling::prelude::*;
 
 use crate::args::CommonOptions;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Args, Clone, Debug)]
 #[cling(run = "view")]
 pub struct View {
     /// Trigger name

cronback-cli/src/whoami.rs

@@ -4,7 +4,7 @@ use colored::Colorize;
 
 use crate::args::CommonOptions;
 
-#[derive(CliRunnable, CliParam, Clone, Debug, Parser)]
+#[derive(Run, Collect, Clone, Debug, Parser)]
 #[cling(run = "whoami")]
 pub struct WhoAmI {
     #[arg(long)]

cronback-services/src/scheduler/spinner/name_cache.rs

@@ -179,8 +179,8 @@ impl<E> NameCache<E> {
 
 // Ensure that NameCache is Send + Sync. Compiler will fail if it's not.
 const _: () = {
-    fn assert_send<T: Send + Sync>() {}
-    let _ = assert_send::<NameCache<anyhow::Error>>;
+    const fn assert_send<T: Send + Sync>() {}
+    assert_send::<NameCache<anyhow::Error>>();
 };
 
 #[cfg(test)]