Make features easier to use

Author: Byron

Diff for: Cargo.toml

@@ -22,7 +22,11 @@ test = false
 doctest = false
 
 [features]
-default = ["fast", "pretty-cli"]
+default = ["pretty"]
+pretty = ["fast", "pretty-cli"]
+lean = ["fast", "lean-cli"]
+small = ["lean-cli"]
+
 fast = ["git-features/parallel", "git-features/fast-sha1"]
 pretty-cli = ["structopt",
               "git-features/progress-prodash",

Diff for: Makefile

@@ -17,15 +17,15 @@ release-default: always ## the default build, big bug pretty (builds in ~2min 35
 	cargo build --release
 
 release-lean: always ## lean and fast (builds in ~1min 10s)
-	cargo build --release --no-default-features --features lean-cli,fast
+	cargo build --release --no-default-features --features lean
 
 release-small: always ## minimal dependencies, at cost of performance (builds in ~46s)
-	cargo build --release --no-default-features --features lean-cli
+	cargo build --release --no-default-features --features small
 
 ##@ Development
 
 target/release/gio: always
-	cargo build --release --no-default-features --features lean-cli
+	cargo build --release --no-default-features --features small
 
 lint: ## Run lints with clippy
 	cargo clippy
@@ -39,14 +39,14 @@ benchmark: target/release/gio ## see how fast things are, powered by hyperfine
 
 ##@ Testing
 
-tests: check unit-tests journey-tests journey-tests-lean-cli ## run all tests, including journey tests
+tests: check unit-tests journey-tests journey-tests-small ## run all tests, including journey tests
 
 check: ## Build all code in suitable configurations
 	cargo check --all
 	cargo check --all --all-features
-	cargo check --no-default-features --features lean-cli
-	cargo check --no-default-features --features pretty-cli
-	cargo check --no-default-features --features lean-cli,fast
+	cargo check --no-default-features --features small
+	cargo check --no-default-features --features pretty
+	cargo check --no-default-features --features lean
 	cd gitoxide-core && cargo check --all-features
 	cd git-object && cargo check --all-features
 	cd git-odb && cargo check --all-features
@@ -62,11 +62,11 @@ continuous-unit-tests: ## run all unit tests whenever something changes
 
 journey-tests: always  ## run stateless journey tests (pretty-cli)
 	cargo build
-	./tests/stateless-journey.sh target/debug/gio target/debug/giop pretty_and_fast
+	./tests/stateless-journey.sh target/debug/gio target/debug/giop pretty
 
-journey-tests-lean-cli: always ## run stateless journey tests (lean-cli)
-	cargo build --no-default-features --features lean-cli
-	./tests/stateless-journey.sh target/debug/gio target/debug/giop lean_and_small
+journey-tests-small: always ## run stateless journey tests (lean-cli)
+	cargo build --no-default-features --features small
+	./tests/stateless-journey.sh target/debug/gio target/debug/giop small
 
 continuous-journey-tests: ## run stateless journey tests whenever something changes
 	watchexec $(MAKE) journey-tests

Diff for: README.md

@@ -172,6 +172,12 @@ The top-level command-line interface.
 * **lean-cli** _(mutually exclusive to pretty-cli)_
   * Use `argh` to produce a usable binary with decent documentation that is smallest in size, usually 300kb less than `pretty-cli`.
   * If `pretty-cli` is enabled as well, `small-cli` will take precedence, and you pay for building unnecessary dependencies.
+  
+There are convenience features, which combine common choices of the above into one name
+
+* **lean** = *lean-cli* + *fast*
+* **pretty** = *pretty-cli* + *fast*
+* **small** = *lean-cli*
 
 ### git-features
 

Diff for: tests/stateless-journey.sh

@@ -69,7 +69,7 @@ title "CLI ${kind}"
           expect_run $SUCCESSFULLY "$exe_plumbing" verify-pack --statistics "$PACK_INDEX_FILE"
         }
       )
-      if test "$kind" = pretty_and_fast; then
+      if test "$kind" = pretty; then
       (with "statistics (JSON)"
         it "verifies the pack index successfully and with desired output" && {
           WITH_SNAPSHOT="$snapshot/plumbing-verify-pack-index-with-statistics-json-success" \