cleepcli 1.35.2__tar.gz → 1.36.0__tar.gz

{cleepcli-1.35.2/cleepcli.egg-info → cleepcli-1.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cleepcli
-Version: 1.35.2
+Version: 1.36.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.35.2 → cleepcli-1.36.0}/bin/ccli

@@ -48,12 +48,13 @@ PRAGMA_NO_COVER_PATTERN = r'#\s*pragma\s*:\s*no\s+cover'
 def core():
     pass
 
-def get_core_mods(git=None):
+def get_core_mods(git=None, branch=None):
     """
     Get all core modules from their repos
 
     Args:
         git (Git): Git instance. Create new instance if not provided
+        branch (str): branch name
 
     Returns:
         bool: True if modules installed successfully
@@ -63,9 +64,9 @@ def get_core_mods(git=None):
     for module in config.DEFAULT_MODULES:
         module_path = os.path.join(config.MODULES_SRC, module)
         if not os.path.exists(module_path):
-            res = g.clone_mod(module)
+            res = g.clone_mod(module, branch)
         else:
-            res = g.pull_mod(module)
+            res = g.pull_mod(module, branch)
 
         if not res:
             logging.error('Error getting "%s" default module' % module)
@@ -843,11 +844,12 @@ def cimoddocpublish(module, version, ghtoken):
 @ci.command(hidden=True)
 @click.pass_context
 @click.option('--nosync', is_flag=True, default=False, help='Sync mods.')
-def cigetmods(ctx, nosync):
+@click.option('--branch', default=None, help='Get apps specific branch')
+def cigetmods(ctx, nosync, branch):
     """
     Get all core modules from git repos
     """
-    if not get_core_mods():
+    if not get_core_mods(branch=branch):
         sys.exit(1)
 
     if not nosync:

{cleepcli-1.35.2 → cleepcli-1.36.0}/bin/cleep-cli

@@ -48,12 +48,13 @@ PRAGMA_NO_COVER_PATTERN = r'#\s*pragma\s*:\s*no\s+cover'
 def core():
     pass
 
-def get_core_mods(git=None):
+def get_core_mods(git=None, branch=None):
     """
     Get all core modules from their repos
 
     Args:
         git (Git): Git instance. Create new instance if not provided
+        branch (str): branch name
 
     Returns:
         bool: True if modules installed successfully
@@ -63,9 +64,9 @@ def get_core_mods(git=None):
     for module in config.DEFAULT_MODULES:
         module_path = os.path.join(config.MODULES_SRC, module)
         if not os.path.exists(module_path):
-            res = g.clone_mod(module)
+            res = g.clone_mod(module, branch)
         else:
-            res = g.pull_mod(module)
+            res = g.pull_mod(module, branch)
 
         if not res:
             logging.error('Error getting "%s" default module' % module)
@@ -843,11 +844,12 @@ def cimoddocpublish(module, version, ghtoken):
 @ci.command(hidden=True)
 @click.pass_context
 @click.option('--nosync', is_flag=True, default=False, help='Sync mods.')
-def cigetmods(ctx, nosync):
+@click.option('--branch', default=None, help='Get apps specific branch')
+def cigetmods(ctx, nosync, branch):
     """
     Get all core modules from git repos
     """
-    if not get_core_mods():
+    if not get_core_mods(branch=branch):
         sys.exit(1)
 
     if not nosync:

{cleepcli-1.35.2 → cleepcli-1.36.0}/cleepcli/git.py

@@ -57,46 +57,68 @@ class Git():
         self.logger.info('Done')
         return True
 
-    def pull_mod(self, module):
+    def pull_mod(self, module, branch):
         """
         Pull module content
 
         Args:
             module (string): module name
+            branch (str): branch name
         """
         self.logger.info('Pulling "%s" module repository...' % module)
         c = Console()
         module_path = os.path.join(config.MODULES_SRC, module)
-        cmd = 'cd "%s"; git pull -q' % (module_path)
+
+        if branch:
+            cmd = f'cd "{module_path}"; git checkout "{branch}"'
+            self.logger.debug('cmd: %s' % cmd)
+            resp = c.command(cmd, 60)
+            self.logger.debug('Checkout resp: %s' % resp)
+            if resp['returncode'] != 0:
+                self.logger.error('Error occured while checking out "%s" mod "%s": %s', module, branch, 'killed' if resp['killed'] else resp['stderr'])
+                return False
+
+        cmd = f'cd "{module_path}"; git pull -q'
         self.logger.debug('cmd: %s' % cmd)
         resp = c.command(cmd, 60)
         self.logger.debug('Pull resp: %s' % resp)
-        if resp['error'] or resp['killed']:
-            self.logger.error('Error occured while pulling "%s" mod repository: %s' % (module, 'killed' if resp['killed'] else resp['stderr']))
+        if resp['returncode'] != 0:
+            self.logger.error('Error occured while pulling "%s" mod repository: %s', module, 'killed' if resp['killed'] else resp['stderr'])
             return False
 
         self.logger.info('Done')
         return True
 
-    def clone_mod(self, module):
+    def clone_mod(self, module, branch=None):
         """
         Clone core content from official repository
 
         Args:
             module (string): module name
+            branch (str): branch name
         """
         self.logger.info('Cloning "%s" module repository...' % module)
         c = Console()
         url = config.MODULES_REPO_URL[module]
         module_path = os.path.join(config.MODULES_SRC, module)
-        cmd = 'git clone -q "%s" "%s"' % (url, module_path)
+        cmd = f'git clone -q "{url}" "{module_path}"'
         self.logger.debug('cmd: %s' % cmd)
-        resp = c.command(cmd, timeout=120)
+        resp = c.command(cmd, timeout=60)
         self.logger.debug('Clone resp: %s' % resp)
-        if resp['error'] or resp['killed']:
+        if resp['returncode'] != 0:
             self.logger.error('Error occured while cloning "%s" mod repository: %s' % (module, 'killed' if resp['killed'] else resp['stderr']))
             return False
-        
+
+        if branch:
+            cmd = f'cd "{module_path}" && git checkout "{branch}"'
+            self.logger.debug('cmd: %s' % cmd)
+            resp = c.command(cmd, timeout=60)
+            self.logger.debug('Checkout resp: %s' % resp)
+            if resp['returncode'] != 0:
+                self.logger.error('Error occured while checking out "%s" mod "%s": %s', module, branch, 'killed' if resp['killed'] else resp['stderr'])
+                return False
+
+
         self.logger.info('Done')
         return True
 

{cleepcli-1.35.2 → cleepcli-1.36.0}/cleepcli/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-VERSION = '1.35.2'
+VERSION = '1.36.0'
 

{cleepcli-1.35.2 → cleepcli-1.36.0/cleepcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cleepcli
-Version: 1.35.2
+Version: 1.36.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