Add app directory overriding w/ WATSON_DIR env var

TailorDev · Feb 6, 2016 · bfa175c · SpotlightKid · Feb 9, 2016 · jmaupetit
1 parent d168b2b
commit bfa175c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/watson/cli.py b/watson/cli.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 
-import json
 import datetime
-import operator
 import itertools
+import json
+import operator
+import os
 
-from functools import reduce
 from dateutil import tz
+from functools import reduce
 
-import click
 import arrow
+import click
 
 from . import watson
 from .frames import Frame
@@ -83,10 +84,10 @@ def cli(ctx):
     project with the `start` command, and you can stop the timer
     when you're done with the `stop` command.
     """
+
     # This is the main command group, needed by click in order
     # to handle the subcommands
-
-    ctx.obj = watson.Watson()
+    ctx.obj = watson.Watson(config_dir=os.environ.get('WATSON_DIR'))
 
 
 @cli.command()

diff --git a/watson/watson.py b/watson/watson.py
@@ -50,7 +50,7 @@ def __init__(self, **kwargs):
         self._config = None
         self._config_changed = False
 
-        self._dir = kwargs.pop('config_dir', click.get_app_dir('watson'))
+        self._dir = kwargs.pop('config_dir') or click.get_app_dir('watson')
 
         self.config_file = os.path.join(self._dir, 'config')
         self.frames_file = os.path.join(self._dir, 'frames')