Merge pull request #213 from DarkEld3r/codename

Add the 'codename' field to the version
stanislav-tkach · Aug 15, 2020 · a4cb067 · a4cb067
2 parents 1b6551c + 4c31ded
commit a4cb067
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 63 deletions.
diff --git a/os_info/src/info.rs b/os_info/src/info.rs
@@ -147,31 +147,48 @@ mod tests {
     #[test]
     fn new() {
         let types = [
-            Type::Unknown,
+            Type::Alpine,
+            Type::Amazon,
             Type::Android,
-            Type::Emscripten,
-            Type::Linux,
-            Type::Redhat,
-            Type::Ubuntu,
-            Type::Debian,
             Type::Arch,
             Type::Centos,
-            Type::Fedora,
-            Type::Solus,
+            Type::Debian,
+            Type::Emscripten,
             Type::EndeavourOS,
-            Type::Manjaro,
-            Type::Alpine,
+            Type::Fedora,
+            Type::Linux,
             Type::Macos,
+            Type::Manjaro,
+            Type::openSUSE,
+            Type::OracleLinux,
+            Type::Pop,
+            Type::Redhat,
+            Type::RedHatEnterprise,
             Type::Redox,
+            Type::Solus,
+            Type::SUSE,
+            Type::Ubuntu,
+            Type::Unknown,
             Type::Windows,
         ];
 
         let versions = [
             Version::unknown(),
-            Version::semantic(0, 0, 0, None),
-            Version::semantic(1, 2, 3, Some("e".to_owned())),
-            Version::custom("version".to_owned(), None),
-            Version::custom("different version".to_owned(), Some("edition".to_owned())),
+            Version::semantic(0, 0, 0, None, None),
+            Version::semantic(1, 2, 3, Some("e".to_owned()), None),
+            Version::semantic(1, 2, 3, Some("e".to_owned()), Some("2020.06.08".to_owned())),
+            Version::rolling(None, None, None),
+            Version::rolling(
+                Some("2020.02.03".to_owned()),
+                Some("edition".to_owned()),
+                Some("codename".to_owned()),
+            ),
+            Version::custom("version".to_owned(), None, None),
+            Version::custom(
+                "different version".to_owned(),
+                Some("edition".to_owned()),
+                Some("codename".to_owned()),
+            ),
         ];
 
         let bitnesses = [Bitness::Unknown, Bitness::X32, Bitness::X64];

diff --git a/os_info/src/linux/file_release.rs b/os_info/src/linux/file_release.rs
@@ -37,7 +37,7 @@ fn retrieve(distributions: &[ReleaseInfo]) -> Option<Info> {
         let version = release_info
             .version_matcher
             .find(&file_content)
-            .map(|x| Version::new(VersionType::from_string(&x), None))
+            .map(|x| Version::new(VersionType::from_string(&x), None, None))
             .unwrap_or_else(Version::unknown);
 
         return Some(Info::new(os_type, version, Bitness::Unknown));
@@ -109,7 +109,7 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::OracleLinux);
-        assert_eq!(info.version, Version::semantic(8, 1, 0, None));
+        assert_eq!(info.version, Version::semantic(8, 1, 0, None, None));
     }
 
     #[test]
@@ -119,7 +119,7 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::Centos);
-        assert_eq!(info.version, Version::semantic(7, 0, 0, None));
+        assert_eq!(info.version, Version::semantic(7, 0, 0, None, None));
     }
 
     #[test]
@@ -129,7 +129,7 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::Ubuntu);
-        assert_eq!(info.version, Version::semantic(18, 10, 0, None));
+        assert_eq!(info.version, Version::semantic(18, 10, 0, None, None));
     }
 
     #[test]
@@ -139,7 +139,7 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::Centos);
-        assert_eq!(info.version, Version::custom("XX", None));
+        assert_eq!(info.version, Version::custom("XX", None, None));
     }
 
     #[test]
@@ -149,7 +149,7 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::Fedora);
-        assert_eq!(info.version, Version::semantic(26, 0, 0, None));
+        assert_eq!(info.version, Version::semantic(26, 0, 0, None, None));
     }
 
     #[test]
@@ -159,7 +159,7 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::Redhat);
-        assert_eq!(info.version, Version::custom("XX", None));
+        assert_eq!(info.version, Version::custom("XX", None, None));
     }
 
     #[test]
@@ -169,6 +169,6 @@ mod tests {
 
         let info = retrieve(&distributions).unwrap();
         assert_eq!(info.os_type(), Type::Alpine);
-        assert_eq!(info.version, Version::custom("A.B.C", None));
+        assert_eq!(info.version, Version::custom("A.B.C", None, None));
     }
 }
diff --git a/os_info/src/linux/lsb_release.rs b/os_info/src/linux/lsb_release.rs
@@ -11,7 +11,7 @@ pub fn get() -> Option<Info> {
 
     let version = release
         .version
-        .map_or_else(Version::unknown, |v| Version::custom(v, None));
+        .map_or_else(Version::unknown, |v| Version::custom(v, None, None));
 
     let os_type = match release.distribution.as_ref().map(String::as_ref) {
         Some("Ubuntu") => Type::Ubuntu,

diff --git a/os_info/src/macos/mod.rs b/os_info/src/macos/mod.rs
@@ -24,7 +24,7 @@ fn version() -> Version {
         Some(val) => val,
     };
 
-    Version::new(VersionType::from_string(&version), None)
+    Version::new(VersionType::from_string(&version), None, None)
 }
 
 fn product_version() -> Option<String> {

diff --git a/os_info/src/redox/mod.rs b/os_info/src/redox/mod.rs
@@ -11,7 +11,8 @@ const UNAME_FILE: &str = "sys:uname";
 pub fn current_platform() -> Info {
     trace!("redox::current_platform is called");
 
-    let version = get_version().map_or_else(|| Version::unknown(), |v| Version::custom(v, None));
+    let version =
+        get_version().map_or_else(|| Version::unknown(), |v| Version::custom(v, None, None));
     let info = Info {
         os_type: Type::Redox,
         version,