chore(release): 0.2.1

CHANGELOG.md

@@ -6,28 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.2.3] - 2024-09-26
-
-### Added
-- add update command
-- only do clone if not exists
-
-### Fixed
-- *(deps)* update rust crate async-trait to v0.1.83
-- *(deps)* update rust crate octocrab to 0.40.0
-
-## [0.2.2] - 2024-09-23
-
-### Other
-- add docs
-
-main@origin
-
-- add license
-- update to gitea-client
-- add publish
-- *(release)* 0.2.1
-
 ## [0.2.1] - 2024-09-23
 
 ### Added

Cargo.lock

@@ -122,9 +122,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -719,10 +719,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
 
 [[package]]
-name = "gitea-client"
+name = "gitea-rs"
 version = "1.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://git.front.kjuulh.io/kjuulh/gitea-rs#6eb4cea5c16d85d32555cea10dc55c045231ca10"
-checksum = "b2c0b6c1b9c7d3b54eff20e6741c82c88f5b25b6469807a306f2e0756e17b2e4"
 dependencies = [
  "reqwest",
  "serde",
@@ -734,7 +733,7 @@ dependencies = [
 
 [[package]]
 name = "gitnow"
-version = "0.2.2"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -744,7 +743,7 @@ dependencies = [
  "dirs 5.0.1",
  "dotenv",
  "futures",
- "gitea-client",
+ "gitea-rs",
  "nucleo-matcher",
  "octocrab",
  "pretty_assertions",
@@ -1348,9 +1347,9 @@ dependencies = [
 
 [[package]]
 name = "octocrab"
-version = "0.40.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09386c28b984097d7a56ec23907bb76751ae6720ebdc4484fe2a705c95d5b77d"
+checksum = "9305e4c99543ecd0f42bd659c9e9d6ca7115fe5e37d5c85a7277b1db0d4c4101"
 dependencies = [
  "arc-swap",
  "async-trait",

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.2.3"
+version = "0.2.1"
 
 [workspace.dependencies]
 

README.md

@@ -4,22 +4,6 @@ Git Now is a utility for easily navigating git projects from common upstream pro
 
 ![example gif](./assets/gifs/example.gif)
 
-## Installation
-
-```bash
-cargo (b)install gitnow
-
-# You can either use gitnow directly (and use spawned shell sessions)
-gitnow
-
-# Or install gitnow scripts (in your .bashrc, .zshrc) this will use native shell commands to move you around
-eval $(gitnow init zsh)
-git-now # Long 
-gn # Short alias
-```
-
-## Reasoning
-
 How many steps do you normally do to download a project?
 
 1. Navigate to github.com

crates/gitnow/Cargo.toml

@@ -1,15 +1,8 @@
 [package]
 name = "gitnow"
-description = "Git Now is a utility for easily navigating git projects from common upstream providers. Search, Download, and Enter projects as quickly as you can type."
 edition = "2021"
-readme = "../../README.md"
-repository = "https://github.com/kjuulh/gitnow"
-homepage = "https://gitnow-client.prod.kjuulh.app"
-license = "MIT"
 
 version.workspace = true
-publish = true
-
 
 [dependencies]
 anyhow.workspace = true
@@ -24,9 +17,9 @@ uuid = { version = "1.7.0", features = ["v4"] }
 async-trait = "0.1.82"
 toml = "0.8.19"
 
-gitea-client = { version = "1.22.1" }
+gitea-rs = { git = "https://git.front.kjuulh.io/kjuulh/gitea-rs", version = "1.22.1" }
 url = "2.5.2"
-octocrab = "0.40.0"
+octocrab = "0.39.0"
 dirs = "5.0.1"
 prost = "0.13.2"
 prost-types = "0.13.2"

crates/gitnow/include/shell/zsh.sh

@@ -1,16 +1,9 @@
 function git-now {
-  # Run an update in the background
-  (
-    nohup gitnow update > /dev/null 2>&1 &
-  )
-
-  # Find the repository of choice
   choice=$(gitnow  "$@" --no-shell)
     if [[ $? -ne 0 ]]; then
     return $?
   fi
-
+  
-  # Enter local repository path
   cd "$(echo "$choice" | tail --lines 1)"
 }
 

crates/gitnow/src/commands.rs

@@ -1,3 +1,2 @@
 pub mod root;
 pub mod shell;
-pub mod update;

crates/gitnow/src/commands/root.rs

@@ -85,37 +85,26 @@ impl RootCommand {
             }
         };
 
-        let project_path = self
+        if clone {
-            .app
+            let git_clone = self.app.git_clone();
-            .config
-            .settings
-            .projects
-            .directory
-            .join(repo.to_rel_path());
-        if !project_path.exists() {
-            if clone {
-                let git_clone = self.app.git_clone();
 
-                if std::io::stdout().is_terminal() && shell {
+            if std::io::stdout().is_terminal() && shell {
-                    let mut wrap_cmd =
+                let mut wrap_cmd =
-                        InlineCommand::new(format!("cloning: {}", repo.to_rel_path().display()));
+                    InlineCommand::new(format!("cloning: {}", repo.to_rel_path().display()));
-                    let repo = repo.clone();
+                let repo = repo.clone();
-                    wrap_cmd
+                wrap_cmd
-                        .execute(move || async move {
+                    .execute(move || async move {
-                            git_clone.clone_repo(&repo, force_refresh).await?;
+                        git_clone.clone_repo(&repo, force_refresh).await?;
 
-                            Ok(())
+                        Ok(())
-                        })
+                    })
-                        .await?;
+                    .await?;
-                } else {
-                    eprintln!("cloning repository...");
-                    git_clone.clone_repo(&repo, force_refresh).await?;
-                }
             } else {
-                tracing::info!("skipping clone for repo: {}", &repo.to_rel_path().display());
+                eprintln!("cloning repository...");
+                git_clone.clone_repo(&repo, force_refresh).await?;
             }
         } else {
-            tracing::info!("repository already exists");
+            tracing::info!("skipping clone for repo: {}", &repo.to_rel_path().display());
         }
 
         if shell {

crates/gitnow/src/commands/update.rs

@@ -1,14 +0,0 @@
-use crate::{app::App, cache::CacheApp, projects_list::ProjectsListApp};
-
-#[derive(clap::Parser)]
-pub struct Update {}
-
-impl Update {
-    pub async fn execute(&mut self, app: &'static App) -> anyhow::Result<()> {
-        let repositories = app.projects_list().get_projects().await?;
-
-        app.cache().update(&repositories).await?;
-
-        Ok(())
-    }
-}

crates/gitnow/src/git_provider/gitea.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use gitea_client::apis::configuration::Configuration;
+use gitea_rs::apis::configuration::Configuration;
 use url::Url;
 
 use crate::{app::App, config::GiteaAccessToken};
@@ -68,9 +68,9 @@ impl GiteaProvider {
         &self,
         config: &Configuration,
         page: usize,
-    ) -> anyhow::Result<Vec<gitea_client::models::Repository>> {
+    ) -> anyhow::Result<Vec<gitea_rs::models::Repository>> {
         let repos =
-            gitea_client::apis::user_api::user_current_list_repos(config, Some(page as i32), None)
+            gitea_rs::apis::user_api::user_current_list_repos(config, Some(page as i32), None)
                 .await
                 .context("failed to fetch repos for users")?;
 
@@ -125,9 +125,9 @@ impl GiteaProvider {
         user: &str,
         config: &Configuration,
         page: usize,
-    ) -> anyhow::Result<Vec<gitea_client::models::Repository>> {
+    ) -> anyhow::Result<Vec<gitea_rs::models::Repository>> {
         let repos =
-            gitea_client::apis::user_api::user_list_repos(config, user, Some(page as i32), None)
+            gitea_rs::apis::user_api::user_list_repos(config, user, Some(page as i32), None)
                 .await
                 .context("failed to fetch repos for users")?;
 
@@ -184,8 +184,8 @@ impl GiteaProvider {
         organisation: &str,
         config: &Configuration,
         page: usize,
-    ) -> anyhow::Result<Vec<gitea_client::models::Repository>> {
+    ) -> anyhow::Result<Vec<gitea_rs::models::Repository>> {
-        let repos = gitea_client::apis::organization_api::org_list_repos(
+        let repos = gitea_rs::apis::organization_api::org_list_repos(
             config,
             organisation,
             Some(page as i32),
@@ -202,7 +202,7 @@ impl GiteaProvider {
         api: &str,
         access_token: Option<&GiteaAccessToken>,
     ) -> anyhow::Result<Configuration> {
-        let mut config = gitea_client::apis::configuration::Configuration::new();
+        let mut config = gitea_rs::apis::configuration::Configuration::new();
         config.base_path = api.into();
         match access_token {
             Some(GiteaAccessToken::Env { env }) => {

crates/gitnow/src/main.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use anyhow::Context;
 use clap::{Parser, Subcommand};
-use commands::{root::RootCommand, shell::Shell, update::Update};
+use commands::{root::RootCommand, shell::Shell};
 use config::Config;
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::EnvFilter;
@@ -50,7 +50,6 @@ struct Command {
 #[derive(Subcommand)]
 enum Commands {
     Init(Shell),
-    Update(Update),
 }
 
 const DEFAULT_CONFIG_PATH: &str = ".config/gitnow/gitnow.toml";
@@ -81,14 +80,7 @@ async fn main() -> anyhow::Result<()> {
     tracing::debug!("Starting cli");
 
     match cli.command {
-        Some(cmd) => match cmd {
+        Some(Commands::Init(mut shell)) => shell.execute().await?,
-            Commands::Init(mut shell) => {
-                shell.execute().await?;
-            }
-            Commands::Update(mut update) => {
-                update.execute(app).await?;
-            }
-        },
         None => {
             RootCommand::new(app)
                 .execute(