From b3855d34fcd7ac7b2819d04a400f841d3091790a Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 3 Oct 2015 09:30:58 +0300 Subject: Move commit_to_git, push_git to jtlib --- jt | 17 ++++------------- jtlib/__init__.py | 1 + jtlib/git.py | 26 ++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 jtlib/git.py diff --git a/jt b/jt index 4b64c87..2162953 100755 --- a/jt +++ b/jt @@ -24,15 +24,6 @@ import time import jtlib -def commit_to_git(source_dir, pathnames): - cliapp.runcmd(['git', 'add'] + pathnames, cwd=source_dir) - cliapp.runcmd(['git', 'commit', '-m', 'Publish log entry'], cwd=source_dir) - - -def push_git(source_dir): - cliapp.runcmd(['git', 'push', 'origin', 'HEAD'], cwd=source_dir) - - class Command(object): def __init__(self, app): @@ -190,10 +181,10 @@ class FinishCommand(Command): os.rename(draft_attch, pub_attch) def _commit_to_git(self, pathnames): - commit_to_git(self._app.settings['source'], pathnames) + jtlib.commit_to_git(self._app.settings['source'], pathnames) def _push_git(self): - push_git(self._app.settings['source']) + jtlib.push_git(self._app.settings['source']) class NewTopicCommand(Command): @@ -205,9 +196,9 @@ class NewTopicCommand(Command): pathname = self._topic_pathname(args[0]) self._create_topic_page(pathname, args[1]) - commit_to_git(self._app.settings['source'], [pathname]) + jtlib.commit_to_git(self._app.settings['source'], [pathname]) if self._app.settings['push']: - push_git(self._app.settings['source']) + jtlib.push_git(self._app.settings['source']) def _topic_pathname(self, page_path): return os.path.join(self._app.settings['source'], page_path + '.mdwn') diff --git a/jtlib/__init__.py b/jtlib/__init__.py index 7c83767..972c289 100644 --- a/jtlib/__init__.py +++ b/jtlib/__init__.py @@ -18,5 +18,6 @@ from .version import __version__ from .draftsdir import DraftsDirectory +from .git import commit_to_git, push_git __all__ = locals() diff --git a/jtlib/git.py b/jtlib/git.py new file mode 100644 index 0000000..439b502 --- /dev/null +++ b/jtlib/git.py @@ -0,0 +1,26 @@ +# Copyright 2010-2015 Lars Wirzenius +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import cliapp + + +def commit_to_git(source_dir, pathnames): + cliapp.runcmd(['git', 'add'] + pathnames, cwd=source_dir) + cliapp.runcmd(['git', 'commit', '-m', 'Publish log entry'], cwd=source_dir) + + +def push_git(source_dir): + cliapp.runcmd(['git', 'push', 'origin', 'HEAD'], cwd=source_dir) -- cgit v1.2.1