diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..42e9f7c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +go.work +go.work.sum diff --git a/edit.go b/edit.go new file mode 100644 index 0000000..7c87097 --- /dev/null +++ b/edit.go @@ -0,0 +1,16 @@ +package main + +/* + +// TODO create a bonzai branch for this and use comp.YAMLConfKeys as +// completer. + +var edit = &Z.Cmd{ + Name: `edit`, + Summary: `edit common files with preferred editor and completion`, + Commands: []*Z.Cmd{help.Cmd}, + Call: func(x *Z.Cmd, args ...string) error { + return nil + }, +} +*/ diff --git a/go.mod b/go.mod index 5da6437..5dd9f78 100644 --- a/go.mod +++ b/go.mod @@ -3,23 +3,40 @@ module github.com/rwxrob/z go 1.18 require ( - github.com/rwxrob/bonzai v0.0.19 - github.com/rwxrob/config v0.2.1 - github.com/rwxrob/twitch v0.1.0 - github.com/rwxrob/y2j v0.3.0 + github.com/rwxrob/bonzai v0.0.33 + github.com/rwxrob/config v0.3.1 + github.com/rwxrob/twitch v0.2.0 + github.com/rwxrob/y2j v0.3.1 + github.com/rwxrob/yq v0.2.0 ) require ( + github.com/a8m/envsubst v1.3.0 // indirect + github.com/elliotchance/orderedmap v1.4.0 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/goccy/go-yaml v1.9.5 // indirect + github.com/jinzhu/copier v0.3.5 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mikefarah/yq/v4 v4.24.2 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect - github.com/rwxrob/fn v0.1.0 // indirect - github.com/rwxrob/fs v0.3.3 // indirect + github.com/rwxrob/fn v0.3.0 // indirect + github.com/rwxrob/fs v0.4.2 // indirect github.com/rwxrob/json v0.4.1 // indirect github.com/rwxrob/structs v0.5.0 // indirect - github.com/rwxrob/term v0.1.2 // indirect + github.com/rwxrob/term v0.1.4 // indirect github.com/rwxrob/to v0.2.1 // 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-20220321153916-2c7772ba3064 // indirect - golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect + golang.org/x/mod v0.5.1 // indirect + golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect + golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index ca94b96..622e3d1 100644 --- a/go.sum +++ b/go.sum @@ -1,43 +1,135 @@ +github.com/a8m/envsubst v1.3.0 h1:GmXKmVssap0YtlU3E230W98RWtWCyIZzjtf1apWWyAg= +github.com/a8m/envsubst v1.3.0/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elliotchance/orderedmap v1.4.0 h1:wZtfeEONCbx6in1CZyE6bELEt/vFayMvsxqI5SgsR+A= +github.com/elliotchance/orderedmap v1.4.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0= +github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= +github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= +github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mikefarah/yq/v4 v4.24.2 h1:2xRu/L49ee+4n964G9cD2PtHOvj3/OQ7up0uXAHb/BY= +github.com/mikefarah/yq/v4 v4.24.2/go.mod h1:S+m9R9Qq17v0Mg/DtaESrbvfvrgbrOEMlEsSN57huV0= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rwxrob/bonzai v0.0.19 h1:GvSUifZqqnjhIAEDGHnq2v7xyJxHhoBa589zrJgiVYI= github.com/rwxrob/bonzai v0.0.19/go.mod h1:gkNuRMH3DrSpVR4OJBPxxxt26srZijD9a/Y9uc1p8Ko= +github.com/rwxrob/bonzai v0.0.32 h1:WNp0BX1DIkmsAEtp9Z//1DZNktAGUddhEc2Ww908rcQ= +github.com/rwxrob/bonzai v0.0.32/go.mod h1:gkNuRMH3DrSpVR4OJBPxxxt26srZijD9a/Y9uc1p8Ko= +github.com/rwxrob/bonzai v0.0.33 h1:pa1E0yinjJKPcUBjiA/m0WUs2lTJSyBn+zqZX81KdTs= +github.com/rwxrob/bonzai v0.0.33/go.mod h1:PyKG44H68o3DZ2Xh6ouViGW9IAbYZVw0OYqLMdCM1RI= github.com/rwxrob/config v0.2.1 h1:W53hExSNj2PtRRTuRXklruzVuOZ9LB8SDo9MC0qRiXQ= github.com/rwxrob/config v0.2.1/go.mod h1:I2Diy79ZQPlanERtvt4VCSvW3jyCHeJ0JXksJMAz8xY= +github.com/rwxrob/config v0.3.0 h1:s6YQ82+lTKzi/YZRN0PmHOGf8GQXGtGy1ZwOzcfsmyk= +github.com/rwxrob/config v0.3.0/go.mod h1:ecVRdEzWYZY7KnrVf2K9O5n7pXUcWgq/AVQ4h9H+NcQ= +github.com/rwxrob/config v0.3.1 h1:YwnPEuEFDZz7gD5ZJwYkYEF/oSjvM9ryXV6oK+aDvJc= +github.com/rwxrob/config v0.3.1/go.mod h1:aqV/tWGH+Tz2ciADZDDYoodAniZ2iQTm8WZNM0wRyCA= github.com/rwxrob/fn v0.1.0 h1:vlQOPxZ77IlXSIDu2eIkuQgMtInlMNRHqwgKfkNAHAA= github.com/rwxrob/fn v0.1.0/go.mod h1:omPqOqEB+dDna09z5pi5YFxq4IZqDvv3wFPUCES5LvY= +github.com/rwxrob/fn v0.3.0 h1:R4kcZhInEc9Fn3lsWbn3O6ZOoZ/D43Y1l3SS5Nxm1wc= +github.com/rwxrob/fn v0.3.0/go.mod h1:omPqOqEB+dDna09z5pi5YFxq4IZqDvv3wFPUCES5LvY= github.com/rwxrob/fs v0.2.0 h1:f0AO9BgsWlYGwiBJH7W60k3AJh0rGOtYZuozkUCQVRw= github.com/rwxrob/fs v0.2.0/go.mod h1:vO8AeluD7rnrO7zC54745xTEBFgHPUpHL0hbp1NnsVo= github.com/rwxrob/fs v0.3.3 h1:zotmbP4BeudGsrGjAjvoTC7pnV0oo07kRRamAkAcito= github.com/rwxrob/fs v0.3.3/go.mod h1:vO8AeluD7rnrO7zC54745xTEBFgHPUpHL0hbp1NnsVo= +github.com/rwxrob/fs v0.4.1 h1:u7dd7RLm0ozu62UAu+emjmQPdpztAv0VkzhUiQPEGCs= +github.com/rwxrob/fs v0.4.1/go.mod h1:vO8AeluD7rnrO7zC54745xTEBFgHPUpHL0hbp1NnsVo= +github.com/rwxrob/fs v0.4.2 h1:KXBs48us7rwkIAT05IMpKJ2AQNHLGBqHaqaCpXjrys0= +github.com/rwxrob/fs v0.4.2/go.mod h1:vO8AeluD7rnrO7zC54745xTEBFgHPUpHL0hbp1NnsVo= github.com/rwxrob/json v0.4.1 h1:b4ToZe4mrQO8rRL/kRFglzZszyZZnGv6JRHj6jrI3f4= github.com/rwxrob/json v0.4.1/go.mod h1:DU3TQKCWY4bK7sQ0wu80cRmTs96b6M//OYvT7Eg2mJA= github.com/rwxrob/structs v0.5.0 h1:pjLsfyYHS+gB1CtzRj3H39wRYL4lI5pTpFf8kl91guw= github.com/rwxrob/structs v0.5.0/go.mod h1:2gIte2ZI9zUok6q6F3v3l41ZXo7Zg5Kf1GUTP2+pXyQ= github.com/rwxrob/term v0.1.2 h1:w71H8seLUS/E5PKtg5VjSlEqv5xPXLYwwQ8FZ+zb3OA= github.com/rwxrob/term v0.1.2/go.mod h1:IVE7hG+VQlM4R+kS4pY6uhfMHoG0QECrZF7d7bKcdsk= +github.com/rwxrob/term v0.1.3 h1:B0tu8VyOq9RjSOJd7rHtCQ80E2IIWe3Gc67NJ3tIDhI= +github.com/rwxrob/term v0.1.3/go.mod h1:IVE7hG+VQlM4R+kS4pY6uhfMHoG0QECrZF7d7bKcdsk= +github.com/rwxrob/term v0.1.4 h1:E49nmDAd7rwfjhled17RapP6RJP6T3a0NGIdW44WVAU= +github.com/rwxrob/term v0.1.4/go.mod h1:IVE7hG+VQlM4R+kS4pY6uhfMHoG0QECrZF7d7bKcdsk= github.com/rwxrob/to v0.2.1 h1:ZYBNEa8LJT5VDQUHm2wSwiRf61xSqU87UqbYvitV3eY= github.com/rwxrob/to v0.2.1/go.mod h1:8qdgCWkh50Avs8sRpV6/P7lAQgVf3KLRSKMZahV/W48= github.com/rwxrob/twitch v0.1.0 h1:XT7pXdCGsxE8ndhASgTd6roGRsFjsgHsDXDDgLgfSYQ= github.com/rwxrob/twitch v0.1.0/go.mod h1:3fNuW8qAKHKw47h4GvwCtk8dhec5B7F3FaqK+Fw+Sw4= +github.com/rwxrob/twitch v0.1.1 h1:FdPD7brFnBoKYy3YKY7NBe7AhhCn3c/S55dyjIB3LYY= +github.com/rwxrob/twitch v0.1.1/go.mod h1:aqAne9uW0iuy/fJfuuZdrGMINt6dX/EyrywzH4IvSpU= +github.com/rwxrob/twitch v0.2.0 h1:xxwQxHbF0j+Vhvz/BjI13s0aORcAth4KuEhCKVnihMo= +github.com/rwxrob/twitch v0.2.0/go.mod h1:aqAne9uW0iuy/fJfuuZdrGMINt6dX/EyrywzH4IvSpU= github.com/rwxrob/y2j v0.3.0 h1:iaYmvRJVi9EMFlA0VSrLZiHXzUqDNOyTkGyjBqR4ZA0= github.com/rwxrob/y2j v0.3.0/go.mod h1:/3eS+LPnOF1F2VfoqZr3Upkr8q4ByziAi3eB6FIgzoE= +github.com/rwxrob/y2j v0.3.1 h1:qOCU7J6g0Q/7KlLAabCMLx6/wG1/NelG6QTOVpESAQg= +github.com/rwxrob/y2j v0.3.1/go.mod h1:/3eS+LPnOF1F2VfoqZr3Upkr8q4ByziAi3eB6FIgzoE= github.com/rwxrob/yaml2json v0.1.0 h1:9ZyxAHZaL1n88tmTDKddz/o2vx3j3ygPuUFfmV85BNs= github.com/rwxrob/yaml2json v0.1.0/go.mod h1:LZv0PcOqzj7q7afI3YRiPogmLHAdv579f/YM/6vcQrg= +github.com/rwxrob/yq v0.1.0 h1:sKvtGTmrOPJ0iBL0qaymSahjYCwFdW8+d5TKdhPoJBQ= +github.com/rwxrob/yq v0.1.0/go.mod h1:xO4RvTI+P1P8p/ZcElLdPijlWjuEk9N3O1ao5SLDqBE= +github.com/rwxrob/yq v0.2.0 h1:Zz2B4z3Y/wB6Je4ZqgepFbD34IDiMH4JpenQ9RcHFnU= +github.com/rwxrob/yq v0.2.0/go.mod h1:xO4RvTI+P1P8p/ZcElLdPijlWjuEk9N3O1ao5SLDqBE= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/timtadh/data-structures v0.5.3 h1:F2tEjoG9qWIyUjbvXVgJqEOGJPMIiYn7U5W5mE+i/vQ= +github.com/timtadh/data-structures v0.5.3/go.mod h1:9R4XODhJ8JdWFEI8P/HJKqxuJctfBQw6fDibMQny2oU= +github.com/timtadh/lexmachine v0.2.2 h1:g55RnjdYazm5wnKv59pwFcBJHOyvTPfDEoz21s4PHmY= +github.com/timtadh/lexmachine v0.2.2/go.mod h1:GBJvD5OAfRn/gnp92zb9KTgHLB7akKyxmVivoYCcjQI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc= +golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE= +gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go.work b/go.work deleted file mode 100644 index a6d1fbd..0000000 --- a/go.work +++ /dev/null @@ -1,15 +0,0 @@ -go 1.19 - -use ( - . - ../bonzai - ../config - ../fs - ../json - ../fn - ../term - ../to - ../twitch - ../y2j - ../yq -) diff --git a/go.work.sum b/go.work.sum deleted file mode 100644 index 763ecd0..0000000 --- a/go.work.sum +++ /dev/null @@ -1,6 +0,0 @@ -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/main.go b/main.go index dc3ac0e..74a4336 100644 --- a/main.go +++ b/main.go @@ -9,13 +9,15 @@ import ( "github.com/rwxrob/config" "github.com/rwxrob/twitch" "github.com/rwxrob/y2j" + "github.com/rwxrob/yq" ) func main() { log.SetFlags(0) bonzai.Aliases = map[string][]string{ - "status": {"tmux", "update"}, - "project": {"twitch", "bot", "commands", "edit", "project"}, + "status": {"tmux", "update"}, + "project": {"twitch", "bot", "commands", "edit", "project"}, + "commands": {"twitch", "bot", "commands"}, } Cmd.Run() } @@ -27,6 +29,6 @@ var Cmd = &Z.Cmd{ Copyright: `Copyright 2021 Robert S Muhlestein`, License: `Apache-2.0`, Commands: []*Z.Cmd{ - help.Cmd, config.Cmd, y2j.Cmd, twitch.Cmd, tmux, + help.Cmd, config.Cmd, y2j.Cmd, twitch.Cmd, tmux, yq.Cmd, //edit.Cmd, }, }