better split between cli app and lib - 2nd step

sycured · Aug 11, 2023 · 6e4f957 · 6e4f957
1 parent fe18fa7
commit 6e4f957
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 139 deletions.
diff --git a/src/cli/group/cli_logic.rs b/src/cli/group/cli_logic.rs
@@ -8,7 +8,7 @@
 use clap::ArgMatches;
 use rayon::prelude::*;
 
-use jira_cli::{Global, library::group};
+use jira_cli::{group, Global};
 
 pub fn add_user(global: &Global, args: &ArgMatches) {
     let account_ids: Vec<&String> = args

diff --git a/src/cli/issue/cli_logic.rs b/src/cli/issue/cli_logic.rs
@@ -8,8 +8,7 @@
 use clap::ArgMatches;
 use rayon::prelude::*;
 
-use jira_cli::{Global, library::issue};
-
+use jira_cli::{issue, Global};
 
 pub fn add_label(global: &Global, args: &ArgMatches) {
     let issue_keys: Vec<&String> = args

diff --git a/src/cli/labels.rs b/src/cli/labels.rs
@@ -7,8 +7,9 @@
 
 use clap::{Arg, ArgMatches, Command};
 
+use jira_cli::labels::list;
+
 use crate::Global;
-use jira_cli::library::labels::list_labels;
 
 pub fn cli_commands() -> Command {
     Command::new("labels")
@@ -29,7 +30,7 @@ pub fn cli_commands() -> Command {
 }
 
 pub fn logic_commands(global: &Global, args: &ArgMatches) {
-    list_labels(
+    list(
         global.domain.as_str(),
         global.user.as_str(),
         global.token.as_str(),

diff --git a/src/cli.rs → src/cli/mod.rs b/src/cli.rs → src/cli/mod.rs
@@ -5,11 +5,6 @@
  * SPDX-License-Identifier: GPL-2.0-only
  */
 
-use clap::{
-    crate_authors, crate_description, crate_name, crate_version, value_parser, Arg, Command,
-};
-use clap_complete::Shell;
-
 pub mod check_version;
 pub mod group;
 pub mod issue;
@@ -18,6 +13,11 @@ pub mod license;
 pub mod project;
 pub mod user;
 
+use clap::{
+    crate_authors, crate_description, crate_name, crate_version, value_parser, Arg, Command,
+};
+use clap_complete::Shell;
+
 fn generate() -> Command {
     Command::new("generate")
         .about("Generate autocompletion script for your shell")

diff --git a/src/cli/project/cli_logic.rs b/src/cli/project/cli_logic.rs
@@ -8,7 +8,7 @@
 use clap::ArgMatches;
 use rayon::prelude::*;
 
-use jira_cli::{Global, library::project};
+use jira_cli::{project, Global};
 
 pub fn create(global: &Global, args: &ArgMatches) {
     project::create(
@@ -24,7 +24,7 @@ pub fn create(global: &Global, args: &ArgMatches) {
 }
 
 pub fn delete_project(global: &Global, args: &ArgMatches) {
-    project::delete_project(
+    project::delete(
         global,
         args.get_one::<String>("project_key").unwrap().as_str(),
     );

diff --git a/src/cli/user/cli_logic.rs b/src/cli/user/cli_logic.rs
@@ -6,7 +6,8 @@
  */
 
 use clap::ArgMatches;
-use jira_cli::{Global, library::user};
+
+use jira_cli::{user, Global};
 
 pub fn create(global: &Global, args: &ArgMatches) {
     user::create(

diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/library/group.rs b/src/library/group.rs
@@ -11,7 +11,9 @@ use comfy_table::{Cell, CellAlignment};
 use rayon::prelude::*;
 use serde_json::{json, Value};
 
-use crate::{confirm, create_and_print_table, delete_request, get_request, post_request, library::urls::URLS, Global};
+use crate::{
+    confirm, create_and_print_table, delete_request, get_request, post_request, urls::URLS, Global,
+};
 
 pub fn add_user(global: &Global, account_id: &str, group_id: &str) {
     let url: String = format!(
@@ -62,6 +64,7 @@ pub fn delete(global: &Global, group_id: &str) {
 }
 
 //noinspection DuplicatedCode
+#[allow(clippy::missing_panics_doc)]
 pub fn find(global: &Global, query: &str) {
     let url: String = format!(
         "https://{}{}/picker?query={query}",
@@ -95,6 +98,7 @@ pub fn find(global: &Global, query: &str) {
 }
 
 //noinspection DuplicatedCode
+#[allow(clippy::missing_panics_doc)]
 pub fn list_groups(global: &Global, start_at: &str, max_results: &str) {
     let url: String = format!(
         "https://{}{}/bulk?startAt={start_at}&maxResults={max_results}",
@@ -128,6 +132,7 @@ pub fn list_groups(global: &Global, start_at: &str, max_results: &str) {
 }
 
 //noinspection DuplicatedCode
+#[allow(clippy::missing_panics_doc)]
 pub fn list_users(
     global: &Global,
     group_id: &str,

diff --git a/src/library/issue.rs b/src/library/issue.rs
@@ -11,7 +11,10 @@ use comfy_table::{Cell, CellAlignment};
 use rayon::prelude::*;
 use serde_json::{json, Value};
 
-use crate::{create_and_print_table, delete_request, Global, get_request, post_request, put_request,library::urls::URLS};
+use crate::{
+    create_and_print_table, delete_request, get_request, post_request, put_request, urls::URLS,
+    Global,
+};
 
 pub fn add_label(global: &Global, issue_key: &str, label: &str) {
     let url: String = format!("https://{}{}/{issue_key}", global.domain, URLS["issue"]);
@@ -84,7 +87,7 @@ pub fn assign(global: &Global, issue_key: &str, account_id: &str, success_messag
     }
 }
 
-#[allow(clippy::too_many_arguments)]
+#[allow(clippy::missing_panics_doc)]
 pub fn create(
     global: &Global,
     reporter_account_id: &str,
@@ -125,6 +128,7 @@ pub fn create(
     }
 }
 
+#[allow(clippy::missing_panics_doc)]
 pub fn create_link_type(global: &Global, name: &str, inward: &str, outward: &str) {
     let url: String = format!("https://{}{}", global.domain, URLS["issue_link_types"]);
     let payload: Value = json!({
@@ -185,6 +189,7 @@ pub fn delete_link_type(global: &Global, link_type_id: &str) {
 }
 
 //noinspection DuplicatedCode
+#[allow(clippy::missing_panics_doc)]
 pub fn get_link_type(global: &Global, link_type_id: &str) {
     let url: String = format!(
         "https://{}{}/{link_type_id}",
@@ -222,6 +227,7 @@ pub fn get_link_type(global: &Global, link_type_id: &str) {
     }
 }
 
+#[allow(clippy::missing_panics_doc)]
 pub fn get_transitions(global: &Global, issue_key: &str) {
     let url: String = format!(
         "https://{}{}/{issue_key}/transitions",
@@ -260,6 +266,7 @@ pub fn get_transitions(global: &Global, issue_key: &str) {
 }
 
 //noinspection DuplicatedCode
+#[allow(clippy::missing_panics_doc)]
 pub fn list_link_types(global: &Global) {
     let url: String = format!("https://{}{}", global.domain, URLS["issue_link_types"]);
     match get_request(&url, global.user.as_str(), global.token.as_str()) {
@@ -296,6 +303,7 @@ pub fn list_link_types(global: &Global) {
     }
 }
 
+#[allow(clippy::missing_panics_doc)]
 pub fn list_priorities(global: &Global) {
     let url: String = format!("https://{}{}", global.domain, URLS["priority"]);
     match get_request(&url, global.user.as_str(), global.token.as_str()) {
@@ -312,6 +320,7 @@ pub fn list_priorities(global: &Global) {
     }
 }
 
+#[allow(clippy::missing_panics_doc)]
 pub fn list_types(global: &Global, project_key: &str) {
     let url: String = format!(
         "https://{}{}/createmeta?projectKeys={project_key}",
@@ -336,6 +345,7 @@ pub fn list_types(global: &Global, project_key: &str) {
 }
 
 //noinspection DuplicatedCode
+#[allow(clippy::missing_panics_doc)]
 pub fn list_votes(global: &Global, issue_key: &str) {
     let url: String = format!(
         "https://{}{}/{issue_key}/votes",
@@ -435,6 +445,7 @@ pub fn remove_vote(global: &Global, issue_key: &str) {
     }
 }
 
+#[allow(clippy::missing_panics_doc)]
 pub fn show_fixversions(global: &Global, issue_key: &str) {
     let url: String = format!("https://{}{}/{issue_key}", global.domain, URLS["issue"]);
     match get_request(&url, global.user.as_str(), global.token.as_str()) {

diff --git a/src/library/labels.rs b/src/library/labels.rs
@@ -6,11 +6,14 @@
  */
 
 use std::process::exit;
+
 use rayon::prelude::*;
 use serde_json::Value;
-use crate::{get_request, library::urls::URLS};
 
-pub fn list_labels(domain: &str, user: &str, token: &str, start_at: &str, max_results: &str) {
+use crate::{get_request, urls::URLS};
+
+#[allow(clippy::missing_panics_doc)]
+pub fn list(domain: &str, user: &str, token: &str, start_at: &str, max_results: &str) {
     let url: String = format!(
         "https://{}{}?startAt={}&maxResults={}",
         domain, URLS["label"], start_at, max_results

diff --git a/src/library/mod.rs b/src/library/mod.rs
@@ -5,6 +5,8 @@
  * SPDX-License-Identifier: GPL-2.0-only
  */
 
+#![forbid(unsafe_code)]
+
 pub mod group;
 pub mod issue;
 pub mod labels;