envstash 0.1.12

Manage .env files across git branches with versioning, diffing, and optional encryption
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214

use std::collections::HashMap;

use crate::types::{DiffResult, EnvEntry};

/// Compare two sets of env entries by variable name (order-independent).
pub fn diff(old: &[EnvEntry], new: &[EnvEntry]) -> DiffResult {
    let old_map: HashMap<&str, &EnvEntry> = old.iter().map(|e| (e.key.as_str(), e)).collect();
    let new_map: HashMap<&str, &EnvEntry> = new.iter().map(|e| (e.key.as_str(), e)).collect();

    let mut added = Vec::new();
    let mut removed = Vec::new();
    let mut changed = Vec::new();
    let mut unchanged = Vec::new();

    // Find removed and changed/unchanged.
    for entry in old {
        match new_map.get(entry.key.as_str()) {
            None => removed.push(entry.clone()),
            Some(new_entry) => {
                if entry == *new_entry {
                    unchanged.push(entry.clone());
                } else {
                    changed.push((entry.clone(), (*new_entry).clone()));
                }
            }
        }
    }

    // Find added (in new but not in old).
    for entry in new {
        if !old_map.contains_key(entry.key.as_str()) {
            added.push(entry.clone());
        }
    }

    DiffResult {
        added,
        removed,
        changed,
        unchanged,
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    fn entry(key: &str, value: &str, comment: Option<&str>) -> EnvEntry {
        EnvEntry {
            key: key.to_string(),
            value: value.to_string(),
            comment: comment.map(String::from),
        }
    }

    #[test]
    fn identical_sets() {
        let a = vec![entry("A", "1", None), entry("B", "2", None)];
        let b = vec![entry("A", "1", None), entry("B", "2", None)];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert!(result.removed.is_empty());
        assert!(result.changed.is_empty());
        assert_eq!(result.unchanged.len(), 2);
    }

    #[test]
    fn completely_different() {
        let a = vec![entry("A", "1", None)];
        let b = vec![entry("B", "2", None)];
        let result = diff(&a, &b);
        assert_eq!(result.added.len(), 1);
        assert_eq!(result.added[0].key, "B");
        assert_eq!(result.removed.len(), 1);
        assert_eq!(result.removed[0].key, "A");
        assert!(result.changed.is_empty());
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn additions_only() {
        let a = vec![entry("A", "1", None)];
        let b = vec![entry("A", "1", None), entry("B", "2", None)];
        let result = diff(&a, &b);
        assert_eq!(result.added.len(), 1);
        assert_eq!(result.added[0].key, "B");
        assert!(result.removed.is_empty());
        assert!(result.changed.is_empty());
        assert_eq!(result.unchanged.len(), 1);
    }

    #[test]
    fn removals_only() {
        let a = vec![entry("A", "1", None), entry("B", "2", None)];
        let b = vec![entry("A", "1", None)];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert_eq!(result.removed.len(), 1);
        assert_eq!(result.removed[0].key, "B");
        assert!(result.changed.is_empty());
        assert_eq!(result.unchanged.len(), 1);
    }

    #[test]
    fn value_change() {
        let a = vec![entry("A", "old", None)];
        let b = vec![entry("A", "new", None)];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert!(result.removed.is_empty());
        assert_eq!(result.changed.len(), 1);
        assert_eq!(result.changed[0].0.value, "old");
        assert_eq!(result.changed[0].1.value, "new");
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn comment_only_change() {
        let a = vec![entry("A", "1", Some("old comment"))];
        let b = vec![entry("A", "1", Some("new comment"))];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert!(result.removed.is_empty());
        assert_eq!(result.changed.len(), 1);
        assert_eq!(result.changed[0].0.comment, Some("old comment".to_string()));
        assert_eq!(result.changed[0].1.comment, Some("new comment".to_string()));
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn reordered_but_identical() {
        let a = vec![entry("B", "2", None), entry("A", "1", None)];
        let b = vec![entry("A", "1", None), entry("B", "2", None)];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert!(result.removed.is_empty());
        assert!(result.changed.is_empty());
        assert_eq!(result.unchanged.len(), 2);
    }

    #[test]
    fn empty_old() {
        let a: Vec<EnvEntry> = vec![];
        let b = vec![entry("A", "1", None)];
        let result = diff(&a, &b);
        assert_eq!(result.added.len(), 1);
        assert!(result.removed.is_empty());
        assert!(result.changed.is_empty());
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn empty_new() {
        let a = vec![entry("A", "1", None)];
        let b: Vec<EnvEntry> = vec![];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert_eq!(result.removed.len(), 1);
        assert!(result.changed.is_empty());
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn both_empty() {
        let a: Vec<EnvEntry> = vec![];
        let b: Vec<EnvEntry> = vec![];
        let result = diff(&a, &b);
        assert!(result.added.is_empty());
        assert!(result.removed.is_empty());
        assert!(result.changed.is_empty());
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn mixed_changes() {
        let a = vec![
            entry("KEEP", "same", None),
            entry("REMOVE", "gone", None),
            entry("CHANGE", "old", Some("old comment")),
        ];
        let b = vec![
            entry("KEEP", "same", None),
            entry("ADD", "new", None),
            entry("CHANGE", "new", Some("new comment")),
        ];
        let result = diff(&a, &b);
        assert_eq!(result.added.len(), 1);
        assert_eq!(result.added[0].key, "ADD");
        assert_eq!(result.removed.len(), 1);
        assert_eq!(result.removed[0].key, "REMOVE");
        assert_eq!(result.changed.len(), 1);
        assert_eq!(result.changed[0].0.key, "CHANGE");
        assert_eq!(result.unchanged.len(), 1);
        assert_eq!(result.unchanged[0].key, "KEEP");
    }

    #[test]
    fn comment_added_to_existing() {
        let a = vec![entry("A", "1", None)];
        let b = vec![entry("A", "1", Some("now with comment"))];
        let result = diff(&a, &b);
        assert_eq!(result.changed.len(), 1);
        assert!(result.unchanged.is_empty());
    }

    #[test]
    fn comment_removed_from_existing() {
        let a = vec![entry("A", "1", Some("had comment"))];
        let b = vec![entry("A", "1", None)];
        let result = diff(&a, &b);
        assert_eq!(result.changed.len(), 1);
        assert!(result.unchanged.is_empty());
    }
}