Add feature flags allowing selection of which commands to build and i…

…nstall. With this we no longer need to provide individual crates for each of the commands, and so we stop doing that.
ctsrc · Nov 17, 2019 · e412753 · e412753
1 parent e95b4e4
commit e412753
Show file tree

Hide file tree

Showing 90 changed files with 107 additions and 378 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,19 +1,18 @@
 [workspace]
 
 members = [
-  "dp2",
-  "aa2",
-  "st2",
-  "di2",
-  "cm2",
-  "pu2",
-  "le2",
-  "tag2",
-  "tags2",
-  "rmtag2",
+  "commands/dp2",
+  "commands/aa2",
+  "commands/st2",
+  "commands/di2",
+  "commands/cm2",
+  "commands/pu2",
+  "commands/le2",
+  "commands/tag2",
+  "commands/tags2",
+  "commands/rmtag2",
 ]
 
 exclude = [
   "repotools",
-  "see_instead",
 ]
diff --git a/README.md b/README.md
@@ -89,17 +89,38 @@ The name comes from "l" for "log" and "e" for the `-e` flag.
 
 ## Installation
 
-Precompiled binaries will be provided in the future, but for now you'll need
-to have the Rust toolchain installed. If you don't have the Rust toolchain
-installed already, head over to https://rustup.rs/ and follow the instructions
-there and then come back here.
+Precompiled binaries will be provided in the future,
+but for now you'll need to build from source.
 
-Once you have the Rust toolchain installed, simply run:
+### Building from source
+
+In order to build from source, you need to have the Rust toolchain installed.
+If you don't have the Rust toolchain installed already, head on over to
+https://rustup.rs/ and follow the instructions there. Then come back here
+once you've done that.
+
+With the Rust toolchain installed, simply run:
 
 ```bash
 cargo install repotools
 ```
 
+This will build and install all of the repotools command utilities.
+
+#### Building and installing only some of the repotools command utilites
+
+If you only wish to build and install some of the repotools command utilities
+rather than all of them, you can do so by making use of the feature flags.
+
+With the Rust toolchain installed (see above), run the following command, with
+the features list adjusted according to your wishing with regards to which of
+the command utilities you would like to build and install:
+
+```bash
+cargo install repotools --no-default-features \
+  --features "dp aa st di cm pu le"
+```
+
 ## Star Me on GitHub 🤩
 
 Do you think this project is awesome? I think *you* are awesome!

diff --git a/aa2/README.md b/aa2/README.md
diff --git a/aa2/build.rs b/aa2/build.rs
diff --git a/cm2/README.md b/cm2/README.md
diff --git a/cm2/build.rs b/cm2/build.rs
diff --git a/aa2/Cargo.toml → commands/aa2/Cargo.toml b/aa2/Cargo.toml → commands/aa2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "aa2"
+publish = false
 description = "add all files in git repository to index, optionally limited to one or more directories"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/aa2"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/aa2/aa2.toml → commands/aa2/aa2.toml b/aa2/aa2.toml → commands/aa2/aa2.toml
diff --git a/commands/aa2/build.rs b/commands/aa2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/aa2/src/cli.yaml → commands/aa2/src/cli.yaml b/aa2/src/cli.yaml → commands/aa2/src/cli.yaml
diff --git a/aa2/src/main.rs → commands/aa2/src/main.rs b/aa2/src/main.rs → commands/aa2/src/main.rs
diff --git a/cm2/Cargo.toml → commands/cm2/Cargo.toml b/cm2/Cargo.toml → commands/cm2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "cm2"
+publish = false
 description = "git commit with message"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/cm2"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/commands/cm2/build.rs b/commands/cm2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/cm2/cm2.toml → commands/cm2/cm2.toml b/cm2/cm2.toml → commands/cm2/cm2.toml
diff --git a/cm2/src/cli.yaml → commands/cm2/src/cli.yaml b/cm2/src/cli.yaml → commands/cm2/src/cli.yaml
diff --git a/cm2/src/main.rs → commands/cm2/src/main.rs b/cm2/src/main.rs → commands/cm2/src/main.rs
diff --git a/di2/Cargo.toml → commands/di2/Cargo.toml b/di2/Cargo.toml → commands/di2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "di2"
+publish = false
 description = "diff files staged for commit in git repository, optionally limited to a given file or directory"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/di2"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/commands/di2/build.rs b/commands/di2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/di2/di2.toml → commands/di2/di2.toml b/di2/di2.toml → commands/di2/di2.toml
diff --git a/di2/src/cli.yaml → commands/di2/src/cli.yaml b/di2/src/cli.yaml → commands/di2/src/cli.yaml
diff --git a/di2/src/main.rs → commands/di2/src/main.rs b/di2/src/main.rs → commands/di2/src/main.rs
diff --git a/dp2/Cargo.toml → commands/dp2/Cargo.toml b/dp2/Cargo.toml → commands/dp2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "dp2"
+publish = false
 description = "diff files pending staging in git repository, optionally limited to a given file or directory"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/dp2"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/commands/dp2/build.rs b/commands/dp2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/dp2/dp2.toml → commands/dp2/dp2.toml b/dp2/dp2.toml → commands/dp2/dp2.toml
diff --git a/dp2/src/cli.yaml → commands/dp2/src/cli.yaml b/dp2/src/cli.yaml → commands/dp2/src/cli.yaml
diff --git a/dp2/src/main.rs → commands/dp2/src/main.rs b/dp2/src/main.rs → commands/dp2/src/main.rs
diff --git a/le2/Cargo.toml → commands/le2/Cargo.toml b/le2/Cargo.toml → commands/le2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "le2"
+publish = false
 description = "number of commits by each author in git repository"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/le2"
-version = "0.9.2"
+version = "0.9.3"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/commands/le2/build.rs b/commands/le2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/le2/le2.toml → commands/le2/le2.toml b/le2/le2.toml → commands/le2/le2.toml
diff --git a/le2/src/cli.yaml → commands/le2/src/cli.yaml b/le2/src/cli.yaml → commands/le2/src/cli.yaml
diff --git a/le2/src/main.rs → commands/le2/src/main.rs b/le2/src/main.rs → commands/le2/src/main.rs
diff --git a/pu2/Cargo.toml → commands/pu2/Cargo.toml b/pu2/Cargo.toml → commands/pu2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "pu2"
+publish = false
 description = "push commits or tags to remote git repository"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/pu2"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/commands/pu2/build.rs b/commands/pu2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/pu2/pu2.toml → commands/pu2/pu2.toml b/pu2/pu2.toml → commands/pu2/pu2.toml
diff --git a/pu2/src/cli.yaml → commands/pu2/src/cli.yaml b/pu2/src/cli.yaml → commands/pu2/src/cli.yaml
diff --git a/pu2/src/main.rs → commands/pu2/src/main.rs b/pu2/src/main.rs → commands/pu2/src/main.rs
diff --git a/rmtag2/Cargo.toml → commands/rmtag2/Cargo.toml b/rmtag2/Cargo.toml → commands/rmtag2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "rmtag2"
+publish = false
 description = "TBA"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/rmtag2"
-version = "0.0.0"
+version = "0.0.1"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/rmtag2/src/main.rs → commands/rmtag2/src/main.rs b/rmtag2/src/main.rs → commands/rmtag2/src/main.rs
diff --git a/st2/Cargo.toml → commands/st2/Cargo.toml b/st2/Cargo.toml → commands/st2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "st2"
+publish = false
 description = "status of git repository, optionally limited to one or more files or directories"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/st2"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/commands/st2/build.rs b/commands/st2/build.rs
@@ -0,0 +1 @@
+../../repotools/build.rs
diff --git a/st2/src/cli.yaml → commands/st2/src/cli.yaml b/st2/src/cli.yaml → commands/st2/src/cli.yaml
diff --git a/st2/src/main.rs → commands/st2/src/main.rs b/st2/src/main.rs → commands/st2/src/main.rs
diff --git a/st2/st2.toml → commands/st2/st2.toml b/st2/st2.toml → commands/st2/st2.toml
diff --git a/tag2/Cargo.toml → commands/tag2/Cargo.toml b/tag2/Cargo.toml → commands/tag2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "tag2"
+publish = false
 description = "TBA"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/tag2"
-version = "0.0.0"
+version = "0.0.1"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/tag2/src/main.rs → commands/tag2/src/main.rs b/tag2/src/main.rs → commands/tag2/src/main.rs
diff --git a/tags2/Cargo.toml → commands/tags2/Cargo.toml b/tags2/Cargo.toml → commands/tags2/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "tags2"
+publish = false
 description = "TBA"
 license = "ISC"
-readme = "README.md"
 repository = "https://github.com/ctsrc/repotools/tree/master/tags2"
-version = "0.0.0"
+version = "0.0.1"
 authors = ["Erik Nordstrøm <erik@nordstroem.no>"]
 edition = "2018"
 

diff --git a/tags2/src/main.rs → commands/tags2/src/main.rs b/tags2/src/main.rs → commands/tags2/src/main.rs