aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-09-22 13:25:33 -0700
committerGitHub <noreply@github.com>2019-09-22 13:25:33 -0700
commitd569f0877155efc752994f8a21f5cf001f9d6ae6 (patch)
treeeb58a3e3f916d6d938d8f05742d48919c053a579 /bin
parent2f49cae9bcbdd94431659727ef75cfd30f557da8 (diff)
downloadqmk_firmware-d569f0877155efc752994f8a21f5cf001f9d6ae6.tar.gz
qmk_firmware-d569f0877155efc752994f8a21f5cf001f9d6ae6.zip
Configuration system for CLI (#6708)
* Rework how bin/qmk handles subcommands * qmk config wip * Code to show all configs * Fully working `qmk config` command * Mark some CLI arguments so they don't pollute the config file * Fleshed out config support, nicer subcommand support * sync with installable cli * pyformat * Add a test for subcommand_modules * Documentation for the `qmk config` command * split config_token on space so qmk config is more predictable * Rework how subcommands are imported * Document `arg_only` * Document deleting from CLI * Document how multiple operations work * Add cli config to the doc index * Add tests for the cli commands * Make running the tests more reliable * Be more selective about building all default keymaps * Update new-keymap to fit the new subcommand style * Add documentation about writing CLI scripts * Document new-keyboard * Update docs/cli_configuration.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update docs/cli_development.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update docs/cli_development.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update docs/cli_development.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Address yan's comments. * Apply suggestions from code review suggestions from @noahfrederick Co-Authored-By: Noah Frederick <code@noahfrederick.com> * Apply suggestions from code review Co-Authored-By: Noah Frederick <code@noahfrederick.com> * Remove pip3 from the test runner
Diffstat (limited to 'bin')
-rwxr-xr-xbin/qmk92
l---------bin/qmk-compile-json1
l---------bin/qmk-doctor1
l---------bin/qmk-hello1
l---------bin/qmk-json-keymap1
5 files changed, 36 insertions, 60 deletions
diff --git a/bin/qmk b/bin/qmk
index 1aa16e17d..876473fa4 100755
--- a/bin/qmk
+++ b/bin/qmk
@@ -4,10 +4,8 @@
4import os 4import os
5import subprocess 5import subprocess
6import sys 6import sys
7from glob import glob
8from time import strftime
9from importlib import import_module
10from importlib.util import find_spec 7from importlib.util import find_spec
8from time import strftime
11 9
12# Add the QMK python libs to our path 10# Add the QMK python libs to our path
13script_dir = os.path.dirname(os.path.realpath(__file__)) 11script_dir = os.path.dirname(os.path.realpath(__file__))
@@ -15,12 +13,8 @@ qmk_dir = os.path.abspath(os.path.join(script_dir, '..'))
15python_lib_dir = os.path.abspath(os.path.join(qmk_dir, 'lib', 'python')) 13python_lib_dir = os.path.abspath(os.path.join(qmk_dir, 'lib', 'python'))
16sys.path.append(python_lib_dir) 14sys.path.append(python_lib_dir)
17 15
18# Change to the root of our checkout
19os.environ['ORIG_CWD'] = os.getcwd()
20os.chdir(qmk_dir)
21
22# Make sure our modules have been setup 16# Make sure our modules have been setup
23with open('requirements.txt', 'r') as fd: 17with open(os.path.join(qmk_dir, 'requirements.txt'), 'r') as fd:
24 for line in fd.readlines(): 18 for line in fd.readlines():
25 line = line.strip().replace('<', '=').replace('>', '=') 19 line = line.strip().replace('<', '=').replace('>', '=')
26 20
@@ -32,72 +26,58 @@ with open('requirements.txt', 'r') as fd:
32 26
33 module = line.split('=')[0] if '=' in line else line 27 module = line.split('=')[0] if '=' in line else line
34 if not find_spec(module): 28 if not find_spec(module):
35 print('Your QMK build environment is not fully setup!\n') 29 print('Could not find module %s!', module)
36 print('Please run `./util/qmk_install.sh` to setup QMK.') 30 print('Please run `pip3 install -r requirements.txt` to install the python dependencies.')
37 exit(255) 31 exit(255)
38 32
39# Figure out our version 33# Figure out our version
34# TODO(skullydazed/anyone): Find a method that doesn't involve git. This is slow in docker and on windows.
40command = ['git', 'describe', '--abbrev=6', '--dirty', '--always', '--tags'] 35command = ['git', 'describe', '--abbrev=6', '--dirty', '--always', '--tags']
41result = subprocess.run(command, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 36result = subprocess.run(command, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
42 37
43if result.returncode == 0: 38if result.returncode == 0:
44 os.environ['QMK_VERSION'] = 'QMK ' + result.stdout.strip() 39 os.environ['QMK_VERSION'] = result.stdout.strip()
45else: 40else:
46 os.environ['QMK_VERSION'] = 'QMK ' + strftime('%Y-%m-%d-%H:%M:%S') 41 os.environ['QMK_VERSION'] = 'nogit-' + strftime('%Y-%m-%d-%H:%M:%S') + '-dirty'
47 42
48# Setup the CLI 43# Setup the CLI
49import milc 44import milc
50milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}'
51 45
52# If we were invoked as `qmk <cmd>` massage sys.argv into `qmk-<cmd>`. 46milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}'
53# This means we can't accept arguments to the qmk script itself.
54script_name = os.path.basename(sys.argv[0])
55if script_name == 'qmk':
56 if len(sys.argv) == 1:
57 milc.cli.log.error('No subcommand specified!\n')
58
59 if len(sys.argv) == 1 or sys.argv[1] in ['-h', '--help']:
60 milc.cli.echo('usage: qmk <subcommand> [...]')
61 milc.cli.echo('\nsubcommands:')
62 subcommands = glob(os.path.join(qmk_dir, 'bin', 'qmk-*'))
63 for subcommand in sorted(subcommands):
64 subcommand = os.path.basename(subcommand).split('-', 1)[1]
65 milc.cli.echo('\t%s', subcommand)
66 milc.cli.echo('\nqmk <subcommand> --help for more information')
67 exit(1)
68 47
69 if sys.argv[1] in ['-V', '--version']:
70 milc.cli.echo(os.environ['QMK_VERSION'])
71 exit(0)
72 48
73 sys.argv[0] = script_name = '-'.join((script_name, sys.argv[1])) 49@milc.cli.entrypoint('QMK Helper Script')
74 del sys.argv[1] 50def qmk_main(cli):
51 """The function that gets run when no subcommand is provided.
52 """
53 cli.print_help()
75 54
76# Look for which module to import
77if script_name == 'qmk':
78 milc.cli.print_help()
79 exit(0)
80elif not script_name.startswith('qmk-'):
81 milc.cli.log.error('Invalid symlink, must start with "qmk-": %s', script_name)
82else:
83 subcommand = script_name.replace('-', '.').replace('_', '.').split('.')
84 subcommand.insert(1, 'cli')
85 subcommand = '.'.join(subcommand)
86 55
87 try: 56def main():
88 import_module(subcommand) 57 """Setup our environment and then call the CLI entrypoint.
89 except ModuleNotFoundError as e: 58 """
90 if e.__class__.__name__ != subcommand: 59 # Change to the root of our checkout
91 raise 60 os.environ['ORIG_CWD'] = os.getcwd()
61 os.chdir(qmk_dir)
92 62
93 milc.cli.log.error('Invalid subcommand! Could not import %s.', subcommand) 63 # Import the subcommands
94 exit(1) 64 import qmk.cli
95 65
96if __name__ == '__main__': 66 # Execute
97 return_code = milc.cli() 67 return_code = milc.cli()
68
98 if return_code is False: 69 if return_code is False:
99 exit(1) 70 exit(1)
100 elif return_code is not True and isinstance(return_code, int) and return_code < 256: 71
72 elif return_code is not True and isinstance(return_code, int):
73 if return_code < 0 or return_code > 255:
74 milc.cli.log.error('Invalid return_code: %d', return_code)
75 exit(255)
76
101 exit(return_code) 77 exit(return_code)
102 else: 78
103 exit(0) 79 exit(0)
80
81
82if __name__ == '__main__':
83 main()
diff --git a/bin/qmk-compile-json b/bin/qmk-compile-json
deleted file mode 120000
index c92dce8a1..000000000
--- a/bin/qmk-compile-json
+++ /dev/null
@@ -1 +0,0 @@
1qmk \ No newline at end of file
diff --git a/bin/qmk-doctor b/bin/qmk-doctor
deleted file mode 120000
index c92dce8a1..000000000
--- a/bin/qmk-doctor
+++ /dev/null
@@ -1 +0,0 @@
1qmk \ No newline at end of file
diff --git a/bin/qmk-hello b/bin/qmk-hello
deleted file mode 120000
index c92dce8a1..000000000
--- a/bin/qmk-hello
+++ /dev/null
@@ -1 +0,0 @@
1qmk \ No newline at end of file
diff --git a/bin/qmk-json-keymap b/bin/qmk-json-keymap
deleted file mode 120000
index c92dce8a1..000000000
--- a/bin/qmk-json-keymap
+++ /dev/null
@@ -1 +0,0 @@
1qmk \ No newline at end of file