chore: GitContext long hash & idiomatic Options (#233)

* chore: GitContext long hash & idiomatic Options * chore: adds regression tests for GitContext * fix: use git2 to construct GitContext
apollographql · Feb 4, 2021 · 23434de · 23434de
1 parent 211cfac
commit 23434de
Show file tree

Hide file tree

Showing 5 changed files with 203 additions and 111 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,12 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build:
-          [
-            linux-stable,
-            macos-stable,
-            windows-stable,
-          ]
+        build: [linux-stable, macos-stable, windows-stable]
         include:
           - build: linux-stable
             os: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,10 @@ timber = { path = "./crates/timber" }
 anyhow = "1.0.38"
 atty = "0.2.14"
 ansi_term = "0.12.1"
+chrono = "0.4"
 console = "0.14.0"
+git2 = "0.13.17"
+git-url-parse = "0.3.1"
 heck = "0.3.2"
 prettytable-rs = "0.8.0"
 serde = "1.0"
@@ -28,13 +31,11 @@ structopt = "0.3.21"
 tracing = "0.1.22"
 regex = "1"
 url = "2.2.0"
-git_info = "0.1.2"
-git-url-parse = "0.3.1"
-chrono = "0.4"
 
 [dev-dependencies]
 assert_cmd = "1.0.1"
 assert_fs = "1.0.0"
+rustversion = "1.0.4"
 serial_test = "0.5.0"
 predicates = "1.0.5"
 

diff --git a/src/cli.rs b/src/cli.rs
@@ -75,7 +75,7 @@ impl Rover {
 
     pub(crate) fn get_git_context(&self) -> Result<GitContext> {
         // constructing GitContext with a set of overrides from env vars
-        let git_context = GitContext::with_env(&self.env_store)?;
+        let git_context = GitContext::try_from_rover_env(&self.env_store)?;
         tracing::debug!(?git_context);
         Ok(git_context)
     }