feat(status): check git installation (closes #249)

bleenco · Oct 23, 2017 · d389d6d · d389d6d
1 parent aa76406
commit d389d6d
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 14 deletions.
diff --git a/src/api/server-routes.ts b/src/api/server-routes.ts
@@ -558,6 +558,7 @@ export function setupRoutes(): express.Router {
 
   router.get('/ready', (req: express.Request, res: express.Response) => {
     Observable.merge(...[
+      system.isGitInstalled(),
       system.isSQLiteInstalled(),
       docker.isDockerInstalled(),
       docker.isDockerRunning(),
@@ -588,18 +589,24 @@ export function setupRoutes(): express.Router {
   });
 
   router.get('/status', (req: express.Request, res: express.Response) => {
-    system.isSQLiteInstalled().subscribe(sqlite => {
-      docker.isDockerInstalled().subscribe(dockerInstalled => {
-        if (dockerInstalled) {
-          docker.isDockerRunning().subscribe(dockerRunning => {
-            const data = { sqlite: sqlite, docker: dockerInstalled, dockerRunning: dockerRunning };
-            res.status(200).json({ data: data });
-          });
-        } else {
-          const data = { sqlite: sqlite, docker: false, dockerRunning: false };
-          res.status(200).json({ data: data });
-        }
-      });
+    Observable.concat(...[
+      system.isGitInstalled(),
+      system.isSQLiteInstalled(),
+      docker.isDockerInstalled()
+    ])
+    .toArray()
+    .subscribe(data => {
+      if (data[2]) {
+        docker.isDockerRunning().subscribe(dockerRunning => {
+          const status = {
+            sqlite: data[1], docker: data[2], dockerRunning: dockerRunning, git: data[0] };
+          res.status(200).json({ data: status });
+        });
+      } else {
+        const status = {
+          sqlite: data[1], docker: false, dockerRunning: false, git: data[0] };
+        res.status(200).json({ data: status });
+      }
     });
   });
 

diff --git a/src/api/system.ts b/src/api/system.ts
@@ -15,3 +15,18 @@ export function isSQLiteInstalled(): Observable<boolean> {
     });
   });
 }
+
+export function isGitInstalled(): Observable<boolean> {
+  return new Observable((observer: Observer<boolean>) => {
+    const git = spawn('which', ['git']);
+    git.on('close', code => {
+      if (code === 0) {
+        observer.next(true);
+      } else {
+        observer.next(false);
+      }
+
+      observer.complete();
+    });
+  });
+}
diff --git a/src/app/components/app-setup/app-setup.component.html b/src/app/components/app-setup/app-setup.component.html
@@ -36,6 +36,9 @@ <h2>
                   <div class="setup-list-item">
                     <img class="icon" [src]="serverStatus.sqlite ? 'images/icons/check-true.svg' : 'images/icons/check-false.svg'" name="sqlite3-installed-icon"> SQLite3 Installed
                   </div>
+                  <div class="setup-list-item">
+                    <img class="icon" [src]="serverStatus.git ? 'images/icons/check-true.svg' : 'images/icons/check-false.svg'" name="git-installed-icon"> Git Installed
+                  </div>
                 </div>
                 <hr/>
                 <p *ngIf="!readyToSetup">Please make sure that all of the above checkmarks are green as it is mandatory to run Abstruse on this server.</p>

diff --git a/src/app/components/app-setup/app-setup.component.ts b/src/app/components/app-setup/app-setup.component.ts
@@ -8,6 +8,7 @@ export interface ServerStatus {
   sqlite: boolean;
   docker: boolean;
   dockerRunning: boolean;
+  git: boolean;
 }
 
 export interface User {
@@ -40,7 +41,8 @@ export class AppSetupComponent implements OnInit {
     this.serverStatus = {
       sqlite: false,
       docker: false,
-      dockerRunning: false
+      dockerRunning: false,
+      git: false
     };
 
     this.readyToSetup = false;

diff --git a/tests/unit/050_new-server-api-routes.spec.ts b/tests/unit/050_new-server-api-routes.spec.ts
@@ -375,7 +375,9 @@ describe('Api Server Routes Unit Tests', () => {
 
     it(`status should return true`, () => {
       return sendGetRequest({}, `api/setup/status`).then(res => {
-        expect(res).to.deep.equal({ data: { docker: true, dockerRunning: true, sqlite: true } });
+        expect(res).to.deep.equal({
+          data: { docker: true, dockerRunning: true, sqlite: true, git: true }
+        });
       });
     });