Better gitGetVersion

components/app/app.js

@@ -67,10 +67,12 @@ class AppViewModel {
         this.latestVersion(version.latestVersion);
         this.showNewVersionAvailable(!ungit.config.ungitVersionCheckOverride && version.outdated);
       }).catch((e) => this.server.unhandledRejection(e));
-    this.server.getPromise('/gitversion')
-      .then((gitversion) => {
-        if (gitversion && !gitversion.satisfied) {
-          this.gitVersionError(gitversion.error);
+
+    const minGitVersion = '>=1.8.0'
+    this.server.getPromise('/gitversion', {requiredGitVersion: minGitVersion})
+      .then((result) => {
+        if (result && !result.satisfied) {
+          this.gitVersionError(`Ungit requires git ${minGitVersion}, found ${result.type} ${result.version}`);
         }
       }).catch((e) => this.server.unhandledRejection(e));
   }

source/server.js

@@ -301,7 +301,13 @@ app.get('/api/latestversion', (req, res) => {
 app.get('/api/ping', (req, res) => res.json({}));
 
 app.get('/api/gitversion', (req, res) => {
-  sysinfo.getGitVersionInfo().then((result) => res.json(result));
+  sysinfo.getGitVersionInfo().then((result) => {
+    res.json({
+      satisfied: semver.satisfies(result, req.query.requiredGitVersion),
+      version: result,
+      type: 'git'
+    })
+  });
 });
 
 const userConfigPath = path.join(config.homedir, '.ungitrc');

source/sysinfo.js

@@ -45,21 +45,5 @@ exports.getUserHash = () => {
 }
 
 exports.getGitVersionInfo = () => {
-  const result = {
-    requiredVersion: '>=1.8.x',
-    version: 'unkown',
-    satisfied: false
-  };
-
-  if (!config.gitVersion) {
-    result.error = `Failed to parse git version number. Note that Ungit requires git version ${result.requiredVersion}`;
-  } else {
-    result.version = config.gitVersion;
-    result.satisfied = semver.satisfies(result.version, result.requiredVersion);
-    if (!result.satisfied) {
-      result.error = `Ungit requires git version ${result.requiredVersion}, you are currently running ${result.version}`;
-    }
-  }
-
-  return Bluebird.resolve(result);
+  return Bluebird.resolve(config.gitVersion);
 }

test/spec.sysinfo.js

@@ -0,0 +1,8 @@
+const expect = require('expect.js');
+const sysinfo = require('../src/sysinfo');
+
+describe('sysinfo', () => {
+  it('returns the gitversion', () => {
+    sysinfo.getGitVersionInfo().then((version) => expect(version).to.match(/\d+\.\d+\.\d+/))
+  });
+});