cleepcli 1.44.2__tar.gz → 1.45.0__tar.gz

{cleepcli-1.44.2/cleepcli.egg-info → cleepcli-1.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.44.2
+Version: 1.45.0
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau

{cleepcli-1.44.2 → cleepcli-1.45.0}/bin/ccli

@@ -17,7 +17,7 @@ from cleepcli.git import Git
 from cleepcli.module import Module
 from cleepcli.file import File
 from cleepcli.watch import CleepWatchdog
-from cleepcli.test import Test
+from cleepcli.test import Test, is_file_coverage_valid
 from cleepcli.package import Package
 from cleepcli.docs import Docs
 from cleepcli.check import Check
@@ -42,8 +42,6 @@ def log_root(msg, *args, **kwargs):
 logging.addLevelName(level, "TRACE")
 logging.trace = log_root
 
-PRAGMA_NO_COVER_PATTERN = r'#\s*pragma\s*:\s*no\s+cover'
-
 @click.group()
 def core():
     pass
@@ -282,7 +280,7 @@ def get_module_name(ctx, param, value):
     return module_name
 
 @mod.command()
-@click.option('--run-scripts', default=False, is_flag=True, help='Also run preinst.sh and postinst.sh scripts')
+@click.option('--run-scripts', default=False, is_flag=True, help='Also run preinst.json and postinst.json phase manifests')
 def modssync(run_scripts):
     """
     Synchronize all mandatory modules (system, network...)
@@ -296,13 +294,13 @@ def modssync(run_scripts):
             res = f.module_sync(module, backend=False, frontend=False, scripts=True)
             if not res:
                 sys.exit(1)
-            res = f.module_run_install_script(module, "preinst.sh")
+            res = f.module_run_phase_manifest(module, "preinst")
             if not res:
                 sys.exit(1)
             res = f.module_sync(module, backend=True, frontend=True, scripts=True)
             if not res:
                 sys.exit(1)
-            res = f.module_run_install_script(module, "postinst.sh")
+            res = f.module_run_phase_manifest(module, "postinst")
             if not res:
                 sys.exit(1)
         else:
@@ -400,30 +398,6 @@ def modtests(ctx, module, coverage, copyto, pattern):
     if not res:
         sys.exit(1)
 
-def is_file_coverage_valid(coverage_info):
-    """
-    Check if file is not respecting Cleep test practices
-    """
-    if coverage_info['file'].find('__init__.py') != -1:
-        # drop __init__.py
-        return True
-
-    if coverage_info['statements'] == 0 and coverage_info['coverage'] == 100:
-        # no statements covered
-        logging.error('File "%s" fully uncovered by tests' % coverage_info['file'])
-        return False
-
-    with open(coverage_info['file']) as fdesc:
-        lines = fdesc.readlines()
-    lines_count = len(lines)
-    max_pragma = max(int(lines_count / 150), 1)
-    count_pragma = len(re.findall(PRAGMA_NO_COVER_PATTERN, '\n'.join(lines)))
-    if count_pragma > max_pragma:
-        logging.error('Number of allowed "no cover" exceed max allowed (1 per 150 source lines) in "%s"' % coverage_info['file'])
-        return False
-
-    return True
-
 @test.command()
 @click.option('--module', callback=get_module_name, help='Module name.')
 @click.option('--missing', is_flag=True, help='Display missing statements.')

{cleepcli-1.44.2 → cleepcli-1.45.0}/bin/cleep-cli

@@ -17,7 +17,7 @@ from cleepcli.git import Git
 from cleepcli.module import Module
 from cleepcli.file import File
 from cleepcli.watch import CleepWatchdog
-from cleepcli.test import Test
+from cleepcli.test import Test, is_file_coverage_valid
 from cleepcli.package import Package
 from cleepcli.docs import Docs
 from cleepcli.check import Check
@@ -42,8 +42,6 @@ def log_root(msg, *args, **kwargs):
 logging.addLevelName(level, "TRACE")
 logging.trace = log_root
 
-PRAGMA_NO_COVER_PATTERN = r'#\s*pragma\s*:\s*no\s+cover'
-
 @click.group()
 def core():
     pass
@@ -282,7 +280,7 @@ def get_module_name(ctx, param, value):
     return module_name
 
 @mod.command()
-@click.option('--run-scripts', default=False, is_flag=True, help='Also run preinst.sh and postinst.sh scripts')
+@click.option('--run-scripts', default=False, is_flag=True, help='Also run preinst.json and postinst.json phase manifests')
 def modssync(run_scripts):
     """
     Synchronize all mandatory modules (system, network...)
@@ -296,13 +294,13 @@ def modssync(run_scripts):
             res = f.module_sync(module, backend=False, frontend=False, scripts=True)
             if not res:
                 sys.exit(1)
-            res = f.module_run_install_script(module, "preinst.sh")
+            res = f.module_run_phase_manifest(module, "preinst")
             if not res:
                 sys.exit(1)
             res = f.module_sync(module, backend=True, frontend=True, scripts=True)
             if not res:
                 sys.exit(1)
-            res = f.module_run_install_script(module, "postinst.sh")
+            res = f.module_run_phase_manifest(module, "postinst")
             if not res:
                 sys.exit(1)
         else:
@@ -400,30 +398,6 @@ def modtests(ctx, module, coverage, copyto, pattern):
     if not res:
         sys.exit(1)
 
-def is_file_coverage_valid(coverage_info):
-    """
-    Check if file is not respecting Cleep test practices
-    """
-    if coverage_info['file'].find('__init__.py') != -1:
-        # drop __init__.py
-        return True
-
-    if coverage_info['statements'] == 0 and coverage_info['coverage'] == 100:
-        # no statements covered
-        logging.error('File "%s" fully uncovered by tests' % coverage_info['file'])
-        return False
-
-    with open(coverage_info['file']) as fdesc:
-        lines = fdesc.readlines()
-    lines_count = len(lines)
-    max_pragma = max(int(lines_count / 150), 1)
-    count_pragma = len(re.findall(PRAGMA_NO_COVER_PATTERN, '\n'.join(lines)))
-    if count_pragma > max_pragma:
-        logging.error('Number of allowed "no cover" exceed max allowed (1 per 150 source lines) in "%s"' % coverage_info['file'])
-        return False
-
-    return True
-
 @test.command()
 @click.option('--module', callback=get_module_name, help='Module name.')
 @click.option('--missing', is_flag=True, help='Display missing statements.')