fix: shell arg + automations

.github/workflows/build_tests.yml

@@ -0,0 +1,39 @@
+name: Run Build Tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - dev
+  workflow_dispatch:
+
+jobs:
+  build_tests:
+    strategy:
+      max-parallel: 2
+      matrix:
+        python-version: [3.8, 3.9, "3.10", "3.11" ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Build Tools
+        run: |
+          python -m pip install build wheel
+      - name: Install System Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt install python3-dev swig libssl-dev
+      - name: Build Source Packages
+        run: |
+          python setup.py sdist
+      - name: Build Distribution Packages
+        run: |
+          python setup.py bdist_wheel
+      - name: Install skill
+        run: |
+          pip install .

.github/workflows/unit_tests.yml

@@ -0,0 +1,66 @@
+name: Run UnitTests
+on:
+  pull_request:
+    branches:
+      - dev
+    paths-ignore:
+      - 'version.py'
+      - 'examples/**'
+      - '.github/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'MANIFEST.in'
+      - 'README.md'
+      - 'scripts/**'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'version.py'
+      - 'examples/**'
+      - '.github/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'MANIFEST.in'
+      - 'README.md'
+      - 'scripts/**'
+  workflow_dispatch:
+
+jobs:
+  unit_tests:
+    strategy:
+      matrix:
+        python-version: [3.9, "3.10" ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install System Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt install python3-dev
+          python -m pip install build wheel
+      - name: Install core repo
+        run: |
+          pip install .
+      - name: Install test dependencies
+        run: |
+          pip install pytest pytest-timeout pytest-cov
+      - name: Install System Dependencies
+        run: |
+          sudo apt-get update
+      - name: Install ovos dependencies
+        run: |
+          pip install ovos-plugin-manager
+      - name: Run unittests
+        run: |
+          pytest --cov=ovos-skill-cmd --cov-report xml test
+      - name: Upload coverage
+        env:
+          CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
+        uses: codecov/codecov-action@v2

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include locale *
+include *.txt

__init__.py

@@ -53,12 +53,13 @@ def initialize(self):
     def run(self, message):
         script = message.data.get('Script')
         script = self.alias.get(script, script)
-        args = script.split(' ')
+        shell = self.settings.get('shell', True)
+        args = script.split(' ') if shell else script
         try:
+            LOG.info(f'Running {args}')
             if self.uid and self.gid:
-                subprocess.Popen(args, preexec_fn=set_user(self.uid, self.gid))
+                subprocess.Popen(args, preexec_fn=set_user(self.uid, self.gid), shell=shell)
             else:
-                LOG.info(f'Running {args}')
-                subprocess.Popen(args)
+                subprocess.Popen(args, shell=shell)
         except Exception:
             LOG.exception('Could not run script ' + script)

setup.py

@@ -5,7 +5,7 @@
 
 # Define package information
 SKILL_CLAZZ = "CmdSkill"  # Make sure it matches __init__.py class name
-URL = "https://github.com/OVOSHatchery/ovos-skill-cmd"
+URL = "https://github.com/OpenVoiceOS/ovos-skill-cmd"
 AUTHOR = "forslund"
 EMAIL = ""
 LICENSE = "Apache2.0"
@@ -37,7 +37,7 @@ def get_requirements(requirements_filename: str = "requirements.txt"):
 
 # Function to find resource files
 def find_resource_files():
-    resource_base_dirs = ("locale", "ui")
+    resource_base_dirs = ("locale")
     base_dir = abspath(dirname(__file__))
     package_data = ["*.json"]
     for res in resource_base_dirs:

test/test_plugin.py

@@ -0,0 +1,13 @@
+import unittest
+from ovos_plugin_manager.skills import find_skill_plugins
+
+
+class TestPlugin(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        self.skill_id = "ovos-skill-cmd.openvoiceos"
+
+    def test_find_plugin(self):
+        plugins = find_skill_plugins()
+        self.assertIn(self.skill_id, list(plugins))
+

test/test_skill_loading.py

@@ -0,0 +1,54 @@
+import unittest
+from os.path import dirname
+
+from ovos_plugin_manager.skills import find_skill_plugins
+from ovos_utils.messagebus import FakeBus
+from ovos_workshop.skill_launcher import PluginSkillLoader, SkillLoader
+from ovos_skill_cmd import CmdSkill
+
+
+class TestSkillLoading(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        self.skill_id = "ovos-skill-cmd.openvoiceos"
+        self.path = dirname(dirname(__file__))
+
+    def test_from_class(self):
+        bus = FakeBus()
+        skill = CmdSkill()
+        skill._startup(bus, self.skill_id)
+        self.assertEqual(skill.bus, bus)
+        self.assertEqual(skill.skill_id, self.skill_id)
+
+    def test_from_plugin(self):
+        bus = FakeBus()
+        for skill_id, plug in find_skill_plugins().items():
+            if skill_id == self.skill_id:
+                skill = plug()
+                skill._startup(bus, self.skill_id)
+                self.assertEqual(skill.bus, bus)
+                self.assertEqual(skill.skill_id, self.skill_id)
+                break
+        else:
+            raise RuntimeError("plugin not found")
+
+    def test_from_loader(self):
+        bus = FakeBus()
+        loader = SkillLoader(bus, self.path)
+        loader.load()
+        self.assertEqual(loader.instance.bus, bus)
+        self.assertEqual(loader.instance.root_dir, self.path)
+
+    def test_from_plugin_loader(self):
+        bus = FakeBus()
+        loader = PluginSkillLoader(bus, self.skill_id)
+        for skill_id, plug in find_skill_plugins().items():
+            if skill_id == self.skill_id:
+                loader.load(plug)
+                break
+        else:
+            raise RuntimeError("plugin not found")
+
+        self.assertEqual(loader.skill_id, self.skill_id)
+        self.assertEqual(loader.instance.bus, bus)
+        self.assertEqual(loader.instance.skill_id, self.skill_id)