chore(release): preparing for release v1.5.0 (#223)

Author: cristianoliveira

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "funzzy"
-version = "1.4.1"
+version = "1.5.0"
 authors = ["Cristian Oliveira <me@cristianoliveira.com>"]
 description = "Yet another fancy watcher inspired by entr."
 license = "MIT"

Cargo.toml

@@ -1,6 +1,8 @@
 .PHONY: help
 help: ## Lists the available commands. Add a comment with '##' to describe a command.
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST)\
+		| sort\
+		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: tests
 tests: ## Execute all the tests
@@ -37,6 +39,10 @@ ci-run-on-push: ## Run checks from .github/workflows/on-push.yml
 		| yq '.jobs | .[] | .steps | .[] | .run | select(. != null)' \
 		| xargs -I {} bash -c {}
 
+.PHONY: fmt
+fmt: ## Format the code (with cargo fmt) and add the changes to the git stage
+	@cargo fmt
+
 .PHONY: lint
 lint:
 	@cargo fmt -- --check
@@ -79,17 +85,17 @@ nix-build: ## Build the nix derivation with the nightly toolchain
 	@nix build .# --verbose -L
 
 .PHONY: nix-bump-default
-nix-bump-default: ##  Bump the version in nix default package and generate a new revision
+nix-bump-default: ## Bump the version in nix default package and generate a new revision
 	@echo "Bumping the version in nix default"
 	scripts/bump-nix-default
 
 .PHONY: nix-bump-nightly
-nix-bump-nightly: ##  Bump the version in nix nightly package and generate a new revision
+nix-bump-nightly: ## Bump the version in nix nightly package and generate a new revision
 	@echo "Bumping the version in nix packages"
 	scripts/bump-nix-nightly
 
 .PHONY: nix-bump-local
-nix-bump-local: ##  Bump the version in nix local package and generate a new revision
+nix-bump-local: ## Bump the version in nix local package and generate a new revision
 	@echo "Bumping the version in nix packages"
 	scripts/bump-nix-local
 

Makefile

@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage {
   pname = "funzzy";
-  version = "019ffb3";
+  version = "c9a662e";
 
   ## build with local source
   src = ../.;
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
 #   allowBuiltinFetchGit = true;
 # };
 
-  cargoHash = "sha256-+ECisCHz7N/HNS8xawZs7uD9hTDrzMtFZVACFI+iSN8=";
+  cargoHash = "sha256-R32136FXsqTRHKoaxHe7X7UWvMnlG6Z79TcOZpFVyNU=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

nix/package-local.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "funzzy";
-  version = "master";
+  version = "5cc03fc";
 
   src = fetchFromGitHub {
     owner = "cristianoliveira";
     repo = "funzzy";
     rev = "${version}";
-    hash = "sha256-BNYlXWyyhSBH5Q0zgmo8G6Wk9LbXdvI1KGYpAP3Oz3o=";
+    hash = "sha256-SuHdKvxhV4Dt+rsyNBCPqMnLfs8wl6pJc8uWXv5b1es=";
   };
 
-  cargoHash = "sha256-Uo8YB5ZvtcRJmZFotAI1IIt49yC5gDa8w3XA0ALIdFs=";
+  cargoHash = "sha256-qmw62ir/+3o8czTw0Oc9KOTmRSO6WBKJ9MlT7Fnb/pM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

nix/package-nightly.nix

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="master"
+VERSION="$(git rev-parse --short origin/master)"
 NIX_FILE="nix/package-nightly.nix"
 
 echo "Bumping version to $VERSION"
@@ -26,3 +26,6 @@ echo "Building nix derivation"
 nix build .#nightly
 
 rm -f build.log
+
+git add "$NIX_FILE"
+git commit -m "chore(nix): bump nightly to origin/master ($VERSION)"

scripts/bump-nix-nightly

@@ -16,6 +16,8 @@ pkgs.mkShell {
 
     yq-go # jq for yaml
 
+    fzf # Used in scripts
+
     # For development install latest version of funzzy
     # copkgs.funzzyNightly
 
@@ -28,6 +30,9 @@ pkgs.mkShell {
   ];
 
   shellHook = ''
+    echo "$@"
+
     cargo update
+    cargo build
   '';
 }

shell.nix

@@ -10,7 +10,8 @@ const BINARY_NAME: &str = "funzzy";
 fn it_fails_when_no_stdin_is_given() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin(BINARY_NAME)?;
 
-    cmd.arg("echo 'foo'")
+    cmd.env("FUNZZY_COLORED", "false")
+        .arg("echo 'foo'")
         .write_stdin("")
         .assert()
         .failure()
@@ -36,7 +37,8 @@ fn it_validates_when_given_list_of_paths_is_invalid() -> Result<(), Box<dyn std:
         .stdout(Stdio::piped())
         .output()?;
 
-    cmd.arg("echo 'foo'")
+    cmd.env("FUNZZY_COLORED", "false")
+        .arg("echo 'foo'")
         .write_stdin(lsla.stdout)
         .assert()
         .failure()

tests/read_stdin_error.rs

@@ -17,6 +17,7 @@ fn it_fails_when_folder_is_read_only() -> Result<(), Box<dyn std::error::Error>>
     change_dir_if_needed();
 
     let mut cmd = Command::cargo_bin(BINARY_NAME)?;
+    cmd.env("FUNZZY_COLORED", "false");
     cmd.assert().failure().stdout(
         vec![
             "Error: Failed to read default config file",
@@ -36,6 +37,7 @@ fn it_fails_using_an_config_with_missing_properties() -> Result<(), Box<dyn std:
     change_dir_if_needed();
 
     let mut cmd = Command::cargo_bin(BINARY_NAME)?;
+    cmd.env("FUNZZY_COLORED", "false");
     cmd.arg("--config")
         .arg("./missing-required-property.yml")
         .assert()
@@ -62,6 +64,7 @@ fn it_fails_using_an_config_with_non_list() -> Result<(), Box<dyn std::error::Er
     change_dir_if_needed();
 
     let mut cmd = Command::cargo_bin(BINARY_NAME)?;
+    cmd.env("FUNZZY_COLORED", "false");
     cmd.arg("--config")
         .arg("./non-list.yaml")
         .assert()