NPO-Accounting/conservancy_beancount Changeset - b1f82badf770

Changeset - b1f82badf770

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-06-16 18:42:09
brettcsmith@brettcsmith.org

config: Get repository directory from config file.

One less thing users have to fiddle with to get set up.

3 files changed with 34 insertions and 20 deletions:

conservancy_beancount/config.py

setup.py

tests/test_config.py

0 comments (0 inline, 0 general)

conservancy_beancount/config.py

➞

Show inline comments

@@ ... / @@ -29,2 +29,3 @@ from pathlib import Path @@
 from typing import (
     Mapping,
     NamedTuple,
@@ ... / @@ -83,2 +84,3 @@ class Config: @@
         self.file_config = configparser.ConfigParser()
         self.file_config.read_string("[Beancount]\n")
@@ ... / @@ -93,2 +95,13 @@ class Config: @@
     def _abspath(self, source: Mapping[str, str], key: str) -> Optional[Path]:
         try:
             retval = Path(source[key])
         except (KeyError, ValueError):
             ok = False
         else:
             if source is not os.environ:
                 retval = retval.expanduser()
             ok = retval.is_absolute()
         return retval if ok else None
     def _dir_or_none(self, path: Path) -> Optional[Path]:
@@ ... / @@ -102,10 +115,4 @@ class Config: @@
     def _path_from_environ(self, key: str, default: Optional[Path]=None) -> Path:
         try:
             retval = Path(os.environ[key])
         except (KeyError, ValueError):
             ok = False
         else:
             # Per the spec, non-absolute paths should be ignored.
             ok = retval.is_absolute()
         if not ok:
         retval = self._abspath(os.environ, key)
         if retval is None:
             retval = default or (Path.home() / self._ENVIRON_DEFAULT_PATHS[key])
@@ ... / @@ -121,9 +128,3 @@ class Config: @@
     def books_path(self) -> Optional[Path]:
         try:
             retval = Path(self.file_config['Beancount']['books dir']).expanduser()
         except (KeyError, ValueError):
             ok = False
         else:
             ok = retval.is_absolute()
         return retval if ok else None
         return self._abspath(self.file_config['Beancount'], 'books dir')
@@ ... / @@ -165,6 +166,6 @@ class Config: @@
     def repository_path(self) -> Optional[Path]:
         try:
             return Path(os.environ['CONSERVANCY_REPOSITORY'])
         except (KeyError, ValueError):
             return None
         retval = self._abspath(self.file_config['Beancount'], 'repository dir')
         if retval is None:
             retval = self._abspath(os.environ, 'CONSERVANCY_REPOSITORY')
         return retval

setup.py

➞

Show inline comments

@@ ... / @@ -7,3 +7,3 @@ setup( @@
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.2.1',
+    version='1.2.2',
     author='Software Freedom Conservancy',

tests/test_config.py

➞

Show inline comments

@@ ... / @@ -88,2 +88,15 @@ def update_umask(mask): @@
 def test_repository_from_file():
     path_s = '/home/good'
     with update_environ(CONSERVANCY_REPOSITORY='bad'):
         config = config_mod.Config()
         config.load_string(f"[Beancount]\nrepository dir = {path_s}\n")
         assert config.repository_path() == Path(path_s)
 def test_repository_expands_user():
     path_s = 'tilderepo'
     config = config_mod.Config()
     config.load_string(f"[Beancount]\nrepository dir = ~/{path_s}\n")
     assert config.repository_path() == Path.home() / path_s
 def test_repository_from_environment():

0 comments (0 inline, 0 general)