Split project into workspaces

.gitignore

@@ -3,11 +3,6 @@ target
 *.rs.bk
 Cargo.lock
 
-# node (for cspell)
-/node_modules
-/npm-debug.log
-/package-lock.json
-
 # IDE files
 .idea
 .vscode

Cargo.toml

@@ -1,37 +1,5 @@
-[package]
-name = "os_info"
-version = "2.0.2"
-authors = ["Jan Schulte <hello@unexpected-co.de>", "Stanislav Tkach <stanislav.tkach@gmail.com>"]
-description = "Detect the operating system type and version."
-documentation = "https://docs.rs/os_info"
-homepage = "https://github.com/darkeld3r/os_info"
-repository = "https://github.com/darkeld3r/os_info"
-readme = "README.md"
-keywords = ["os", "os_type", "os_version", "os_info"]
-categories = ["os"]
-license = "MIT"
-edition = "2018"
-
-[badges]
-codecov = { repository = "DarkEld3r/os_info", branch = "master", service = "github" }
-is-it-maintained-issue-resolution = { repository = "DarkEld3r/os_info" }
-is-it-maintained-open-issues = { repository = "DarkEld3r/os_info" }
-
-[features]
-default = ["serde"]
-
-[dependencies]
-log = "0.4.5"
-serde = { version = "1.0.0", features = ["derive"], optional = true }
-env_logger = "0.7.1"
-structopt = "0.3"
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["minwindef", "ntdef", "ntstatus", "sysinfoapi", "winnt", "winuser", "libloaderapi", "processthreadsapi"] }
-
-[dev-dependencies]
-itertools = "0.9.0"
-pretty_assertions = "0.6.1"
-doc-comment = "0.3.1"
-assert_cmd = "1.0.1"
-predicates = "1.0.4"
+[workspace]
+members = [
+    "os_info",
+    "cli",
+]

cli/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "os_info_cli"
+version = "1.0.0"
+authors = ["Stanislav Tkach <stanislav.tkach@gmail.com>"]
+description = "Detect the operating system type and version."
+documentation = "https://docs.rs/os_info"
+homepage = "https://github.com/darkeld3r/os_info"
+repository = "https://github.com/darkeld3r/os_info"
+readme = "../README.md"
+keywords = ["cli", "os", "os_type", "os_version", "os_info"]
+categories = ["command-line-interface", "os"]
+license = "MIT"
+edition = "2018"
+
+[[bin]]
+name = "os_info"
+path = "src/main.rs"
+
+[dependencies]
+os_info = { version = "", default-features = false, path = "../os_info" }
+log = "0.4.5"
+env_logger = "0.7.1"
+structopt = "0.3"
+
+[dev-dependencies]
+assert_cmd = "1.0.1"
+predicates = "1.0.4"

tests/cli.rs → cli/tests/cli.rs

@@ -1,19 +1,26 @@
+use std::path::Path;
+
 use assert_cmd::Command;
 use predicates::prelude::*;
 
+const BIN_NAME: &str = env!("CARGO_BIN_EXE_os_info");
+
+#[test]
+fn path_is_correct() {
+    assert!(Path::new(BIN_NAME).is_file());
+}
+
 #[test]
 fn no_args() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .assert()
         .success()
         .stdout(all_predicate());
 }
 
 #[test]
 fn all() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("--all")
         .assert()
         .success()
@@ -22,8 +29,7 @@ fn all() {
 
 #[test]
 fn type_short() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("-t")
         .assert()
         .success()
@@ -32,8 +38,7 @@ fn type_short() {
 
 #[test]
 fn type_long() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("--type")
         .assert()
         .success()
@@ -42,8 +47,7 @@ fn type_long() {
 
 #[test]
 fn version_short() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("-v")
         .assert()
         .success()
@@ -52,8 +56,7 @@ fn version_short() {
 
 #[test]
 fn version_long() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("--version")
         .assert()
         .success()
@@ -62,8 +65,7 @@ fn version_long() {
 
 #[test]
 fn bitness_short() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("-b")
         .assert()
         .success()
@@ -72,8 +74,7 @@ fn bitness_short() {
 
 #[test]
 fn bitness_long() {
-    Command::cargo_bin(env!("CARGO_PKG_NAME"))
-        .expect("cargo_bin failed")
+    Command::new(BIN_NAME)
         .arg("--bitness")
         .assert()
         .success()

os_info/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "os_info"
+version = "2.0.2"
+authors = ["Jan Schulte <hello@unexpected-co.de>", "Stanislav Tkach <stanislav.tkach@gmail.com>"]
+description = "Detect the operating system type and version."
+documentation = "https://docs.rs/os_info"
+homepage = "https://github.com/darkeld3r/os_info"
+repository = "https://github.com/darkeld3r/os_info"
+readme = "../README.md"
+keywords = ["os", "os_type", "os_version", "os_info"]
+categories = ["os"]
+license = "MIT"
+edition = "2018"
+
+[badges]
+codecov = { repository = "DarkEld3r/os_info", branch = "master", service = "github" }
+is-it-maintained-issue-resolution = { repository = "DarkEld3r/os_info" }
+is-it-maintained-open-issues = { repository = "DarkEld3r/os_info" }
+
+[features]
+default = ["serde"]
+
+[dependencies]
+log = "0.4.5"
+serde = { version = "1.0.0", features = ["derive"], optional = true }
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3.8", features = ["minwindef", "ntdef", "ntstatus", "sysinfoapi", "winnt", "winuser", "libloaderapi", "processthreadsapi"] }
+
+[dev-dependencies]
+itertools = "0.9.0"
+pretty_assertions = "0.6.1"
+doc-comment = "0.3.1"

os_info/tests/md_doc.rs

@@ -0,0 +1,3 @@
+// spell-checker:ignore doctest
+
+doc_comment::doctest!("../../README.md");