chore: Update to clap v3

CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.5] - unreleased
+## [1.0.5] - 2022-01-02
+
+### Changed
+
+- Update to stable clap v3.0.
 
 ### Fix
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pueue"
 description = "A cli tool for managing long running shell commands."
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Arne Beer <contact@arne.beer>"]
 homepage = "https://github.com/nukesor/pueue"
 repository = "https://github.com/nukesor/pueue"
@@ -12,7 +12,7 @@ readme = "README.md"
 edition = "2018"
 
 [badges]
-maintenance = { status = "actively-developed" }
+maintenance = { status="actively-developed" }
 
 [[bin]]
 name = "pueue"
@@ -35,31 +35,37 @@ pueue-lib = "0.18.0"
 #pueue-lib = { path = "../../libraries/pueue-lib" }
 
 anyhow = "1"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version="0.4", features=["serde"] }
 chrono-english = "0.1"
 shell-escape = "0.1"
 tempfile = "3"
 
 crossbeam-channel = "0.5"
-tokio = { version = "1", features = ["rt-multi-thread", "time", "macros", "io-std", "io-util"] }
+tokio = { version="1", features=["rt-multi-thread", "time", "macros", "io-std", "io-util"] }
 snap = "1"
 serde = "1"
 serde_json = "1"
 serde_derive = "1"
 
 log = "0.4"
-simplelog = { version = "0.10", default-features = false }
-clap = "=3.0.0-beta.4"
-clap_generate = "3.0.0-beta.4"
+simplelog = { version="0.10", default-features=false }
+clap = { version="3", features=["derive", "cargo"] }
+clap_complete = "3"
 crossterm = "0.20"
-comfy-table= "4"
+comfy-table = "4"
 
 handlebars = "4"
-ctrlc = { version = "3", features = ["termination"] }
+ctrlc = { version="3", features=["termination"] }
 
 # Windows
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["tlhelp32", "handleapi", "processthreadsapi", "minwindef", "impl-default"] }
+winapi = { version="0.3", features=[
+  "tlhelp32",
+  "handleapi",
+  "processthreadsapi",
+  "minwindef",
+  "impl-default",
+] }
 
 # Unix
 [target.'cfg(not(windows))'.dependencies]
@@ -68,7 +74,7 @@ whoami = "1"
 
 # Linux / Freebsd
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
-procfs = { version = "0.9", default-features = false }
+procfs = { version="0.9", default-features=false }
 
 [build-dependencies]
 version_check = "0.9"

client/cli.rs

@@ -3,11 +3,11 @@ use std::path::PathBuf;
 use chrono::prelude::*;
 use chrono::Duration;
 use chrono_english::*;
-use clap::{ArgEnum, Clap};
+use clap::{ArgEnum, Parser};
 
 use pueue_lib::network::message::Signal;
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 pub enum SubCommand {
     /// Enqueue a task for execution.
     Add {
@@ -235,7 +235,7 @@ pub enum SubCommand {
         /// Send a UNIX signal instead of simply killing the process.
         /// DISCLAIMER: This bypasses Pueue's process handling logic!
         ///     You might enter weird invalid states, use at your own descretion.
-        #[clap(short, long, case_insensitive(true))]
+        #[clap(short, long, ignore_case(true))]
         signal: Option<Signal>,
     },
 
@@ -390,7 +390,7 @@ pub enum SubCommand {
     },
 }
 
-#[derive(Clap, Debug, PartialEq, ArgEnum)]
+#[derive(Parser, ArgEnum, Debug, Clone, PartialEq)]
 pub enum Shell {
     Bash,
     Elvish,
@@ -399,7 +399,7 @@ pub enum Shell {
     Zsh,
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 #[clap(
     name = "Pueue client",
     about = "Interact with the Pueue daemon",

client/main.rs

@@ -1,7 +1,6 @@
 use anyhow::{Context, Result};
-use clap::{Clap, IntoApp};
-use clap_generate::generate_to;
-use clap_generate::generators::*;
+use clap::{IntoApp, Parser};
+use clap_complete::{generate_to, shells};
 use simplelog::{Config, LevelFilter, SimpleLogger};
 
 use pueue_lib::settings::Settings;
@@ -27,13 +26,13 @@ async fn main() -> Result<()> {
         let mut app = CliArguments::into_app();
         app.set_bin_name("pueue");
         let completion_result = match shell {
-            Shell::Bash => generate_to::<Bash, _, _>(&mut app, "pueue", output_directory),
-            Shell::Elvish => generate_to::<Elvish, _, _>(&mut app, "pueue", output_directory),
-            Shell::Fish => generate_to::<Fish, _, _>(&mut app, "pueue", output_directory),
+            Shell::Bash => generate_to(shells::Bash, &mut app, "pueue", output_directory),
+            Shell::Elvish => generate_to(shells::Elvish, &mut app, "pueue", output_directory),
+            Shell::Fish => generate_to(shells::Fish, &mut app, "pueue", output_directory),
             Shell::PowerShell => {
-                generate_to::<PowerShell, _, _>(&mut app, "pueue", output_directory)
+                generate_to(shells::PowerShell, &mut app, "pueue", output_directory)
             }
-            Shell::Zsh => generate_to::<Zsh, _, _>(&mut app, "pueue", output_directory),
+            Shell::Zsh => generate_to(shells::Zsh, &mut app, "pueue", output_directory),
         };
         completion_result.context(format!("Failed to generate completions for {:?}", shell))?;
         return Ok(());

daemon/cli.rs

@@ -1,14 +1,9 @@
 use std::path::PathBuf;
 
-use clap::Clap;
+use clap::Parser;
 
-#[derive(Clap, Debug)]
-#[clap(
-    name = "Pueue daemon",
-    about = "Start the daemon for pueue",
-    author = env!("CARGO_PKG_AUTHORS"),
-    version = env!("CARGO_PKG_VERSION")
-)]
+#[derive(Parser, Debug)]
+#[clap(name = "Pueue daemon", about, author, version)]
 pub struct CliArguments {
     /// Verbose mode (-v, -vv, -vvv)
     #[clap(short, long, parse(from_occurrences))]

daemon/main.rs

@@ -1,7 +1,7 @@
 use std::process::Command;
 
 use anyhow::Result;
-use clap::Clap;
+use clap::Parser;
 use simplelog::{Config, LevelFilter, SimpleLogger};
 
 use pueue_daemon_lib::cli::CliArguments;