bump version to 0.6.3

README.md

@@ -215,9 +215,11 @@ $ docker run tconnectsync --help
 
 Move the `.env` file you created earlier into this folder, and run:
 ```
-$ docker run tconnectsync --check-login
+$ docker run --env-file=.env tconnectsync --check-login
 ```
 
+**NOTE:** If using the `--env-file` option to `docker run`, you may need to remove all quotation marks (`'` and `"`s) around values in the `.env` file for Docker to propagate the variables correctly.
+
 If you receive no errors, then you can move on to the **Running Tconnectsync Continuously** section.
 
 ## Running Tconnectsync Continuously

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tconnectsync
-version = 0.6.1
+version = 0.6.3
 author = James Woglom 
 author_email = j@wogloms.net
 description = Syncs Tandem t:connect pump data to Nightscout for the t:slim X2

tconnectsync/__init__.py

@@ -30,7 +30,7 @@ except Exception:
     __version__ = "UNKNOWN"
 
 def parse_args(*args, **kwargs):
-    parser = argparse.ArgumentParser(description="Syncs bolus, basal, and IOB data from Tandem Diabetes t:connect to Nightscout.")
+    parser = argparse.ArgumentParser(description="Syncs bolus, basal, and IOB data from Tandem Diabetes t:connect to Nightscout.", epilog="Version %s" % __version__)
     parser.add_argument('--version', action='version', version='tconnectsync %s' % __version__)
     parser.add_argument('--pretend', dest='pretend', action='store_const', const=True, default=False, help='Pretend mode: do not upload any data to Nightscout.')
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_const', const=True, default=False, help='Verbose mode: show extra logging details')

tconnectsync/parser/tconnect.py

@@ -157,7 +157,10 @@ class TConnectEntry:
         "alarm": "Empty Cartridge/Pump Shutdown",
 
         # manual corresponds to a Pumping Suspended by User event
-        "manual": "User Suspended"
+        "manual": "User Suspended",
+
+        # temp-profile corresponds to a Basal Rate Change event to 0u/hr
+        "temp-profile": "Basal Rate Change"
     }
 
     BASALSUSPENSION_SKIPPED_EVENTS = {

tconnectsync/secret.py

@@ -13,8 +13,8 @@ elif os.path.exists(global_path):
 else:
     values = dotenv_values()
 
-def get(*args):
-    return values.get(args[0], os.environ.get(*args))
+def get(val, default=None):
+    return os.environ.get(val, values.get(val, default))
 
 def get_number(name, default):
     val = get(name, default)

tests/parser/test_tconnect.py

@@ -594,6 +594,18 @@ class TestTConnectEntryBasalSuspensionEvent(unittest.TestCase):
             }
         )
 
+    def test_parse_basalsuspension_event_tempprofile(self):
+        self.assertEqual(
+            TConnectEntry.parse_basalsuspension_event({
+                'EventDateTime': '/Date(1640541521000-0000)/',
+                'SuspendReason': 'temp-profile'
+            }),
+            {
+                "time": "2021-12-26 09:58:41-05:00",
+                "event_type": "Basal Rate Change"
+            }
+        )
+
     def test_parse_basalsuspension_event_basalprofile_skipped(self):
         self.assertIsNone(
             TConnectEntry.parse_basalsuspension_event({

tests/test_secret.py

@@ -21,6 +21,13 @@ def chdir(dir):
 class TestSecretDotEnv(unittest.TestCase):
     maxDiff = None
 
+    def setUp(self):
+        if 'TCONNECT_EMAIL' in os.environ:
+            del os.environ['TCONNECT_EMAIL']
+
+        if 'NS_URL' in os.environ:
+            del os.environ['NS_URL']
+
     def write_test_dotenv_file(self, path, type):
         with open(os.path.join(path, ".env"), "w") as f:
             f.write("""
@@ -66,5 +73,34 @@ NS_URL=http://test_%s_url
                 self.assertEqual(secret.TCONNECT_EMAIL, environ["TCONNECT_EMAIL"])
                 self.assertEqual(secret.NS_URL, environ["NS_URL"])
 
+    def test_environment_merges_with_dotenv_file(self):
+        with tempfile.TemporaryDirectory(prefix='env_plus_environ') as dir, chdir(dir):
+            self.write_test_dotenv_file(dir, "dotenv_cwd_defaults")
+
+            environ = {
+                "TCONNECT_EMAIL": "test_environ_override_email@email.com"
+            }
+
+            with unittest.mock.patch.dict(os.environ, environ):
+                secret = self.import_secret()
+                self.assertEqual(secret.TCONNECT_EMAIL, "test_environ_override_email@email.com")
+                self.assertEqual(secret.NS_URL, "http://test_dotenv_cwd_defaults_url")
+
+    def test_dotenv_in_current_working_directory_overrides_homedir_config(self):
+        with tempfile.TemporaryDirectory(prefix='dotenv_cwd') as dir, chdir(dir):
+            self.write_test_dotenv_file(dir, "dotenv_cwd")
+
+            config_dir = os.path.join(dir, '.config/tconnectsync')
+            os.makedirs(config_dir)
+
+            self.write_test_dotenv_file(config_dir, "dotenv_homedir_config")
+
+            with unittest.mock.patch.object(pathlib.Path, "home") as mock_home:
+                mock_home.return_value = dir
+
+                secret = self.import_secret()
+                self.assertEqual(secret.TCONNECT_EMAIL, "test_dotenv_cwd_email@email.com")
+                self.assertEqual(secret.NS_URL, "http://test_dotenv_cwd_url")
+
 if __name__ == '__main__':
     unittest.main()