diff options
author | Daniel Mueller <deso@posteo.net> | 2020-04-04 15:32:14 -0700 |
---|---|---|
committer | Daniel Mueller <deso@posteo.net> | 2020-04-04 15:32:14 -0700 |
commit | 681cc8882f7995407c33eb48730daaa901074460 (patch) | |
tree | c865f6c4a34e11af685889a09d95f3225e54a16c | |
parent | d0d9683df8398696147e7ee1fcffb2e4e957008c (diff) | |
download | nitrocli-681cc8882f7995407c33eb48730daaa901074460.tar.gz nitrocli-681cc8882f7995407c33eb48730daaa901074460.tar.bz2 |
Move nitrocli source code into repository root
Now that all vendored dependencies have been removed, this change moves
the program's source code from the nitrocli/ directory into the root of
the repository.
-rw-r--r-- | .gitignore (renamed from nitrocli/.gitignore) | 0 | ||||
-rw-r--r-- | CHANGELOG.md (renamed from nitrocli/CHANGELOG.md) | 3 | ||||
-rw-r--r-- | Cargo.lock (renamed from nitrocli/Cargo.lock) | 0 | ||||
-rw-r--r-- | Cargo.toml (renamed from nitrocli/Cargo.toml) | 0 | ||||
-rw-r--r-- | LICENSE (renamed from nitrocli/LICENSE) | 0 | ||||
-rw-r--r-- | Makefile (renamed from nitrocli/Makefile) | 0 | ||||
-rw-r--r-- | README.md (renamed from nitrocli/README.md) | 3 | ||||
-rw-r--r-- | ci/gitlab-ci.yml (renamed from nitrocli/ci/gitlab-ci.yml) | 10 | ||||
-rw-r--r-- | doc/CONTRIBUTING.md (renamed from nitrocli/doc/CONTRIBUTING.md) | 0 | ||||
-rw-r--r-- | doc/nitrocli.1 (renamed from nitrocli/doc/nitrocli.1) | 0 | ||||
-rw-r--r-- | doc/nitrocli.1.pdf (renamed from nitrocli/doc/nitrocli.1.pdf) | bin | 18442 -> 18442 bytes | |||
-rw-r--r-- | doc/packaging.md (renamed from nitrocli/doc/packaging.md) | 0 | ||||
-rw-r--r-- | rustfmt.toml (renamed from nitrocli/rustfmt.toml) | 0 | ||||
-rw-r--r-- | src/arg_util.rs (renamed from nitrocli/src/arg_util.rs) | 0 | ||||
-rw-r--r-- | src/args.rs (renamed from nitrocli/src/args.rs) | 0 | ||||
-rw-r--r-- | src/commands.rs (renamed from nitrocli/src/commands.rs) | 0 | ||||
-rw-r--r-- | src/error.rs (renamed from nitrocli/src/error.rs) | 0 | ||||
-rw-r--r-- | src/main.rs (renamed from nitrocli/src/main.rs) | 0 | ||||
-rw-r--r-- | src/pinentry.rs (renamed from nitrocli/src/pinentry.rs) | 0 | ||||
-rw-r--r-- | src/redefine.rs (renamed from nitrocli/src/redefine.rs) | 0 | ||||
-rw-r--r-- | src/tests/config.rs (renamed from nitrocli/src/tests/config.rs) | 0 | ||||
-rw-r--r-- | src/tests/encrypted.rs (renamed from nitrocli/src/tests/encrypted.rs) | 0 | ||||
-rw-r--r-- | src/tests/hidden.rs (renamed from nitrocli/src/tests/hidden.rs) | 0 | ||||
-rw-r--r-- | src/tests/lock.rs (renamed from nitrocli/src/tests/lock.rs) | 0 | ||||
-rw-r--r-- | src/tests/mod.rs (renamed from nitrocli/src/tests/mod.rs) | 0 | ||||
-rw-r--r-- | src/tests/otp.rs (renamed from nitrocli/src/tests/otp.rs) | 0 | ||||
-rw-r--r-- | src/tests/pin.rs (renamed from nitrocli/src/tests/pin.rs) | 0 | ||||
-rw-r--r-- | src/tests/pws.rs (renamed from nitrocli/src/tests/pws.rs) | 0 | ||||
-rw-r--r-- | src/tests/reset.rs (renamed from nitrocli/src/tests/reset.rs) | 0 | ||||
-rw-r--r-- | src/tests/run.rs (renamed from nitrocli/src/tests/run.rs) | 0 | ||||
-rw-r--r-- | src/tests/status.rs (renamed from nitrocli/src/tests/status.rs) | 0 | ||||
-rw-r--r-- | src/tests/unencrypted.rs (renamed from nitrocli/src/tests/unencrypted.rs) | 0 | ||||
-rwxr-xr-x | var/binary-size.py (renamed from nitrocli/var/binary-size.py) | 0 |
33 files changed, 3 insertions, 13 deletions
diff --git a/nitrocli/.gitignore b/.gitignore index c6262ea..c6262ea 100644 --- a/nitrocli/.gitignore +++ b/.gitignore diff --git a/nitrocli/CHANGELOG.md b/CHANGELOG.md index 9147ec5..531a38e 100644 --- a/nitrocli/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Unreleased ---------- -- Removed vendored dependencies +- Removed vendored dependencies and moved source code into repository + root 0.3.1 diff --git a/nitrocli/Cargo.lock b/Cargo.lock index 3e914a4..3e914a4 100644 --- a/nitrocli/Cargo.lock +++ b/Cargo.lock diff --git a/nitrocli/Cargo.toml b/Cargo.toml index 63e6409..63e6409 100644 --- a/nitrocli/Cargo.toml +++ b/Cargo.toml diff --git a/nitrocli/LICENSE b/LICENSE index ef7e7ef..ef7e7ef 100644 --- a/nitrocli/LICENSE +++ b/LICENSE diff --git a/nitrocli/Makefile b/Makefile index e7f7da5..e7f7da5 100644 --- a/nitrocli/Makefile +++ b/Makefile diff --git a/nitrocli/README.md b/README.md index 0f01ac5..f76216f 100644 --- a/nitrocli/README.md +++ b/README.md @@ -102,8 +102,7 @@ $ cargo install nitrocli --root=$PWD/nitrocli ``` #### From Source -After cloning the repository and changing into the `nitrocli` subfolder, -the build is as simple as running: +After cloning the repository the build is as simple as running: ```bash $ cargo build --release ``` diff --git a/nitrocli/ci/gitlab-ci.yml b/ci/gitlab-ci.yml index 29bf59d..729944d 100644 --- a/nitrocli/ci/gitlab-ci.yml +++ b/ci/gitlab-ci.yml @@ -12,25 +12,15 @@ build-test:cargo: - apt-get update - apt-get install --assume-yes libudev-dev libhidapi-dev - rustc --version && cargo --version - - cd nitrocli - cargo build --all --verbose - cargo test --all --verbose lint:clippy: script: - rustup component add clippy - # First check and build everything but be very permissive. Then clean - # only the nitrocli package artifacts. Lastly check once more, but - # with warnings turned to errors. This last run will only recheck - # nitrocli (everything else is still up-to-date). That procedure is - # necessary because consumed dependencies may emit errors otherwise. - - cd nitrocli - - cargo clippy --all-targets --all-features -- -A clippy::all - - cargo clean --package=nitrocli - cargo clippy --all-targets --all-features -- -D warnings format:rustfmt: script: - rustup component add rustfmt - - cd nitrocli - cargo fmt --all -- --check diff --git a/nitrocli/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 3ebdfce..3ebdfce 100644 --- a/nitrocli/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md diff --git a/nitrocli/doc/nitrocli.1 b/doc/nitrocli.1 index 75f5960..75f5960 100644 --- a/nitrocli/doc/nitrocli.1 +++ b/doc/nitrocli.1 diff --git a/nitrocli/doc/nitrocli.1.pdf b/doc/nitrocli.1.pdf Binary files differindex cd15a66..cd15a66 100644 --- a/nitrocli/doc/nitrocli.1.pdf +++ b/doc/nitrocli.1.pdf diff --git a/nitrocli/doc/packaging.md b/doc/packaging.md index 5ff4089..5ff4089 100644 --- a/nitrocli/doc/packaging.md +++ b/doc/packaging.md diff --git a/nitrocli/rustfmt.toml b/rustfmt.toml index b196eaa..b196eaa 100644 --- a/nitrocli/rustfmt.toml +++ b/rustfmt.toml diff --git a/nitrocli/src/arg_util.rs b/src/arg_util.rs index e2e7b1d..e2e7b1d 100644 --- a/nitrocli/src/arg_util.rs +++ b/src/arg_util.rs diff --git a/nitrocli/src/args.rs b/src/args.rs index 9f4cae2..9f4cae2 100644 --- a/nitrocli/src/args.rs +++ b/src/args.rs diff --git a/nitrocli/src/commands.rs b/src/commands.rs index 537a2cf..537a2cf 100644 --- a/nitrocli/src/commands.rs +++ b/src/commands.rs diff --git a/nitrocli/src/error.rs b/src/error.rs index 819bed8..819bed8 100644 --- a/nitrocli/src/error.rs +++ b/src/error.rs diff --git a/nitrocli/src/main.rs b/src/main.rs index c639f14..c639f14 100644 --- a/nitrocli/src/main.rs +++ b/src/main.rs diff --git a/nitrocli/src/pinentry.rs b/src/pinentry.rs index fd47657..fd47657 100644 --- a/nitrocli/src/pinentry.rs +++ b/src/pinentry.rs diff --git a/nitrocli/src/redefine.rs b/src/redefine.rs index a79cb4b..a79cb4b 100644 --- a/nitrocli/src/redefine.rs +++ b/src/redefine.rs diff --git a/nitrocli/src/tests/config.rs b/src/tests/config.rs index ea3a0e8..ea3a0e8 100644 --- a/nitrocli/src/tests/config.rs +++ b/src/tests/config.rs diff --git a/nitrocli/src/tests/encrypted.rs b/src/tests/encrypted.rs index 75b84c3..75b84c3 100644 --- a/nitrocli/src/tests/encrypted.rs +++ b/src/tests/encrypted.rs diff --git a/nitrocli/src/tests/hidden.rs b/src/tests/hidden.rs index 28a5d23..28a5d23 100644 --- a/nitrocli/src/tests/hidden.rs +++ b/src/tests/hidden.rs diff --git a/nitrocli/src/tests/lock.rs b/src/tests/lock.rs index 5140152..5140152 100644 --- a/nitrocli/src/tests/lock.rs +++ b/src/tests/lock.rs diff --git a/nitrocli/src/tests/mod.rs b/src/tests/mod.rs index 5ebf285..5ebf285 100644 --- a/nitrocli/src/tests/mod.rs +++ b/src/tests/mod.rs diff --git a/nitrocli/src/tests/otp.rs b/src/tests/otp.rs index 0ccecf9..0ccecf9 100644 --- a/nitrocli/src/tests/otp.rs +++ b/src/tests/otp.rs diff --git a/nitrocli/src/tests/pin.rs b/src/tests/pin.rs index 958a36d..958a36d 100644 --- a/nitrocli/src/tests/pin.rs +++ b/src/tests/pin.rs diff --git a/nitrocli/src/tests/pws.rs b/src/tests/pws.rs index 651b2d5..651b2d5 100644 --- a/nitrocli/src/tests/pws.rs +++ b/src/tests/pws.rs diff --git a/nitrocli/src/tests/reset.rs b/src/tests/reset.rs index e197970..e197970 100644 --- a/nitrocli/src/tests/reset.rs +++ b/src/tests/reset.rs diff --git a/nitrocli/src/tests/run.rs b/src/tests/run.rs index c59c660..c59c660 100644 --- a/nitrocli/src/tests/run.rs +++ b/src/tests/run.rs diff --git a/nitrocli/src/tests/status.rs b/src/tests/status.rs index c9f4976..c9f4976 100644 --- a/nitrocli/src/tests/status.rs +++ b/src/tests/status.rs diff --git a/nitrocli/src/tests/unencrypted.rs b/src/tests/unencrypted.rs index 547dcaf..547dcaf 100644 --- a/nitrocli/src/tests/unencrypted.rs +++ b/src/tests/unencrypted.rs diff --git a/nitrocli/var/binary-size.py b/var/binary-size.py index 3653814..3653814 100755 --- a/nitrocli/var/binary-size.py +++ b/var/binary-size.py |