Commit 693d7ab4 authored by Pascal's avatar Pascal
Browse files

Merge branch 'master' of

parents 5bf9484b 559b5ec4
# -*- coding: utf-8 -*-
import shlex
import subprocess
def git_decode(letter):
code = {
' ': 'unmodified',
'M': 'modified',
'A': 'added',
'D': 'deleted',
'U': 'unmerged',
'?': 'untracked'
return code.get(letter, None)
class PathStatus:
File status as output by git status --porcelain
TODO: consider using porcelain=v2
def __init__(self, line, number):
self.number = number
self.line = line
self.index = git_decode(line[0])
self.tree = git_decode(line[1])
self.path = line[3:]
def __repr__(self):
return self.line
class Status(list):
states = [ ('changed', 'modifiés non publiés'),
('saved', 'validés pour publication') ]
actions = [ ('save', 'valider'),
('skip', 'ignorer'),
('discard', 'abandonner') ]
def __init__(self, gitstatus):
files = [ PathStatus(l,i) for i,l in enumerate(gitstatus) ]
class GitCommand(object):
TODO: consider turning this class
into a function,
using __new__(*args)
instead of __call__(self, *args)
git_cmd = []
def git_args(self, *args):
return []
def result(self, rv):
return rv.returncode == 0
def before(self):
def check_before(self):
return True
def __call__(self, *args, **kwargs):
assert self.check_before()
args = self.git_cmd + self.git_args(*args)
rv = subprocess.check_output(args)
return self.result(rv)
def instantiate(cls):
return cls()
class git_skip(GitCommand):
class git_add(GitCommand):
git_cmd = ['git', 'add']
def git_args(self, path):
return [path]
class git_add_tree(GitCommand):
git_cmd = ['git', 'add', '-u', ':/']
class git_status(GitCommand):
git_cmd = ['git', 'status', '--porcelain']
def result(self, rv):
return Status(rv.decode('utf-8').splitlines())
class GitCommit(GitCommand):
git_cmd = ['git', 'commit']
def git_args(self, message, author):
author = shlex.quote(author)
return ['-m', message, '--author="%s"'%(author)]
class git_commit_index(GitCommit):
class git_commit_tree(GitCommit):
git_cmd = ['git', 'commit']
def check_before(self):
return GitAddTree()
#class GitCheckUpstream(GitCommand):
# """
# git fetch origin master
# git merge-tree `git merge-base FETCH_HEAD master` FETCH_HEAD master
# """
# branch = 'master'
# origin = 'origin'
# class GitMergeBase(GitCommand):
# git_cmd = ['git', 'merge-base', 'FETCH_HEAD', branch]
# class GitMergeTree(GitCommand):
# git_cmd = ['git', 'merge-tree']
# def git_args(self, sha):
# sha = merge_base()
# return []
# fetch = GitFetch()
# merge_base = GitMergeBase()
# merge_tree = GitMergeTree()
# def __call__(self, *args):
# self.fetch()
# sha = self.merge_base()
# return self.merge_tree(sha)
# -*- coding: utf-8 -*-
import os
import shutil
import subprocess
from flask import Blueprint, \
current_app, \
render_template, \
url_for, \
Markup, \
has_app_context, \
from lektor.pluginsystem import Plugin
from lektor.publisher import Publisher
from lektor.pluginsystem import get_plugin
from lektor.admin.modules import serve, api
from git import git_add, git_status, git_commit_tree
gitbp = Blueprint('git', __name__,
def status():
values = git_status()
return render_template("status.html", status = values)
#def add():
# path = request.values.get('path', None)
# if path:
# rv = git_add(path)
# return "done"
# return "failed"
#def commit():
# #author = request.values.get(
# rv = git_commit()
#['git', 'commit', '--author="John Doe <>"'])
# return "failed"
class CommitPublisher(Publisher):
commit all changes from current tree
get username from session cookie
def publish(self, target_url, credentials=None, **extra):
rv = git_commit_tree()
yield rv
class AskReviewPublisher(CommitPublisher):
commit changes and ask for review before push
def send_mail(self, status):
#mail -s "Test" < /dev/null
def publish(self, target_url, credentials=None, **extra):
status = git_status()
yield '%d fichiers modifiés'
for s in status:
yield str(s)
yield 'Message envoyé'
yield 'Les changements seront publiés après validation.'
class GitPushPublisher(CommitPublisher):
commit modified files and push
caveat: the publish method does not have access to the request
which triggered it, hence the publisher name.
As a tentative workaround, we let flask store the user associated
to the last valid /publish request
def publish(self, target_url, credentials=None, **extra):
#src_path = self.output_path
#dst_path = target_url.path"Vous n'avez pas le droit de publier directement, \
# sélectionnez plutôt «signaler les changements pour publication»")
app = current_app
login = get_plugin('login', self.env)
with app.app_context():
user = login.get_auth_user()
if user is not None and user.get('publish',False):
msg = 'user %s'%user['username']
yield msg
yield 'Done''Please commit all changes before publishing')
class CommitPlugin(Plugin):
name = 'lektor-commit'
description = u'Publish by git commit+push, or ask review.'
def on_setup_env(self, *args, **extra):
self.env.add_publisher('askreview', AskReviewPublisher)
self.env.add_publisher('gitpush', GitPushPublisher)
def setup_git_bp():
app = current_app
login = get_plugin('login', self.env)
login.add_button( url_for('git.status'),
'see all changes',
Markup('<i class="fa fa-save"></i>'))
## use to add/commit after each use
##pylint: disable=unused-variable
#def after_request_api(response):
# # add modification to user cookie
# # can use request
# return response
......@@ -114,79 +114,3 @@ def server(lektorproject, port):
yield server
def login(client, name, **kwargs):
password = kwargs.pop('password',name)
url = kwargs.pop('url', '/admin/root/edit')
data = dict( username=name, password=password, url=url),
def logout(client, **kwargs):
return client.get('/auth/logout', **kwargs)
def anonymous(server):
session = BaseUrlSession(base_url=server.base_url)
yield session
def admin(server):
session = BaseUrlSession(base_url=server.base_url)
login(session, 'admin')
yield session
def blog(server):
session = BaseUrlSession(base_url=server.base_url)
login(session, 'blog')
yield session
def test(server):
session = BaseUrlSession(base_url=server.base_url)
login(session, 'test')
yield session
def project(request, lektorproject):
from lektor.project import Project
return Project.from_path(lektorproject)
def env(request, project):
env = project.make_env()
return env
def pad(request, env):
from lektor.db import Database
return Database(env).new_pad()
def webui(request, env):
from lektor.admin.webui import WebUI
output_path = tempfile.mkdtemp()
def cleanup():
except (OSError, IOError):
return WebUI(env,
def webclient(webui):
webui.config['TESTING'] = True
with webui.test_client() as client:
yield client
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment