Replace atty with is_terminal()

Update dependencies Enable fancy output for miette errors Fix clippy lints Bump version
Better CI
2023-09-10 19:36:36 +02:00 · 2023-09-10 18:47:57 +02:00
9 changed files with 165 additions and 30 deletions
--- a/.direnv/flake-profile
+++ b/.direnv/flake-profile
@ -1 +0,0 @@
-flake-profile-2-link
--- a/.direnv/flake-profile-1-link
+++ b/.direnv/flake-profile-1-link
@ -1 +0,0 @@
-/nix/store/vhxg5a3va792mff3i55jgcd2fayjzc2z-nix-shell-env
--- a/.direnv/flake-profile-2-link
+++ b/.direnv/flake-profile-2-link
@ -1 +0,0 @@
-/nix/store/di1jdvlfxza2mnh3f0gdl8h9a5gd41yh-nix-shell-env
--- a/.github/workflows/build_nix.yml
+++ b/.github/workflows/build_nix.yml
@ -1,4 +1,4 @@
-name: "Build legacy Nix package on Ubuntu"
+name: "Build Nix package on Ubuntu"

 on:
  push:
@ -7,13 +7,15 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v12
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v23
      - name: Building package
-        run:  nix-build . -A packages.x86_64-linux.default
+        run:  nix build
+      - name: Get repository name
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
      - name: Get commit hash
        run:  echo "COMMIT_HASH=${GITHUB_SHA::6}" >> $GITHUB_ENV
      - uses: actions/upload-artifact@v3
        with:
-          name: colorpickle-${{ env.COMMIT_HASH }}-x86_64-linux
-          path: result/bin/colorpickle
+          name: ${{ env.REPO_NAME }}-${{ env.COMMIT_HASH }}-x86_64-linux
+          path: result/bin/${{ env.REPO_NAME }}
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 /target
+.direnv
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3

+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@ -74,6 +83,30 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

+[[package]]
+name = "backtrace"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "backtrace-ext"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50"
+dependencies = [
+ "backtrace",
+]
+
 [[package]]
 name = "bit_field"
 version = "0.10.2"
@ -129,8 +162,8 @@ dependencies = [
 "once_cell",
 "strsim",
 "termcolor",
- "terminal_size",
- "textwrap",
+ "terminal_size 0.2.6",
+ "textwrap 0.16.0",
 ]

 [[package]]
@ -212,7 +245,6 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 name = "colorpickle"
 version = "0.1.0"
 dependencies = [
- "atty",
 "clap 4.2.1",
 "color-thief",
 "image",
@ -394,6 +426,12 @@ dependencies = [
 "weezl",
 ]

+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
 [[package]]
 name = "half"
 version = "2.2.1"
@ -491,6 +529,12 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

+[[package]]
+name = "is_ci"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@ -567,8 +611,17 @@ version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abdc09c381c9336b9f2e9bd6067a9a5290d20e2d2e2296f275456121c33ae89"
 dependencies = [
+ "backtrace",
+ "backtrace-ext",
+ "is-terminal",
 "miette-derive",
 "once_cell",
+ "owo-colors",
+ "supports-color",
+ "supports-hyperlinks",
+ "supports-unicode",
+ "terminal_size 0.1.17",
+ "textwrap 0.15.2",
 "thiserror",
 "unicode-width",
 ]
@ -658,6 +711,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "object"
+version = "0.30.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.1"
@ -679,6 +741,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
 [[package]]
 name = "pastel"
 version = "0.9.0"
@ -838,6 +906,12 @@ dependencies = [
 "bytemuck",
 ]

+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
 [[package]]
 name = "rustix"
 version = "0.37.11"
@ -870,6 +944,12 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

+[[package]]
+name = "smawk"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@ -885,6 +965,34 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

+[[package]]
+name = "supports-color"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354"
+dependencies = [
+ "is-terminal",
+ "is_ci",
+]
+
+[[package]]
+name = "supports-hyperlinks"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d"
+dependencies = [
+ "is-terminal",
+]
+
+[[package]]
+name = "supports-unicode"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7"
+dependencies = [
+ "is-terminal",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@ -916,6 +1024,16 @@ dependencies = [
 "winapi-util",
 ]

+[[package]]
+name = "terminal_size"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "terminal_size"
 version = "0.2.6"
@ -926,13 +1044,24 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

+[[package]]
+name = "textwrap"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 dependencies = [
- "terminal_size",
+ "terminal_size 0.2.6",
 ]

 [[package]]
@ -972,6 +1101,12 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.10"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "colorpickle"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["Agatha V. Lovelace <agatha@technogothic.net>"]
 description = "A colorscheme generator"
@ -11,7 +11,6 @@ license = "NVPLv7+"
 [dependencies]
 pastel = "0.9.0"
 color-thief = "0.2.2"
-miette = "5.7.0"
+miette = { version = "5.7.0", features = ["fancy"] }
 image = "0.24.6"
 clap = { version = "4.2.1", features = ["derive"] }
-atty = "0.2.14"
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1679567394,
-        "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
+        "lastModified": 1694081375,
+        "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=",
        "owner": "nix-community",
        "repo": "naersk",
-        "rev": "88cd22380154a2c36799fe8098888f0f59861a15",
+        "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89",
        "type": "github"
      },
      "original": {
@ -21,11 +21,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1681002951,
-        "narHash": "sha256-nD9fXN7EVKGovtjrXIuA7Si9M6PD9b02GNtvQPTSuOk=",
+        "lastModified": 1694343207,
+        "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "431bf1e6cdd494e5230fbb72884afb4ca612c578",
+        "rev": "78058d810644f5ed276804ce7ea9e82d92bee293",
        "type": "github"
      },
      "original": {
@ -35,11 +35,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1681002951,
-        "narHash": "sha256-nD9fXN7EVKGovtjrXIuA7Si9M6PD9b02GNtvQPTSuOk=",
+        "lastModified": 1694343207,
+        "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "431bf1e6cdd494e5230fbb72884afb4ca612c578",
+        "rev": "78058d810644f5ed276804ce7ea9e82d92bee293",
        "type": "github"
      },
      "original": {
@ -76,11 +76,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1681037374,
-        "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
        "type": "github"
      },
      "original": {
--- a/src/main.rs
+++ b/src/main.rs
@ -3,6 +3,7 @@ use color_thief::ColorFormat;
 use image::io::Reader as ImageReader;
 use miette::{IntoDiagnostic, Result};
 use pastel::ansi::{self, Brush, ToAnsiStyle};
+use std::io::{stdout, IsTerminal};

 #[derive(Parser, Debug)]
 #[command(author, version, about)]
@ -79,7 +80,7 @@ fn main() -> Result<()> {
    colors.iter().for_each(|c| {
        println!(
            "{}",
-            if atty::is(atty::Stream::Stdout) {
+            if stdout().is_terminal() {
                brush.paint(c.to_rgb_hex_string(true), c.text_color().ansi_style().on(c))
            } else {
                c.to_rgb_hex_string(true)
@ -95,7 +96,7 @@ fn validate_color_delta(s: &str) -> Result<f64, String> {
    let num = s
        .parse()
        .map_err(|_| format!("`{s}` is not a valid floating point number"))?;
-    if num >= -1.0 && num <= 1.0 {
+    if (-1.0..=1.0).contains(&num) {
        Ok(num)
    } else {
        Err(format!("{num} is not in range [-1.0,1.0]"))
Author	SHA1	Message	Date
Agatha Lovelace	5689bff525	Replace atty with is_terminal() Update dependencies Enable fancy output for miette errors Fix clippy lints Bump version	2023-09-10 19:36:36 +02:00
Agatha Lovelace	f7c014dd07	Better CI	2023-09-10 18:47:57 +02:00
				`@ -1 +0,0 @@`
				`/nix/store/vhxg5a3va792mff3i55jgcd2fayjzc2z-nix-shell-env`
				`@ -1 +0,0 @@`
				`/nix/store/di1jdvlfxza2mnh3f0gdl8h9a5gd41yh-nix-shell-env`