ID

89c40b0

date

2022-10-24 18:31:00+00:00

author

Alex Chan <alex@alexwlchan.net>

parent

0404a49

message

Get the tests passing; use the new builder pattern

changed files

2 files, 44 additions, 29 deletions

• src/cli.rs
• src/main.rs

Changed files

src/cli.rs (0) → src/cli.rs (1094)

diff --git a/src/cli.rs b/src/cli.rs
new file mode 100644
index 0000000..2b80668
--- /dev/null
+++ b/src/cli.rs
@@ -0,0 +1,40 @@
+use clap::{App, Arg};
+
+const VERSION: &str = env!("CARGO_PKG_VERSION");
+
+pub fn app() -> clap::App<'static> {
+    App::new("dominant_colours")
+        .version(VERSION)
+        .author("Alex Chan <alex@alexwlchan.net>")
+        .about("Find the dominant colours in an image")
+        .arg(
+            Arg::with_name("PATH")
+                .help("path to the image to inspect")
+                .required(true)
+                .index(1),
+        )
+        .arg(
+            Arg::with_name("MAX-COLOURS")
+                .long("max-colours")
+                .help("how many colours to find")
+                .default_value("5")
+                .takes_value(true),
+        )
+        .arg(
+            Arg::with_name("no-palette")
+                .long("no-palette")
+                .help("Just print the hex values, not colour previews")
+                .takes_value(false),
+        )
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::cli::app;
+
+    // See https://github.com/clap-rs/clap/blob/master/CHANGELOG.md#300---2021-12-31
+    #[test]
+    fn verify_app() {
+        app().debug_assert();
+    }
+}

src/main.rs (9257) → src/main.rs (8502)

diff --git a/src/main.rs b/src/main.rs
index 8e37f47..5e33ab4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,39 +3,14 @@
 #[macro_use]
 extern crate clap;
 
-use clap::{App, Arg};
 use kmeans_colors::get_kmeans_hamerly;
 use palette::{Lab, Pixel, Srgb, Srgba};
 
+mod cli;
 mod get_bytes;
 
-const VERSION: &str = env!("CARGO_PKG_VERSION");
-
 fn main() {
-    let matches = App::new("dominant_colours")
-        .version(VERSION)
-        .author("Alex Chan <alex@alexwlchan.net>")
-        .about("Find the dominant colours in an image")
-        .arg(
-            Arg::with_name("PATH")
-                .help("path to the image to inspect")
-                .required(true)
-                .index(1),
-        )
-        .arg(
-            Arg::with_name("MAX-COLOURS")
-                .long("max-colours")
-                .help("how many colours to find")
-                .default_value("5")
-                .takes_value(true),
-        )
-        .arg(
-            Arg::with_name("no-palette")
-                .long("no-palette")
-                .help("Just print the hex values, not colour previews")
-                .takes_value(false),
-        )
-        .get_matches();
+    let matches = cli::app().get_matches();
 
     // This .unwrap() is safe because "path" is a required param
     let path = matches.value_of("PATH").unwrap();
@@ -213,11 +188,11 @@ mod tests {
     fn it_fails_if_you_pass_an_invalid_max_colours() {
         let output = get_failure(&["./src/tests/red.png", "--max-colours=NaN"]);
 
-        assert_eq!(output.exit_code, 1);
+        assert_eq!(output.exit_code, 2);
         assert_eq!(output.stdout, "");
         assert_eq!(
             output.stderr,
-            "error: Invalid value: The argument 'NaN' isn't a valid value\n"
+            "error: Invalid value \"NaN\" for 'MAX-COLOURS': The argument 'NaN' isn't a valid value for 'MAX-COLOURS': invalid digit found in string\n"
         );
     }