eva-shell 0.2.16__tar.gz → 0.2.18__tar.gz

{eva-shell-0.2.16 → eva-shell-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.16
+Version: 0.2.18
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva-shell-0.2.16 → eva-shell-0.2.18}/eva4_shell/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.2.16'
+__version__ = '0.2.18'
 
 DEFAULT_REPOSITORY_URL = 'https://pub.bma.ai/eva4'

{eva-shell-0.2.16 → eva-shell-0.2.18}/eva4_shell/ap.py

@@ -262,7 +262,7 @@ def append_svc_cli(root_sp):
     p.add_argument('-f',
                    '--file',
                    metavar='FILE',
-                   help='read call params payload form the file'
+                   help='read call params payload form the file ("-" for stdin)'
                   ).completer = ComplDeployFile()
     p.add_argument('method', metavar='METHOD').completer = ComplSvcRpcMethod()
     p.add_argument('params',
@@ -618,6 +618,7 @@ def append_item_cli(root_sp):
 
     p = sp.add_parser('export', help='export item(s) to a deployment file')
     p.add_argument('i', metavar='MASK').completer = ComplOID()
+    p.add_argument('-y', '--full', help='include item states', action='store_true')
     p.add_argument('-o', '--output', metavar='FILE',
                    help='output file').completer = ComplDeployFile()
 
@@ -1387,7 +1388,8 @@ def init_ap():
 
     sp.add_parser('save', help='save scheduled states (if instant-save is off)')
     append_svc_cli(sp)
-    sp.add_parser('test', help='core test/info')
+    p = sp.add_parser('test', help='core test/info')
+    p.add_argument('--wait-active', help='wait for the core to become active', action='store_true')
 
     p = sp.add_parser('dump', help='dump node info')
     p.add_argument('-s',

{eva-shell-0.2.16 → eva-shell-0.2.18}/eva4_shell/cli.py

@@ -52,8 +52,15 @@ class CLI:
             args += f' --dest "{kwargs["dest"]}"'
         exec_cmd('venvmgr', args, search_in='sbin', search_system=False)
 
-    def test(self):
-        data = call_rpc('test')
+    def test(self, wait_active=False):
+        op_start = time.perf_counter()
+        while True:
+            if op_start + current_command.timeout < time.perf_counter():
+                raise TimeoutError
+            else:
+                data = call_rpc('test')
+                if not wait_active or data.get('active'):
+                    break
         print_result(data, need_header=False, name_value=True)
 
     def dump(self, s=False):
@@ -945,13 +952,18 @@ class CLI:
         )
         ok()
 
-    def item_export(self, i, output=None):
+    def item_export(self, i, full=False, output=None):
         c = 0
-        configs = []
+        configs = dict()
         for item in call_rpc('item.list', dict(i=i, node='.local')):
             c += 1
-            configs.append(call_rpc('item.get_config', dict(i=item['oid'])))
-        result = dict(items=configs)
+            configs[item['oid']] = call_rpc('item.get_config', dict(i=item['oid']))
+        if full:
+            for state in call_rpc('item.state', dict(i=list(configs))):
+                oid = state['oid']
+                configs[oid]['status'] = state['status']
+                configs[oid]['value'] = state['value']
+        result = dict(items=sorted([v for _, v in configs.items()], key= lambda k: k['oid']))
         if current_command.json:
             print_result(result)
         else:

{eva-shell-0.2.16 → eva-shell-0.2.18}/eva_shell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.16
+Version: 0.2.18
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva-shell-0.2.16 → eva-shell-0.2.18}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.16'
+__version__ = '0.2.18'
 
 import setuptools