move butler to another crate

butler/.gitignore

@@ -0,0 +1,3 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/

butler/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "butler"
+version = "0.0.0"
+description = ""
+authors = [""]
+license = ""
+repository = ""
+edition = "2021"
+rust-version = "1.57"
+
+[dependencies]
+git2 = { version = "0.17.2", features = ["vendored-openssl", "vendored-libgit2"] }
+dirs = "5.0.1"
+colored = "2.0.0"
+clap = { version = "4.0", features = ["derive"] }
+dialoguer = "0.10.4"
+anyhow = "1.0.71"
+git-butler-tauri = { path = "../src-tauri" }

butler/src/cli.rs

@@ -1,9 +1,6 @@
-mod app;
-mod commands;
-
 use std::process::ExitCode;
 
-use commands::RunCommand;
+use crate::commands::{self, RunCommand};
 
 use clap::{Parser, Subcommand};
 use colored::Colorize;

butler/src/commands/branches.rs

@@ -4,7 +4,7 @@ use colored::Colorize;
 
 use git_butler_tauri::virtual_branches;
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Branches {}

butler/src/commands/clear.rs

@@ -3,7 +3,7 @@ use clap::Args;
 
 use git_butler_tauri::{sessions, virtual_branches};
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Clear {}

butler/src/commands/commit.rs

@@ -5,7 +5,7 @@ use dialoguer::{console::Term, theme::ColorfulTheme, Input, Select};
 
 use git_butler_tauri::{reader, sessions, virtual_branches};
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Commit {}

butler/src/commands/flush.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Result};
 use clap::Args;
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Flush {}

butler/src/commands/info.rs

@@ -4,7 +4,7 @@ use colored::Colorize;
 
 use git_butler_tauri::{reader, sessions, virtual_branches};
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Info {}

butler/src/commands/mv.rs

@@ -4,7 +4,7 @@ use dialoguer::{console::Term, theme::ColorfulTheme, MultiSelect, Select};
 
 use git_butler_tauri::{reader, sessions, virtual_branches};
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Move {}

butler/src/commands/new.rs

@@ -4,7 +4,7 @@ use dialoguer::{theme::ColorfulTheme, Input};
 
 use git_butler_tauri::virtual_branches;
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct New {}

butler/src/commands/remotes.rs

@@ -3,7 +3,7 @@ use clap::Args;
 
 use git_butler_tauri::virtual_branches;
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Remotes {}

butler/src/commands/reset.rs

@@ -3,7 +3,7 @@ use clap::Args;
 
 use git_butler_tauri::{reader, sessions, virtual_branches};
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Reset {}

butler/src/commands/setup.rs

@@ -3,7 +3,7 @@ use clap::Args;
 use colored::Colorize;
 use dialoguer::{console::Term, theme::ColorfulTheme, Select};
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Setup {}

butler/src/commands/status.rs

@@ -4,7 +4,7 @@ use colored::Colorize;
 
 use git_butler_tauri::virtual_branches;
 
-use crate::cli::butler::app::App;
+use crate::app::App;
 
 #[derive(Debug, Args)]
 pub struct Status {}

butler/src/main.rs

@@ -2,8 +2,10 @@ use std::process::ExitCode;
 
 use clap::Parser;
 
+mod commands;
+mod app;
 mod cli;
 
 fn main() -> ExitCode {
-    cli::Butler::parse().run()
+    cli::Cli::parse().run()
 }

src-tauri/src/bin/cli/mod.rs

@@ -1,3 +0,0 @@
-mod butler;
-
-pub use butler::Cli as Butler;