chore(release): 0.4.0

2024-12-22 12:34:17 +00:00
7 changed files with 150 additions and 140 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - make init zsh

-### Other
- make variant for the other shell commands
-
 ## [0.3.0] - 2024-12-22

 ### Added
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,7 +47,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
 "anstyle",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -74,18 +74,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
 "clap_builder",
 ]

 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
 "anstream",
 "anstyle",
@@ -109,15 +109,15 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"

 [[package]]
 name = "console"
-version = "0.15.11"
+version = "0.15.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
 dependencies = [
 "encode_unicode",
 "libc",
 "once_cell",
 "unicode-width",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -131,23 +131,23 @@ dependencies = [

 [[package]]
 name = "dirs"
-version = "6.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
 "dirs-sys",
 ]

 [[package]]
 name = "dirs-sys"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -197,7 +197,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"

 [[package]]
 name = "kignore"
-version = "0.4.0"
+version = "0.2.4"
 dependencies = [
 "clap",
 "console",
@@ -325,9 +325,9 @@ dependencies = [

 [[package]]
 name = "redox_users"
-version = "0.5.0"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
 "getrandom",
 "libredox",
@@ -432,18 +432,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -614,13 +614,37 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]

 [[package]]
@@ -629,28 +653,46 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
 "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -663,24 +705,48 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,12 +4,3 @@ resolver = "2"

 [workspace.package]
 version = "0.4.0"
-
-[profile.release]
-opt-level = "z"
-lto = true
-codegen-units = 1
-debug = false
-panic = "abort"
-overflow-checks = false
-strip = true
--- a/README.md
+++ b/README.md
@@ -27,22 +27,24 @@ Cargo will only pull the `kignore` command and won't add a subcommand to `git.

 ```bash
 $ cargo install kignore
-$ cargo binstall kignore # binstall will warn that git.front.kjuulh.io isn't a valid repo, it is still installable though
-
 ```

 #### Post install

 To get the `git ignore` subcommand working you will need to have the file
-git-ignore available on your path
+git-ignore available on your path, either add it yourself using
+`git-alias/git-ignore` as a template or:

 ```
-# zsh
-eval "kignore init zsh"
-
-# shell
-eval "kignore init sh"
-
-# bash
-eval "kignore init bash"
+git clone https://github.com/kjuulh/gitignore
+./scripts/install-git-alias.sh # only tested on mac and linux
+```
+
+### Homebrew
+
+Added in HomebrewFormula
+
+```bash
+$ brew tap kjuulh/gitignore  https://github.com/kjuulh/gitignore
+$ brew install kjuulh/gitignore/kignore-bin
 ```
--- a/crates/kignore/Cargo.toml
+++ b/crates/kignore/Cargo.toml
@@ -15,11 +15,10 @@ edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

-
 [dependencies]
 clap = { version = "4.5.4", features = ["env", "unicode", "string"] }
 console = "0.15.8"
-dirs = "6.0.0"
+dirs = "5.0.1"
 eyre = "0.6.12"
 tracing = { version = "0.1.40", features = ["log"] }
 tracing-subscriber = { version = "0.3.18", features = [
--- a/crates/kignore/src/main.rs
+++ b/crates/kignore/src/main.rs
@@ -7,55 +7,29 @@ use std::{env::current_dir, io::Read, path::PathBuf};
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;

-const ZSH_FILE_CONTENTS: &[u8] = b"#!/usr/bin/env zsh
-set -e
-
-kignore $@
-";
-
 const SH_FILE_CONTENTS: &[u8] = b"#!/usr/bin/env sh
 set -e

 kignore $@
 ";

-const BASH_FILE_CONTENTS: &[u8] = b"#!/usr/bin/env bash
-set -e
-
-kignore $@
-";
-
 pub fn main() -> eyre::Result<()> {
    let matches = Command::new("gitignore")
        .version("0.1")
        .author("Kasper J. Hermansen <contact@kjuulh.io>")
        .about("Easily ignore items and remove from git state")
-        .long_about(
-            "git ignore is a utility tool for easily adding patterns to your .gitignore file.
-Easily add patterns using `git ignore <pattern>` this will by default
-also help you remove committed code violating these patterns
-                    ",
-        )
+        .long_about("git ignore is a utility tool for easily adding patterns to your .gitignore file.
+Easily add patterns using `git ignore <pattern>` this will by default also help you remove committed code violating these patterns
+                    ")
        .propagate_version(true)
        .arg(
            Arg::new("pattern")
                .help("the pattern you want to ignore")
-                .long_help("the pattern you want to ignore in the nearest .gitignore file"),
-        )
-        .arg(
-            Arg::new("log-level")
-                .long("log-level")
-                .default_value("warn")
-                .help("choose a log level and get more messages")
-                .long_help("Choose a log level and get more message, defaults to [warn]"),
-        )
-        .subcommand(
-            clap::Command::new("init")
-                .subcommand_required(true)
-                .subcommand(Command::new("zsh"))
-                .subcommand(Command::new("sh"))
-                .subcommand(Command::new("bash")),
+                .long_help("the pattern you want to ignore in the nearest .gitignore file")
+        ).arg(
+            Arg::new("log-level").long("log-level").default_value("warn").help("choose a log level and get more messages").long_help("Choose a log level and get more message, defaults to [warn]")
        )
+        .subcommand(clap::Command::new("init").subcommand_required(true).subcommand(Command::new("zsh")))
        .get_matches();

    match matches.subcommand() {
@@ -63,9 +37,40 @@ also help you remove committed code violating these patterns
            .subcommand()
            .expect("should never be able to call on init")
        {
-            ("zsh", _) => init_script(ShellType::Zsh),
-            ("bash", _) => init_script(ShellType::Bash),
-            ("sh", _) => init_script(ShellType::Shell),
+            ("zsh", _) => {
+                let bin_dir = dirs::executable_dir().ok_or_eyre("failed to find executable dir")?;
+
+                let alias_script = bin_dir.join("git-ignore");
+                if let Ok(existing_file) = std::fs::read(&alias_script) {
+                    if existing_file == SH_FILE_CONTENTS {
+                        return Ok(());
+                    }
+                } else {
+                    std::fs::create_dir_all(&bin_dir).context("failed to create bin dir")?;
+                }
+
+                let mut file = std::fs::OpenOptions::new()
+                    .write(true)
+                    .create(true)
+                    .truncate(true)
+                    .open(&alias_script)?;
+
+                file.write_all(SH_FILE_CONTENTS)?;
+                file.flush()?;
+
+                // Set the file to be executable
+                let metadata = file.metadata()?;
+                let mut permissions = metadata.permissions();
+                permissions.set_mode(0o755); // rwxr-xr-x
+                file.set_permissions(permissions)?;
+
+                println!(
+                    "successfully wrote alias to {}",
+                    style(alias_script.display()).green()
+                );
+
+                Ok(())
+            }
            (subcommand, _) => {
                panic!("cannot call on subcommand: {}", subcommand);
            }
@@ -300,50 +305,3 @@ fn search_for_dotgitignore(path: &PathBuf) -> eyre::Result<GitSearchResult> {

    search_for_dotgitignore(&upwards_par)
 }
-
-enum ShellType {
-    Bash,
-    Shell,
-    Zsh,
-}
-
-fn init_script(shell: ShellType) -> eyre::Result<()> {
-    let bin_dir = dirs::executable_dir().ok_or_eyre("failed to find executable dir")?;
-
-    let script = match shell {
-        ShellType::Bash => BASH_FILE_CONTENTS,
-        ShellType::Shell => SH_FILE_CONTENTS,
-        ShellType::Zsh => ZSH_FILE_CONTENTS,
-    };
-
-    let alias_script = bin_dir.join("git-ignore");
-    if let Ok(existing_file) = std::fs::read(&alias_script) {
-        if existing_file == script {
-            return Ok(());
-        }
-    } else {
-        std::fs::create_dir_all(&bin_dir).context("failed to create bin dir")?;
-    }
-
-    let mut file = std::fs::OpenOptions::new()
-        .write(true)
-        .create(true)
-        .truncate(true)
-        .open(&alias_script)?;
-
-    file.write_all(script)?;
-    file.flush()?;
-
-    // Set the file to be executable
-    let metadata = file.metadata()?;
-    let mut permissions = metadata.permissions();
-    permissions.set_mode(0o755); // rwxr-xr-x
-    file.set_permissions(permissions)?;
-
-    println!(
-        "successfully wrote alias to {}",
-        style(alias_script.display()).green()
-    );
-
-    Ok(())
-}
--- a/cuddle.yaml
+++ b/cuddle.yaml
@@ -6,9 +6,6 @@ vars:
  service: "kignore"
  registry: kasperhermansen

-  rust:
-    publish: {}
-
 please:
  project:
    owner: kjuulh