Merge pull request openaps#64 from openaps/dev

stub out dev branch next version

Author: scottleibrand

openaps/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = '0.0.7'
+__version__ = '0.0.8'
 

openaps/reports/add.py

@@ -23,7 +23,7 @@ def configure_parser (parser):
 def main (args, app):
   report = Report(report=args.report, device=args.device, reporter=args.reporter, use=args.use)
   task = app.actions.selected(args).usages.commands[args.device].method.commands[report.fields['use']]
-  params = task.method.get_params(args)
+  params = task.method.to_ini(args)
   for k, v in params.items( ):
     report.add_option(k, str(v))
   report.store(app.config)

openaps/reports/invoke.py

@@ -26,7 +26,7 @@ def main (args, app):
     # print device.name, device
     # print report.name, report.fields
     # XXX.bewest: very crude, need to prime the Use's args from the config
-    app.parser.set_defaults(**report.fields)
+    app.parser.set_defaults(**task.method.from_ini(report.fields))
     args, extra = app.parser.parse_known_args( )
     """
     for k, v in report.fields.items( ):
@@ -40,8 +40,14 @@ def main (args, app):
         output = task.method(args, app)
     except Exception as e:
         print(report.name, ' raised ', e, file=sys.stderr)
+        # save prior progress in git
+        app.epilog( )
+        # ensure we still blow up with non-zero exit
         raise
     else:
         reporters.Reporter(report, device, task)(output)
         print('reporting', report.name)
-        repo.index.add([report.name])
+        repo.git.add([report.name])
+        # XXX: https://github.com/gitpython-developers/GitPython/issues/265o
+        # GitPython <  0.3.7, this can corrupt the index
+        # repo.index.add([report.name])

openaps/uses/use.py

@@ -22,6 +22,12 @@ def main (self, args, app):
     print "HAHA", args, app
     """
 
+  def to_ini (self, args):
+    return self.get_params(args)
+
+  def from_ini (self, fields):
+    return fields
+
   def get_params (self, args):
     """
     Return dictionary of all parameters collected from args.

openaps/vendors/medtronic.py

@@ -277,7 +277,12 @@ class read_bg_targets (SelectedNameCommand):
 
 @use( )
 class read_insulin_sensitivies (SameNameCommand):
-  """ Read insulin sensitivies. """
+  """ XXX: Deprecated.  Don't use.  Use read_insulin_sensitivities instead. """
+
+
+@use( )
+class read_insulin_sensitivities (SameNameCommand):
+  """ Read insulin sensitivities. """
 
 
 @use( )

openaps/vendors/process.py

@@ -32,6 +32,7 @@ def set_config (args, device):
 def display_device (device):
   data = dict(**device.fields)
   data.update(**device.extra.fields)
+  data.update(cmd=device.get('cmd'), args=device.get('args'))
   return '/{cmd:s}/{args:s}'.format(**data)
 
 @use( )
@@ -77,7 +78,7 @@ def main (self, args, app):
         command.append(getattr(args, opt))
     command.extend(getattr(args, 'remainder', []))
     command = shlex.split(' '.join(command))
-    proc = subprocess.Popen(command, stdin=PIPE, stdout=PIPE)
+    proc = subprocess.Popen(command, stdout=PIPE)
     output, stderr = proc.communicate( )
     # output = check_output(command, shell=True)
     return output