Merge pull request #75 from TomasTomecek/git-0.20

Update git2 to 0.20 and update RPM packaging

Author: TomasTomecek

.packit.yaml

@@ -2,10 +2,11 @@
 downstream_package_name: rust-pretty-git-prompt
 srpm_build_deps:
 - cargo
-- rust
+- cargo-rpm-macros
 actions:
   create-archive:
-  - cargo publish --dry-run --allow-dirty
+    # didn't manage to make it work with --offline, cargo cannot find the packages/crates locally
+  - cargo package --allow-dirty
   - bash -c "ls -1 target/package/*.crate"
 jobs:
   - job: copr_build

Cargo.toml

@@ -22,6 +22,6 @@ default-features = false
 features = ["std", "cargo"]
 
 [dependencies.git2]
-version = "0.18"
+version = "0.20"
 default-features = false
 features = []

rust-pretty-git-prompt.spec

@@ -1,64 +1,63 @@
-# Generated by rust2rpm
-%bcond_without check
+# Generated by rust2rpm 28
+# * tests can only be run inside the upstream git repository:
+#   https://github.com/tomastomecek/pretty-git-prompt/issues/35
+%bcond check 0
 
 %global crate pretty-git-prompt
 
-Name:           rust-%{crate}
+Name:           rust-pretty-git-prompt
 Version:        0.2.2
 Release:        %autorelease
 Summary:        Your current git repository information inside a beautiful shell prompt
 
 License:        MIT
 URL:            https://crates.io/crates/pretty-git-prompt
-Source0:        %{crates_source}
+Source:         %{crates_source}
 
-ExclusiveArch:  %{rust_arches}
+BuildRequires:  cargo-rpm-macros >= 24
 
-BuildRequires:  rust-packaging >= 23
+%global _description %{expand:
+Your current git repository information inside a beautiful shell prompt.}
 
-%description
-%{summary}.
+%description %{_description}
 
 %package     -n %{crate}
 Summary:        %{summary}
+# (MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT
 # MIT
-# MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause
 # MIT OR Apache-2.0
 # MIT OR Apache-2.0 OR Zlib
 # Zlib OR Apache-2.0 OR MIT
 License:        MIT AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib)
 # LICENSE.dependencies contains a full license breakdown
 
-%description -n %{crate}
-%{summary}.
+%description -n %{crate} %{_description}
+
+%files       -n %{crate}
+%license LICENSE
+%license LICENSE.dependencies
+%doc README.md
+%{_bindir}/pretty-git-prompt
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
 %cargo_generate_buildrequires
 
 %build
 %cargo_build
-%cargo_license_summary
+%{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
 %install
 %cargo_install
 
 %if %{with check}
 %check
-# https://github.com/tomastomecek/pretty-git-prompt/issues/35
-%cargo_test || :
+%cargo_test
 %endif
 
-%files       -n %{crate}
-%license LICENSE
-%license LICENSE.dependencies
-%doc README.md
-%doc files
-%{_bindir}/pretty-git-prompt
-
 %changelog
 %autochangelog

src/backend.rs

@@ -106,7 +106,7 @@ impl Backend {
         Backend{ repo: repo, debug: debug, cache: Cache::new() }
     }
 
-    fn get_head(&self) -> Option<Reference> {
+    fn get_head(&self) -> Option<Reference<'_>> {
         match self.repo.head() {
             Ok(head) => Some(head),
             Err(e2) => {
@@ -317,7 +317,7 @@ impl Backend {
         }
     }
 
-    pub fn get_status(&self) -> Option<Statuses> {
+    pub fn get_status(&self) -> Option<Statuses<'_>> {
         let mut so = StatusOptions::new();
         let mut opts = so.show(StatusShow::IndexAndWorkdir);
         opts.include_untracked(true);

src/conf.rs

@@ -297,15 +297,6 @@ pub fn create_default_config(path: &PathBuf) -> Result<String, io::Error> {
 
 mod tests {
     // We'll use this git repo for testing
-    use std::fs::{File,OpenOptions,remove_file};
-    use std::io::{Write,Read};
-    use std::path::{Path,PathBuf};
-    use conf::{get_configuration,create_default_config,DEFAULT_CONF,Conf};
-    use yaml_rust::{YamlLoader};
-    use backend::Backend;
-    use models::DisplayMaster;
-    use git2::Repository;
-
     #[test]
     #[should_panic(expected = "'version' is missing in config file.")]
     fn test_empty_config() {

src/constants.rs

@@ -38,9 +38,6 @@ pub fn get_default_config_path() -> PathBuf {
 }
 
 mod tests {
-    use std::ffi::OsStr;
-    use constants::{get_default_config_path,DEFAULT_CONFIG_NAME};
-
     #[test]
     fn test_default_config_path() {
         // FIXME: create test dir and remove it aftet testing