chiark / gitweb /
Ian Jackson [Tue, 8 Jun 2021 17:24:06 +0000 (18:24 +0100)]
make-release: Poll crates.io in the hope of making release reliable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 17:21:33 +0000 (18:21 +0100)]
make-release: Set pipefail
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:52:22 +0000 (13:52 +0100)]
Revert "penultima: Add colourful fairy chess pieces, for revert"
This reverts commit
277d94410024a1ccd8364ce888b5f44306ef5179.
Ian Jackson [Tue, 8 Jun 2021 12:52:07 +0000 (13:52 +0100)]
penultima: Add colourful fairy chess pieces, for revert
This is very cluttered.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:41:05 +0000 (13:41 +0100)]
penultima: Add colourful pawns
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:37:49 +0000 (13:37 +0100)]
penultima: Prep for more colourful things
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:34:09 +0000 (13:34 +0100)]
penultima: loopify colours
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:25:47 +0000 (13:25 +0100)]
penultima: macroify colours
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:20:50 +0000 (13:20 +0100)]
penultima: add more spare pawns
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:19:38 +0000 (13:19 +0100)]
penultima: add some comments to help navigation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:16:09 +0000 (13:16 +0100)]
penultima: use tera for for player label sets
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:14:38 +0000 (13:14 +0100)]
penultima: use count for player labels (2)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:14:04 +0000 (13:14 +0100)]
penultima: use count for player labels (1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:08:34 +0000 (13:08 +0100)]
penultima: macros, officers and fairy chess pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:04:24 +0000 (13:04 +0100)]
mao: Add some delimiters etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:04:13 +0000 (13:04 +0100)]
mao: Use decks variable for jokers too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:02:19 +0000 (13:02 +0100)]
mao: Introduce some_cards macro
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:59:00 +0000 (12:59 +0100)]
mao: Use new "decks" variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:57:40 +0000 (12:57 +0100)]
mao: Use "suits" variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:51:48 +0000 (12:51 +0100)]
mao: Use macro for main decks of 52
This changes the order: now it's CDHS CDHS CDHS J9 rather than
CCC DDD HHH SSS J9 (bottom to top)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:40:26 +0000 (12:40 +0100)]
mao: rename deckplace
We're going to want deck52 for a deck of cards, too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:36:52 +0000 (12:36 +0100)]
mao: change deck stacking order
Put the jokers on top. That makes it easy to show them and also to
remove them if desired.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:33:49 +0000 (12:33 +0100)]
mao: Use macros for deck
No functional change, verified with
target/debug/otter -vv --account server: --config tmp/at-otter/server-config.toml -g server::dummy reset ~ian/Rustup/Game/server/specs/mao.game.toml | sed -n 's/^spec out [0-9][0-9]* //p' >t
and same for u with modified mao.game.toml and then
diff -Bu [tu] |less
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:33:27 +0000 (12:33 +0100)]
mao: Remove some now-extraneous whitespace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:23:45 +0000 (12:23 +0100)]
otter cli: reset -vv templating output goes to stdout
There's no other use for stdout here.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:21:58 +0000 (12:21 +0100)]
specs docs: Improvements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 01:12:23 +0000 (02:12 +0100)]
specs docs: Fix a typo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 23:26:53 +0000 (00:26 +0100)]
mao: Convert hands to use a macro
I have verified by messing about with otter -vv and diff that this
does not change the meaning.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 00:37:10 +0000 (01:37 +0100)]
specs: Document templating
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 00:14:55 +0000 (01:14 +0100)]
specs: template expand when loading in otter cli, debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 00:04:15 +0000 (01:04 +0100)]
specs: template expand when loading in otter cli
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 00:00:29 +0000 (01:00 +0100)]
specs: spec_macroexpand diagnostic facility
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 23:52:56 +0000 (00:52 +0100)]
specs: Break out spec_macroexpand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 23:25:36 +0000 (00:25 +0100)]
specs: Add a templating facility for game specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 23:28:38 +0000 (00:28 +0100)]
deps: Add a newer tera for standalone use
The old tera that rocket_contrib wants is ... old. It has a strange
API.
Adding this newer version and using it for spec templating adds 16Mby
to the debug binary and 1.2Mby to the release binary. Ah well.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 17:18:59 +0000 (18:18 +0100)]
bundles: Restructure zip load_spec_to_read
Move more into the Zip branch to simplify the structure.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 13:53:28 +0000 (14:53 +0100)]
ssh keys update: Test via the hardlink facility
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 13:53:14 +0000 (14:53 +0100)]
ssh keys update: Log when we find the hardlink situation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 13:43:40 +0000 (14:43 +0100)]
ssh keys update: Mention hardlink approach in error message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 13:41:31 +0000 (14:41 +0100)]
ssh keys update: Allow setting up if static is hardlinked to real
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 13:32:16 +0000 (14:32 +0100)]
ssh keys update: Roorder to support checking for hardlink
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 13:29:50 +0000 (14:29 +0100)]
config, ssh: check that authorized_keys{,_include} is not recursive
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 11:01:20 +0000 (12:01 +0100)]
Makefile: check errors from cargo doc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:39:50 +0000 (01:39 +0100)]
prefs docs: Describe the prefs.toml format in the usage message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:07:18 +0000 (01:07 +0100)]
prefs: Simplify parsing code slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:17:55 +0000 (01:17 +0100)]
prefs test: Actually test that we can load some prefs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:12:05 +0000 (01:12 +0100)]
prefs test: Break out ssh_command ds also
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:13:39 +0000 (01:13 +0100)]
prefs bugfix: Pass our argv[0] as a synth arg too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:13:35 +0000 (01:13 +0100)]
prefs bugfix: Only expect non-option argummnts for main arg parsing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 23:54:14 +0000 (00:54 +0100)]
otter cli: Move ArgumentParser out of RawArgParserContext
We need to work with different ones.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 23:21:28 +0000 (00:21 +0100)]
prefs tests: Break out ssh_command, ready for adding a test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 23:20:41 +0000 (00:20 +0100)]
otter cli: With -vv, mention skipped nonexistent prefs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 22:18:53 +0000 (23:18 +0100)]
otter cli: Initial prefs support, not debugged
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 4 Jun 2021 19:11:23 +0000 (20:11 +0100)]
Add dependency on directories (for xdg directories)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:07:11 +0000 (01:07 +0100)]
toml-de: Do not say it's a config file
Currently used for specs, will be used for prefs too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:15:17 +0000 (01:15 +0100)]
otter cli: anyhow::Error for ArgumentParseError without spurious \n
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 7 Jun 2021 00:04:31 +0000 (01:04 +0100)]
otter cli: anyhow::Error printed for ArgumentParseError with .d()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 22:03:22 +0000 (23:03 +0100)]
otter: Introduce RawArgParserContext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 21:49:53 +0000 (22:49 +0100)]
otter: Introduce extra_error message hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 21:28:32 +0000 (22:28 +0100)]
otter: Rework run_ap_completer into argparse_more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 21:24:19 +0000 (22:24 +0100)]
otter: Break out ArgumentParseError::report
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 21:14:03 +0000 (22:14 +0100)]
otter: Fold in a copy of parse_args into main
This will Do Stuff with prefs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 21:09:26 +0000 (22:09 +0100)]
otter: Break up main()'s arg parsing ready for prefs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 21:04:23 +0000 (22:04 +0100)]
otter: Break out run_ap_completer
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 6 Jun 2021 20:58:44 +0000 (21:58 +0100)]
otter: Break out run_argparse
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 3 Jun 2021 00:22:33 +0000 (01:22 +0100)]
script: Do not multiselect hands (non-moveable pieces)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 3 Jun 2021 00:10:59 +0000 (01:10 +0100)]
script: Sort other ungrabs
And rename do_ungrab to do_ungrab_1 to make sure we caught them all.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 3 Jun 2021 00:10:32 +0000 (01:10 +0100)]
script: Sort drag piece list
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 3 Jun 2021 00:07:56 +0000 (01:07 +0100)]
script: Sort targets for keystrokes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 3 Jun 2021 00:06:34 +0000 (01:06 +0100)]
script: Provide piece_z_cmp and pieceid_z_cmp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 23:13:10 +0000 (00:13 +0100)]
Move admin.rs out of otter.rs and forgame.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 23:09:39 +0000 (00:09 +0100)]
Move ssh key stuff out of otter.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 23:09:27 +0000 (00:09 +0100)]
Move clear-game out of otter.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 23:05:45 +0000 (00:05 +0100)]
Move usebundles.rs out of otter.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 23:04:02 +0000 (00:04 +0100)]
Move adhoc.rs out of otter.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 23:00:25 +0000 (00:00 +0100)]
Rename forgame.rs from manipgame.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 22:59:39 +0000 (23:59 +0100)]
Break out functions into manipgame.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 22:57:18 +0000 (23:57 +0100)]
Move more to clisupport.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 22:56:05 +0000 (23:56 +0100)]
Break out clisupport.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 22:46:02 +0000 (23:46 +0100)]
Rename atmain.rs (from apitest/main.rs)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 18:51:09 +0000 (19:51 +0100)]
Break out otter-cli into separate cargo package
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 21:30:35 +0000 (22:30 +0100)]
script: sse disconnection: Check the connecting status
Don't produce an error if the browser is reconnecting. Hopefully it
will be fine soon...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 18:04:18 +0000 (19:04 +0100)]
otter cli: When accessing via ssh, make default account be ssh:
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 18:03:59 +0000 (19:03 +0100)]
otter cli: Change defaulting order of server and account
We're going to need the server to decide the account.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 17:57:40 +0000 (18:57 +0100)]
sshkeys: Require an option to set ssh keys for a non-ssh: acocunt
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 17:50:23 +0000 (18:50 +0100)]
More sophisticated handling of program name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 17:05:59 +0000 (18:05 +0100)]
sshkeys: Tests restricted command branch sawing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 17:03:05 +0000 (18:03 +0100)]
sshkeys: Tests a restricted command, refactor
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 17:01:13 +0000 (18:01 +0100)]
sshkeys: Tests restricted command a bit more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 17:00:04 +0000 (18:00 +0100)]
sshkeys: Tests a restricted command, refactor
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 16:57:22 +0000 (17:57 +0100)]
sshkeys: Tests a restricted command
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 16:56:58 +0000 (17:56 +0100)]
sshkeys: Tests: Rework dummy key handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 16:45:50 +0000 (17:45 +0100)]
sshkeys: Test that static data is included
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 16:41:04 +0000 (17:41 +0100)]
sshkeys: Test banner and static handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 16:40:54 +0000 (17:40 +0100)]
sshkeys: Fix newline insertion
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 1 Jun 2021 19:31:09 +0000 (20:31 +0100)]
sshkeys: Tests, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 1 Jun 2021 19:42:50 +0000 (20:42 +0100)]
sshkeys: Tests: Provide a dummy test key
I threw the private half away. Nevertheless, this should not be put
into any real file.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 14:24:43 +0000 (15:24 +0100)]
sshkeys: Fix auth key header newline
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 16:28:31 +0000 (17:28 +0100)]
sshkeys: Fix magic banner handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 2 Jun 2021 12:19:45 +0000 (13:19 +0100)]
sshkeys: Improve ssh auth key banner and header
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log