From 428f01b8602de385bd1ae30ede24df47b6fe7a5e Mon Sep 17 00:00:00 2001 From: rwxrob Date: Sun, 24 Apr 2022 12:12:52 -0400 Subject: [PATCH] Add pomo, etc. --- go.mod | 17 +++++++++-------- go.sum | 20 ++++++++++++++++++++ go.work.off | 5 +++-- main.go | 36 ++++++++++++++++++------------------ 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index 7112427..75e74d4 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,16 @@ module github.com/rwxrob/z go 1.18 require ( - github.com/rwxrob/bonzai v0.12.2 - github.com/rwxrob/conf v0.6.3 + github.com/rwxrob/bonzai v0.13.0 + github.com/rwxrob/conf v0.7.0 github.com/rwxrob/fs v0.5.1 github.com/rwxrob/github v0.0.1 - github.com/rwxrob/help v0.4.2 - github.com/rwxrob/term v0.2.6 + github.com/rwxrob/help v0.5.0 + github.com/rwxrob/pomo v0.0.0-20220424152818-0a571eff4611 + github.com/rwxrob/term v0.2.7 github.com/rwxrob/twitch v0.3.4 github.com/rwxrob/uniq v0.2.1 - github.com/rwxrob/vars v0.3.2 + github.com/rwxrob/vars v0.4.1 github.com/rwxrob/y2j v0.4.0 github.com/rwxrob/yq v0.2.4 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b @@ -28,13 +29,13 @@ require ( github.com/mattn/go-isatty v0.0.14 // indirect github.com/mikefarah/yq/v4 v4.24.5 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect - github.com/rwxrob/compcmd v0.2.2 // indirect - github.com/rwxrob/compfile v0.1.10 // indirect + github.com/rwxrob/compcmd v0.2.3 // indirect + github.com/rwxrob/compfile v0.1.11 // indirect github.com/rwxrob/fn v0.3.3 // indirect github.com/rwxrob/json v0.7.1 // indirect github.com/rwxrob/scan v0.6.1 // indirect github.com/rwxrob/structs v0.6.0 // indirect - github.com/rwxrob/to v0.5.2 // indirect + github.com/rwxrob/to v0.5.3 // indirect github.com/timtadh/data-structures v0.5.3 // indirect github.com/timtadh/lexmachine v0.2.2 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect diff --git a/go.sum b/go.sum index f67830d..fdaf03d 100644 --- a/go.sum +++ b/go.sum @@ -41,18 +41,24 @@ github.com/rwxrob/bonzai v0.12.1 h1:/1g5B8WrR3AktCqjCxAUDJZCDGisXs2OKt4bd7CvJYg= github.com/rwxrob/bonzai v0.12.1/go.mod h1:zisCd2LCW9yR3w3csCWkqmUGnOcUOItjatYdSplJtmk= github.com/rwxrob/bonzai v0.12.2 h1:A9Pwp89QgExsBXwxxrctmrHx7Z+Tr0HAJ8aKwWFZmrA= github.com/rwxrob/bonzai v0.12.2/go.mod h1:zisCd2LCW9yR3w3csCWkqmUGnOcUOItjatYdSplJtmk= +github.com/rwxrob/bonzai v0.13.0 h1:zCfB3A7NEPu4Sqss+7lQUFpCthD2oDiFKcUDsYqpGJQ= +github.com/rwxrob/bonzai v0.13.0/go.mod h1:zisCd2LCW9yR3w3csCWkqmUGnOcUOItjatYdSplJtmk= github.com/rwxrob/compcmd v0.1.6 h1:jswlgUwSJuCe8h0zIvCS13CePE8UGKwib7YegyV+bfU= github.com/rwxrob/compcmd v0.1.6/go.mod h1:imoLwFPWbpH7fFtYWvC/vZSF2P7gVZrnW3UjQBZYaxI= github.com/rwxrob/compcmd v0.2.1 h1:WNSnoAbiV7bbB9YBr0OsIGzvfPVMSrSkOPbx/bi4Y8Q= github.com/rwxrob/compcmd v0.2.1/go.mod h1:qqI0Gkm+8z+7ZLFL+JySsCA05o9HgNI1X+iJbinxduI= github.com/rwxrob/compcmd v0.2.2 h1:IS3oZIyD+DBBzjodAvk2KDF7Zn0fvyEkpPOxkOml4xQ= github.com/rwxrob/compcmd v0.2.2/go.mod h1:uedtEwRMTXilhjH7yKQPOfgEBWajpb9zz4vKOXtSwtA= +github.com/rwxrob/compcmd v0.2.3 h1:L05+CnLoJWpRp745+Hpz8fB0dz8SIzH0+uwSZxIZgEM= +github.com/rwxrob/compcmd v0.2.3/go.mod h1:fS9smeE6XIb/2511RU6618IimOJjg0tC69eXISxaxU4= github.com/rwxrob/compfile v0.1.7 h1:mmeH1eZbgJ+xN+Y3bWFiG/+yt/2hrq8qe2hLNhmKtMU= github.com/rwxrob/compfile v0.1.7/go.mod h1:LUo442DRI1qEtwBMWP4W1wEhd4h+PrlXg3FKkKjlW30= github.com/rwxrob/compfile v0.1.9 h1:dOCi+mwaZt/rlIbTQgHU1MQk07C+nFUQHO7rcukvC+E= github.com/rwxrob/compfile v0.1.9/go.mod h1:c7BH9OxC05Uc0fVo6aTEYQJHf2hqbxIgnyJJCWzwbaQ= github.com/rwxrob/compfile v0.1.10 h1:8WINthRqh6oU6ccsgqMIVFlOR2mGF9Rp2J/LTEnrGcE= github.com/rwxrob/compfile v0.1.10/go.mod h1://iBjQnw604pmOkPwM15TD2R1tJafX2LdiZOvytOhrc= +github.com/rwxrob/compfile v0.1.11 h1:yydKh22uEKH1DZspxsD/JFpeaReKzRWDbe/MwSNONB8= +github.com/rwxrob/compfile v0.1.11/go.mod h1:kEIa7tRsoFY8GiG+eVjiImXjXhBqiiGEk2C2WezPX5Q= github.com/rwxrob/conf v0.5.6 h1:tbkS8Y51ucoyPpwRAQsowO5rTfgPp/yGYoExfc8GIqQ= github.com/rwxrob/conf v0.5.6/go.mod h1:oTUaeNMOagRFciWx7ddeifY1FbPXpwr/Gsds7fOPqKA= github.com/rwxrob/conf v0.6.1 h1:AeJMVG3RYbu5RBx8/9x0ty9L5Z6S6Hdm02SiRtLCC/Y= @@ -61,6 +67,8 @@ github.com/rwxrob/conf v0.6.2 h1:lI2D0EnWdEizxuKLSZvK4k6UHgAbuh5apC38K3rxGuo= github.com/rwxrob/conf v0.6.2/go.mod h1:e/59yaowalxCWPv3maUMY497JQzZbucun9vscT+52+w= github.com/rwxrob/conf v0.6.3 h1:AUfF3xP0OApAsXU4c8BG1Fr9vLx6YxDh8cGyg+JuLgE= github.com/rwxrob/conf v0.6.3/go.mod h1:Cea53dJQv6msfg7WXC30ZDJzAW971+6bh2hdF98BpZo= +github.com/rwxrob/conf v0.7.0 h1:bsTYPEqEqqhriY835wJ75EBm2G8kwunK1PwxqU30v5M= +github.com/rwxrob/conf v0.7.0/go.mod h1:DR9sMN6Wm/4/KIazsEdMxVeNK94eiAPatjUal8k7ilw= github.com/rwxrob/fn v0.3.3 h1:ymRQGWDhrrvoHKXLJ4WZlgI2qrC7gMOotowQMGvwmVQ= github.com/rwxrob/fn v0.3.3/go.mod h1:omPqOqEB+dDna09z5pi5YFxq4IZqDvv3wFPUCES5LvY= github.com/rwxrob/fs v0.5.0 h1:1AcZUMBzYhippXl0RfYb+KMo67Sj+e5eSUkOKTx2rUU= @@ -77,16 +85,24 @@ github.com/rwxrob/help v0.4.1 h1:WatjhJebk+5lPd+zrUa2t0T3h/+w4YvvUuNf8cflNhc= github.com/rwxrob/help v0.4.1/go.mod h1:eZoUfqKNxqEomnMwn11ipeDU5kVvSOrpFjaj7rHnYLQ= github.com/rwxrob/help v0.4.2 h1:fvH/4ErmWBSld2ErubfpNSUnkuA4hCnJ1NuXspytmms= github.com/rwxrob/help v0.4.2/go.mod h1:l7XtT4J75+bzTnsLZcIpMAgt2edLnA26U9cbVbY6DY4= +github.com/rwxrob/help v0.5.0 h1:wEARG5oj9/d3pVeho1tvk1jLVPU5ZujQ5o44VvlNeCI= +github.com/rwxrob/help v0.5.0/go.mod h1:rgLDEcJjYuz4MTu6c2J/T0mI9GpXAaqQ1BWKLdKP3mc= github.com/rwxrob/json v0.7.1 h1:5ipzVseNcb2WGRuqwCvBzK4OirC5J8V0qzHdoSR7sKg= github.com/rwxrob/json v0.7.1/go.mod h1:BYaPIp+4cI64f7jdqkaVAjqU/HSIiwkqPNDr9tTUvRQ= +github.com/rwxrob/pomo v0.0.0-20220424152818-0a571eff4611 h1:QhBhyWpKhx3+q3vq1H30I62+Wqmn8zDbua5peoUKFxs= +github.com/rwxrob/pomo v0.0.0-20220424152818-0a571eff4611/go.mod h1:xoRJAItSw3PL27bU+YwNs0xtMT/sV6ruTKHULxIENjE= github.com/rwxrob/scan v0.6.1 h1:KMGi/kV7TY4pcVo8H/HVwwyQZ2gBFNQI3g7tT121Voo= github.com/rwxrob/scan v0.6.1/go.mod h1:eF28AgH3YUvP7E9UrhjePRUyLq3Gh7+fR28P7Z/Ku4E= github.com/rwxrob/structs v0.6.0 h1:t8JVd/Pee1OGaXgT6QYmGed470C9vOw6scdH8Cr5LPg= github.com/rwxrob/structs v0.6.0/go.mod h1:txMfzPfEiIDNM5bwhzUqxr/1QQ3ekOuj3KLT8Nt1fA0= github.com/rwxrob/term v0.2.6 h1:C8BqqHaEh8MGYp1cVrPRlDAYPEK3HfvhGjf7l5AvnV8= github.com/rwxrob/term v0.2.6/go.mod h1:II0qQ7aHUdPniZCAPWOdYwugcZqdmRmEWIJQN7Z8NA0= +github.com/rwxrob/term v0.2.7 h1:uFhFcZkjphRQHhkzaV5G34r4es7R6qEw52XA3xD0yn0= +github.com/rwxrob/term v0.2.7/go.mod h1:II0qQ7aHUdPniZCAPWOdYwugcZqdmRmEWIJQN7Z8NA0= github.com/rwxrob/to v0.5.2 h1:BK2xKkWNhnR5TwEzbsPpXjGODFrTrgZfXzfEdtgCeyU= github.com/rwxrob/to v0.5.2/go.mod h1:lojk6scni4ZRYjnKJO/f2DVRTW0BB6l9LZQ/NvZZt4Y= +github.com/rwxrob/to v0.5.3 h1:CTkQuXXjrv9NhRDWH0zafu9aRWXwvw+VWWqPNYXLZaY= +github.com/rwxrob/to v0.5.3/go.mod h1:lojk6scni4ZRYjnKJO/f2DVRTW0BB6l9LZQ/NvZZt4Y= github.com/rwxrob/twitch v0.3.2 h1:CgkZmDNguybLTiWKwdlU6v1z/7QejWDASM5XtHx0tWg= github.com/rwxrob/twitch v0.3.2/go.mod h1:BnzV+Lm79+AhOr0n/kUIJVAZmKFAGYDvrRg9dXtDFJI= github.com/rwxrob/twitch v0.3.3 h1:/nrlEuqWRd1A8cOtSYDVIePPJLh8Pfpq/7TC+Rf/RP8= @@ -105,6 +121,10 @@ github.com/rwxrob/vars v0.3.1 h1:17XZIEK9Fdj5pMoX2LDY5AaiPT/5FPZ4+Fce5UrKM1M= github.com/rwxrob/vars v0.3.1/go.mod h1:VlbLqDq6Pt7zFk3RdmVwGf57YkhAvgss1icAnf/Nha4= github.com/rwxrob/vars v0.3.2 h1:gtvkSejawtBLJZvjv7QkndS2SNKPLBMLnUtqnkRDDVc= github.com/rwxrob/vars v0.3.2/go.mod h1:KTqAJz/EcoSgkSDm8C/E0Ov3IfviVo0nCxBoW79s5Ag= +github.com/rwxrob/vars v0.4.0 h1:7aUdiGm3zAepyxFH1h7IDYOTV3ckq0Lo/+trqD8W5y8= +github.com/rwxrob/vars v0.4.0/go.mod h1:0jfIBWWVU38UZAUilH57vbXJ6cQKuiTg32z8G6q1pNU= +github.com/rwxrob/vars v0.4.1 h1:d9Ju1DBB4j5ELKgM4rqFWoEyGyl2l/y5brSUT3PpFiI= +github.com/rwxrob/vars v0.4.1/go.mod h1:Djtvv3ah2VFQ7dmrlk3JRH05/kmGI2Sr6N7jZaQOxP4= github.com/rwxrob/y2j v0.4.0 h1:65lJVNNhEzMvrAT1lfv+4uYx6s7PLAT0eJxPjX2ztKs= github.com/rwxrob/y2j v0.4.0/go.mod h1:7TRFWeNsiNZoFWaqkSQkJkVRhbjfbJ9GRzfwQOe5304= github.com/rwxrob/yq v0.2.4 h1:NMQLDM/wBYN9IgJC0NlxcDs9COC/fDIdCi5DC9ijvUA= diff --git a/go.work.off b/go.work.off index ace9365..4eaf037 100644 --- a/go.work.off +++ b/go.work.off @@ -3,21 +3,22 @@ go 1.19 use ( . ../bonzai + ../compcmd ../conf ../fn ../fs ../github ../help + ../json + ../pomo ../scan ../term ../to ../twitch - ../compcmd ../uniq ../update ../vars ../web ../y2j - ../json ../yq ) diff --git a/main.go b/main.go index 45740fa..4089aff 100644 --- a/main.go +++ b/main.go @@ -7,6 +7,7 @@ import ( Z "github.com/rwxrob/bonzai/z" "github.com/rwxrob/conf" "github.com/rwxrob/help" + "github.com/rwxrob/pomo" "github.com/rwxrob/twitch" "github.com/rwxrob/uniq" "github.com/rwxrob/vars" @@ -40,22 +41,6 @@ func main() { */ - // MONOLITH (z) - which I prefer - Z.Shortcuts = map[string][]string{ - "status": {"tmux", "update"}, - "offscreen": {"chat", "!offscreen"}, - "project": {"twitch", "bot", "commands", "edit", "project"}, - "commands": {"twitch", "bot", "commands", "file", "edit"}, - "sync": {"twitch", "bot", "commands", "sync"}, - "work": {"go", "work"}, - "chat": {"twitch", "chat"}, - "afk": {"twitch", "chat", "!afk"}, - "isosec": {"uniq", "isosec"}, - "isonan": {"uniq", "isonan"}, - "uuid": {"uniq", "uuid"}, - "epoch": {"uniq", "second"}, - } - Cmd.Run() } @@ -63,7 +48,7 @@ func main() { var Cmd = &Z.Cmd{ Name: `z`, Summary: `rwxrob's bonzai command tree`, - Version: `v0.3.0`, + Version: `v0.4.0`, Copyright: `Copyright 2021 Robert S Muhlestein`, License: `Apache-2.0`, Site: `rwxrob.tv`, @@ -72,7 +57,22 @@ var Cmd = &Z.Cmd{ Commands: []*Z.Cmd{ help.Cmd, conf.Cmd, vars.Cmd, y2j.Cmd, twitch.Cmd, tmux, yq.Cmd, golang, - uniq.Cmd, //github.Cmd, //update.Cmd, + uniq.Cmd, pomo.Cmd, //github.Cmd, //update.Cmd, + }, + + Shortcuts: Z.ArgMap{ + "project": {"twitch", "bot", "commands", "edit", "project"}, + "status": {"tmux", "update"}, + "offscreen": {"chat", "!offscreen"}, + "commands": {"twitch", "bot", "commands", "file", "edit"}, + "sync": {"twitch", "bot", "commands", "sync"}, + "work": {"go", "work"}, + "chat": {"twitch", "chat"}, + "afk": {"twitch", "chat", "!afk"}, + "isosec": {"uniq", "isosec"}, + "isonan": {"uniq", "isonan"}, + "uuid": {"uniq", "uuid"}, + "epoch": {"uniq", "second"}, }, Dynamic: template.FuncMap{