nix: fix overlays

- color - moved to a feature . To enable install vnetod with
- suggestions

.dockerignore

@@ -1,4 +0,0 @@
-/target
-
-.env*
-!.envrc

.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -1,4 +1,11 @@
+# build
 /target
+/result
 
+# environments
 .env*
 !.env.example
+
+# direnv
+.envrc
+.direnv

Cargo.lock

@@ -37,7 +37,6 @@ dependencies = [
  "clap_lex",
  "indexmap",
  "once_cell",
- "strsim",
  "termcolor",
  "textwrap",
 ]
@@ -155,12 +154,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "syn"
 version = "1.0.98"
@@ -201,9 +194,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vnetod"
-version = "0.2.2"
+version = "0.4.0"
 dependencies = [
+ "atty",
  "clap",
+ "termcolor",
 ]
 
 [[package]]

Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "vnetod"
-description = "Dotenv state switcher"
+description = "Are you still switching sections in your dotenv file manually? Try this dotenv section switcher"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 license = "GPL-3.0+"
+homepage = "https://github.com/pleshevskiy/vnetod/discussions"
 repository = "https://git.pleshevski.ru/pleshevskiy/vnetod.git"
 keywords = ["env", "dotenv", "switcher", "change"]
 categories = ["command-line-interface", "config", "development-tools"]
@@ -11,6 +12,9 @@ categories = ["command-line-interface", "config", "development-tools"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "3.2.15", features = ["derive"] }
+clap = { version = "3.2.15", default-features = false, features = ["std", "env", "derive"] }
+atty = { version = "0.2.14", optional = true }
+termcolor = { version = "1.1.3", optional = true }
 
 [features]
+color = ["clap/color", "dep:atty", "dep:termcolor"]

Dockerfile

@@ -1,22 +0,0 @@
-FROM rust:1.62.0-slim-buster
-
-WORKDIR /app
-
-RUN cargo init .
-
-COPY Cargo.* ./
-
-RUN cargo build --release \
-  && rm -rf src
-
-COPY ./src ./src
-
-RUN cargo install --bin vnetod --path . \
-  && rm -rf ./src Cargo.*
-
-VOLUME ["/data"]
-
-WORKDIR /data
-
-ENTRYPOINT ["/usr/local/cargo/bin/vnetod"]
-

README.md

@@ -1,17 +1,20 @@
-# vnetod
+# vnetod*
 
-Dotenv state switcher
+<small><strong>*</strong> inverted word "dotenv"</small>
 
-You can create many states in your `.env` and switch between them.
+Are you still switching sections in your dotenv file manually? Try this dotenv
+section switcher!
+
+You can create many sections in your `.env` and switch between them.
 
 Rules:
 
-- State name starts on a new line with `###` symbols (Ex. `### local`)
+- Section name starts on a new line with `###` symbols (Ex. `### local`)
-- State name can contain multiple comma-separated sections (Ex.
+- Section can contain multiple comma-separated names (Ex.
   `### local,staging`)
-- Each section may specify a namespace (Ex. `### debug:on,dev:on`). If a section
+- Each section name may specify a namespace (Ex. `### debug:on,dev:on`). If a
-  doesn't contain a namespace, it's a global namespace.
+  section doesn't contain a namespace, it's a global namespace.
-- State ends if line is empty or contains a new state name.
+- Section ends if line is empty or contains a new section name.
 
 You can see the [full example].
 
@@ -82,6 +85,13 @@ docker run --rm -it -v $PWD:/data pleshevskiy/vnetod --help
 nix run git+https://git.pleshevski.ru/pleshevskiy/vnetod -- --help
 ```
 
+# Contact me
+
+- [send feedback](https://github.com/pleshevskiy/vnetod/discussions)
+- [make an issue](https://github.com/pleshevskiy/vnetod/issues)
+- matrix: @pleshevskiy:matrix.org
+- email: dmitriy@pleshevski.ru
+
 # License
 
 GNU General Public License v3.0 or later

docker/README.md

@@ -1,11 +1,25 @@
 # Supported tags
 
 - latest
-- 0.3
+- 0.4
 
-# vnetod
+# vnetod*
 
-Dotenv state switcher
+<small><strong>*</strong> inverted word "dotenv"</small>
+
+Are you still switching sections in your dotenv file manually? Try this dotenv
+section switcher!
+
+You can create many sections in your `.env` and switch between them.
+
+Rules:
+
+- Section name starts on a new line with `###` symbols (Ex. `### local`)
+- Section can contain multiple comma-separated names (Ex.
+  `### local,staging`)
+- Each section name may specify a namespace (Ex. `### debug:on,dev:on`). If a
+  section doesn't contain a namespace, it's a global namespace.
+- Section ends if line is empty or contains a new section name.
 
 # Usage
 

flake.lock

@@ -1,39 +1,21 @@
 {
   "nodes": {
-    "naersk": {
+    "flake-utils": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
       "locked": {
-        "lastModified": 1655042882,
+        "lastModified": 1667395993,
-        "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "nix-community",
+        "owner": "numtide",
-        "repo": "naersk",
+        "repo": "flake-utils",
-        "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "numtide",
-        "ref": "master",
+        "repo": "flake-utils",
-        "repo": "naersk",
         "type": "github"
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1659190188,
-        "narHash": "sha256-LudYrDFPFaQMW0l68TYkPWRPKmqpxIFU1nWfylIp9AQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a3fddd46a7f3418d7e3940ded94701aba569161d",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1659190188,
         "narHash": "sha256-LudYrDFPFaQMW0l68TYkPWRPKmqpxIFU1nWfylIp9AQ=",
@@ -51,24 +33,8 @@
     },
     "root": {
       "inputs": {
-        "naersk": "naersk",
+        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs"
-        "utils": "utils"
-      }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -1,46 +1,77 @@
 {
   inputs = {
-    naersk.url = "github:nix-community/naersk/master";
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils, naersk }:
+  outputs = { self, nixpkgs, flake-utils }:
-    utils.lib.eachDefaultSystem (system:
+    let
+      inherit (builtins) fromTOML readFile substring;
+
+      cargoToml = fromTOML (readFile ./Cargo.toml);
+      version = "${cargoToml.package.version}+${substring 0 8 self.lastModifiedDate}.${self.shortRev or "dirty"}";
+
+      mkVnetod = { lib, rustPlatform, vnetodFeatures ? [ ], ... }:
+        rustPlatform.buildRustPackage {
+          name = "vnetod-${version}";
+
+          src = lib.cleanSource ./.;
+          cargoLock.lockFile = ./Cargo.lock;
+
+          buildFeatures = vnetodFeatures;
+
+          doCheck = true;
+        };
+    in
+    {
+      overlays = {
+        minimal = final: prev: {
+          vnetod = final.callPackage mkVnetod { };
+        };
+        default = final: prev: {
+          vnetod = final.callPackage mkVnetod {
+            vnetodFeatures = [ "color" ];
+          };
+        };
+      };
+    }
+    // flake-utils.lib.eachDefaultSystem (system:
       let
-        name = "vnetod";
         pkgs = import nixpkgs { inherit system; };
-        naersk-lib = pkgs.callPackage naersk { };
+
+        vnetod = pkgs.callPackage mkVnetod { vnetodFeatures = [ "color" ]; };
+        minimalVnetod = pkgs.callPackage mkVnetod { };
+
+        docker = pkgs.dockerTools.buildLayeredImage {
+          name = "pleshevskiy/vnetod";
+          tag = cargoToml.package.version;
+          config = {
+            Volumes."/data" = { };
+            WorkingDir = "/data";
+            Entrypoint = [ "${vnetod}/bin/vnetod" ];
+          };
+        };
+
+        mkApp = prog: {
+          type = "app";
+          program = "${vnetod}/bin/vnetod";
+        };
       in
-      rec {
+      {
-        # Executes by `nix build .#<name>`
-        packages = {
-         ${name} = naersk.lib.${system}.buildPackage {
-            pname = name;
-            root = ./.;
-          };
-        };
-        # Executes by `nix build .`
-        packages.default = packages.${name};
-        # the same but deprecated in Nix 2.7
-        defaultPackage = packages.default;
-
-        # Executes by `nix run .#<name> -- <args?>` 
         apps = {
-          ${name} = utils.lib.mkApp {
+          default = mkApp vnetod;
-            inherit name;
+          minimal = mkApp minimalVnetod;
-            drv = packages.${name};
-          };
         };
-        # Executes by `nix run . -- <args?>`
-        apps.default = apps.${name};
-        # the same but deprecated in Nix 2.7
-        defaultApp = apps.default;
 
-        # Used by `nix develop`
+        packages = {
-        devShell = with pkgs; mkShell {
+          inherit docker vnetod;
-          buildInputs = [ cargo rustc rustfmt pre-commit rustPackages.clippy ];
+          default = vnetod;
-          RUST_SRC_PATH = rustPlatform.rustLibSrc;
+          minimal = minimalVnetod;
+        };
+
+        devShell = pkgs.mkShell {
+          packages = with pkgs; [ cargo rustc rustfmt clippy rust-analyzer ];
+          RUST_SRC_PATH = pkgs.rustPlatform.rustLibSrc;
         };
       });
 }

src/cli.rs

@@ -1,4 +1,4 @@
-//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@ideascup.me>
+//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
 //!
 //! vnetod is free software: you can redistribute it and/or modify
 //! it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@ use std::path::PathBuf;
 
 use clap::Parser;
 
-#[derive(Parser)]
+#[derive(Parser, Debug)]
 #[clap(
     author,
     version,
     about = "\
 Dotenv state switcher
 ---------------------------------------------------------------------
-vnetod  Copyright (C) 2022  Dmitriy Pleshevskiy <dmitriy@ideascup.me>
+vnetod  Copyright (C) 2022  Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
 This program comes with ABSOLUTELY NO WARRANTY;
 This is free software, and you are welcome to redistribute it
 under certain conditions;
@@ -39,14 +39,15 @@ pub struct Args {
         short = 'f',
         long,
         default_value = ".env",
-        help = "Change source file with environment variables"
+        env = "VNETOD_FILE",
+        help = "Change source file with environment variables."
     )]
     pub file: PathBuf,
 
     #[clap(
         short = 'o',
         long,
-        help = "Change output file with modified environment variables. It uses `file` argument by default if the output is not specified"
+        help = "Change output file with modified environment variables. It uses `file` argument by default if the output is not specified."
     )]
     pub output: Option<PathBuf>,
 
@@ -58,7 +59,66 @@ pub struct Args {
 
     #[clap(
         value_parser,
-        help = "Environment varible sections that will be enabled"
+        help = "Environment varible sections that will be enabled."
     )]
     pub sections: Vec<String>,
+
+    #[cfg(feature = "color")]
+    #[clap(
+        long,
+        value_enum,
+        default_value = "auto",
+        help = "This flag controls when to use colors.",
+        long_help = "
+This flag controls when to use colors. The default setting is 'auto', which
+means vnetod will try to guess when to use colors. For example, if vnetod is
+printing to a terminal, then it will use colors, but if it is redirected to a
+file or a pipe, then it will suppress color output. vnetod will suppress color
+output in some other circumstances as well. For example, if the TERM
+environment variable is not set or set to 'dumb', then vnetod will not use
+colors.
+
+The possible values for this flag are:
+
+never    Colors will never be used.
+auto     The default. vnetod tries to be smart.
+always   Colors will always be used regardless of where output is sent.
+ansi     Like 'always', but emits ANSI escapes (even in a Windows console).
+"
+    )]
+    pub color: ColorVariant,
+}
+
+#[cfg(feature = "color")]
+#[derive(clap::ValueEnum, Clone, Debug)]
+pub enum ColorVariant {
+    Auto,
+    Always,
+    Ansi,
+    Never,
+}
+
+#[cfg(feature = "color")]
+impl From<ColorVariant> for termcolor::ColorChoice {
+    fn from(col: ColorVariant) -> Self {
+        match col {
+            ColorVariant::Never => Self::Never,
+            ColorVariant::Always => Self::Always,
+            ColorVariant::Ansi => Self::AlwaysAnsi,
+            ColorVariant::Auto => {
+                if atty::is(atty::Stream::Stdout) {
+                    // Otherwise let's `termcolor` decide by inspecting the environment. From the [doc]:
+                    // - If `NO_COLOR` is set to any value, then colors will be suppressed.
+                    // - If `TERM` is set to dumb, then colors will be suppressed.
+                    // - In non-Windows environments, if `TERM` is not set, then colors will be suppressed.
+                    //
+                    // [doc]: https://github.com/BurntSushi/termcolor#automatic-color-selection
+                    Self::Auto
+                } else {
+                    // Colors should be deactivated if the terminal is not a tty.
+                    Self::Never
+                }
+            }
+        }
+    }
 }

src/cli/switch.rs

@@ -1,4 +1,4 @@
-//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@ideascup.me>
+//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
 //!
 //! vnetod is free software: you can redistribute it and/or modify
 //! it under the terms of the GNU General Public License as published by
@@ -14,21 +14,24 @@
 //! along with vnetod.  If not, see <https://www.gnu.org/licenses/>.
 //!
 
+#[cfg(feature = "color")]
+use termcolor::{Color, ColorSpec, StandardStream, WriteColor};
+
 use crate::{cli::Args, domain};
 use std::fs::File;
-use std::io::{stdout, Write};
+use std::io::Write;
 
 #[derive(Debug)]
 pub enum Error {
     OpenFile,
-    Switch(domain::switch::Error),
+    WriteFile,
 }
 
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Error::OpenFile => f.write_str("Cannot open file"),
-            Error::Switch(inner) => write!(f, "Cannot switch between states: {}", inner),
+            Error::WriteFile => f.write_str("Cannot write file"),
         }
     }
 }
@@ -38,19 +41,51 @@ impl std::error::Error for Error {}
 pub fn execute(args: &Args) -> Result<(), Error> {
     let content = std::fs::read_to_string(&args.file).map_err(|_| Error::OpenFile)?;
 
-    let writer: Box<dyn Write> = if args.dry_run {
+    if args.dry_run {
-        Box::new(stdout())
+        println!("Your file will be changed to the following")
-    } else {
+    }
-        Box::new(
-            File::create(args.output.as_ref().unwrap_or(&args.file))
-                .map_err(|_| Error::OpenFile)?,
-        )
-    };
 
-    domain::switch::execute(domain::switch::Request {
+    let fs_writer = (!args.dry_run)
-        content: &content,
+        .then(|| {
-        writer,
+            File::create(args.output.as_ref().unwrap_or(&args.file)).map_err(|_| Error::OpenFile)
+        })
+        .transpose()?;
+
+    #[cfg(feature = "color")]
+    let color = args.color.clone();
+
+    println!();
+
+    let new_content = domain::switch::execute(domain::switch::Request {
+        content: &content.trim(),
         sections: &args.sections,
-    })
+        on_line: Some(Box::new(move |line| {
-    .map_err(Error::Switch)
+            #[cfg(feature = "color")]
+            print_line(line, color.clone());
+            #[cfg(not(feature = "color"))]
+            print!("{}", line)
+        })),
+    });
+
+    println!();
+
+    if let Some(mut fs_writer) = fs_writer {
+        fs_writer
+            .write_all(new_content.as_bytes())
+            .map_err(|_| Error::WriteFile)?;
+    }
+
+    Ok(())
+}
+
+#[cfg(feature = "color")]
+fn print_line(line: &String, color: crate::cli::ColorVariant) {
+    let mut stdout = StandardStream::stdout(color.into());
+    let color = line
+        .starts_with("###")
+        .then_some(Color::Yellow)
+        .or_else(|| (!line.starts_with("#")).then_some(Color::Green));
+    stdout.set_color(ColorSpec::new().set_fg(color)).ok();
+    write!(&mut stdout, "{}", line).unwrap();
+    stdout.reset().ok();
 }

src/domain.rs

@@ -1,4 +1,4 @@
-//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@ideascup.me>
+//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
 //!
 //! vnetod is free software: you can redistribute it and/or modify
 //! it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ impl Section {
     }
 }
 
-struct SectionInfo {
+pub struct SectionInfo {
     enable_variable: bool,
     disable_variable: bool,
 }

src/domain/switch.rs

@@ -1,4 +1,4 @@
-//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@ideascup.me>
+//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
 //!
 //! vnetod is free software: you can redistribute it and/or modify
 //! it under the terms of the GNU General Public License as published by
@@ -14,54 +14,32 @@
 //! along with vnetod.  If not, see <https://www.gnu.org/licenses/>.
 //!
 
-use std::io::{BufWriter, Write};
-
 use super::{Section, SectionInfo};
 
-#[derive(Debug)]
+pub type OnLineFn = Box<dyn Fn(&String)>;
-pub enum Error {
-    WriteData,
-}
 
-impl std::fmt::Display for Error {
+pub struct Request<'args> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Error::WriteData => f.write_str("Cannot write data"),
-        }
-    }
-}
-
-impl std::error::Error for Error {}
-
-pub struct Request<'args, W>
-where
-    W: Write,
-{
     pub content: &'args str,
-    pub writer: W,
     pub sections: &'args [String],
+    pub on_line: Option<OnLineFn>,
 }
 
-pub fn execute<W>(req: Request<W>) -> Result<(), Error>
+pub fn execute(req: Request) -> String {
-where
-    W: Write,
-{
-    let mut writer = BufWriter::new(req.writer);
-
     let choose_sections = req
         .sections
         .iter()
         .map(|s| Section::parse(s.as_str()))
         .collect::<Vec<_>>();
 
-    let mut current_sections: Option<SectionInfo> = None;
+    let mut current_section: Option<SectionInfo> = None;
+    let mut new_content = String::new();
 
     for line in req.content.split_inclusive('\n') {
         let new_line = if is_section_end(line) {
-            current_sections = None;
+            current_section = None;
             line.to_string()
         } else if let Some(section_info) = line.strip_prefix("### ") {
-            current_sections = section_info.split_whitespace().next().map(|r| {
+            current_section = section_info.split_whitespace().next().map(|r| {
                 let current_sections = r.split(',').map(Section::parse).collect::<Vec<_>>();
                 SectionInfo {
                     enable_variable: should_enable_variable(&choose_sections, &current_sections),
@@ -69,7 +47,7 @@ where
                 }
             });
             line.to_string()
-        } else if let Some(section_info) = current_sections.as_ref() {
+        } else if let Some(section_info) = current_section.as_ref() {
             let trimmed_line = line.trim_start_matches(['#', ' ']);
             let is_var = is_variable(trimmed_line);
             if is_var && section_info.enable_variable {
@@ -83,12 +61,13 @@ where
             line.to_string()
         };
 
-        writer
+        new_content.push_str(&new_line);
-            .write_all(new_line.as_bytes())
+        if let Some(on_line) = req.on_line.as_ref() {
-            .map_err(|_| Error::WriteData)?;
+            on_line(&new_line);
+        }
     }
 
-    writer.flush().map_err(|_| Error::WriteData)
+    new_content
 }
 
 fn is_variable(trimmed_line: &str) -> bool {
@@ -144,28 +123,19 @@ fn should_disable_variable(choose_sections: &[Section], current_sections: &[Sect
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::io::Cursor;
 
     const BASE_ENV: &str = include_str!("../../test_data/base_env");
 
     fn make_test(input: &str, expected_output: &str, sections: Vec<&str>) {
-        let mut output_data = vec![];
+        let output_data = execute(Request {
-        let writer = Cursor::new(&mut output_data);
-
-        match execute(Request {
             content: input,
-            writer,
             sections: &sections.into_iter().map(String::from).collect::<Vec<_>>(),
-        }) {
+            on_line: None,
-            Ok(()) => {
+        });
-                let output = String::from_utf8(output_data).unwrap();
+        assert_eq!(
-                assert_eq!(
+            output_data.lines().collect::<Vec<_>>(),
-                    output.lines().collect::<Vec<_>>(),
+            expected_output.lines().collect::<Vec<_>>()
-                    expected_output.lines().collect::<Vec<_>>()
+        );
-                );
-            }
-            _ => unreachable!(),
-        }
     }
 
     #[test]

src/main.rs

@@ -1,4 +1,4 @@
-//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@ideascup.me>
+//! Copyright (C) 2022, Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
 //!
 //! vnetod is free software: you can redistribute it and/or modify
 //! it under the terms of the GNU General Public License as published by