py/data/convert/csv-to-json.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.data.converter import convert
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.data import convert
-
-
-description = 'convert csv into json'
-parse_args = []
 
 def main(_args, stream):
     return convert(
@@ -16,5 +18,7 @@ def main(_args, stream):
             )
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'convert csv into json',
+        parse_args = [],
+        )

py/data/convert/csv-to-yaml.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.data.converter import convert
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.data import convert
-
-
-description = 'convert csv into yaml'
-parse_args = []
 
 def main(_args, stream):
     return convert(
@@ -16,5 +18,7 @@ def main(_args, stream):
             )
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'convert csv into yaml',
+        parse_args = [],
+        )

py/data/convert/json-to-csv.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.data.converter import convert
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.data import convert
-
-
-description = 'convert json into csv'
-parse_args = []
 
 def main(_args, stream):
     return convert(
@@ -16,5 +18,7 @@ def main(_args, stream):
             )
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'convert json into csv',
+        parse_args = [],
+        )

py/data/convert/json-to-yaml.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.data.converter import convert
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.data import convert
-
-
-description = 'convert json into yaml'
-parse_args = []
 
 def main(_args, stream):
     return convert(
@@ -16,5 +18,7 @@ def main(_args, stream):
             )
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'convert json into yaml',
+        parse_args = [],
+        )

py/data/convert/yaml-to-csv.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.data.converter import convert
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.data import convert
-
-
-description = 'convert yaml into csv'
-parse_args = []
 
 def main(_args, stream):
     return convert(
@@ -16,5 +18,7 @@ def main(_args, stream):
             )
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'convert yaml into csv',
+        parse_args = [],
+        )

py/data/convert/yaml-to-json.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.data.converter import convert
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.data import convert
-
-
-description = 'convert yaml into json'
-parse_args = []
 
 def main(_args, stream):
     return convert(
@@ -16,5 +18,7 @@ def main(_args, stream):
             )
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'convert yaml into json',
+        parse_args = [],
+        )

py/directus/get-items.py

@@ -1,55 +1,16 @@
 #!/usr/bin/env python
-from scwrypts import execute
-#####################################################################
 from json import dumps
 
-from scwrypts.fzf import fzf, fzf_tail
+from py.lib.fzf import fzf, fzf_tail
-from scwrypts.http import directus
+from py.lib.http import directus
+from py.lib.scwrypts import execute
 
+from py.lib.scwrypts.exceptions import ImportedExecutableError
 
-description = 'interactive CLI to get data from directus'
+if __name__ != '__main__':
+    raise ImportedExecutableError()
 
-parse_args = [
+#####################################################################
-        ( ['-c', '--collection'], {
-            "dest"     : 'collection',
-            "default"  : None,
-            "help"     : 'the name of the collection',
-            "required" : False,
-            }),
-        ( ['-f', '--filters'], {
-            "dest"     : 'filters',
-            "default"  : None,
-            "help"     : 'as a URL-suffix, filters for the query',
-            "required" : False,
-            }),
-        ( ['-d', '--fields'], {
-            "dest"     : 'fields',
-            "default"  : None,
-            "help"     : 'comma-separated list of fields to include',
-            "required" : False,
-            }),
-        ( ['-p', '--interactive-prompt'], {
-            "action"   : 'store_true',
-            "dest"     : 'interactive',
-            "default"  : False,
-            "help"     : 'interactively generate filter prompts; implied if no flags are provided',
-            "required" : False,
-            }),
-        ( ['--prompt-filters'], {
-            "action"   : 'store_true',
-            "dest"     : 'generate_filters_prompt',
-            "default"  : False,
-            "help"     : '(superceded by -p) only generate filters interactively',
-            "required" : False,
-            }),
-        ( ['--prompt-fields'], {
-            "action"   : 'store_true',
-            "dest"     : 'generate_fields_prompt',
-            "default"  : False,
-            "help"     : '(superceded by -p) only generate filters interactively',
-            "required" : False,
-            }),
-        ]
 
 def main(args, stream):
     if {None} == { args.collection, args.filters, args.fields }:
@@ -135,6 +96,50 @@ def _get_or_select_fields(args, collection):
 
     return fields
 
+
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'interactive CLI to get data from directus',
+        parse_args = [
+            ( ['-c', '--collection'], {
+                "dest"     : 'collection',
+                "default"  : None,
+                "help"     : 'the name of the collection',
+                "required" : False,
+                }),
+            ( ['-f', '--filters'], {
+                "dest"     : 'filters',
+                "default"  : None,
+                "help"     : 'as a URL-suffix, filters for the query',
+                "required" : False,
+                }),
+            ( ['-d', '--fields'], {
+                "dest"     : 'fields',
+                "default"  : None,
+                "help"     : 'comma-separated list of fields to include',
+                "required" : False,
+                }),
+            ( ['-p', '--interactive-prompt'], {
+                "action"   : 'store_true',
+                "dest"     : 'interactive',
+                "default"  : False,
+                "help"     : 'interactively generate filter prompts; implied if no flags are provided',
+                "required" : False,
+                }),
+            ( ['--prompt-filters'], {
+                "action"   : 'store_true',
+                "dest"     : 'generate_filters_prompt',
+                "default"  : False,
+                "help"     : '(superceded by -p) only generate filters interactively',
+                "required" : False,
+                }),
+            ( ['--prompt-fields'], {
+                "action"   : 'store_true',
+                "dest"     : 'generate_fields_prompt',
+                "default"  : False,
+                "help"     : '(superceded by -p) only generate filters interactively',
+                "required" : False,
+                }),
+            ]
+
+        )

py/discord/post-message.py

@@ -1,14 +1,37 @@
 #!/usr/bin/env python
-from scwrypts import execute
-#####################################################################
 from json import dumps
 from sys import stderr
 
-from scwrypts.http import discord
+from py.lib.http import discord
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
+#####################################################################
+
+def main(args, stream):
+    if args.content is None:
+        print(f'reading input from {stream.input.name}', file=stderr)
+        args.content = ''.join(stream.readlines()).strip()
+
+    if len(args.content) == 0:
+        args.content = 'PING'
+
+    response = discord.send_message(**vars(args))
+
+    stream.writeline(dumps({
+        **(response.json() if response.text != '' else {'message': 'OK'}),
+        'scwrypts_metadata': {},
+        }))
 
 
-description = 'post a message to the indicated discord channel'
+#####################################################################
-parse_args = [
+execute(main,
+        description = 'post a message to the indicated discord channel',
+        parse_args = [
             ( ['-b', '--body'], {
                 'dest'     : 'content',
                 'help'     : 'message body',
@@ -35,23 +58,4 @@ parse_args = [
                 'required' : False,
                 }),
             ]
-
+        )
-def main(args, stream):
-    if args.content is None:
-        print(f'reading input from {stream.input.name}', file=stderr)
-        args.content = ''.join(stream.readlines()).strip()
-
-    if len(args.content) == 0:
-        args.content = 'PING'
-
-    response = discord.send_message(**vars(args))
-
-    stream.writeline(dumps({
-        **(response.json() if response.text != '' else {'message': 'OK'}),
-        'scwrypts_metadata': {},
-        }))
-
-
-#####################################################################
-if __name__ == '__main__':
-    execute(main, description, parse_args)

py/hello-world.py

@@ -1,21 +1,27 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
 
-description = 'a simple "Hello, World!" program'
-parse_args = [
-        ( ['-m', '--message'], {
-            'dest'     : 'message',
-            'default'  : 'HELLO WORLD',
-            'help'     : 'message to print',
-            'required' : False,
-            }),
-        ]
 
 def main(args, stream):
     stream.writeline(args.message)
 
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'a simple "Hello, World!" program',
+        parse_args = [
+            ( ['-m', '--message'], {
+                'dest'     : 'message',
+                'default'  : 'HELLO WORLD',
+                'help'     : 'message to print',
+                'required' : False,
+                }),
+            ],
+        )

py/lib/.gitignore

@@ -1 +0,0 @@
-dist/

py/lib/README.md

@@ -1,3 +0,0 @@
-# Python Scwrypts
-[![Generic Badge](https://img.shields.io/badge/python->=3.9-informational.svg)](https://python.org)
-<br>

py/lib/__init__.py

@@ -0,0 +1,6 @@
+import py.lib.data
+import py.lib.fzf
+import py.lib.http
+import py.lib.redis
+import py.lib.scwrypts
+import py.lib.twilio

py/lib/data/__init__.py

@@ -0,0 +1 @@
+import py.lib.data.converter

py/lib/data/converter.py

@@ -4,6 +4,9 @@ import yaml
 
 
 def convert(input_stream, input_type, output_stream, output_type):
+    if input_type == output_type:
+        raise ValueError('input type and output type are the same')
+
     data = convert_input(input_stream, input_type)
     write_output(output_stream, output_type, data)
 

py/lib/fzf/__init__.py

@@ -0,0 +1 @@
+from py.lib.fzf.client import fzf, fzf_tail, fzf_head

py/lib/http/__init__.py

@@ -0,0 +1,5 @@
+from py.lib.http.client import get_request_client
+
+import py.lib.http.directus
+import py.lib.http.discord
+import py.lib.http.linear

py/lib/http/directus/__init__.py

@@ -0,0 +1,2 @@
+from py.lib.http.directus.client import *
+from py.lib.http.directus.constant import *

py/lib/http/directus/client.py

@@ -1,6 +1,5 @@
-from scwrypts.env import getenv
+from py.lib.http import get_request_client
-
+from py.lib.scwrypts import getenv
-from .. import get_request_client
 
 
 REQUEST     = None

py/lib/http/directus/constant.py

@@ -1,5 +1,3 @@
-from .client import *
-
 FILTER_OPERATORS = {
         '_eq',
         '_neq',

py/lib/http/discord/__init__.py

@@ -0,0 +1,2 @@
+from py.lib.http.discord.client import *
+from py.lib.http.discord.send_message import *

py/lib/http/discord/client.py

@@ -1,5 +1,5 @@
-from scwrypts.env import getenv
+from py.lib.http import get_request_client
-from scwrypts.http import get_request_client
+from py.lib.scwrypts import getenv
 
 REQUEST = None
 

py/lib/http/discord/send_message.py

@@ -1,5 +1,5 @@
-from scwrypts.env import getenv
+from py.lib.scwrypts import getenv
-from .client import request
+from py.lib.http.discord import request
 
 def send_message(content, channel_id=None, webhook=None, username=None, avatar_url=None, **kwargs):
     if username is None:

py/lib/http/linear/__init__.py

@@ -0,0 +1 @@
+from py.lib.http.linear.client import *

py/lib/http/linear/client.py

@@ -1,6 +1,5 @@
-from scwrypts.env import getenv
+from py.lib.http import get_request_client
-
+from py.lib.scwrypts import getenv
-from .. import get_request_client
 
 REQUEST = None
 

py/lib/pyproject.toml

@@ -1,61 +0,0 @@
-[project]
-name = 'scwrypts'
-description = 'scwrypts library and invoker'
-license = 'GPL-3.0-or-later'
-
-readme = 'README.md'
-requires-python = '>=3.10'
-
-authors = [
-	{ name='yage', email='yage@yage.io' },
-]
-
-
-classifiers = [
-	'Programming Language :: Python :: 3',
-	'Programming Language :: Python :: 3.10',
-	'Programming Language :: Python :: 3.11',
-	'Programming Language :: Python :: 3.12',
-	'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
-	]
-
-dynamic = ['version']
-
-dependencies = [
-	'bpython',
-	'pyfzf',
-	'pyyaml',
-	'redis',
-	'twilio',
-]
-
-[project.optional-dependencies]
-dev = [
-	'pylint',
-]
-
-test = [
-	'pytest',
-	'mergedeep',
-]
-
-[project.urls]
-homepage = 'https://github.com/wrynegade/scwrypts'
-issues = 'https://github.com/wrynegade/scwrypts/issues'
-
-[build-system]
-requires = [
-	'hatchling',
-	'versioningit',
-]
-build-backend = 'hatchling.build'
-
-[tool.hatch.version]
-source = 'versioningit'
-
-[tool.hatch.build.targets.wheel]
-packages = ['./']
-
-[tool.versioningit]
-match = ['v*']
-

py/lib/redis/__init__.py

@@ -0,0 +1 @@
+from py.lib.redis.client import get_client

py/lib/redis/client.py

@@ -1,6 +1,6 @@
 from redis import StrictRedis
 
-from scwrypts.env import getenv
+from py.lib.scwrypts import getenv
 
 CLIENT = None
 

py/lib/scwrypts/__init__.py

@@ -1,9 +1,6 @@
-'''
+from py.lib.scwrypts.execute import execute
-scwrypts
+from py.lib.scwrypts.getenv import getenv
+from py.lib.scwrypts.interactive import interactive
+from py.lib.scwrypts.run import run
 
-python library functions and invoker for scwrypts
+import py.lib.scwrypts.io
-'''
-
-from .scwrypts.execute import execute
-from .scwrypts.interactive import interactive
-from .scwrypts.scwrypts import scwrypts

py/lib/scwrypts/data/__init__.py

@@ -1 +0,0 @@
-from .converter import convert

py/lib/scwrypts/data/test_converter.py

@@ -1,75 +0,0 @@
-from io import StringIO
-#from string import ascii_letters, digits
-from unittest.mock import patch
-
-from pytest import raises
-
-from scwrypts.test import generate
-
-from .converter import convert
-
-GENERATE_OPTIONS = {
-        'depth': 1,
-        'minimum': -999999,
-        'maximum':  999999,
-        'dict_key_types': {str, int},
-        'csv_columns_minimum': 10,
-        'csv_columns_maximum': 64,
-        'csv_rows_minimum': 10,
-        'csv_rows_maximum': 64,
-        }
-
-INPUT_TYPES  = {'csv', 'json', 'yaml'}
-OUTPUT_TYPES = {'csv', 'json', 'yaml'}
-
-
-def test_convert_to_csv():
-    for input_type in INPUT_TYPES:
-        input_stream = generate(input_type, {
-            **GENERATE_OPTIONS,
-            'data_types': {bool,int,float,str},
-            })
-
-        if isinstance(input_stream, str):
-            input_stream = StringIO(input_stream)
-
-
-        convert(input_stream, input_type, StringIO(), 'csv')
-
-def test_convert_to_json():
-    for input_type in INPUT_TYPES:
-        input_stream = generate(input_type, GENERATE_OPTIONS)
-
-        if isinstance(input_stream, str):
-            input_stream = StringIO(input_stream)
-
-        convert(input_stream, input_type, StringIO(), 'json')
-
-def test_convert_to_yaml():
-    for input_type in INPUT_TYPES:
-        input_stream = generate(input_type, GENERATE_OPTIONS)
-
-        if isinstance(input_stream, str):
-            input_stream = StringIO(input_stream)
-
-        convert(input_stream, input_type, StringIO(), 'yaml')
-
-
-def test_convert_deep_json_to_yaml():
-    input_stream = StringIO(generate('json', {**GENERATE_OPTIONS, 'depth': 4}))
-    convert(input_stream, 'json', StringIO(), 'yaml')
-
-def test_convert_deep_yaml_to_json():
-    input_stream = generate('yaml', {**GENERATE_OPTIONS, 'depth': 4})
-    convert(input_stream, 'yaml', StringIO(), 'json')
-
-
-def test_convert_output_unsupported():
-    for input_type in list(INPUT_TYPES):
-        with raises(ValueError):
-            convert(StringIO(), input_type, StringIO(), generate(str))
-
-def test_convert_input_unsupported():
-    for output_type in list(OUTPUT_TYPES):
-        with raises(ValueError):
-            convert(StringIO(), generate(str), StringIO(), output_type)

py/lib/scwrypts/exceptions.py

@@ -6,11 +6,11 @@ class MissingVariableError(EnvironmentError):
         super().__init__(f'Missing required environment variable "{name}"')
 
 
+class ImportedExecutableError(ImportError):
+    def __init__(self):
+        super().__init__('executable only; must run through scwrypts')
+
+
 class MissingFlagAndEnvironmentVariableError(EnvironmentError, ArgumentError):
     def __init__(self, flags, env_var):
         super().__init__(f'must provide at least one of : {{ flags: {flags} OR {env_var} }}')
-
-
-class MissingScwryptsExecutableError(EnvironmentError):
-    def __init__(self):
-        super().__init__(f'scwrypts must be installed and available on your PATH')

py/lib/scwrypts/execute.py

@@ -1,12 +1,9 @@
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
 
-from scwrypts.io import get_combined_stream, add_io_arguments
+from py.lib.scwrypts.io import get_combined_stream, add_io_arguments
 
 
-def execute(main, description=None, parse_args=None, allow_input=True, allow_output=True):
+def execute(main, description=None, parse_args=None, toggle_input=True, toggle_output=True):
-    '''
-    API to initiate a python-based scwrypt
-    '''
     if parse_args is None:
         parse_args = []
 
@@ -15,7 +12,7 @@ def execute(main, description=None, parse_args=None, allow_input=True, allow_out
             formatter_class = ArgumentDefaultsHelpFormatter,
             )
 
-    add_io_arguments(parser, allow_input, allow_output)
+    add_io_arguments(parser, toggle_input, toggle_output)
 
     for a in parse_args:
         parser.add_argument(*a[0], **a[1])

py/lib/scwrypts/fzf/__init__.py

@@ -1 +0,0 @@
-from .client import fzf, fzf_tail, fzf_head

py/lib/scwrypts/getenv.py

@@ -1,6 +1,6 @@
 from os import getenv as os_getenv
 
-from .scwrypts.exceptions import MissingVariableError
+from py.lib.scwrypts.exceptions import MissingVariableError
 
 
 def getenv(name, required=True):

py/lib/scwrypts/http/__init__.py

@@ -1 +0,0 @@
-from .client import get_request_client

py/lib/scwrypts/http/discord/__init__.py

@@ -1,2 +0,0 @@
-from .client import *
-from .send_message import *

py/lib/scwrypts/http/linear/__init__.py

@@ -1 +0,0 @@
-from .client import *

py/lib/scwrypts/interactive.py

@@ -2,9 +2,6 @@ from bpython import embed
 
 
 def interactive(variable_descriptions):
-    '''
-    main() decorator to drop to interactive python environment upon completion
-    '''
     def outer(function):
 
         def inner(*args, **kwargs):

py/lib/scwrypts/io.py

@@ -2,7 +2,7 @@ from contextlib import contextmanager
 from pathlib import Path
 from sys import stdin, stdout, stderr
 
-from scwrypts.env import getenv
+from py.lib.scwrypts.getenv import getenv
 
 
 @contextmanager
@@ -34,8 +34,8 @@ def get_stream(filename=None, mode='r', encoding='utf-8', verbose=False, **kwarg
             stdout.flush()
 
 
-def add_io_arguments(parser, allow_input=True, allow_output=True):
+def add_io_arguments(parser, toggle_input=True, toggle_output=True):
-    if allow_input:
+    if toggle_input:
         parser.add_argument(
                 '-i', '--input-file',
                 dest     = 'input_file',
@@ -44,7 +44,7 @@ def add_io_arguments(parser, allow_input=True, allow_output=True):
                 required = False,
                 )
 
-    if allow_output:
+    if toggle_output:
         parser.add_argument(
                 '-o', '--output-file',
                 dest     = 'output_file',

py/lib/scwrypts/io/__init__.py

@@ -1 +0,0 @@
-from .combined_io_stream import get_combined_stream, add_io_arguments

py/lib/scwrypts/redis/__init__.py

@@ -1 +0,0 @@
-from .client import get_client

py/lib/scwrypts/run.py

@@ -0,0 +1,22 @@
+from os import getenv
+from pathlib import Path
+from subprocess import run as subprocess_run
+
+
+def run(scwrypt_name, *args):
+    DEPTH = int(getenv('SUBSCWRYPT', '0'))
+    DEPTH += 1
+
+    SCWRYPTS_EXE = Path(__file__).parents[3] / 'scwrypts'
+    ARGS = ' '.join([str(x) for x in args])
+    print(f'SUBSCWRYPT={DEPTH} {SCWRYPTS_EXE} {scwrypt_name} -- {ARGS}')
+
+    print(f'\n {"--"*DEPTH} ({DEPTH}) BEGIN SUBSCWRYPT : {Path(scwrypt_name).name}')
+    subprocess_run(
+        f'SUBSCWRYPT={DEPTH} {SCWRYPTS_EXE} {scwrypt_name} -- {ARGS}',
+        shell=True,
+        executable='/bin/zsh',
+        check=False,
+        )
+
+    print(f' {"--"*DEPTH} ({DEPTH}) END SUBSCWRYPT   : {Path(scwrypt_name).name}\n')

py/lib/scwrypts/scwrypts/scwrypts.py

@@ -1,30 +0,0 @@
-from os import getenv
-from shutil import which
-from subprocess import run
-
-from .exceptions import MissingScwryptsExecutableError
-
-
-def scwrypts(name, group, _type, *args, log_level=None):
-    '''
-    invoke non-python scwrypts from python
-    '''
-    executable = which('scwrypts')
-    if executable is None:
-        raise MissingScwryptsExecutableError()
-
-    pre_args = ''
-
-    if log_level is not None:
-        pre_args += '--log-level {log_level}'
-
-    depth = getenv('SUBSCWRYPT', '')
-    if depth != '':
-        depth = int(depth) + 1
-
-    return run(
-        f'SUBSCWRYPT={depth} {executable} --name {name} --group {group} --type {_type} {pre_args} -- {" ".join(args)}',
-        shell=True,
-        executable='/bin/zsh',
-        check=False,
-        )

py/lib/scwrypts/test/__init__.py

@@ -1 +0,0 @@
-from .random_generator import generate

py/lib/scwrypts/test/exceptions.py

@@ -1,10 +0,0 @@
-class GeneratorError(Exception):
-    pass
-
-class NoDataTypeError(GeneratorError, ValueError):
-    def __init__(self):
-        super().__init__('must provide at least one data type (either "data_type" or "data_types")')
-
-class BadGeneratorTypeError(GeneratorError, ValueError):
-    def __init__(self, data_type):
-        super().__init__(f'no generator exists for data type "{data_type}"')

py/lib/scwrypts/test/random_generator.py

@@ -1,240 +0,0 @@
-from csv import writer, QUOTE_NONNUMERIC
-from io import StringIO
-from json import dumps
-from random import randint, uniform, choice
-from re import sub
-from string import printable
-from yaml import safe_dump
-
-from .exceptions import NoDataTypeError, BadGeneratorTypeError
-
-
-SUPPORTED_DATA_TYPES = None
-
-DEFAULT_OPTIONS = {
-        'data_types': None,
-        'minimum':  0,
-        'maximum': 64,
-        'depth': 1,
-        'character_set': None,
-        'bool_nullable': False,
-        'str_length': None,
-        'str_minimum_length': 0,
-        'str_maximum_length': 32,
-        'list_length': 8,
-        'set_length': 8,
-        'dict_length': 8,
-        'dict_key_types': {int, float, chr, str},
-        'csv_columns': None,
-        'csv_columns_minimum': 1,
-        'csv_columns_maximum': 16,
-        'csv_rows': None,
-        'csv_rows_minimum': 2,
-        'csv_rows_maximum': 16,
-        'json_initial_type': dict,
-        'yaml_initial_type': dict,
-        }
-
-def generate(data_type=None, options=None):
-    '''
-    generate random data with the call of a function
-        use data_type to generate a single value
-
-        use options to set generation options (key = type, value = kwargs)
-
-        use options.data_types and omit data_type to generate a random type
-    '''
-    if options is None:
-        options = {**DEFAULT_OPTIONS}
-    else:
-        options = DEFAULT_OPTIONS | options
-
-    if data_type is None and options['data_types'] is None:
-        raise NoDataTypeError()
-
-    if data_type is None and options['data_types'] is not None:
-        return generate(data_type=choice(list(options['data_types'])), options=options)
-
-    if not isinstance(data_type, str):
-        data_type = data_type.__name__
-
-    if data_type not in Generator.get_supported_data_types():
-        raise BadGeneratorTypeError(data_type)
-
-    return getattr(Generator, f'_{data_type}')(options)
-
-#####################################################################
-
-class Generator:
-
-    @classmethod
-    def get_supported_data_types(cls):
-        global SUPPORTED_DATA_TYPES  # pylint: disable=global-statement
-        if SUPPORTED_DATA_TYPES is None:
-            SUPPORTED_DATA_TYPES = {
-                    sub('^_', '', data_type)
-                    for data_type, method in Generator.__dict__.items()
-                    if isinstance(method, staticmethod)
-                    }
-
-        return SUPPORTED_DATA_TYPES
-
-
-
-    @staticmethod
-    def _bool(options):
-        return choice([True, False, None]) if options['bool_nullable'] else choice([True, False])
-
-
-    @staticmethod
-    def _int(options):
-        return randint(options['minimum'], options['maximum'])
-
-
-    @staticmethod
-    def _float(options):
-        return uniform(options['minimum'], options['maximum'])
-
-
-    @staticmethod
-    def _chr(options):
-        character_set = options['character_set']
-        return choice(character_set) if character_set is not None else chr(randint(0,65536))
-
-
-    @staticmethod
-    def _str(options):
-        length = options['str_length']
-        if length is None:
-            length = generate(int, {
-                'minimum': options['str_minimum_length'],
-                'maximum': options['str_maximum_length'],
-                })
-        return ''.join((generate(chr, options) for _ in range(length)))
-
-
-    @staticmethod
-    def _list(options):
-        if options['depth'] <= 0:
-            return []
-
-        options['depth'] -= 1
-
-        if options['data_types'] is None:
-            options['data_types'] = {bool, int, float, chr, str}
-
-        return [ generate(None, options) for _ in range(options['list_length']) ]
-
-
-    @staticmethod
-    def _set(options):
-        if options['depth'] <= 0:
-            return set()
-
-        options['depth'] -= 1
-
-        if options['data_types'] is None:
-            options['data_types'] = {bool, int, float, chr, str}
-
-        set_options = options | {'data_types': options['data_types'] - {list, dict, set}}
-
-        return { generate(None, set_options) for _ in range(options['set_length']) }
-
-
-    @staticmethod
-    def _dict(options):
-        if options['depth'] <= 0:
-            return {}
-
-        options['depth'] -= 1
-
-        if options['data_types'] is None:
-            options['data_types'] = {bool, int, float, chr, str, list, set, dict}
-
-        if len(options['data_types']) == 0:
-            return {}
-
-        key_options = options | {'data_types': options['dict_key_types']}
-        return {
-                generate(None, key_options): generate(None, options)
-                for _ in range(options['dict_length'])
-                }
-
-
-    @staticmethod
-    def _csv(options):
-        '''
-        creates a StringIO object containing csv data
-        '''
-        if options['data_types'] is None:
-            options['data_types'] = {int, float, str}
-
-        columns = options['csv_columns']
-        if columns is None:
-            columns = max(1, generate(int, {
-                'minimum': options['csv_columns_minimum'],
-                'maximum': options['csv_columns_maximum'],
-                }))
-
-        rows = options['csv_rows']
-        if rows is None:
-            rows = max(1, generate(int, {
-                'minimum': options['csv_rows_minimum'],
-                'maximum': options['csv_rows_maximum'],
-                }))
-
-        if options['character_set'] is None:
-            options['character_set'] = printable
-
-        csv = StringIO()
-        csv_writer = writer(csv, quoting=QUOTE_NONNUMERIC)
-
-        options['list_length'] = columns
-
-        for line in [ generate(list, options) for _ in range(rows) ]:
-            csv_writer.writerow(line)
-
-        csv.seek(0)
-        return csv
-
-
-    @staticmethod
-    def _json(options):
-        '''
-        creates a str containing json data
-        '''
-        if options['data_types'] is None:
-            options['data_types'] = {bool, int, float, str, list, dict}
-
-        if options['character_set'] is None:
-            options['character_set'] = printable
-
-        options['dict_key_types'] = { int, float, str }
-
-        data = generate(options['json_initial_type'], options)
-        return dumps(data)
-
-
-    @staticmethod
-    def _yaml(options):
-        '''
-        creates a StringIO object containing yaml data
-        '''
-        if options['data_types'] is None:
-            options['data_types'] = {bool, int, float, str, list, dict}
-
-        if options['character_set'] is None:
-            options['character_set'] = printable
-
-        options['dict_key_types'] = { int, float, str }
-
-        yaml = StringIO()
-        safe_dump(generate(options['yaml_initial_type'], options), yaml, default_flow_style=False)
-
-        yaml.seek(0)
-        return yaml
-
-
-#####################################################################
-if __name__ == '__main__':
-    print(generate('json', {'depth': 3}))

py/lib/scwrypts/test/test_random_generator.py

@@ -1,44 +0,0 @@
-from os import getenv
-from random import randint
-
-from .random_generator import generate, Generator
-
-
-ITERATIONS = int(getenv('PYTEST_ITERATIONS__scwrypts__test__random_generator', getenv('PYTEST_ITERATIONS', '999')))
-
-
-def test_generate():  # generators should be quick and "just work" (no Exceptions)
-    for data_type in Generator.get_supported_data_types():
-        for _ in range(ITERATIONS):
-            generate(data_type)
-
-
-def test_generate_depth_deep():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'depth': 4})
-
-def test_generate_depth_shallow():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'depth': randint(-999, 0)})
-
-
-def test_generate_range_all():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'minimum': -99, 'maximum': 99})
-
-def test_generate_range_positive():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'minimum':   1, 'maximum': 99})
-
-def test_generate_range_zero():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'minimum':   3, 'maximum':  3})
-
-def test_generate_range_negative():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'minimum': -99, 'maximum': -1})
-
-
-def test_generate_bool_nullable():
-    for data_type in Generator.get_supported_data_types():
-        generate(data_type, {'bool': {'nullable': True}})

py/lib/scwrypts/twilio/__init__.py

@@ -1,2 +0,0 @@
-from .client import get_client
-from .send_sms import send_sms

py/lib/twilio/__init__.py

@@ -0,0 +1,2 @@
+from py.lib.twilio.client import get_client
+from py.lib.twilio.send_sms import send_sms

py/lib/twilio/client.py

@@ -1,6 +1,6 @@
 from twilio.rest import Client
 
-from scwrypts.env import getenv
+from py.lib.scwrypts import getenv
 
 CLIENT = None
 

py/lib/twilio/send_sms.py

@@ -1,7 +1,7 @@
 from json import dumps
 from time import sleep
 
-from .client import get_client
+from py.lib.twilio.client import get_client
 
 
 def send_sms(to, from_, body, max_char_count=300, stream=None):

py/linear/comment.py

@@ -1,22 +1,13 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.http.linear import graphql
+from py.lib.scwrypts import execute
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts.http.linear import graphql
-
-
-description = 'comment on an issue in linear.app'
-parse_args = [
-        ( ['-d', '--issue-id'], {
-            'dest'     : 'issue_id',
-            'help'     : 'issue short-code (e.g. CLOUD-319)',
-            'required' : True,
-            }),
-        ( ['-m', '--message'], {
-            'dest'     : 'message',
-            'help'     : 'comment to post to the target issue',
-            'required' : True,
-            }),
-        ]
 
 
 def get_query(args):
@@ -35,6 +26,20 @@ def main(args, stream):
     response = graphql(get_query(args))
     stream.writeline(response)
 
+
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'comment on an inssue in linear.app',
+        parse_args = [
+            ( ['-d', '--issue-id'], {
+                'dest'     : 'issue_id',
+                'help'     : 'issue short-code (e.g. CLOUD-319)',
+                'required' : True,
+                }),
+            ( ['-m', '--message'], {
+                'dest'     : 'message',
+                'help'     : 'comment to post to the target issue',
+                'required' : True,
+                }),
+            ]
+        )

py/redis/interactive.py

@@ -1,14 +1,15 @@
 #!/usr/bin/env python
-from scwrypts import execute
+from py.lib.redis import get_client
+from py.lib.scwrypts import execute, interactive, getenv
+
+from py.lib.scwrypts.exceptions import ImportedExecutableError
+
+if __name__ != '__main__':
+    raise ImportedExecutableError()
+
 #####################################################################
-from scwrypts import interactive
-from scwrypts.env import getenv
-from scwrypts.redis import get_client
 
 
-description = 'establishes a redis client in an interactive python shell'
-parse_args = []
-
 @interactive([
         f'r = StrictRedis(\'{getenv("REDIS_HOST")}:{getenv("REDIS_PORT")}\')',
     ])
@@ -19,5 +20,7 @@ def main(_args, _stream):
 
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'establishes a redis client in an interactive python shell',
+        parse_args = [],
+        )

py/requirements.txt

@@ -1 +1,5 @@
-./lib
+bpython
+pyfzf
+pyyaml
+redis
+twilio

py/twilio/send-sms.py

@@ -1,38 +1,15 @@
 #!/usr/bin/env python
-from scwrypts import execute
-#####################################################################
 from sys import stderr
 
-from scwrypts.env import getenv
+from py.lib.scwrypts import execute, getenv
-from scwrypts.twilio import send_sms
+from py.lib.twilio import send_sms
 
+from py.lib.scwrypts.exceptions import ImportedExecutableError, MissingFlagAndEnvironmentVariableError
 
-description = 'send a simple SMS through twilio'
+if __name__ != '__main__':
-parse_args = [
+    raise ImportedExecutableError()
-        ( ['-t', '--to'], {
+
-            'dest'     : 'to',
+#####################################################################
-            'help'     : 'phone number of the receipient',
-            'required' : False,
-            'default'  : getenv('TWILIO__DEFAULT_PHONE_TO', required=False),
-            }),
-        ( ['-f', '--from'], {
-            'dest'     : 'from_',
-            'help'     : 'phone number of the receipient',
-            'required' : False,
-            'default'  : getenv('TWILIO__DEFAULT_PHONE_FROM', required=False),
-            }),
-        ( ['-b', '--body'], {
-            'dest'     : 'body',
-            'help'     : 'message body',
-            'required' : False,
-            }),
-        ( ['--max-char-count'], {
-            'dest'     : 'max_char_count',
-            'help'     : 'separate message into parts by character count (1 < N <= 1500)',
-            'required' : False,
-            'default'  : 300,
-            }),
-        ]
 
 def main(args, stream):
     if args.body is None:
@@ -58,5 +35,31 @@ def main(args, stream):
 
 
 #####################################################################
-if __name__ == '__main__':
+execute(main,
-    execute(main, description, parse_args)
+        description = 'send a simple SMS through twilio',
+        parse_args = [
+            ( ['-t', '--to'], {
+                'dest'     : 'to',
+                'help'     : 'phone number of the receipient',
+                'required' : False,
+                'default'  : getenv('TWILIO__DEFAULT_PHONE_TO', required=False),
+                }),
+            ( ['-f', '--from'], {
+                'dest'     : 'from_',
+                'help'     : 'phone number of the receipient',
+                'required' : False,
+                'default'  : getenv('TWILIO__DEFAULT_PHONE_FROM', required=False),
+                }),
+            ( ['-b', '--body'], {
+                'dest'     : 'body',
+                'help'     : 'message body',
+                'required' : False,
+                }),
+            ( ['--max-char-count'], {
+                'dest'     : 'max_char_count',
+                'help'     : 'separate message into parts by character count (1 < N <= 1500)',
+                'required' : False,
+                'default'  : 300,
+                }),
+            ]
+        )

run

@@ -19,12 +19,12 @@ source "${0:a:h}/zsh/lib/import.driver.zsh" || exit 42
 		  runtime
 		    -y, --yes              auto-accept all [yn] prompts through current scwrypt
 		    -e, --env <env-name>   set environment; overwrites SCWRYPTS_ENV
-		    -n                     shorthand for "--log-level 0"
+		    -n                     shorthand for "--verbosity 0"
-		    -v, --log-level [0-4]  set scwrypts log level to one of the following:
+		    -v, --verbosity [0-4]  set scwrypts log level to one of the following:
 			                         0 : only command output and critical failures; skips logfile
 			                         1 : add success / failure messages
 			                         2 : (default) include status update messages
-									 3 : (CI default) include warning messages
+			                         3 : include warning messages
 			                         4 : include debug messages
 
 		  alternate commands
@@ -138,8 +138,8 @@ source "${0:a:h}/zsh/lib/import.driver.zsh" || exit 42
 				[[ $1 =~ ^--no-log$ ]] && WARNING 'the --no-log flag is deprecated and will be removed in scwrypts v4.2'
 				;;
 
-			-v | --log-level )
+			-v | --verbosity )
-				[[ $2 =~ ^[0-4]$ ]] || ERROR "invalid setting for log-level '$2'"
+				[[ $2 =~ ^[0-4]$ ]] || ERROR "invalid setting for verbosity '$2'"
 				SCWRYPTS_LOG_LEVEL=$2
 				shift 1
 				;;
@@ -336,7 +336,7 @@ source "${0:a:h}/zsh/lib/import.driver.zsh" || exit 42
 				script    : $SCWRYPT_GROUP $SCWRYPT_TYPE $SCWRYPT_NAME
 				run at    : $(date)
 				config    : $ENV_NAME
-				log level : $SCWRYPTS_LOG_LEVEL
+				verbosity : $SCWRYPTS_LOG_LEVEL
 				\\033[1;33m--- SCWRYPT BEGIN ---------------------------------------------------\\033[0m
 			" | sed 's/^\s\+//; 1d'
 		)
@@ -353,8 +353,6 @@ source "${0:a:h}/zsh/lib/import.driver.zsh" || exit 42
 	### run the scwrypt #################################################
 	#####################################################################
 
-	[ ! $SUBSCWRYPT ] && export SUBSCWRYPT=0
-
 	set -o pipefail
 	{
 		[ $HEADER ] && echo $HEADER

zsh/lib/scwrypts/virtualenv.module.zsh

@@ -85,6 +85,8 @@ CREATE_VIRTUALENV__scwrypts__py() {
 
 	DEPENDENCIES=(virtualenv) CHECK_ENVIRONMENT || return 1
 
+	local VIRTUALENV_PATH="$1"
+
 	STATUS 'creating python virtualenv'
 	local PY PYTHON
 	for PY in $(echo $SCWRYPTS_PREFERRED_PYTHON_VERSIONS__scwrypts)
@@ -139,6 +141,8 @@ CREATE_VIRTUALENV__scwrypts__zx() {
 
 	DEPENDENCIES=(nodeenv) CHECK_ENVIRONMENT || return 1
 
+	local VIRTUALENV_PATH="$1"
+
 	STATUS 'setting up nodeenv'
 	nodeenv $VIRTUALENV_PATH --node=$SCWRYPTS_NODE_VERSION__scwrypts \
 		&& SUCCESS 'node virtualenv created' \

zsh/scwrypts/virtualenv/refresh

@@ -18,7 +18,7 @@ MAIN() {
 	
 	REMINDER "
 		this will permanently remove all artifacts for the scwrypts $ENV_TYPE environment
-		(safe unless you have put something important in $(_VIRTUALENV__GET_PATH $ENV_GROUP $ENV_TYPE))
+		(safe unless you have put something important in $(GET_VIRTUALENV_PATH $ENV_GROUP $ENV_TYPE))
 		"
 	
 	Yn "drop and recreate $ENV_TYPE virtual environment?" || ABORT