Start integrating git

Pipfile

@@ -8,11 +8,11 @@ verify_ssl = true
 [packages]
 flask = "*"
 wtforms = "*"
-gitpython = "*"
 markdown = "*"
 pytest = "*"
 pytest-cov = "*"
 flask-webpack = "*"
+sh = "*"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "4389fadf9b02e4cf8b8de26830e9ffa003e4414fe29778e11d1a07862e19c8da"
+            "sha256": "2fc31fe49a97d00c3e1f88f1aacb9aaaa7348bd39cc4e09df5a42018eb09a640"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -88,21 +88,6 @@
             "index": "pypi",
             "version": "==0.1.0"
         },
-        "gitdb2": {
-            "hashes": [
-                "sha256:83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2",
-                "sha256:e3a0141c5f2a3f635c7209d56c496ebe1ad35da82fe4d3ec4aaa36278d70648a"
-            ],
-            "version": "==2.0.5"
-        },
-        "gitpython": {
-            "hashes": [
-                "sha256:563221e5a44369c6b79172f455584c9ebbb122a13368cc82cb4b5addff788f82",
-                "sha256:8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"
-            ],
-            "index": "pypi",
-            "version": "==2.1.11"
-        },
         "itsdangerous": {
             "hashes": [
                 "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
@@ -196,6 +181,14 @@
             "index": "pypi",
             "version": "==2.6.0"
         },
+        "sh": {
+            "hashes": [
+                "sha256:ae3258c5249493cebe73cb4e18253a41ed69262484bad36fdb3efcb8ad8870bb",
+                "sha256:b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc"
+            ],
+            "index": "pypi",
+            "version": "==1.12.14"
+        },
         "six": {
             "hashes": [
                 "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
@@ -203,13 +196,6 @@
             ],
             "version": "==1.12.0"
         },
-        "smmap2": {
-            "hashes": [
-                "sha256:0555a7bf4df71d1ef4218e4807bbf9b201f910174e6e08af2e138d4e517b4dde",
-                "sha256:29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a"
-            ],
-            "version": "==2.0.5"
-        },
         "werkzeug": {
             "hashes": [
                 "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c",

assets/scss/style.scss

@@ -3,7 +3,7 @@
 $black:       #000000;
 $white:       #ffffff;
 $blue:        #496893;
-$red:         #ff0000;
+$red:         #d9534f;
 $light-gray:  #f5f5f5;
 $medium-gray: #c8c8c8;
 
@@ -46,6 +46,36 @@ body {
   margin-bottom: 15px;
 }
 
+.error {
+  align-items: center;
+  color: $white;
+  display: flex;
+  font-size: 14px;
+  padding: 10px;
+}
+
+.error {
+  background: $red;
+}
+
+.error__message {
+  flex: 1;
+}
+
+.error__button {
+  background: $white;
+  border: none;
+  color: $black;
+  cursor: pointer;
+  font-family: $body-font-family;
+  font-size: 14px;
+  padding: 5px 10px;
+
+  &:hover {
+    background: $light-gray;
+  }
+}
+
 /* layout */
 
 .container {

yird/app.py

@@ -2,6 +2,8 @@ from flask import Flask, redirect, render_template, request, url_for
 
 from flask_webpack import Webpack
 
+from yird.services.git import GitService
+
 from yird.services.posts import PostsService
 
 from yird.settings import Settings
@@ -27,6 +29,11 @@ def inject_site_name():
     }
 
 
+@app.context_processor
+def inject_git_status():
+    return GitService.get_status()
+
+
 @app.route('/admin')
 def index():
     posts = PostsService.get_posts()
@@ -61,6 +68,15 @@ def update_post(post_id):
 @app.route('/admin/generate')
 def generate():
     PostsService.generate_posts()
+
+
+@app.route('/admin/repo', methods=["GET"])
+def repo():
+    return render_template('repo/index.html.j2')
+
+@app.route('/admin/repo', methods=["POST"])
+def git_init():
+    GitService.init()
     return redirect(url_for('index'))
 
 if __name__ == "__main__":

yird/services/git.py

@@ -0,0 +1,47 @@
+import re
+import sh
+
+from yird.settings import Settings
+
+
+class GitService:
+    git = sh.git.bake(_cwd=Settings().YIRD_PATH)
+
+    @classmethod
+    def get_status(cls):
+        files = []
+        initialized = False
+        try:
+            status = cls.git.status("-s", "-uall").strip()
+
+            for line in status.split("\n"):
+                if line[0:9] == "\x1b[31mM\x1b[m":
+                    files.append({
+                        "filename": line[10:],
+                        "status": "modified"
+                    })
+                elif line[0:9] == "\x1b[32mM\x1b[m":
+                    files.append({
+                        "filename": line[10:],
+                        "status": "added and modified"
+                    })
+                elif line[0:10] == "\x1b[31m??\x1b[m":
+                    files.append({
+                        "filename": line[11:],
+                        "status": "untracked"
+                    })
+
+            initialized = True
+        except sh.ErrorReturnCode_128 as e:
+            if re.search('not a git repository', str(e)):
+                initialized = False
+        return {
+            "git": {
+                "initialized": initialized,
+                "file_statuses": files
+            }
+        }
+
+    @classmethod
+    def init(cls):
+        cls.git.init()

yird/templates/layout.html.j2

@@ -27,6 +27,16 @@
           </a>
         </li>
       </ul>
+      {% if not git.initialized %}
+        <div class="error">
+          <p class="error__message">
+            Your YIRD_PATH has not been initialized as a git repository.
+          </p>
+          <form class="error__form" method="post" action="{{ url_for('git_init') }}">
+            <input class="error__button" type="submit" value="Initialize">
+          </form>
+        </p>
+      {% endif %}
     </header>
     <main class="main">
       {% block content %}{% endblock %}

yird/templates/repo/index.html.j2

@@ -0,0 +1,18 @@
+{% extends "layout.html.j2" %}
+{% block content %}
+<div class="repo">
+  <h3 class="heading">git repo</h3>
+  <table class="file_statuses">
+    {% for file in git.file_statuses %}
+      <tr>
+        <td class="file_statuses__status file_statuses__status--{{ file.status|replace('_', '-') }}">
+          {{ file.status }}
+        </td>
+        <td class="file_statuses__filename">
+          {{ file.filename }}
+        </td>
+      </tr>
+    {% endfor %}
+  </table>
+</div>
+{% endblock %}