feat: support env overrides

Author: howenyap

README.md

@@ -26,6 +26,16 @@ Puddle is a CLI tool to interact with the [Raindrop.io API](https://developer.ra
 - Copy your `Client ID` and `Client secret` into the CLI inputs
 - Try running `puddle me`, you should see your account details and you're all set!
 
+## Environment Variables
+`puddle` can also load configuration from environment variables instead of `config.toml`.
+
+Supported variables:
+- `PUDDLE_CLIENT_ID`
+- `PUDDLE_CLIENT_SECRET`
+- `PUDDLE_REDIRECT_URI`
+- `PUDDLE_ACCESS_TOKEN`
+- `PUDDLE_REFRESH_TOKEN`
+
 # Development
 Make sure you have [Rust](https://rust-lang.org/tools/install/) installed.
 

src/app.rs

@@ -1,4 +1,4 @@
-use crate::config::{Config, global_config_path};
+use crate::config::Config;
 use puddle::RaindropClient;
 
 pub(crate) struct CliApp {
@@ -7,8 +7,7 @@ pub(crate) struct CliApp {
 
 impl CliApp {
     pub(crate) fn new() -> Result<Self, Box<dyn std::error::Error>> {
-        let config_path = global_config_path()?;
-        let config = Config::from_path(&config_path)?;
+        let config = Config::load()?;
 
         Ok(Self {
             client: RaindropClient::new(config.access_token)?,

src/config.rs

@@ -1,4 +1,5 @@
 use crate::constants::{
+    ENV_ACCESS_TOKEN, ENV_CLIENT_ID, ENV_CLIENT_SECRET, ENV_REDIRECT_URI, ENV_REFRESH_TOKEN,
     TOML_ACCESS_TOKEN, TOML_CLIENT_ID, TOML_CLIENT_SECRET, TOML_REDIRECT_URI, TOML_REFRESH_TOKEN,
 };
 use std::env;
@@ -7,6 +8,7 @@ use std::io;
 use std::path::{Path, PathBuf};
 use toml::Value;
 
+#[derive(Debug)]
 pub struct Config {
     pub client_id: String,
     pub client_secret: String,
@@ -16,6 +18,15 @@ pub struct Config {
 }
 
 impl Config {
+    pub fn load() -> io::Result<Self> {
+        if let Some(config) = Self::from_env()? {
+            return Ok(config);
+        }
+
+        let config_path = global_config_path()?;
+        Self::from_path(&config_path)
+    }
+
     pub fn from_path(path: impl AsRef<Path>) -> io::Result<Self> {
         let path = path.as_ref();
         let content = fs::read_to_string(path).map_err(|err| {
@@ -73,6 +84,57 @@ impl Config {
         Ok(())
     }
 
+    fn from_env() -> io::Result<Option<Self>> {
+        let entries = [
+            ENV_CLIENT_ID,
+            ENV_CLIENT_SECRET,
+            ENV_REDIRECT_URI,
+            ENV_ACCESS_TOKEN,
+            ENV_REFRESH_TOKEN,
+        ]
+        .map(|key| {
+            (
+                key,
+                env::var(key).ok().filter(|value| !value.trim().is_empty()),
+            )
+        });
+
+        if entries.iter().all(|(_, value)| value.is_none()) {
+            return Ok(None);
+        }
+
+        let [
+            (_, Some(client_id)),
+            (_, Some(client_secret)),
+            (_, Some(redirect_uri)),
+            (_, Some(access_token)),
+            (_, Some(refresh_token)),
+        ] = entries
+        else {
+            let missing = entries
+                .iter()
+                .filter(|(_, value)| value.is_none())
+                .map(|(env_key, _)| *env_key)
+                .collect::<Vec<_>>()
+                .join(", ");
+
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidInput,
+                format!(
+                    "partial PUDDLE_* environment configuration detected. Missing or empty: {missing}"
+                ),
+            ));
+        };
+
+        Ok(Some(Self {
+            client_id,
+            client_secret,
+            redirect_uri,
+            access_token,
+            refresh_token,
+        }))
+    }
+
     fn required_toml_string(table: &toml::Table, key: &str, path: &Path) -> io::Result<String> {
         let value = table.get(key).ok_or_else(|| {
             io::Error::new(

src/constants.rs

@@ -4,6 +4,12 @@ pub const TOML_REDIRECT_URI: &str = "redirect_uri";
 pub const TOML_ACCESS_TOKEN: &str = "access_token";
 pub const TOML_REFRESH_TOKEN: &str = "refresh_token";
 
+pub const ENV_CLIENT_ID: &str = "PUDDLE_CLIENT_ID";
+pub const ENV_CLIENT_SECRET: &str = "PUDDLE_CLIENT_SECRET";
+pub const ENV_REDIRECT_URI: &str = "PUDDLE_REDIRECT_URI";
+pub const ENV_ACCESS_TOKEN: &str = "PUDDLE_ACCESS_TOKEN";
+pub const ENV_REFRESH_TOKEN: &str = "PUDDLE_REFRESH_TOKEN";
+
 pub const RAINDROP_INTEGRATIONS_URI: &str = "https://app.raindrop.io/settings/integrations";
 pub const DEFAULT_OAUTH_DEBUG_REDIRECT_URI: &str = "https://oauthdebugger.com/debug";
 pub const AUTHORIZE_URL_BASE: &str = "https://raindrop.io/oauth/authorize";