From b18d00813f94264c750c3e40010f2ea97c978bcf Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 2 Sep 2024 21:05:38 +0000 Subject: [PATCH 1/8] Prepare Next Version --- build/lib/ovos_skill_cmd/LICENSE.txt | 202 ++++++++++++++++++ build/lib/ovos_skill_cmd/README.md | 23 ++ build/lib/ovos_skill_cmd/__init__.py | 64 ++++++ build/lib/ovos_skill_cmd/locale/de-de/Run.voc | 2 + build/lib/ovos_skill_cmd/locale/en-us/Run.voc | 1 + build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc | 1 + .../ovos_skill_cmd.egg-info/PKG-INFO | 11 + .../ovos_skill_cmd.egg-info/SOURCES.txt | 10 + .../dependency_links.txt | 1 + .../ovos_skill_cmd.egg-info/entry_points.txt | 3 + .../ovos_skill_cmd.egg-info/top_level.txt | 1 + build/lib/ovos_skill_cmd/version.py | 6 + dist/ovos_skill_cmd-0.1.0-py3-none-any.whl | Bin 0 -> 13704 bytes ovos_skill_cmd.egg-info/PKG-INFO | 11 + ovos_skill_cmd.egg-info/SOURCES.txt | 10 + ovos_skill_cmd.egg-info/dependency_links.txt | 1 + ovos_skill_cmd.egg-info/entry_points.txt | 3 + ovos_skill_cmd.egg-info/top_level.txt | 1 + version.py | 2 +- 19 files changed, 352 insertions(+), 1 deletion(-) create mode 100644 build/lib/ovos_skill_cmd/LICENSE.txt create mode 100644 build/lib/ovos_skill_cmd/README.md create mode 100644 build/lib/ovos_skill_cmd/__init__.py create mode 100644 build/lib/ovos_skill_cmd/locale/de-de/Run.voc create mode 100644 build/lib/ovos_skill_cmd/locale/en-us/Run.voc create mode 100644 build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc create mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO create mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt create mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt create mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt create mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt create mode 100644 build/lib/ovos_skill_cmd/version.py create mode 100644 dist/ovos_skill_cmd-0.1.0-py3-none-any.whl create mode 100644 ovos_skill_cmd.egg-info/PKG-INFO create mode 100644 ovos_skill_cmd.egg-info/SOURCES.txt create mode 100644 ovos_skill_cmd.egg-info/dependency_links.txt create mode 100644 ovos_skill_cmd.egg-info/entry_points.txt create mode 100644 ovos_skill_cmd.egg-info/top_level.txt diff --git a/build/lib/ovos_skill_cmd/LICENSE.txt b/build/lib/ovos_skill_cmd/LICENSE.txt new file mode 100644 index 0000000..073ff14 --- /dev/null +++ b/build/lib/ovos_skill_cmd/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Åke Forslund + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/build/lib/ovos_skill_cmd/README.md b/build/lib/ovos_skill_cmd/README.md new file mode 100644 index 0000000..ddfedee --- /dev/null +++ b/build/lib/ovos_skill_cmd/README.md @@ -0,0 +1,23 @@ +# Commands Skill + +A Simple OVOS skill for running shell scripts and other commands. The commands will run quietly without any confirmation from OVOS. + +## Usage + +*Hey Mycroft, launch command echo TEST* + +*Hey Mycroft, run script generate report* + +## Configuration + +The skill can be configured to run scripts from easily pronounceable human utterances, such as "generate report" by adding the following to the skill `settings.json` + +```json +{ + "alias": { + "generate report": "/home/forslund/scripts/generate_report.sh" + } +} +``` + +The configuration above will launch `/home/forslund/scripts/generate_report.sh` when "run script generate report" is said by the user. diff --git a/build/lib/ovos_skill_cmd/__init__.py b/build/lib/ovos_skill_cmd/__init__.py new file mode 100644 index 0000000..388a6fe --- /dev/null +++ b/build/lib/ovos_skill_cmd/__init__.py @@ -0,0 +1,64 @@ +# Copyright 2024 Åke Forslund +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from pwd import getpwnam +import os +import subprocess + +from ovos_utils.log import LOG +from ovos_workshop.skills import OVOSSkill +from ovos_workshop.intents import IntentBuilder +from ovos_workshop.decorators import intent_handler + + +def set_user(uid, gid): + LOG.info(f'Setting group and user to {gid}:{uid}') + os.setgid(gid) + os.setuid(uid) + + +class CmdSkill(OVOSSkill): + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.uid = None + self.gid = None + self.alias = {} + + def initialize(self): + user = self.settings.get('user') + if user: + pwnam = getpwnam(user) + self.uid = pwnam.pw_uid + self.gid = pwnam.pw_gid + self.alias = self.settings.get('alias') or {} + + for alias in self.alias: + LOG.info(f"Adding script keyword: {alias}") + self.register_vocabulary(alias, 'Script') + + @intent_handler(IntentBuilder('RunScriptCommandIntent') + .require('Script').require('Run')) + def run(self, message): + script = message.data.get('Script') + script = self.alias.get(script, script) + args = script.split(' ') + try: + if self.uid and self.gid: + subprocess.Popen(args, preexec_fn=set_user(self.uid, self.gid)) + else: + LOG.info(f'Running {args}') + subprocess.Popen(args) + except Exception: + LOG.exception('Could not run script ' + script) diff --git a/build/lib/ovos_skill_cmd/locale/de-de/Run.voc b/build/lib/ovos_skill_cmd/locale/de-de/Run.voc new file mode 100644 index 0000000..a1bae7d --- /dev/null +++ b/build/lib/ovos_skill_cmd/locale/de-de/Run.voc @@ -0,0 +1,2 @@ +starte (Befehl|Skript) +führe (Befehl|Skript) aus \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/locale/en-us/Run.voc b/build/lib/ovos_skill_cmd/locale/en-us/Run.voc new file mode 100644 index 0000000..ab51c2d --- /dev/null +++ b/build/lib/ovos_skill_cmd/locale/en-us/Run.voc @@ -0,0 +1 @@ +(run|execute|launch) (command|script) \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc b/build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc new file mode 100644 index 0000000..723edbe --- /dev/null +++ b/build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc @@ -0,0 +1 @@ +(executar|lançar|iniciar) (comando|script) \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO new file mode 100644 index 0000000..58147f3 --- /dev/null +++ b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO @@ -0,0 +1,11 @@ +Metadata-Version: 1.0 +Name: ovos-skill-cmd +Version: 0.1.0 +Summary: CmdSkill +Home-page: https://github.com/OVOSHatchery/ovos-skill-cmd +Author: forslund +Author-email: UNKNOWN +License: Apache2.0 +Description: UNKNOWN +Keywords: ovos skill plugin +Platform: UNKNOWN diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt new file mode 100644 index 0000000..26d5d52 --- /dev/null +++ b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt @@ -0,0 +1,10 @@ +LICENSE.txt +README.md +__init__.py +setup.py +version.py +ovos_skill_cmd.egg-info/PKG-INFO +ovos_skill_cmd.egg-info/SOURCES.txt +ovos_skill_cmd.egg-info/dependency_links.txt +ovos_skill_cmd.egg-info/entry_points.txt +ovos_skill_cmd.egg-info/top_level.txt \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt new file mode 100644 index 0000000..07a926e --- /dev/null +++ b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt @@ -0,0 +1,3 @@ +[ovos.plugin.skill] +ovos-skill-cmd.forslund=ovos_skill_cmd:CmdSkill + diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt new file mode 100644 index 0000000..8e17c23 --- /dev/null +++ b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt @@ -0,0 +1 @@ +ovos_skill_cmd diff --git a/build/lib/ovos_skill_cmd/version.py b/build/lib/ovos_skill_cmd/version.py new file mode 100644 index 0000000..cbb1e3f --- /dev/null +++ b/build/lib/ovos_skill_cmd/version.py @@ -0,0 +1,6 @@ +# START_VERSION_BLOCK +VERSION_MAJOR = 0 +VERSION_MINOR = 1 +VERSION_BUILD = 0 +VERSION_ALPHA = 0 +# END_VERSION_BLOCK diff --git a/dist/ovos_skill_cmd-0.1.0-py3-none-any.whl b/dist/ovos_skill_cmd-0.1.0-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..f93a09894c39657f56a9ea5f4ebeca2b8c3b58d2 GIT binary patch literal 13704 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 literal 0 HcmV?d00001 diff --git a/ovos_skill_cmd.egg-info/PKG-INFO b/ovos_skill_cmd.egg-info/PKG-INFO new file mode 100644 index 0000000..58147f3 --- /dev/null +++ b/ovos_skill_cmd.egg-info/PKG-INFO @@ -0,0 +1,11 @@ +Metadata-Version: 1.0 +Name: ovos-skill-cmd +Version: 0.1.0 +Summary: CmdSkill +Home-page: https://github.com/OVOSHatchery/ovos-skill-cmd +Author: forslund +Author-email: UNKNOWN +License: Apache2.0 +Description: UNKNOWN +Keywords: ovos skill plugin +Platform: UNKNOWN diff --git a/ovos_skill_cmd.egg-info/SOURCES.txt b/ovos_skill_cmd.egg-info/SOURCES.txt new file mode 100644 index 0000000..26d5d52 --- /dev/null +++ b/ovos_skill_cmd.egg-info/SOURCES.txt @@ -0,0 +1,10 @@ +LICENSE.txt +README.md +__init__.py +setup.py +version.py +ovos_skill_cmd.egg-info/PKG-INFO +ovos_skill_cmd.egg-info/SOURCES.txt +ovos_skill_cmd.egg-info/dependency_links.txt +ovos_skill_cmd.egg-info/entry_points.txt +ovos_skill_cmd.egg-info/top_level.txt \ No newline at end of file diff --git a/ovos_skill_cmd.egg-info/dependency_links.txt b/ovos_skill_cmd.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/ovos_skill_cmd.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/ovos_skill_cmd.egg-info/entry_points.txt b/ovos_skill_cmd.egg-info/entry_points.txt new file mode 100644 index 0000000..07a926e --- /dev/null +++ b/ovos_skill_cmd.egg-info/entry_points.txt @@ -0,0 +1,3 @@ +[ovos.plugin.skill] +ovos-skill-cmd.forslund=ovos_skill_cmd:CmdSkill + diff --git a/ovos_skill_cmd.egg-info/top_level.txt b/ovos_skill_cmd.egg-info/top_level.txt new file mode 100644 index 0000000..8e17c23 --- /dev/null +++ b/ovos_skill_cmd.egg-info/top_level.txt @@ -0,0 +1 @@ +ovos_skill_cmd diff --git a/version.py b/version.py index cbb1e3f..45c1596 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 -VERSION_MINOR = 1 +VERSION_MINOR = 2 VERSION_BUILD = 0 VERSION_ALPHA = 0 # END_VERSION_BLOCK From dd7b0bc7f0d39411c4084bde54c04ec39b98a4d8 Mon Sep 17 00:00:00 2001 From: "gitlocalize-app[bot]" <55277160+gitlocalize-app[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 18:30:43 +0100 Subject: [PATCH 2/8] catalan support (#7) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Joan Montané --- translations/ca-es/vocabs.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 translations/ca-es/vocabs.json diff --git a/translations/ca-es/vocabs.json b/translations/ca-es/vocabs.json new file mode 100644 index 0000000..c15d134 --- /dev/null +++ b/translations/ca-es/vocabs.json @@ -0,0 +1,5 @@ +{ + "Run.voc": [ + "(executa|llança|inicia) (un |una |la|l'|sa |s')(ordre|orde|comanda|script)" + ] +} From 6cd46be24a5f0ac93825cb41522e67249920b16d Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 9 Oct 2024 17:30:56 +0000 Subject: [PATCH 3/8] Update translations --- locale/ca-es/Run.voc | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/ca-es/Run.voc diff --git a/locale/ca-es/Run.voc b/locale/ca-es/Run.voc new file mode 100644 index 0000000..7266078 --- /dev/null +++ b/locale/ca-es/Run.voc @@ -0,0 +1 @@ +(executa|llança|inicia) (un |una |la|l'|sa |s')(ordre|orde|comanda|script) \ No newline at end of file From 83c3ecbc958f21712dd9f233d39e48f69e5ac06d Mon Sep 17 00:00:00 2001 From: "gitlocalize-app[bot]" <55277160+gitlocalize-app[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 18:31:05 +0100 Subject: [PATCH 4/8] accepted addition translation (#6) Co-authored-by: Michael Moroni --- translations/it-it/vocabs.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 translations/it-it/vocabs.json diff --git a/translations/it-it/vocabs.json b/translations/it-it/vocabs.json new file mode 100644 index 0000000..f4796d8 --- /dev/null +++ b/translations/it-it/vocabs.json @@ -0,0 +1,5 @@ +{ + "Run.voc": [ + "(avvia|esegui|lancia|apri) (un|uno|il|lo|) (comando|script)" + ] +} From 9c32ec227698d96d07921730cdd41bc141a0d600 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 9 Oct 2024 17:31:17 +0000 Subject: [PATCH 5/8] Update translations --- locale/it-it/Run.voc | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/it-it/Run.voc diff --git a/locale/it-it/Run.voc b/locale/it-it/Run.voc new file mode 100644 index 0000000..cc2f648 --- /dev/null +++ b/locale/it-it/Run.voc @@ -0,0 +1 @@ +(avvia|esegui|lancia|apri) (un|uno|il|lo|) (comando|script) \ No newline at end of file From 929e58ff6f688bc133794788160a7110e01cda0a Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 04:10:11 +0100 Subject: [PATCH 6/8] semver (#8) --- .github/workflows/conventional-label.yml | 10 + .github/workflows/publish_build.yml | 86 -------- .github/workflows/publish_major.yml | 86 -------- .github/workflows/publish_minor.yml | 86 -------- .../{publish_alpha.yml => publish_stable.yml} | 69 +++--- .github/workflows/release_workflow.yml | 108 ++++++++++ .gitignore | 19 ++ build/lib/ovos_skill_cmd/LICENSE.txt | 202 ------------------ build/lib/ovos_skill_cmd/README.md | 23 -- build/lib/ovos_skill_cmd/__init__.py | 64 ------ build/lib/ovos_skill_cmd/locale/de-de/Run.voc | 2 - build/lib/ovos_skill_cmd/locale/en-us/Run.voc | 1 - build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc | 1 - .../ovos_skill_cmd.egg-info/PKG-INFO | 11 - .../ovos_skill_cmd.egg-info/SOURCES.txt | 10 - .../dependency_links.txt | 1 - .../ovos_skill_cmd.egg-info/entry_points.txt | 3 - .../ovos_skill_cmd.egg-info/top_level.txt | 1 - build/lib/ovos_skill_cmd/version.py | 6 - dist/ovos_skill_cmd-0.1.0-py3-none-any.whl | Bin 13704 -> 0 bytes ovos_skill_cmd.egg-info/PKG-INFO | 11 - ovos_skill_cmd.egg-info/SOURCES.txt | 10 - ovos_skill_cmd.egg-info/dependency_links.txt | 1 - ovos_skill_cmd.egg-info/entry_points.txt | 3 - ovos_skill_cmd.egg-info/top_level.txt | 1 - requirements.txt | 1 + setup.py | 1 + 27 files changed, 172 insertions(+), 645 deletions(-) create mode 100644 .github/workflows/conventional-label.yml delete mode 100644 .github/workflows/publish_build.yml delete mode 100644 .github/workflows/publish_major.yml delete mode 100644 .github/workflows/publish_minor.yml rename .github/workflows/{publish_alpha.yml => publish_stable.yml} (56%) create mode 100644 .github/workflows/release_workflow.yml delete mode 100644 build/lib/ovos_skill_cmd/LICENSE.txt delete mode 100644 build/lib/ovos_skill_cmd/README.md delete mode 100644 build/lib/ovos_skill_cmd/__init__.py delete mode 100644 build/lib/ovos_skill_cmd/locale/de-de/Run.voc delete mode 100644 build/lib/ovos_skill_cmd/locale/en-us/Run.voc delete mode 100644 build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc delete mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO delete mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt delete mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt delete mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt delete mode 100644 build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt delete mode 100644 build/lib/ovos_skill_cmd/version.py delete mode 100644 dist/ovos_skill_cmd-0.1.0-py3-none-any.whl delete mode 100644 ovos_skill_cmd.egg-info/PKG-INFO delete mode 100644 ovos_skill_cmd.egg-info/SOURCES.txt delete mode 100644 ovos_skill_cmd.egg-info/dependency_links.txt delete mode 100644 ovos_skill_cmd.egg-info/entry_points.txt delete mode 100644 ovos_skill_cmd.egg-info/top_level.txt create mode 100644 requirements.txt diff --git a/.github/workflows/conventional-label.yml b/.github/workflows/conventional-label.yml new file mode 100644 index 0000000..9894c1b --- /dev/null +++ b/.github/workflows/conventional-label.yml @@ -0,0 +1,10 @@ +# auto add labels to PRs +on: + pull_request_target: + types: [ opened, edited ] +name: conventional-release-labels +jobs: + label: + runs-on: ubuntu-latest + steps: + - uses: bcoe/conventional-release-labels@v1 diff --git a/.github/workflows/publish_build.yml b/.github/workflows/publish_build.yml deleted file mode 100644 index 6f7c8ad..0000000 --- a/.github/workflows/publish_build.yml +++ /dev/null @@ -1,86 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Build Release ..X -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - commitish: dev - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Build version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_build.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{secrets.PYPI_TOKEN}} - - name: Send message to Matrix bots channel - id: matrix-chat-message - uses: fadenb/matrix-chat-message@v0.0.6 - with: - homeserver: 'matrix.org' - token: ${{ secrets.MATRIX_TOKEN }} - channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' - message: | - New skill-ovos-fallback-unknown release! ${{ steps.version.outputs.version }} diff --git a/.github/workflows/publish_major.yml b/.github/workflows/publish_major.yml deleted file mode 100644 index 220cdfe..0000000 --- a/.github/workflows/publish_major.yml +++ /dev/null @@ -1,86 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Major Release X.0.0 -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - commitish: master - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Major version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_major.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{secrets.PYPI_TOKEN}} - - name: Send message to Matrix bots channel - id: matrix-chat-message - uses: fadenb/matrix-chat-message@v0.0.6 - with: - homeserver: 'matrix.org' - token: ${{ secrets.MATRIX_TOKEN }} - channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' - message: | - New skill-ovos-fallback-unknown release! ${{ steps.version.outputs.version }} diff --git a/.github/workflows/publish_minor.yml b/.github/workflows/publish_minor.yml deleted file mode 100644 index eeadd42..0000000 --- a/.github/workflows/publish_minor.yml +++ /dev/null @@ -1,86 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Minor Release .X.0 -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - commitish: master - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Minor version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_minor.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{secrets.PYPI_TOKEN}} - - name: Send message to Matrix bots channel - id: matrix-chat-message - uses: fadenb/matrix-chat-message@v0.0.6 - with: - homeserver: 'matrix.org' - token: ${{ secrets.MATRIX_TOKEN }} - channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' - message: | - New skill-ovos-fallback-unknown release! ${{ steps.version.outputs.version }} diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_stable.yml similarity index 56% rename from .github/workflows/publish_alpha.yml rename to .github/workflows/publish_stable.yml index 1cd4443..c9393e7 100644 --- a/.github/workflows/publish_alpha.yml +++ b/.github/workflows/publish_stable.yml @@ -1,26 +1,22 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Alpha Build ...aX +name: Stable Release on: push: - branches: - - dev - paths-ignore: - - 'version.py' - - 'test/**' - - 'examples/**' - - '.github/**' - - '.gitignore' - - 'LICENSE' - - 'CHANGELOG.md' - - 'MANIFEST.in' - - 'readme.md' - - 'scripts/**' - - 'translations/**' + branches: [master] workflow_dispatch: jobs: - build_and_publish: + publish_stable: + uses: TigreGotico/gh-automations/.github/workflows/publish-stable.yml@master + secrets: inherit + with: + branch: 'master' + version_file: 'version.py' + setup_py: 'setup.py' + publish_release: true + + publish_pypi: + needs: publish_stable + if: success() # Ensure this job only runs if the previous job succeeds runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -34,21 +30,6 @@ jobs: - name: Install Build Tools run: | python -m pip install build wheel - - name: Increment Version - run: | - VER=$(python setup.py --version) - python scripts/bump_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - maxIssues: 50 - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Increment Version - branch: dev - name: version run: echo "::set-output name=version::$(python setup.py --version)" id: version @@ -68,8 +49,24 @@ jobs: commitish: dev - name: Build Distribution Packages run: | - python setup.py bdist_wheel - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + python setup.py sdist bdist_wheel + - name: Publish to Test PyPI + uses: pypa/gh-action-pypi-publish@master with: password: ${{secrets.PYPI_TOKEN}} + + + sync_dev: + needs: publish_stable + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + ref: master + - name: Push master -> dev + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: dev \ No newline at end of file diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml new file mode 100644 index 0000000..d17f77f --- /dev/null +++ b/.github/workflows/release_workflow.yml @@ -0,0 +1,108 @@ +name: Release Alpha and Propose Stable + +on: + pull_request: + types: [closed] + branches: [dev] + +jobs: + publish_alpha: + if: github.event.pull_request.merged == true + uses: TigreGotico/gh-automations/.github/workflows/publish-alpha.yml@master + secrets: inherit + with: + branch: 'dev' + version_file: 'version.py' + setup_py: 'setup.py' + update_changelog: true + publish_prerelease: true + changelog_max_issues: 100 + + notify: + if: github.event.pull_request.merged == true + needs: publish_alpha + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Send message to Matrix bots channel + id: matrix-chat-message + uses: fadenb/matrix-chat-message@v0.0.6 + with: + homeserver: 'matrix.org' + token: ${{ secrets.MATRIX_TOKEN }} + channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' + message: | + new ${{ github.event.repository.name }} PR merged! https://github.com/${{ github.repository }}/pull/${{ github.event.number }} + + publish_pypi: + needs: publish_alpha + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: dev + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + - name: Setup Python + uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: Install Build Tools + run: | + python -m pip install build wheel + - name: version + run: echo "::set-output name=version::$(python setup.py --version)" + id: version + - name: Build Distribution Packages + run: | + python setup.py sdist bdist_wheel + - name: Publish to Test PyPI + uses: pypa/gh-action-pypi-publish@master + with: + password: ${{secrets.PYPI_TOKEN}} + + + propose_release: + needs: publish_alpha + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - name: Checkout dev branch + uses: actions/checkout@v3 + with: + ref: dev + + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: '3.10' + + - name: Get version from setup.py + id: get_version + run: | + VERSION=$(python setup.py --version) + echo "VERSION=$VERSION" >> $GITHUB_ENV + + - name: Create and push new branch + run: | + git checkout -b release-${{ env.VERSION }} + git push origin release-${{ env.VERSION }} + + - name: Open Pull Request from dev to master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # Variables + BRANCH_NAME="release-${{ env.VERSION }}" + BASE_BRANCH="master" + HEAD_BRANCH="release-${{ env.VERSION }}" + PR_TITLE="Release ${{ env.VERSION }}" + PR_BODY="Human review requested!" + + # Create a PR using GitHub API + curl -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d "{\"title\":\"$PR_TITLE\",\"body\":\"$PR_BODY\",\"head\":\"$HEAD_BRANCH\",\"base\":\"$BASE_BRANCH\"}" \ + https://api.github.com/repos/${{ github.repository }}/pulls + diff --git a/.gitignore b/.gitignore index 0d20b64..9595be5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,20 @@ +dev.env +.dev_opts.json +.idea +*.code-workspace *.pyc +*.swp +*~ +*.egg-info/ +build +dist +.coverage +/htmlcov +.installed +.mypy_cache +.vscode +.theia +.venv/ + +# Created by unit tests +.pytest_cache/ diff --git a/build/lib/ovos_skill_cmd/LICENSE.txt b/build/lib/ovos_skill_cmd/LICENSE.txt deleted file mode 100644 index 073ff14..0000000 --- a/build/lib/ovos_skill_cmd/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2024 Åke Forslund - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/build/lib/ovos_skill_cmd/README.md b/build/lib/ovos_skill_cmd/README.md deleted file mode 100644 index ddfedee..0000000 --- a/build/lib/ovos_skill_cmd/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Commands Skill - -A Simple OVOS skill for running shell scripts and other commands. The commands will run quietly without any confirmation from OVOS. - -## Usage - -*Hey Mycroft, launch command echo TEST* - -*Hey Mycroft, run script generate report* - -## Configuration - -The skill can be configured to run scripts from easily pronounceable human utterances, such as "generate report" by adding the following to the skill `settings.json` - -```json -{ - "alias": { - "generate report": "/home/forslund/scripts/generate_report.sh" - } -} -``` - -The configuration above will launch `/home/forslund/scripts/generate_report.sh` when "run script generate report" is said by the user. diff --git a/build/lib/ovos_skill_cmd/__init__.py b/build/lib/ovos_skill_cmd/__init__.py deleted file mode 100644 index 388a6fe..0000000 --- a/build/lib/ovos_skill_cmd/__init__.py +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2024 Åke Forslund -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from pwd import getpwnam -import os -import subprocess - -from ovos_utils.log import LOG -from ovos_workshop.skills import OVOSSkill -from ovos_workshop.intents import IntentBuilder -from ovos_workshop.decorators import intent_handler - - -def set_user(uid, gid): - LOG.info(f'Setting group and user to {gid}:{uid}') - os.setgid(gid) - os.setuid(uid) - - -class CmdSkill(OVOSSkill): - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.uid = None - self.gid = None - self.alias = {} - - def initialize(self): - user = self.settings.get('user') - if user: - pwnam = getpwnam(user) - self.uid = pwnam.pw_uid - self.gid = pwnam.pw_gid - self.alias = self.settings.get('alias') or {} - - for alias in self.alias: - LOG.info(f"Adding script keyword: {alias}") - self.register_vocabulary(alias, 'Script') - - @intent_handler(IntentBuilder('RunScriptCommandIntent') - .require('Script').require('Run')) - def run(self, message): - script = message.data.get('Script') - script = self.alias.get(script, script) - args = script.split(' ') - try: - if self.uid and self.gid: - subprocess.Popen(args, preexec_fn=set_user(self.uid, self.gid)) - else: - LOG.info(f'Running {args}') - subprocess.Popen(args) - except Exception: - LOG.exception('Could not run script ' + script) diff --git a/build/lib/ovos_skill_cmd/locale/de-de/Run.voc b/build/lib/ovos_skill_cmd/locale/de-de/Run.voc deleted file mode 100644 index a1bae7d..0000000 --- a/build/lib/ovos_skill_cmd/locale/de-de/Run.voc +++ /dev/null @@ -1,2 +0,0 @@ -starte (Befehl|Skript) -führe (Befehl|Skript) aus \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/locale/en-us/Run.voc b/build/lib/ovos_skill_cmd/locale/en-us/Run.voc deleted file mode 100644 index ab51c2d..0000000 --- a/build/lib/ovos_skill_cmd/locale/en-us/Run.voc +++ /dev/null @@ -1 +0,0 @@ -(run|execute|launch) (command|script) \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc b/build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc deleted file mode 100644 index 723edbe..0000000 --- a/build/lib/ovos_skill_cmd/locale/pt-pt/Run.voc +++ /dev/null @@ -1 +0,0 @@ -(executar|lançar|iniciar) (comando|script) \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO deleted file mode 100644 index 58147f3..0000000 --- a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/PKG-INFO +++ /dev/null @@ -1,11 +0,0 @@ -Metadata-Version: 1.0 -Name: ovos-skill-cmd -Version: 0.1.0 -Summary: CmdSkill -Home-page: https://github.com/OVOSHatchery/ovos-skill-cmd -Author: forslund -Author-email: UNKNOWN -License: Apache2.0 -Description: UNKNOWN -Keywords: ovos skill plugin -Platform: UNKNOWN diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt deleted file mode 100644 index 26d5d52..0000000 --- a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/SOURCES.txt +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE.txt -README.md -__init__.py -setup.py -version.py -ovos_skill_cmd.egg-info/PKG-INFO -ovos_skill_cmd.egg-info/SOURCES.txt -ovos_skill_cmd.egg-info/dependency_links.txt -ovos_skill_cmd.egg-info/entry_points.txt -ovos_skill_cmd.egg-info/top_level.txt \ No newline at end of file diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt deleted file mode 100644 index 07a926e..0000000 --- a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ovos.plugin.skill] -ovos-skill-cmd.forslund=ovos_skill_cmd:CmdSkill - diff --git a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt b/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt deleted file mode 100644 index 8e17c23..0000000 --- a/build/lib/ovos_skill_cmd/ovos_skill_cmd.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -ovos_skill_cmd diff --git a/build/lib/ovos_skill_cmd/version.py b/build/lib/ovos_skill_cmd/version.py deleted file mode 100644 index cbb1e3f..0000000 --- a/build/lib/ovos_skill_cmd/version.py +++ /dev/null @@ -1,6 +0,0 @@ -# START_VERSION_BLOCK -VERSION_MAJOR = 0 -VERSION_MINOR = 1 -VERSION_BUILD = 0 -VERSION_ALPHA = 0 -# END_VERSION_BLOCK diff --git a/dist/ovos_skill_cmd-0.1.0-py3-none-any.whl b/dist/ovos_skill_cmd-0.1.0-py3-none-any.whl deleted file mode 100644 index f93a09894c39657f56a9ea5f4ebeca2b8c3b58d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13704 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 diff --git a/ovos_skill_cmd.egg-info/PKG-INFO b/ovos_skill_cmd.egg-info/PKG-INFO deleted file mode 100644 index 58147f3..0000000 --- a/ovos_skill_cmd.egg-info/PKG-INFO +++ /dev/null @@ -1,11 +0,0 @@ -Metadata-Version: 1.0 -Name: ovos-skill-cmd -Version: 0.1.0 -Summary: CmdSkill -Home-page: https://github.com/OVOSHatchery/ovos-skill-cmd -Author: forslund -Author-email: UNKNOWN -License: Apache2.0 -Description: UNKNOWN -Keywords: ovos skill plugin -Platform: UNKNOWN diff --git a/ovos_skill_cmd.egg-info/SOURCES.txt b/ovos_skill_cmd.egg-info/SOURCES.txt deleted file mode 100644 index 26d5d52..0000000 --- a/ovos_skill_cmd.egg-info/SOURCES.txt +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE.txt -README.md -__init__.py -setup.py -version.py -ovos_skill_cmd.egg-info/PKG-INFO -ovos_skill_cmd.egg-info/SOURCES.txt -ovos_skill_cmd.egg-info/dependency_links.txt -ovos_skill_cmd.egg-info/entry_points.txt -ovos_skill_cmd.egg-info/top_level.txt \ No newline at end of file diff --git a/ovos_skill_cmd.egg-info/dependency_links.txt b/ovos_skill_cmd.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/ovos_skill_cmd.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ovos_skill_cmd.egg-info/entry_points.txt b/ovos_skill_cmd.egg-info/entry_points.txt deleted file mode 100644 index 07a926e..0000000 --- a/ovos_skill_cmd.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ovos.plugin.skill] -ovos-skill-cmd.forslund=ovos_skill_cmd:CmdSkill - diff --git a/ovos_skill_cmd.egg-info/top_level.txt b/ovos_skill_cmd.egg-info/top_level.txt deleted file mode 100644 index 8e17c23..0000000 --- a/ovos_skill_cmd.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -ovos_skill_cmd diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..9679af9 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +ovos-workshop>=0.0.15,<2.0.0 \ No newline at end of file diff --git a/setup.py b/setup.py index d8db4a0..dbebb2f 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,7 @@ def get_version(): version += f"a{alpha}" return version + # Setup configuration setup( name=PYPI_NAME, From f5632b1df8807bb8b3237e70824192007a8e3ad8 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 03:10:25 +0000 Subject: [PATCH 7/8] Increment Version to 0.2.1a1 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index 45c1596..cc3a2a1 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 2 -VERSION_BUILD = 0 -VERSION_ALPHA = 0 +VERSION_BUILD = 1 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From b68b72396b4f5928aa63ba4acadf1e48bbeb4e30 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 03:10:46 +0000 Subject: [PATCH 8/8] Update Changelog --- CHANGELOG.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf6fdcb..d011f40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,14 @@ # Changelog -## [V0.1.0a2](https://github.com/OpenVoiceOS/ovos-skill-cmd/tree/V0.1.0a2) (2024-09-02) +## [0.2.1a1](https://github.com/OpenVoiceOS/ovos-skill-cmd/tree/0.2.1a1) (2024-10-15) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-cmd/compare/44dc7aea48ecf015eeb74baab7d20511351d34c7...V0.1.0a2) - -**Implemented enhancements:** - -- pt-pt/translate [\#4](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/4) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) -- improve Run.voc [\#3](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/3) ([JarbasAl](https://github.com/JarbasAl)) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-cmd/compare/V0.1.0...0.2.1a1) **Merged pull requests:** -- de-de/translate [\#5](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/5) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) -- Minor issues in setup.py [\#2](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/2) ([forslund](https://github.com/forslund)) +- semver [\#8](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/8) ([JarbasAl](https://github.com/JarbasAl)) +- catalan support [\#7](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/7) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) +- accepted addition translation [\#6](https://github.com/OpenVoiceOS/ovos-skill-cmd/pull/6) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))