From 1596dc6818812f884dc1d51357e6656aad580671 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler <71695780+ellmau@users.noreply.github.com> Date: Tue, 2 Aug 2022 15:09:48 +0200 Subject: [PATCH] Prepare files to publish the adf-bdd-bin package (#89) * Prepare files to publish the adf-bdd-bin package --- .github/workflows/pr.yml | 2 ++ Cargo.lock | 2 +- README.md | 3 ++- bin/Cargo.toml | 2 +- bin/README.md | 10 +++++++++- bin/tests/cli.rs | 25 ++++++++++++++----------- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5608773..6213023 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -29,6 +29,7 @@ jobs: - run: cargo test --verbose --workspace - run: cargo test --verbose --workspace --all-features - run: cargo test --verbose --workspace --no-default-features + - run: cargo test --verbose --workspace --no-default-features -F benchmark clippy: name: Lint with clippy @@ -43,6 +44,7 @@ jobs: - run: cargo clippy --workspace --all-targets --verbose - run: cargo clippy --workspace --all-targets --verbose --no-default-features - run: cargo clippy --workspace --all-targets --verbose --all-features + - run: cargo clippy --workspace --all-targets --verbose --no-default-features -F benchmark rustfmt: name: Verify code formatting diff --git a/Cargo.lock b/Cargo.lock index 1f44795..3e7ac1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,7 +3,7 @@ version = 3 [[package]] -name = "adf-bdd-solver" +name = "adf-bdd-bin" version = "0.3.0" dependencies = [ "adf_bdd", diff --git a/README.md b/README.md index 886ef96..406b3a5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Crates.io](https://img.shields.io/crates/v/adf_bdd)](https://crates.io/crates/adf_bdd) +[![Crates.io](https://img.shields.io/crates/v/adf-bdd-bin?label=crates.io%20%28bin%29)](https://crates.io/crates/adf-bdd-bin) +[![Crates.io](https://img.shields.io/crates/v/adf_bdd?label=crates.io%20%28lib%29)](https://crates.io/crates/adf_bdd) [![docs.rs](https://img.shields.io/docsrs/adf_bdd?label=docs.rs)](https://docs.rs/adf_bdd/latest/adf_bdd/) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ellmau/adf-obdd/Code%20coverage%20with%20tarpaulin) [![Coveralls](https://img.shields.io/coveralls/github/ellmau/adf-obdd)](https://coveralls.io/github/ellmau/adf-obdd) diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 4779075..a104edf 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "adf-bdd-solver" +name = "adf-bdd-bin" version = "0.3.0" authors = ["Stefan Ellmauthaler "] edition = "2021" diff --git a/bin/README.md b/bin/README.md index 6b34e8e..bf50c18 100644 --- a/bin/README.md +++ b/bin/README.md @@ -1,4 +1,12 @@ -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ellmau/adf-obdd/Code%20coverage%20with%20tarpaulin) [![Coveralls](https://img.shields.io/coveralls/github/ellmau/adf-obdd)](https://coveralls.io/github/ellmau/adf-obdd) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/ellmau/adf-obdd?include_prereleases) ![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/ellmau/adf-obdd?label=release%20from) ![GitHub top language](https://img.shields.io/github/languages/top/ellmau/adf-obdd) [![GitHub all releases](https://img.shields.io/github/downloads/ellmau/adf-obdd/total)](https://github.com/ellmau/adf-obdd/releases) [![GitHub Discussions](https://img.shields.io/github/discussions/ellmau/adf-obdd)](https://github.com/ellmau/adf-obdd/discussions) ![rust-edition](https://img.shields.io/badge/Rust--edition-2021-blue?logo=rust) +[![Crates.io](https://img.shields.io/crates/v/adf-bdd-bin)](https://crates.io/crates/adf-bdd-bin) +![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ellmau/adf-obdd/Code%20coverage%20with%20tarpaulin) +[![Coveralls](https://img.shields.io/coveralls/github/ellmau/adf-obdd)](https://coveralls.io/github/ellmau/adf-obdd) +![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/ellmau/adf-obdd?include_prereleases) +![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/ellmau/adf-obdd?label=release%20from) +![GitHub top language](https://img.shields.io/github/languages/top/ellmau/adf-obdd) +[![GitHub all releases](https://img.shields.io/github/downloads/ellmau/adf-obdd/total)](https://github.com/ellmau/adf-obdd/releases) +[![GitHub Discussions](https://img.shields.io/github/discussions/ellmau/adf-obdd)](https://github.com/ellmau/adf-obdd/discussions) +![rust-edition](https://img.shields.io/badge/Rust--edition-2021-blue?logo=rust) # Abstract Dialectical Frameworks solved by Binary Decision Diagrams; developed in Dresden (ADF-BDD) This is the readme for the executable solver. diff --git a/bin/tests/cli.rs b/bin/tests/cli.rs index 7ca6bfc..0dbf211 100644 --- a/bin/tests/cli.rs +++ b/bin/tests/cli.rs @@ -27,7 +27,7 @@ fn arguments() -> Result<(), Box> { cmd.arg("--version"); cmd.assert() .success() - .stdout(predicate::str::contains("adf-bdd-solver ")); + .stdout(predicate::str::contains("adf-bdd-bin ")); Ok(()) } @@ -148,16 +148,19 @@ fn runs_naive() -> Result<(), Box> { "u(1) u(2) u(3) F(4) F(5) u(6) u(7) u(8) u(9) u(10) \n", )); - cmd = Command::cargo_bin("adf-bdd")?; - cmd.arg(tempdir.path().with_file_name("test.json")) - .arg("--an") - .arg("--grd") - .arg("--import") - .arg("--lib") - .arg("naive"); - cmd.assert().success().stdout(predicate::str::contains( - "u(1) u(2) u(3) F(4) F(5) u(6) u(7) u(8) u(9) u(10) \n", - )); + #[cfg(feature = "importexport")] + { + cmd = Command::cargo_bin("adf-bdd")?; + cmd.arg(tempdir.path().with_file_name("test.json")) + .arg("--an") + .arg("--grd") + .arg("--import") + .arg("--lib") + .arg("naive"); + cmd.assert().success().stdout(predicate::str::contains( + "u(1) u(2) u(3) F(4) F(5) u(6) u(7) u(8) u(9) u(10) \n", + )); + } cmd = Command::cargo_bin("adf-bdd")?; cmd.arg(file.path())