skilleter-modules 0.0.6__tar.gz → 0.0.8__tar.gz

{skilleter_modules-0.0.6/src/skilleter_modules.egg-info → skilleter_modules-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.6
+Version: 0.0.8
 Summary: Modules used by my various Python projects (and hopefully useful to other people)
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_modules-0.0.6 → skilleter_modules-0.0.8}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_modules"
 
 # Version must be incremented to install updated skilleter-extras
 
-version = "0.0.6"
+version = "0.0.8"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_modules-0.0.6 → skilleter_modules-0.0.8}/src/skilleter_modules/git.py

@@ -27,6 +27,7 @@ import re
 import logging
 import fnmatch
 import subprocess
+from functools import cache
 
 import pygit2
 
@@ -873,6 +874,7 @@ def reset(sha1, path=None):
 
 ################################################################################
 
+@cache
 def config_get(section, key, source=None, defaultvalue=None, path=None):
     """ Return the specified configuration entry
         Returns a default value if no matching configuration entry exists """
@@ -900,6 +902,8 @@ def config_get(section, key, source=None, defaultvalue=None, path=None):
 def config_set(section, key, value, source=None, path=None):
     """ Set a configuration entry """
 
+    config_get.cache_clear()
+
     cmd = ['config']
 
     if source == GLOBAL:
@@ -1212,6 +1216,18 @@ def isbranch(branchname, path=None):
 
 ################################################################################
 
+def is_default_branch(branchname=None):
+    """ Return True if the specified branch is a default branch """
+
+    if not branchname:
+        branchname = branch()
+
+    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES, path=path).split(',')
+
+    return branchname in default_branches
+
+################################################################################
+
 def default_branch(path=None):
     """ Return the name of the default branch, attempting to interrogate GitLab
         if the repo appears to have been cloned from there and falling back to
@@ -1238,11 +1254,10 @@ def default_branch(path=None):
                     return None
 
     git_branches = branches(path=path)
-    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES, path=path).split(',')
 
-    for branch in default_branches:
-        if branch in git_branches:
-            return branch
+    for branchname in git_branches:
+        if is_default_branch(branchname):
+            return branchname
 
     raise GitError('Unable to determine default branch in the repo')
 
@@ -1423,80 +1438,3 @@ def clean(recurse=False, force=False, dry_run=False, quiet=False,
         cmd.append('-X')
 
     return git(cmd, path=path)
-
-################################################################################
-
-def run_tests():
-    """Test suite for the module"""
-
-    print('Creating local git repo')
-
-    init('test-repo')
-    os.chdir('test-repo')
-
-    try:
-        print('Initial status:')
-        print('  User name:            %s' % config_get('user', 'name'))
-        print('  Project:              %s' % project())
-        print('  Remotes:              %s' % remotes())
-        print('  Current branch:       %s' % branch())
-        print('  Current working tree: %s' % working_tree())
-        print('  Rebasing?             %s' % rebasing())
-        print('  Status:               %s' % status())
-        print()
-
-        print('Adding a removing a configuration value')
-
-        config_set('user', 'size', 'medium')
-
-        print('  User size config:     %s' % config_get('user', 'size'))
-
-        config_rm('user', 'size')
-
-        value = config_get('user', 'size')
-        if value is None:
-            print('  Successfully failed to read the newly-deleted config data')
-        else:
-            raise GitError('Unexpected lack of error reading configuration data', 1)
-
-        config_set('user', 'email', 'user@localhost')
-        config_set('user', 'name', 'User Name')
-
-        print('')
-
-        with open('newfile.txt', 'w', encoding='utf8') as newfile:
-            newfile.write('THIS IS A TEST')
-
-        print('Adding and committing "newfile.txt"')
-
-        add(['newfile.txt'])
-
-        commit(['newfile.txt'], 'Test the add and commit functionality')
-
-        print('Removing and committing "newfile.txt"')
-
-        rm(['newfile.txt'])
-
-        commit(None, 'Removed "newfile.txt"')
-
-        print('Removing the last commit')
-
-        reset('HEAD~1')
-
-        print('Commit info for HEAD  %s' % commit_info('HEAD'))
-
-    except GitError as exc:
-        sys.stderr.write(f'ERROR: {exc.msg}')
-        sys.exit(1)
-
-    finally:
-        # If anything fails, then clean up afterwards
-
-        os.chdir('..')
-        shutil.rmtree('test-repo')
-
-################################################################################
-# Entry point
-
-if __name__ == '__main__':
-    run_tests()

{skilleter_modules-0.0.6 → skilleter_modules-0.0.8}/src/skilleter_modules/popup.py

@@ -21,7 +21,7 @@ import curses.panel
 class PopUp():
     """ Class to enable popup windows to be used via with statements """
 
-    def __init__(self, screen, msg, colour, waitkey=False, sleep=True, centre=True, refresh=True):
+    def __init__(self, screen, msg, colour, waitkey=False, sleep=1, centre=True, refresh=True):
         """ Initialisation - just save the popup parameters """
 
         self.panel = None
@@ -30,7 +30,7 @@ class PopUp():
         self.centre = centre
         self.colour = curses.color_pair(colour)
         self.refresh = refresh
-        self.sleep = sleep and not waitkey
+        self.sleep = 0 if waitkey else sleep
         self.waitkey = waitkey
         self.start_time = 0
 
@@ -81,8 +81,8 @@ class PopUp():
             if self.sleep:
                 elapsed = time.monotonic() - self.start_time
 
-                if elapsed < 1:
-                    time.sleep(1 - elapsed)
+                if elapsed < self.sleep:
+                    time.sleep(self.sleep - elapsed)
 
             del self.panel
 

{skilleter_modules-0.0.6 → skilleter_modules-0.0.8/src/skilleter_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.6
+Version: 0.0.8
 Summary: Modules used by my various Python projects (and hopefully useful to other people)
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

skilleter_modules-0.0.8/tests/test_git.py

@@ -0,0 +1,73 @@
+import pytest
+
+git = pytest.importorskip('skilleter_modules.git', reason='pygit2 not installed')
+
+def test_git():
+    """Test suite for the module"""
+
+    print('Creating local git repo')
+
+    init('test-repo')
+    os.chdir('test-repo')
+
+    try:
+        print('Initial status:')
+        print('  User name:            %s' % config_get('user', 'name'))
+        print('  Project:              %s' % project())
+        print('  Remotes:              %s' % remotes())
+        print('  Current branch:       %s' % branch())
+        print('  Current working tree: %s' % working_tree())
+        print('  Rebasing?             %s' % rebasing())
+        print('  Status:               %s' % status())
+        print('  Default branch?:      %s' % is_default_branch())
+        print()
+
+        print('Adding a removing a configuration value')
+
+        config_set('user', 'size', 'medium')
+
+        print('  User size config:     %s' % config_get('user', 'size'))
+
+        config_rm('user', 'size')
+
+        value = config_get('user', 'size')
+        if value is None:
+            print('  Successfully failed to read the newly-deleted config data')
+        else:
+            raise GitError('Unexpected lack of error reading configuration data', 1)
+
+        config_set('user', 'email', 'user@localhost')
+        config_set('user', 'name', 'User Name')
+
+        print('')
+
+        with open('newfile.txt', 'w', encoding='utf8') as newfile:
+            newfile.write('THIS IS A TEST')
+
+        print('Adding and committing "newfile.txt"')
+
+        add(['newfile.txt'])
+
+        commit(['newfile.txt'], 'Test the add and commit functionality')
+
+        print('Removing and committing "newfile.txt"')
+
+        rm(['newfile.txt'])
+
+        commit(None, 'Removed "newfile.txt"')
+
+        print('Removing the last commit')
+
+        reset('HEAD~1')
+
+        print('Commit info for HEAD  %s' % commit_info('HEAD'))
+
+    except GitError as exc:
+        sys.stderr.write(f'ERROR: {exc.msg}')
+        sys.exit(1)
+
+    finally:
+        # If anything fails, then clean up afterwards
+
+        os.chdir('..')
+        shutil.rmtree('test-repo')

skilleter_modules-0.0.8/tests/test_popup.py

@@ -0,0 +1,4 @@
+import skilleter_modules.popup as popup
+
+def test_popup():
+    pass

skilleter_modules-0.0.6/tests/test_git.py

@@ -1,6 +0,0 @@
-import pytest
-
-git = pytest.importorskip('skilleter_modules.git', reason='pygit2 not installed')
-
-def test_git():
-    pass

skilleter_modules-0.0.6/tests/test_popup.py

@@ -1,70 +0,0 @@
-from types import SimpleNamespace
-
-import skilleter_modules.popup as popup
-
-
-class FakePanel:
-    def __init__(self):
-        self.update_calls = 0
-        self.new_calls = []
-
-    def new_panel(self, window):
-        self.new_calls.append(window)
-        return SimpleNamespace(top=lambda: None)
-
-    def update_panels(self):
-        self.update_calls += 1
-
-
-class FakeWindow:
-    def __init__(self):
-        self.add_calls = []
-        self.bkgd_calls = []
-
-    def bkgd(self, ch, colour):
-        self.bkgd_calls.append((ch, colour))
-
-    def addstr(self, y_pos, x_pos, line, colour):
-        self.add_calls.append((y_pos, x_pos, line, colour))
-
-
-class FakeScreen:
-    def __init__(self, keys):
-        self.keys = list(keys)
-        self.getch_calls = 0
-        self.refresh_calls = 0
-
-    def getmaxyx(self):
-        return (24, 80)
-
-    def refresh(self):
-        self.refresh_calls += 1
-
-    def getch(self):
-        self.getch_calls += 1
-        return self.keys.pop(0)
-
-
-def test_waitkey_occurs_on_exit(monkeypatch):
-    fake_panel = FakePanel()
-
-    fake_curses = SimpleNamespace(
-        KEY_RESIZE=999,
-        panel=fake_panel,
-    )
-
-    fake_curses.color_pair = lambda colour: f'colour-{colour}'
-    fake_curses.newwin = lambda h, w, y, x: FakeWindow()
-
-    monkeypatch.setattr(popup, 'curses', fake_curses)
-
-    keys = [fake_curses.KEY_RESIZE, ord('a')]
-    screen = FakeScreen(keys)
-
-    with popup.PopUp(screen, 'hello', 3, waitkey=True):
-        enter_updates = fake_panel.update_calls
-        assert screen.getch_calls == 0
-
-    assert fake_panel.update_calls == enter_updates + 1
-    assert screen.getch_calls == 2
-    assert screen.refresh_calls >= 1