Merge pull request #121 from baoyachi/add_test

refactor date_time

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shadow-rs"
-version = "0.17.1"
+version = "0.18.0"
 authors = ["baoyachi <[email protected]>"]
 edition = "2021"
 description = "A build-time information stored in your rust project"
@@ -36,5 +36,8 @@ document-features = { version = "0.2", optional = true }
 [features]
 default = ["git2", "tzdb"]
 
+[dev-dependencies]
+regex = "1.7.0"
+
 [workspace]
 members = ["example_shadow", "example_shadow_hook"]

src/data_time.rs → src/date_time.rs

@@ -10,8 +10,8 @@ pub enum DateTime {
     Utc(OffsetDateTime),
 }
 
-pub fn now_data_time() -> DateTime {
-    // Enable reproducibility for uses of `now_data_time` by respecting the
+pub fn now_date_time() -> DateTime {
+    // Enable reproducibility for uses of `now_date_time` by respecting the
     // `SOURCE_DATE_EPOCH` env variable.
     //
     // https://reproducible-builds.org/docs/source-date-epoch/
@@ -108,11 +108,12 @@ impl Format for OffsetDateTime {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use regex::Regex;
 
     #[test]
     fn test_source_date_epoch() {
         std::env::set_var("SOURCE_DATE_EPOCH", "1628080443");
-        let time = now_data_time();
+        let time = now_date_time();
         assert_eq!(time.human_format(), "2021-08-04 12:34:03 +00:00");
     }
 
@@ -122,6 +123,12 @@ mod tests {
         #[cfg(unix)]
         assert!(!std::fs::read("/etc/localtime").unwrap().is_empty());
 
+        let regex = Regex::new(
+            r#"^[0-9]{4}-[0-9]{2}-[0-9]{2}\s[0-9]{2}:[0-9]{2}:[0-9]{2}\s[+][0-9]{2}:[0-9]{2}"#,
+        )
+        .unwrap();
+        assert!(regex.is_match(&time));
+
         println!("local now:{}", time); // 2022-07-14 00:40:05 +08:00
         assert_eq!(time.len(), 26);
     }

src/env.rs

@@ -1,5 +1,5 @@
 use crate::build::*;
-use crate::data_time::now_data_time;
+use crate::date_time::now_date_time;
 use crate::env::dep_source_replace::filter_cargo_tree;
 use crate::err::SdResult;
 use crate::Format;
@@ -282,7 +282,7 @@ const BUILD_RUST_CHANNEL: ShadowConst = "BUILD_RUST_CHANNEL";
 
 pub fn build_time(project: &mut Project) {
     // Enable reproducible builds: https://reproducible-builds.org/docs/source-date-epoch/
-    let time = now_data_time();
+    let time = now_date_time();
     project.map.insert(
         BUILD_TIME,
         ConstVal {

src/git.rs

@@ -1,6 +1,6 @@
 use crate::build::{ConstType, ConstVal, ShadowConst};
 use crate::ci::CiType;
-use crate::data_time::DateTime;
+use crate::date_time::DateTime;
 use crate::err::*;
 use crate::Format;
 use std::collections::BTreeMap;

src/lib.rs

@@ -145,7 +145,7 @@
 
 mod build;
 mod ci;
-mod data_time;
+mod date_time;
 mod env;
 mod err;
 mod gen_const;
@@ -167,7 +167,7 @@ use env::*;
 use git::*;
 
 use crate::ci::CiType;
-pub use crate::data_time::DateTime;
+pub use crate::date_time::DateTime;
 pub use const_format::*;
 use std::collections::BTreeMap;
 use std::env as std_env;