chore: migrate to new templates repo (#8)

Templates are now in mono repo:
https://github.com/NativeScript/nativescript-app-templates

Author: dtopuzov

core/enums/env.py

@@ -7,6 +7,7 @@
 class EnvironmentType(IntEnum):
     _init_ = 'value string'
 
+    PR = 0, 'pr'
     NEXT = 1, 'next'
     RC = 2, 'rc'
     LIVE = 3, 'latest'

core/settings/Settings.py

@@ -28,6 +28,8 @@ def get_env():
         return EnvironmentType.NEXT
     elif 'rc' in env:
         return EnvironmentType.RC
+    elif 'pr' in env:
+        return EnvironmentType.LIVE
     else:
         return EnvironmentType.LIVE
 

core/utils/git.py

@@ -1,6 +1,7 @@
 """
 A wrapper around GitHub commands.
 """
+from core.log.log import Log
 from core.settings import Settings
 from core.utils.file_utils import Folder
 from core.utils.run import run
@@ -17,18 +18,17 @@ def get_repo_url(repo_url, ssh_clone=False):
 
 class Git(object):
     @staticmethod
-    def clone(repo_url, local_folder, branch=None):
-        """Clone GitHub repo to local folder
+    def clone(repo_url, local_folder, branch='master'):
+        """Clone GitHub repo to local folder.
         :param repo_url: HTTPs url of the repo.
-        :param branch: Branch
+        :param branch: Branch.
         :param local_folder: Local folder to clone the repo.
         """
         if Folder.exists(folder=local_folder):
             Folder.clean(folder=local_folder)
         repo_url = get_repo_url(repo_url=repo_url, ssh_clone=Settings.SSH_CLONE)
-        command = 'git clone {0} "{1}"'.format(repo_url, str(local_folder))
-        if branch is not None:
-            command = command + ' -b ' + branch
+        command = 'git clone --depth 1 {0} -b {1} "{2}"'.format(repo_url, branch, str(local_folder))
+        Log.info(command)
         result = run(cmd=command)
         assert "fatal" not in result.output, "Failed to clone: " + repo_url
         assert result.exit_code is 0, "Failed to clone: " + repo_url

core/utils/npm.py

@@ -14,11 +14,10 @@ class Npm(object):
     @staticmethod
     def __run_npm_command(cmd, folder=Settings.TEST_RUN_HOME, verify=True):
         command = 'npm {0}'.format(cmd)
-        Log.info(command)
+        Log.info(command + " (at " + folder + ").")
         result = run(cmd=command, cwd=folder, wait=True, timeout=300)
         if verify:
             assert result.exit_code is 0, '" + command + " exited with non zero exit code!: \n' + result.output
-        Log.debug(result.output)
         return result.output.strip()
 
     @staticmethod

data/templates.py

@@ -1,14 +1,13 @@
 import os
 
 from core.enums.app_type import AppType
-from core.settings.Settings import NS_GIT_ORG, TEST_SUT_HOME
+from core.settings.Settings import TEST_SUT_HOME
 from products.nativescript.template_info import TemplateInfo
 
 
 def gen_template_info(name, app_type, texts=None):
-    return TemplateInfo(name=name, repo='https://github.com/{0}/{1}'.format(NS_GIT_ORG, name),
-                        local_package=os.path.join(TEST_SUT_HOME, '{0}.tgz'.format(name)),
-                        app_type=app_type, texts=texts)
+    return TemplateInfo(name=name, local_package=os.path.join(TEST_SUT_HOME, '{0}.tgz'.format(name)), app_type=app_type,
+                        texts=texts)
 
 
 class Template(object):
@@ -19,7 +18,9 @@ class Template(object):
     dr_str = ['Home']
     tn_str = ['Item 1']
     login = ['Login']
-    auth = ['Your Company Name']
+
+    # Templates repo
+    REPO = 'https://github.com/NativeScript/nativescript-app-templates'
 
     # Blank templates
     BLANK_JS = gen_template_info(name='template-blank', app_type=AppType.JS)
@@ -54,11 +55,6 @@ class Template(object):
     TAB_NAVIGATION_TS = gen_template_info(name='template-tab-navigation-ts', app_type=AppType.TS, texts=tn_str)
     TAB_NAVIGATION_NG = gen_template_info(name='template-tab-navigation-ng', app_type=AppType.NG, texts=tn_str)
 
-    # Enterprise auth templates
-    ENTERPRISE_AUTH_JS = gen_template_info(name='template-enterprise-auth', app_type=AppType.JS, texts=auth)
-    ENTERPRISE_AUTH_TS = gen_template_info(name='template-enterprise-auth-ts', app_type=AppType.TS, texts=auth)
-    ENTERPRISE_AUTH_NG = gen_template_info(name='template-enterprise-auth-ng', app_type=AppType.NG, texts=auth)
-
     # Health templates
     HEALTH_SURVEY_NG = gen_template_info(name='template-health-survey-ng', app_type=AppType.NG, texts=login)
     PATIENT_CARE_NG = gen_template_info(name='template-patient-care-ng', app_type=AppType.NG, texts=login)

products/nativescript/template_info.py

@@ -1,7 +1,6 @@
 class TemplateInfo(object):
-    def __init__(self, name=None, repo=None, local_package=None, app_type=None, texts=None):
+    def __init__(self, name=None, local_package=None, app_type=None, texts=None):
         self.name = name
-        self.repo = repo
         self.local_package = local_package
         self.app_type = app_type
         self.texts = texts

run_common.py

@@ -3,6 +3,7 @@
 from core.enums.os_type import OSType
 from core.log.log import Log
 from core.settings import Settings
+from core.utils.ci.jenkins import Jenkins
 from core.utils.device.adb import Adb
 from core.utils.device.device_manager import DeviceManager
 from core.utils.file_utils import File, Folder
@@ -37,17 +38,22 @@ def __get_templates():
     Clone hello-world templates and pack them as local npm packages.
     Hints: Creating project from local npm package is much faster than from GitHub repo.
     """
-    apps = [Template.HELLO_WORLD_JS, Template.HELLO_WORLD_TS, Template.HELLO_WORLD_NG]
+    branch = 'master'
+    if Jenkins.is_pr():
+        branch = Jenkins.get_pr_info().source_branch
+    local_folder = os.path.join(Settings.TEST_SUT_HOME, 'templates')
+    Git.clone(repo_url=Template.REPO, branch=branch, local_folder=local_folder)
+
+    apps = [Template.HELLO_WORLD_JS, Template.HELLO_WORLD_TS, Template.HELLO_WORLD_NG, Template.MASTER_DETAIL_NG]
     for app in apps:
-        template_name = app.repo.split('/')[-1]
-        local_folder = os.path.join(Settings.TEST_SUT_HOME, template_name)
+        template_name = app.name
+        template_folder = os.path.join(local_folder, 'packages', template_name)
         out_file = os.path.join(Settings.TEST_SUT_HOME, template_name + '.tgz')
-        Git.clone(repo_url=app.repo, local_folder=local_folder)
-        Npm.pack(folder=local_folder, output_file=out_file)
+        Npm.pack(folder=template_folder, output_file=out_file)
         if File.exists(out_file):
             app.path = out_file
         else:
-            raise IOError("Failed to clone and pack template: " + app.repo)
+            raise IOError("Failed to clone and pack template: " + template_name)
 
 
 def __get_packages():
@@ -127,15 +133,15 @@ def __install_schematics():
     Npm.install(package=Settings.Packages.NS_SCHEMATICS, folder=Settings.TEST_RUN_HOME)
 
 
-def prepare(shared=False):
+def prepare(clone_templates=True, install_ng_cli=False):
     Log.info('================== Prepare Test Run ==================')
     __cleanup()
     __get_packages()
     __install_ns_cli()
-    if shared:
+    if install_ng_cli:
         __install_ng_cli()
         __install_schematics()
-    else:
+    if clone_templates:
         __get_templates()
 
     Log.settings()

run_ns.py

@@ -6,7 +6,7 @@
 from core.log.log import Log
 
 if __name__ == '__main__':
-    run_common.prepare()
+    run_common.prepare(clone_templates=True, install_ng_cli=False)
     Log.info("Running tests...")
     arguments = ['nosetests', '-v', '-s', '--nologcapture', '--with-doctest', '--with-xunit']
     for i in sys.argv:

run_schematics.py

@@ -6,7 +6,7 @@
 from core.log.log import Log
 
 if __name__ == '__main__':
-    run_common.prepare(shared=True)
+    run_common.prepare(clone_templates=False, install_ng_cli=True)
     Log.info("Running tests...")
     arguments = ['nosetests', '-v', '-s', '--nologcapture', '--logging-filter=nose', '--with-xunit', '--with-flaky']
     for i in sys.argv:

tests/live/apps_tests.py renamed to tests/apps/apps_tests.py

@@ -30,7 +30,7 @@ def setUpClass(cls):
             cls.sim = DeviceManager.Simulator.ensure_available(Settings.Simulators.DEFAULT)
 
         # Create app
-        Tns.create(app_name=cls.app_name, template=Template.MASTER_DETAIL_NG.repo, update=True)
+        Tns.create(app_name=cls.app_name, template=Template.MASTER_DETAIL_NG.local_package, update=True)
         Tns.platform_add_android(app_name=cls.app_name, framework_path=Settings.Android.FRAMEWORK_PATH)
         if Settings.HOST_OS is OSType.OSX:
             Tns.platform_add_ios(app_name=cls.app_name, framework_path=Settings.IOS.FRAMEWORK_PATH)

tests/cli/run/templates/master_detail_ng_tests.py

@@ -8,8 +8,9 @@
 from core.settings import Settings
 from core.utils.device.adb import Adb
 from core.utils.device.device_manager import DeviceManager
-from core.utils.file_utils import Folder
+from core.utils.file_utils import Folder, File
 from core.utils.gradle import Gradle
+from core.utils.npm import Npm
 from data.const import Colors
 from data.templates import Template
 from products.nativescript.app import App
@@ -25,31 +26,28 @@ class TemplateTests(TnsTest):
     sim = None
 
     test_data = [
-        [Template.HELLO_WORLD_JS.name, Template.HELLO_WORLD_JS],
-        [Template.HELLO_WORLD_TS.name, Template.HELLO_WORLD_TS],
-        [Template.HELLO_WORLD_NG.name, Template.HELLO_WORLD_NG],
         [Template.BLANK_JS.name, Template.BLANK_JS],
         [Template.BLANK_TS.name, Template.BLANK_TS],
         [Template.BLANK_NG.name, Template.BLANK_NG],
+        [Template.VUE_BLANK.name, Template.VUE_BLANK],
         [Template.DRAWER_NAVIGATION_JS.name, Template.DRAWER_NAVIGATION_JS],
         [Template.DRAWER_NAVIGATION_TS.name, Template.DRAWER_NAVIGATION_TS],
         [Template.DRAWER_NAVIGATION_NG.name, Template.DRAWER_NAVIGATION_NG],
-        [Template.TAB_NAVIGATION_JS.name, Template.TAB_NAVIGATION_JS],
-        [Template.TAB_NAVIGATION_TS.name, Template.TAB_NAVIGATION_TS],
-        [Template.TAB_NAVIGATION_NG.name, Template.TAB_NAVIGATION_NG],
-        [Template.MASTER_DETAIL_JS.name, Template.MASTER_DETAIL_JS],
-        [Template.MASTER_DETAIL_TS.name, Template.MASTER_DETAIL_TS],
-        [Template.MASTER_DETAIL_NG.name, Template.MASTER_DETAIL_NG],
+        [Template.HEALTH_SURVEY_NG.name, Template.HEALTH_SURVEY_NG],
+        [Template.HELLO_WORLD_JS.name, Template.HELLO_WORLD_JS],
+        [Template.HELLO_WORLD_TS.name, Template.HELLO_WORLD_TS],
+        [Template.HELLO_WORLD_NG.name, Template.HELLO_WORLD_NG],
         [Template.MASTER_DETAIL_KINVEY_JS.name, Template.MASTER_DETAIL_KINVEY_JS],
         [Template.MASTER_DETAIL_KINVEY_TS.name, Template.MASTER_DETAIL_KINVEY_TS],
         [Template.MASTER_DETAIL_KINVEY_NG.name, Template.MASTER_DETAIL_KINVEY_NG],
-        [Template.ENTERPRISE_AUTH_JS.name, Template.ENTERPRISE_AUTH_JS],
-        [Template.ENTERPRISE_AUTH_TS.name, Template.ENTERPRISE_AUTH_TS],
-        [Template.ENTERPRISE_AUTH_NG.name, Template.ENTERPRISE_AUTH_NG],
-        [Template.HEALTH_SURVEY_NG.name, Template.HEALTH_SURVEY_NG],
+        [Template.MASTER_DETAIL_JS.name, Template.MASTER_DETAIL_JS],
+        [Template.MASTER_DETAIL_TS.name, Template.MASTER_DETAIL_TS],
+        [Template.MASTER_DETAIL_NG.name, Template.MASTER_DETAIL_NG],
+        [Template.VUE_MASTER_DETAIL.name, Template.VUE_MASTER_DETAIL],
         [Template.PATIENT_CARE_NG.name, Template.PATIENT_CARE_NG],
-        [Template.VUE_BLANK.name, Template.VUE_BLANK],
-        [Template.VUE_MASTER_DETAIL.name, Template.VUE_MASTER_DETAIL]
+        [Template.TAB_NAVIGATION_JS.name, Template.TAB_NAVIGATION_JS],
+        [Template.TAB_NAVIGATION_TS.name, Template.TAB_NAVIGATION_TS],
+        [Template.TAB_NAVIGATION_NG.name, Template.TAB_NAVIGATION_NG]
     ]
 
     @classmethod
@@ -71,11 +69,17 @@ def tearDownClass(cls):
 
     @parameterized.expand(test_data)
     def test(self, template_name, template_info):
+        # Ensure template local package
+        template_folder = os.path.join(Settings.TEST_SUT_HOME, 'templates', 'packages', template_name)
+        out_file = os.path.join(Settings.TEST_SUT_HOME, template_name + '.tgz')
+        Npm.pack(folder=template_folder, output_file=out_file)
+        assert File.exists(out_file), "Failed to pack template: " + template_name
+
         # Create app
         app_name = template_info.name.replace('template-', '')
-        local_path = os.path.join(Settings.TEST_RUN_HOME, app_name)
-        Tns.create(app_name=app_name, template=template_info.repo, update=False)
-        if Settings.ENV != EnvironmentType.LIVE:
+        app_path = os.path.join(Settings.TEST_RUN_HOME, app_name)
+        Tns.create(app_name=app_name, template=template_info.local_package, update=False)
+        if Settings.ENV != EnvironmentType.LIVE and Settings.ENV != EnvironmentType.PR:
             App.update(app_name=app_name)
 
         # Run Android
@@ -99,4 +103,4 @@ def test(self, template_name, template_info):
         # Cleanup
         Tns.kill()
         Gradle.kill()
-        Folder.clean(local_path)
+        Folder.clean(app_path)