New release: 0.0.45 → 0.0.46

README.md

@@ -1,5 +1,6 @@
 # QMK CLI
 [![CLI Setup](https://github.com/qmk/qmk_cli/workflows/CLI%20Setup/badge.svg)](https://github.com/qmk/qmk_cli/actions?query=workflow%3A%22CLI+Setup%22)  
+
 A program to help users work with [QMK Firmware](https://qmk.fm/).
 
 # Features
@@ -8,15 +9,17 @@ A program to help users work with [QMK Firmware](https://qmk.fm/).
 * Use `qmk clone` to pull down anyone's `qmk_firmware` fork
 * Setup your build environment with `qmk setup`
 * Check that your environment is correctly setup with `qmk doctor`
-* Dispatches to `qmk_firmware/bin/qmk` for additional functionality:
-    * `qmk compile-json`
-    * More to come
+* Integrates with your qmk_firmware for additional functionality:
+    * `qmk c2json`
+    * `qmk compile`
+    * `qmk flash`
+    * `qmk json2c`
+    * `qmk lint`
+    * `qmk new-keymap`
 
 # Quickstart
 
-Full documentation: <https://docs.qmk.fm/#/tutorial>
-
-Basic steps:
-
 * `python3 -m pip install qmk`
 * `qmk setup`
+
+Full documentation: <https://docs.qmk.fm/#/tutorial>

qmk_cli/__init__.py

@@ -1,3 +1,3 @@
 """A program to help you work with qmk_firmware."""
 
-__version__ = '0.0.44'
+__version__ = '0.0.46'

qmk_cli/subcommands/__init__.py

@@ -3,4 +3,5 @@
 We list each subcommand here explicitly because all the reliable ways of searching for modules are slow and delay startup.
 """
 from . import clone  # noqa
+from . import env  # noqa
 from . import setup  # noqa

qmk_cli/subcommands/env.py

@@ -0,0 +1,30 @@
+"""Prints environment information.
+"""
+import os
+from pathlib import Path
+
+from milc import cli
+from qmk_cli.helpers import is_qmk_firmware
+
+
+@cli.argument('var', default=None, nargs='?', help='Optional variable to query')
+@cli.subcommand('Prints environment information.')
+def env(cli):
+    home = os.environ.get('QMK_HOME', "")
+    data = {
+        'QMK_HOME': home,
+        'QMK_FIRMWARE': home if is_qmk_firmware(Path(home)) else ""
+    }
+
+    # Now munge the current cli config
+    for key, val in cli.config.general.items():
+        converted_key = 'QMK_' + key.upper()
+        data[converted_key] = val
+
+    if cli.args.var:
+        # dump out requested arg
+        print(data[cli.args.var])
+    else:
+        # dump out everything
+        for key, val in data.items():
+            print(f'{key}="{val}"')

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.44
+current_version = 0.0.46
 commit = True
 tag = True
 tag_name = {new_version}

setup.py

@@ -24,7 +24,7 @@ if __name__ == "__main__":
         long_description=long_description,
         long_description_content_type="text/markdown",
         packages=find_packages(),
-        py_modules=['milc'],
+        py_modules=['qmk_cli'],
         classifiers=[
             'Development Status :: 3 - Alpha',
             'Environment :: Console',
@@ -45,11 +45,13 @@ if __name__ == "__main__":
             "colorama",
             "dotty-dict",
             "flake8",
+            "hid",
             "hjson",
             "jsonschema>=3",
-            "milc>=1.0.8",
+            "milc>=1.3.0",
             "nose2",
             "pygments",
+            "pyusb",
             "yapf"
-        ],
+        ]
     )