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.
d-e-s-o · Apr 4, 2020 · 681cc88 · 681cc88
1 parent d0d9683
commit 681cc88
Show file tree

Hide file tree

Showing 33 changed files with 3 additions and 13 deletions.
diff --git a/nitrocli/.gitignore → .gitignore b/nitrocli/.gitignore → .gitignore
diff --git a/nitrocli/CHANGELOG.md → CHANGELOG.md b/nitrocli/CHANGELOG.md → 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 → Cargo.lock b/nitrocli/Cargo.lock → Cargo.lock
diff --git a/nitrocli/Cargo.toml → Cargo.toml b/nitrocli/Cargo.toml → Cargo.toml
diff --git a/nitrocli/LICENSE → LICENSE b/nitrocli/LICENSE → LICENSE
diff --git a/nitrocli/Makefile → Makefile b/nitrocli/Makefile → Makefile
diff --git a/nitrocli/README.md → README.md b/nitrocli/README.md → 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 → ci/gitlab-ci.yml b/nitrocli/ci/gitlab-ci.yml → 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 → doc/CONTRIBUTING.md b/nitrocli/doc/CONTRIBUTING.md → doc/CONTRIBUTING.md
diff --git a/nitrocli/doc/nitrocli.1 → doc/nitrocli.1 b/nitrocli/doc/nitrocli.1 → doc/nitrocli.1
diff --git a/nitrocli/doc/nitrocli.1.pdf → doc/nitrocli.1.pdf b/nitrocli/doc/nitrocli.1.pdf → doc/nitrocli.1.pdf
diff --git a/nitrocli/doc/packaging.md → doc/packaging.md b/nitrocli/doc/packaging.md → doc/packaging.md
diff --git a/nitrocli/rustfmt.toml → rustfmt.toml b/nitrocli/rustfmt.toml → rustfmt.toml
diff --git a/nitrocli/src/arg_util.rs → src/arg_util.rs b/nitrocli/src/arg_util.rs → src/arg_util.rs
diff --git a/nitrocli/src/args.rs → src/args.rs b/nitrocli/src/args.rs → src/args.rs
diff --git a/nitrocli/src/commands.rs → src/commands.rs b/nitrocli/src/commands.rs → src/commands.rs
diff --git a/nitrocli/src/error.rs → src/error.rs b/nitrocli/src/error.rs → src/error.rs
diff --git a/nitrocli/src/main.rs → src/main.rs b/nitrocli/src/main.rs → src/main.rs
diff --git a/nitrocli/src/pinentry.rs → src/pinentry.rs b/nitrocli/src/pinentry.rs → src/pinentry.rs
diff --git a/nitrocli/src/redefine.rs → src/redefine.rs b/nitrocli/src/redefine.rs → src/redefine.rs
diff --git a/nitrocli/src/tests/config.rs → src/tests/config.rs b/nitrocli/src/tests/config.rs → src/tests/config.rs
diff --git a/nitrocli/src/tests/encrypted.rs → src/tests/encrypted.rs b/nitrocli/src/tests/encrypted.rs → src/tests/encrypted.rs
diff --git a/nitrocli/src/tests/hidden.rs → src/tests/hidden.rs b/nitrocli/src/tests/hidden.rs → src/tests/hidden.rs
diff --git a/nitrocli/src/tests/lock.rs → src/tests/lock.rs b/nitrocli/src/tests/lock.rs → src/tests/lock.rs
diff --git a/nitrocli/src/tests/mod.rs → src/tests/mod.rs b/nitrocli/src/tests/mod.rs → src/tests/mod.rs
diff --git a/nitrocli/src/tests/otp.rs → src/tests/otp.rs b/nitrocli/src/tests/otp.rs → src/tests/otp.rs
diff --git a/nitrocli/src/tests/pin.rs → src/tests/pin.rs b/nitrocli/src/tests/pin.rs → src/tests/pin.rs
diff --git a/nitrocli/src/tests/pws.rs → src/tests/pws.rs b/nitrocli/src/tests/pws.rs → src/tests/pws.rs
diff --git a/nitrocli/src/tests/reset.rs → src/tests/reset.rs b/nitrocli/src/tests/reset.rs → src/tests/reset.rs
diff --git a/nitrocli/src/tests/run.rs → src/tests/run.rs b/nitrocli/src/tests/run.rs → src/tests/run.rs
diff --git a/nitrocli/src/tests/status.rs → src/tests/status.rs b/nitrocli/src/tests/status.rs → src/tests/status.rs
diff --git a/nitrocli/src/tests/unencrypted.rs → src/tests/unencrypted.rs b/nitrocli/src/tests/unencrypted.rs → src/tests/unencrypted.rs
diff --git a/nitrocli/var/binary-size.py → var/binary-size.py b/nitrocli/var/binary-size.py → var/binary-size.py