dryad2dataverse 0.8.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

dryad2dataverse/__init__.py

@@ -26,7 +26,7 @@ downloading and file duplication.
 
 import sys
 
-VERSION = (0, 8, 0)
+VERSION = (0, 8, 1)
 __version__ = '.'.join([str(x) for x in VERSION])
 USERAGENT = (f'dryad2dataverse/v{__version__} ({sys.platform.capitalize()}); '
              f'Python {sys.version[:sys.version.find("(")-1]}')

dryad2dataverse/data/dryad2dataverse_config.yml

@@ -20,7 +20,7 @@ secret: null
 #Base url of Dataverse instance (eg: https://borealisdata.ca)
 dv_url: null 
 #Dataverse API KEY
-apikey: null
+api_key: null
 #Maximum upload size in bytes (contact Dataverse administrator for value if unknown)
 max_upload: 3221225472
 #Contact email address for Dataverse record, eg: research.data@test.invalid
@@ -78,8 +78,9 @@ recipients:
 - null
 #location of dryadd log
 #include full file name: eg: /var/log/dryadd.log
-log: null
-
+#The default below will exist but is a terrible place
+#for a log so you should change it.
+log: ~/dryadd.log
 #level at which to write a log message. Select from:
 # debug, info, warning, error or critical
 loglevel: warning

dryad2dataverse/scripts/dryadd.py

@@ -492,6 +492,12 @@ def test_config(cfile:pathlib.Path):
         print('Configuration file error', file=sys.stdout)
         print(e, file=sys.stderr)
         sys.exit()
+    #this shouldn't happen ever, but just in case
+    except FileNotFoundError as e:
+        print(e, file=sys.stderr)
+        sys.exit()
+
+
 
 def main():
     '''
@@ -499,13 +505,23 @@ def main():
     '''
     #pylint: disable=too-many-branches, too-many-locals, too-many-statements
     args = argp().parse_args()
-    configfile = pathlib.Path(args.config)
+    configfile = pathlib.Path(args.config).expanduser().absolute()
+    if not configfile.exists():
+        print(('Config file not found. Creating it at '
+              f'{str(configfile)} and exiting.') , file=sys.stderr)
+        config = dryad2dataverse.config.Config(configfile.parent, configfile.name)
+        sys.exit()
+    else:
+        config = dryad2dataverse.config.Config(configfile.parent, configfile.name)
     test_config(configfile)
-    config = dryad2dataverse.config.Config(configfile.parent, configfile.name)
     for val in ['api_key', 'secret']:
         if getattr(args,val):
             config[val] = getattr(args,val)
-    #TODONE remove this for prod
+    try:
+        config.validate()
+    except ValueError as e:
+        print(e, file=sys.stderr)
+        sys.exit()
     config['token'] = dryad2dataverse.auth.Token(**config)
 
     logpath = pathlib.Path(config['log']).expanduser().absolute()

{dryad2dataverse-0.8.0.dist-info → dryad2dataverse-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dryad2dataverse
-Version: 0.8.0
+Version: 0.8.1
 Summary: Utility for copying and syncing data from a Dryad data repository to a Dataverse repository
 License: MIT
 Keywords: Harvard Dataverse,Dataverse,research data management,data repository,Dryad,datadryad.org,dataverse.org

{dryad2dataverse-0.8.0.dist-info → dryad2dataverse-0.8.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-dryad2dataverse/__init__.py,sha256=SnRJmT6Huew6ZoAuKRYCHmpSF9vpqgZi0e5z0gkPKFg,915
+dryad2dataverse/__init__.py,sha256=e034K3LQEPO1wDDA2w539h6arIQTIqCCiw6W6hMSmGQ,915
 dryad2dataverse/auth.py,sha256=NsM9TFTd6J29mdWBqbEsIjTcHgjPCQ8REwIO-pzeGR0,2848
 dryad2dataverse/config.py,sha256=UiFqS1PgIP0IHtRcZbFL5T-ziC3Hqw5N8VTl_0GA0aQ,5917
-dryad2dataverse/data/dryad2dataverse_config.yml,sha256=jYORkg_vpFC_CsULDQ4BgbFR4jWD7gtqNUK0vKwj2R4,3880
+dryad2dataverse/data/dryad2dataverse_config.yml,sha256=74M6VDdU-wToBbv0gzVU8GbIETJ6kE1uNsKrGEGN8cw,3978
 dryad2dataverse/exceptions.py,sha256=oIP1_fSEvLF3HpK6gOYb05vUisY-IAxwXZDeNoAvCPM,1008
 dryad2dataverse/handlers.py,sha256=9c0ksWVIBJVMP5mO0O36QRnEUg6I9e4MdQWCvdwKBo4,1569
 dryad2dataverse/monitor.py,sha256=ctrbdNk7BglM_YCpHNV5ay-zB7XN6xbQUHJhsBwgO_E,26193
-dryad2dataverse/scripts/dryadd.py,sha256=YBQqyEA0Zsdo9Yj-ScCkR-x6ElUb7-l2otlumDwq4ZY,26333
+dryad2dataverse/scripts/dryadd.py,sha256=PkWeT4t0AN_sCttFFFyWXaQubFhOL1ZORw9KSTYdLcw,26852
 dryad2dataverse/serializer.py,sha256=_GQBqDmZa_dJZmtf2X699WWiJWxuWdH5s1k-EafK1fI,33531
 dryad2dataverse/transfer.py,sha256=3Uzr9N1X-muIHGqmWacO4mEIQ_wo4MzpkEDCEB_NWlA,34794
-dryad2dataverse-0.8.0.dist-info/METADATA,sha256=eQmdhumAokALwFtmiDmJnDBxK7hz-Lx42XbjacCH0Jg,3817
-dryad2dataverse-0.8.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dryad2dataverse-0.8.0.dist-info/entry_points.txt,sha256=P-Wu7phJ2dGqaZT6OzHEgy3I-TXXq_7ad67r--O8IcA,62
-dryad2dataverse-0.8.0.dist-info/RECORD,,
+dryad2dataverse-0.8.1.dist-info/METADATA,sha256=hJD1Qix550QE02D6chCguCU9Zgf3Ej4a6kV4PvlJf3Q,3817
+dryad2dataverse-0.8.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dryad2dataverse-0.8.1.dist-info/entry_points.txt,sha256=P-Wu7phJ2dGqaZT6OzHEgy3I-TXXq_7ad67r--O8IcA,62
+dryad2dataverse-0.8.1.dist-info/RECORD,,