eva-shell 0.2.32__tar.gz → 0.2.34__tar.gz

{eva_shell-0.2.32 → eva_shell-0.2.34}/PKG-INFO

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

{eva_shell-0.2.32 → eva_shell-0.2.34}/eva4_shell/__init__.py

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

{eva_shell-0.2.32 → eva_shell-0.2.34}/eva4_shell/ap.py

@@ -279,6 +279,10 @@ def append_alarm_cli(root_sp):
     p.add_argument('--active', action='store_true', help='active only')
     p.add_argument('--inactive', action='store_true', help='inactive only')
     p.add_argument('--user', help='view user subscriptions')
+    p.add_argument('-z',
+                   '--time-zone',
+                   metavar='ZONE',
+                   help='time zone (pytz, e.g. UTC or Europe/Prague)')
     p.add_argument('-a',
                    '--alarm-svc',
                    help=f'Alarm service (default: {DEFAULT_ALARM_SERVICE})',
@@ -716,6 +720,8 @@ def append_user_cli(root_sp):
         help=f'Authentication service (default: {DEFAULT_AUTH_SERVICE})',
         default=DEFAULT_AUTH_SERVICE).completer = ComplSvc('aaa')
 
+    p.add_argument('--acl', metavar='ACL', action='append', help=f'Uer ACL')
+
     p = sp.add_parser('destroy', help='destroy user')
     p.add_argument('i', metavar='user')
     p.add_argument(
@@ -787,7 +793,7 @@ def append_item_cli(root_sp):
     p.add_argument('--xopts',
                    metavar='NAME=VALUE',
                    help='Extra query options',
-                   nargs='*')
+                   action='append')
 
     p = sp.add_parser('slog', help='item state log')
     p.add_argument('i', metavar='OID').completer = ComplOID()

{eva_shell-0.2.32 → eva_shell-0.2.34}/eva4_shell/cli.py

@@ -502,7 +502,7 @@ class CLI:
         print(f'{len(users)} user(s) undeployed')
         print()
 
-    def user_create(self, i, auth_svc):
+    def user_create(self, i, auth_svc, acl):
         import pwinput
         password = pwinput.pwinput()
         try:
@@ -515,7 +515,7 @@ class CLI:
             from hashlib import sha256
             pwhash = sha256(password.encode()).hexdigest()
         call_rpc('user.deploy',
-                 dict(users=[dict(login=i, password=pwhash)]),
+                 dict(users=[dict(login=i, password=pwhash, acls=acl or [])]),
                  target=auth_svc)
         ok()
 
@@ -946,8 +946,8 @@ class CLI:
                         pass
             print_result(data,
                          cols=[
-                             'name', 'svc', 'type', 'online', 'timeout',
-                             'ver', 'build'
+                             'name', 'svc', 'type', 'online', 'timeout', 'ver',
+                             'build'
                          ])
         else:
             data = call_rpc('node.list', target=repl_svc)
@@ -1195,14 +1195,13 @@ class CLI:
                              limit=limit,
                              xopts=xopts_map),
                         target=db_svc)
-        cols = []
+        cols = [
+            't|n=time|f=time{}'.format(f':{time_zone}' if time_zone else '')
+        ]
         if prop == 'status' or prop is None:
             cols += ['status']
         if prop == 'value' or prop is None:
             cols += ['value']
-        cols += [
-            't|n=time|f=time{}'.format(f':{time_zone}' if time_zone else '')
-        ]
         print_result(data, cols=cols)
 
     def accounting_query(self, accounting_svc, time_start, time_end, time_zone,
@@ -1914,6 +1913,7 @@ class CLI:
                     current=None,
                     active=None,
                     inactive=None,
+                    time_zone=None,
                     user=None):
         flt = {}
         if node:
@@ -1939,7 +1939,9 @@ class CLI:
             print_result(data)
         else:
             cols = [
-                'oid', 'node', 'level', 'group', 'id', 'current', 'description'
+                'oid', 'node', 'level', 'group', 'id', 'current',
+                't|n=time|f=time_sec{}'.format(
+                    f':{time_zone}' if time_zone else ''), 'description'
             ]
             if user:
                 cols += ['subscriptions']

{eva_shell-0.2.32 → eva_shell-0.2.34}/eva_shell.egg-info/PKG-INFO

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

{eva_shell-0.2.32 → eva_shell-0.2.34}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.32'
+__version__ = '0.2.34'
 
 import setuptools