dotenvx 4.0.5 → 4.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Cargo.lock +3 -3
- data/ext/dotenvx/Cargo.toml +2 -2
- data/ext/dotenvx/src/lib.rs +4 -21
- data/lib/dotenvx/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a226fa6cca5ffa31823ef4d670b2860f174260de75654902121e49438fe0ec50
|
|
4
|
+
data.tar.gz: 592d8ddbaf65cd2074078cb4cc4e09d885b7cb4c503dbd1ff42ec6ee0ce33dcd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9851c708289150555f197a20dd4a9a76805968f80138d8861db16d9132e85c6128755bbaa0b4e2adbe55b81b25a159430f6f152a21ab45e7c7c89ba7976cba44
|
|
7
|
+
data.tar.gz: 1a899dfc7ef979033f616a2958b1ee3d8a22d98b65bcd6ce2070951b2b1f14868996a7fa458149b4d547ef75f309c6b0479531867cd00c9e4e38ce2259473efb
|
data/Cargo.lock
CHANGED
|
@@ -208,9 +208,9 @@ dependencies = [
|
|
|
208
208
|
|
|
209
209
|
[[package]]
|
|
210
210
|
name = "dotenvx-primitives"
|
|
211
|
-
version = "
|
|
211
|
+
version = "3.0.0"
|
|
212
212
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
213
|
-
checksum = "
|
|
213
|
+
checksum = "3437345180bc51f1355f184583a394ce06ca94ddf4f37859f6e6a42cfa29db2c"
|
|
214
214
|
dependencies = [
|
|
215
215
|
"base64",
|
|
216
216
|
"ecies",
|
|
@@ -222,7 +222,7 @@ dependencies = [
|
|
|
222
222
|
|
|
223
223
|
[[package]]
|
|
224
224
|
name = "dotenvx_native"
|
|
225
|
-
version = "4.0.
|
|
225
|
+
version = "4.0.6"
|
|
226
226
|
dependencies = [
|
|
227
227
|
"dotenvx-primitives",
|
|
228
228
|
"magnus",
|
data/ext/dotenvx/Cargo.toml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[package]
|
|
2
2
|
name = "dotenvx_native"
|
|
3
|
-
version = "4.0.
|
|
3
|
+
version = "4.0.6"
|
|
4
4
|
edition = "2021"
|
|
5
5
|
rust-version = "1.83"
|
|
6
6
|
publish = false
|
|
@@ -10,7 +10,7 @@ name = "dotenvx_native"
|
|
|
10
10
|
crate-type = ["cdylib"]
|
|
11
11
|
|
|
12
12
|
[dependencies]
|
|
13
|
-
dotenvx-primitives = "=
|
|
13
|
+
dotenvx-primitives = "=3.0.0"
|
|
14
14
|
magnus = "0.8"
|
|
15
15
|
rb-sys = { version = "0.9.128", default-features = false, features = ["stable-api-compiled-force"] }
|
|
16
16
|
serde = { version = "1", features = ["derive"] }
|
data/ext/dotenvx/src/lib.rs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
use dotenvx_primitives::{
|
|
1
|
+
use dotenvx_primitives::{parse, ParseOptions, ParseResult};
|
|
2
2
|
use magnus::{function, prelude::*, Error, Ruby};
|
|
3
3
|
use serde::Deserialize;
|
|
4
4
|
use std::collections::HashMap;
|
|
@@ -12,16 +12,6 @@ fn runtime_error(message: impl Into<String>) -> Error {
|
|
|
12
12
|
Error::new(ruby.exception_runtime_error(), message.into())
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
fn scalar_values(values: HashMap<String, Value>) -> StringPairs {
|
|
16
|
-
values
|
|
17
|
-
.into_iter()
|
|
18
|
-
.filter_map(|(key, value)| match value {
|
|
19
|
-
Value::Scalar(value) => Some((key, value)),
|
|
20
|
-
Value::Array(_) => None,
|
|
21
|
-
})
|
|
22
|
-
.collect()
|
|
23
|
-
}
|
|
24
|
-
|
|
25
15
|
fn parse_result(result: ParseResult) -> (StringPairs, StringPairs, ErrorPairs) {
|
|
26
16
|
let errors = result
|
|
27
17
|
.errors
|
|
@@ -29,8 +19,8 @@ fn parse_result(result: ParseResult) -> (StringPairs, StringPairs, ErrorPairs) {
|
|
|
29
19
|
.map(|error| (error.code().to_owned(), error.to_string()))
|
|
30
20
|
.collect();
|
|
31
21
|
(
|
|
32
|
-
|
|
33
|
-
|
|
22
|
+
result.parsed.into_iter().collect(),
|
|
23
|
+
result.injected.into_iter().collect(),
|
|
34
24
|
errors,
|
|
35
25
|
)
|
|
36
26
|
}
|
|
@@ -47,19 +37,12 @@ fn parse_dotenv(input_json: String) -> Result<(StringPairs, StringPairs, ErrorPa
|
|
|
47
37
|
let input = serde_json::from_str::<ParseInput>(&input_json)
|
|
48
38
|
.map_err(|error| runtime_error(error.to_string()))?;
|
|
49
39
|
let process_env = input.process_env;
|
|
50
|
-
let ring = keyring(&KeyringOptions {
|
|
51
|
-
process_env: process_env.clone(),
|
|
52
|
-
key_files: input.key_files.into_iter().map(PathBuf::from).collect(),
|
|
53
|
-
..Default::default()
|
|
54
|
-
})
|
|
55
|
-
.map_err(|error| runtime_error(error.to_string()))?;
|
|
56
|
-
|
|
57
40
|
Ok(parse_result(parse(
|
|
58
41
|
&input.source,
|
|
59
42
|
&ParseOptions {
|
|
60
43
|
process_env,
|
|
61
44
|
overload: input.overwrite,
|
|
62
|
-
|
|
45
|
+
key_files: input.key_files.into_iter().map(PathBuf::from).collect(),
|
|
63
46
|
..Default::default()
|
|
64
47
|
},
|
|
65
48
|
)))
|
data/lib/dotenvx/version.rb
CHANGED