From 69169b06ddc6e92ea6d97177f5950705a93fb45a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 02:31:49 +0000 Subject: [PATCH 01/20] Bump github.com/essentialkaos/ek/v12 from 12.113.1 to 12.114.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.113.1 to 12.114.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.113.1...v12.114.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c40c24f..21fd622 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.113.1 + github.com/essentialkaos/ek/v12 v12.114.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) diff --git a/go.sum b/go.sum index b76d7b7..cc6490d 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.113.1 h1:3opV9dwRpIQq1fqg5mkaSEt6ogECL4VLzrH/829qeYg= -github.com/essentialkaos/ek/v12 v12.113.1/go.mod h1:SslW97Se34YQKc08Ume2V/8h/HPTgLS1+Iok64cNF/U= +github.com/essentialkaos/ek/v12 v12.114.0 h1:E5j04Ic1qHbZnlc8PzoK6BWYaNfuQB2//g/fXy/aglQ= +github.com/essentialkaos/ek/v12 v12.114.0/go.mod h1:SslW97Se34YQKc08Ume2V/8h/HPTgLS1+Iok64cNF/U= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From bed9990b4437a814db15d9a1b9a0fcb5d9844d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 02:52:11 +0000 Subject: [PATCH 02/20] Bump github.com/essentialkaos/ek/v12 from 12.114.0 to 12.116.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.114.0 to 12.116.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.114.0...v12.116.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 21fd622..2dbf7d7 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.114.0 + github.com/essentialkaos/ek/v12 v12.116.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) require ( github.com/essentialkaos/depsy v1.1.0 // indirect - golang.org/x/sys v0.18.0 // indirect + golang.org/x/sys v0.19.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index cc6490d..24481c4 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,15 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.114.0 h1:E5j04Ic1qHbZnlc8PzoK6BWYaNfuQB2//g/fXy/aglQ= -github.com/essentialkaos/ek/v12 v12.114.0/go.mod h1:SslW97Se34YQKc08Ume2V/8h/HPTgLS1+Iok64cNF/U= +github.com/essentialkaos/ek/v12 v12.116.0 h1:lEe1pakqCFgbJMBQ+Ymrbd0GvzXdtg9/0nB6lgpuH6o= +github.com/essentialkaos/ek/v12 v12.116.0/go.mod h1:L3l8wkmXO9T72+hXc4nZosl7tj49XiU0gVrwiXyiYBg= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= From 81bd777872515ab9156f6ca2932c3e2458b4cd50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 03:01:29 +0000 Subject: [PATCH 03/20] Bump github.com/essentialkaos/ek/v12 from 12.116.0 to 12.121.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.116.0 to 12.121.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.116.0...v12.121.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2dbf7d7..a1a23d0 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.116.0 + github.com/essentialkaos/ek/v12 v12.121.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) require ( - github.com/essentialkaos/depsy v1.1.0 // indirect + github.com/essentialkaos/depsy v1.3.0 // indirect golang.org/x/sys v0.19.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 24481c4..b642e21 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= -github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= -github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.116.0 h1:lEe1pakqCFgbJMBQ+Ymrbd0GvzXdtg9/0nB6lgpuH6o= -github.com/essentialkaos/ek/v12 v12.116.0/go.mod h1:L3l8wkmXO9T72+hXc4nZosl7tj49XiU0gVrwiXyiYBg= +github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= +github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= +github.com/essentialkaos/ek/v12 v12.121.0 h1:Ax/6FsF6mYzT9KSaphqGqrphvMuWslSCIUCrQqWk0v0= +github.com/essentialkaos/ek/v12 v12.121.0/go.mod h1:VUiC4T8afqtE+UzJftTlIypDBKI1s+0nxxNfBhjyIbo= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From 7e202b4b2238735aa7bea7ae6a6a2141dd86c8cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 02:25:15 +0000 Subject: [PATCH 04/20] Bump github.com/essentialkaos/ek/v12 from 12.121.0 to 12.122.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.121.0 to 12.122.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.121.0...v12.122.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a1a23d0..8b540bb 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.121.0 + github.com/essentialkaos/ek/v12 v12.122.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) diff --git a/go.sum b/go.sum index b642e21..4e6e013 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.121.0 h1:Ax/6FsF6mYzT9KSaphqGqrphvMuWslSCIUCrQqWk0v0= -github.com/essentialkaos/ek/v12 v12.121.0/go.mod h1:VUiC4T8afqtE+UzJftTlIypDBKI1s+0nxxNfBhjyIbo= +github.com/essentialkaos/ek/v12 v12.122.0 h1:bIc4JhnnZwdF8pR9GmO51338WARHy6uvVT5eN0JZafU= +github.com/essentialkaos/ek/v12 v12.122.0/go.mod h1:VUiC4T8afqtE+UzJftTlIypDBKI1s+0nxxNfBhjyIbo= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From 07514b45b15ae0b6b196a7155ab13b08e01fae48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 02:47:20 +0000 Subject: [PATCH 05/20] Bump github.com/essentialkaos/ek/v12 from 12.122.0 to 12.123.2 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.122.0 to 12.123.2. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.122.0...v12.123.2) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8b540bb..16ad0ed 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.122.0 + github.com/essentialkaos/ek/v12 v12.123.2 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) require ( github.com/essentialkaos/depsy v1.3.0 // indirect - golang.org/x/sys v0.19.0 // indirect + golang.org/x/sys v0.20.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 4e6e013..8c5121d 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,15 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.122.0 h1:bIc4JhnnZwdF8pR9GmO51338WARHy6uvVT5eN0JZafU= -github.com/essentialkaos/ek/v12 v12.122.0/go.mod h1:VUiC4T8afqtE+UzJftTlIypDBKI1s+0nxxNfBhjyIbo= +github.com/essentialkaos/ek/v12 v12.123.2 h1:pTJ/XfEAPXb4RUU9ZtCtVfeOT9kLpZsUhtYFVOoCTwI= +github.com/essentialkaos/ek/v12 v12.123.2/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= From a2b1c89ca094bd8a8cfd67943a0b8cfd85261d20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 02:57:36 +0000 Subject: [PATCH 06/20] Bump github.com/essentialkaos/ek/v12 from 12.123.2 to 12.124.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.123.2 to 12.124.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.123.2...v12.124.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 16ad0ed..270a552 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.123.2 + github.com/essentialkaos/ek/v12 v12.124.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) diff --git a/go.sum b/go.sum index 8c5121d..dc499c8 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.123.2 h1:pTJ/XfEAPXb4RUU9ZtCtVfeOT9kLpZsUhtYFVOoCTwI= -github.com/essentialkaos/ek/v12 v12.123.2/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= +github.com/essentialkaos/ek/v12 v12.124.0 h1:WyeEHCalPV7LcF/7YaoR5T3YHBIpOYzmsef9LI7nvbQ= +github.com/essentialkaos/ek/v12 v12.124.0/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From fd42a369e1f5e9802c17fd264c4adb55f3d53378 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 02:21:06 +0000 Subject: [PATCH 07/20] --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 270a552..1b73913 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.124.0 + github.com/essentialkaos/ek/v12 v12.125.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) diff --git a/go.sum b/go.sum index dc499c8..2864983 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.124.0 h1:WyeEHCalPV7LcF/7YaoR5T3YHBIpOYzmsef9LI7nvbQ= -github.com/essentialkaos/ek/v12 v12.124.0/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= +github.com/essentialkaos/ek/v12 v12.125.0 h1:LVtDVESX0Rr0/34ZBOwgmpATaQfoQ/FDExqZyAzQp8I= +github.com/essentialkaos/ek/v12 v12.125.0/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From 5886a8915099e458cc86658e95213ed8f832a60f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 02:45:55 +0000 Subject: [PATCH 08/20] Bump github.com/essentialkaos/ek/v12 from 12.125.0 to 12.125.1 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.125.0 to 12.125.1. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.125.0...v12.125.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1b73913..362c5f5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.125.0 + github.com/essentialkaos/ek/v12 v12.125.1 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) diff --git a/go.sum b/go.sum index 2864983..3167145 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.125.0 h1:LVtDVESX0Rr0/34ZBOwgmpATaQfoQ/FDExqZyAzQp8I= -github.com/essentialkaos/ek/v12 v12.125.0/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= +github.com/essentialkaos/ek/v12 v12.125.1 h1:r01XTxKWZ5AdgFr4SH0kZNWigX+LknWnC1AMotbVkWg= +github.com/essentialkaos/ek/v12 v12.125.1/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From 437dacf117c99c33c1a1db9db92af5815730a41f Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sun, 9 Jun 2024 00:08:54 +0300 Subject: [PATCH 09/20] Improve README --- .github/images/usage.svg | 84 ++++++++++++++++++++++++++++++++++++++++ README.md | 43 +------------------- 2 files changed, 85 insertions(+), 42 deletions(-) create mode 100644 .github/images/usage.svg diff --git a/.github/images/usage.svg b/.github/images/usage.svg new file mode 100644 index 0000000..78d3606 --- /dev/null +++ b/.github/images/usage.svg @@ -0,0 +1,84 @@ + + + + yo Usage + + + + + + + + + + + + + + + + + + Terminal + Usage: yo {options} query + Options + --from-file, -f filename .. Read data from file + --no-color, -nc ........... Disable colors in output + --help, -h ................ Show this help message + --version, -v ............. Show version + Examples + cat file.yml | yo '.foo' + Return value for key foo + yo -f file.yml '.foo' + Return value for key foo + yo -f file.yml '.foo | length' + Print value length + yo -f file.yml '.foo[]' + Return all items from array + yo -f file.yml '.bar[2:]' + Return subarray started from item with index 2 + yo -f file.yml '.bar[1,2,5]' + Return items with index 1, 2 and 5 from array + yo -f file.yml '.bar[] | length' + Print array size + yo -f file.yml '.xyz | keys' + Print hash map keys + yo -f file.yml '.xyz | keys | length' + Print number of hash map keys + yo -f file.yml '.xyz | keys | sort' + Print sorted list of keys + + + diff --git a/README.md b/README.md index ce4429e..b0c7ae7 100644 --- a/README.md +++ b/README.md @@ -41,48 +41,7 @@ bash <(curl -fsSL https://apps.kaos.st/get) yo ### Usage -``` -Usage: yo {options} query - -Options - - --from-file, -f filename Read data from file - --no-color, -nc Disable colors in output - --help, -h Show this help message - --version, -v Show version - -Examples - - cat file.yml | yo '.foo' - Return value for key foo - - yo -f file.yml '.foo' - Return value for key foo - - yo -f file.yml '.foo | length' - Print value length - - yo -f file.yml '.foo[]' - Return all items from array - - yo -f file.yml '.bar[2:]' - Return subarray started from item with index 2 - - yo -f file.yml '.bar[1,2,5]' - Return items with index 1, 2 and 5 from array - - yo -f file.yml '.bar[] | length' - Print array size - - yo -f file.yml '.xyz | keys' - Print hash map keys - - yo -f file.yml '.xyz | keys | length' - Print number of hash map keys - - yo -f file.yml '.xyz | keys | sort' - Print sorted list of keys -``` + ### Build Status From 331bd25f202e87e30633328f9d06e3231245b8e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 02:49:14 +0000 Subject: [PATCH 10/20] Bump github.com/essentialkaos/ek/v12 from 12.125.1 to 12.126.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.125.1 to 12.126.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.125.1...v12.126.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 362c5f5..0befb69 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.125.1 + github.com/essentialkaos/ek/v12 v12.126.0 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) require ( github.com/essentialkaos/depsy v1.3.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 3167145..5d5a13d 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,15 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.125.1 h1:r01XTxKWZ5AdgFr4SH0kZNWigX+LknWnC1AMotbVkWg= -github.com/essentialkaos/ek/v12 v12.125.1/go.mod h1:cnS6YLrSZc9Ct7NvS5Qx0/7+sMRcEwPp4vGNHMq95/Y= +github.com/essentialkaos/ek/v12 v12.126.0 h1:5iyDAFx5tIQeCOqLaT0Jwt7A3QPlgjH4tNhMyp7YAbs= +github.com/essentialkaos/ek/v12 v12.126.0/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= From 17e2eb7a17c36a5f3998131b8fb4fc64fd8cc4e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 02:21:24 +0000 Subject: [PATCH 11/20] Bump github.com/essentialkaos/ek/v12 from 12.126.0 to 12.126.1 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.126.0 to 12.126.1. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.126.0...v12.126.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0befb69..e348ab6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.126.0 + github.com/essentialkaos/ek/v12 v12.126.1 github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 ) diff --git a/go.sum b/go.sum index 5d5a13d..459f8fd 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.126.0 h1:5iyDAFx5tIQeCOqLaT0Jwt7A3QPlgjH4tNhMyp7YAbs= -github.com/essentialkaos/ek/v12 v12.126.0/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw= +github.com/essentialkaos/ek/v12 v12.126.1 h1:K4tCpu9T3k5Bv6hJ1lmW7Ou0GxjgjBIKRsoZgAGdEhE= +github.com/essentialkaos/ek/v12 v12.126.1/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From a9be250887308b34ebd8a66ec5fdca61f446e41b Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 13 Jun 2024 17:49:51 +0300 Subject: [PATCH 12/20] Improve dependabot configuration --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fc51337..d0ad1de 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,6 +14,12 @@ updates: - "andyone" reviewers: - "andyone" + groups: + all: + applies-to: version-updates + update-types: + - "minor" + - "patch" - package-ecosystem: "github-actions" directory: "/" From bb15a1cf7bc0b9dc02491e44f7462e54ca32219b Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 13 Jun 2024 17:54:45 +0300 Subject: [PATCH 13/20] Regenerate Makefile with the latest version of gomakegen --- Makefile | 64 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 26a90b0..23a3b4b 100644 --- a/Makefile +++ b/Makefile @@ -1,39 +1,40 @@ ################################################################################ -# This Makefile generated by GoMakeGen 2.3.0 using next command: +# This Makefile generated by GoMakeGen 3.0.2 using next command: # gomakegen --mod . # # More info: https://kaos.sh/gomakegen ################################################################################ -export GO111MODULE=on - ifdef VERBOSE ## Print verbose information (Flag) VERBOSE_FLAG = -v endif -COMPAT ?= 1.18 +COMPAT ?= 1.19 MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD) ################################################################################ .DEFAULT_GOAL := help -.PHONY = fmt vet all clean deps update init vendor mod-init mod-update mod-download mod-vendor help +.PHONY = fmt vet all install uninstall clean deps update init vendor mod-init mod-update mod-download mod-vendor help ################################################################################ all: yo ## Build all binaries yo: - go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" yo.go + @echo "Building yo…" + @go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" yo.go install: ## Install all binaries - cp yo /usr/bin/yo + @echo "Installing binaries…" + @cp yo /usr/bin/yo uninstall: ## Uninstall all binaries - rm -f /usr/bin/yo + @echo "Removing installed binaries…" + @rm -f /usr/bin/yo init: mod-init ## Initialize new module @@ -44,57 +45,70 @@ update: mod-update ## Update dependencies to the latest versions vendor: mod-vendor ## Make vendored copy of dependencies mod-init: + @echo "[1/2] Modules initialization…" ifdef MODULE_PATH ## Module path for initialization (String) - go mod init $(MODULE_PATH) + @go mod init $(MODULE_PATH) else - go mod init + @go mod init endif + @echo "[2/2] Dependencies cleanup…" ifdef COMPAT ## Compatible Go version (String) - go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT) + @go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT) else - go mod tidy $(VERBOSE_FLAG) + @go mod tidy $(VERBOSE_FLAG) endif mod-update: + @echo "[1/4] Updating dependencies…" ifdef UPDATE_ALL ## Update all dependencies (Flag) - go get -u $(VERBOSE_FLAG) all + @go get -u $(VERBOSE_FLAG) all else - go get -u $(VERBOSE_FLAG) ./... + @go get -u $(VERBOSE_FLAG) ./... endif + @echo "[2/4] Stripping toolchain info…" + @grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || : + + @echo "[3/4] Dependencies cleanup…" ifdef COMPAT - go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) + @go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) else - go mod tidy $(VERBOSE_FLAG) + @go mod tidy $(VERBOSE_FLAG) endif - test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || : + @echo "[4/4] Updating vendored dependencies…" + @test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || : mod-download: - go mod download + @echo "Downloading dependencies…" + @go mod download mod-vendor: - rm -rf vendor && go mod vendor $(VERBOSE_FLAG) + @echo "Vendoring dependencies…" + @rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || : fmt: ## Format source code with gofmt - find . -name "*.go" -exec gofmt -s -w {} \; + @echo "Formatting sources…" + @find . -name "*.go" -exec gofmt -s -w {} \; vet: ## Runs 'go vet' over sources - go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./... + @echo "Running 'go vet' over sources…" + @go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./... clean: ## Remove generated files - rm -f yo + @echo "Removing built binaries…" + @rm -f yo help: ## Show this info @echo -e '\n\033[1mTargets:\033[0m\n' @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ - | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-14s\033[0m %s\n", $$1, $$2}' + | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-9s\033[0m %s\n", $$1, $$2}' @echo -e '\n\033[1mVariables:\033[0m\n' @grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \ | sed 's/ifdef //' \ - | awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-14s\033[0m %s\n", $$1, $$2}' + | awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-11s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 2.3.0\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 3.0.2\033[0m\n' ################################################################################ From 019521ca9c3c5a2d2fdae1965f415e5cbbd0c070 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 13 Jun 2024 18:03:18 +0300 Subject: [PATCH 14/20] Improve README --- .github/images/card.svg | 4 ++++ .github/images/license.svg | 1 + README.md | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 .github/images/card.svg create mode 100644 .github/images/license.svg diff --git a/.github/images/card.svg b/.github/images/card.svg new file mode 100644 index 0000000..1b87d94 --- /dev/null +++ b/.github/images/card.svg @@ -0,0 +1,4 @@ + + + + diff --git a/.github/images/license.svg b/.github/images/license.svg new file mode 100644 index 0000000..8990e77 --- /dev/null +++ b/.github/images/license.svg @@ -0,0 +1 @@ +license: Apache-2.0licenseApache-2.0 \ No newline at end of file diff --git a/README.md b/README.md index b0c7ae7..226d2b5 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -

+

- GitHub Actions Status - - - codebeat badge - + GitHub Actions CI Status + GitHub Actions CodeQL Status + GoReportCard + codebeat badge +

-

Installation • Usage • Build Status • Contributing • License

+

Installation • Usage • CI Status • Contributing • License


@@ -18,13 +18,13 @@ Yo is a command-line YAML processor. #### From source -To build the Yo from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://go.dev/doc/install)_), then: +To build the Yo from scratch, make sure you have a working Go 1.21+ workspace (_[instructions](https://go.dev/doc/install)_), then: ``` go install github.com/essentialkaos/yo@latest ``` -#### From [ESSENTIAL KAOS Public Repository](https://pkgs.kaos.st) +#### From [ESSENTIAL KAOS Public Repository](https://kaos.sh/kaos-repo) ```bash sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm @@ -43,12 +43,12 @@ bash <(curl -fsSL https://apps.kaos.st/get) yo -### Build Status +### CI Status | Branch | Status | |--------|--------| -| `master` | [![CI](https://github.com/essentialkaos/yo/workflows/CI/badge.svg?branch=master)](https://github.com/essentialkaos/yo/actions) | -| `develop` | [![CI](https://github.com/essentialkaos/yo/workflows/CI/badge.svg?branch=develop)](https://github.com/essentialkaos/yo/actions) | +| `master` | [![CI](https://kaos.sh/w/yo/ci.svg?branch=master)](https://kaos.sh/w/yo/ci?query=branch:master) | +| `develop` | [![CI](https://kaos.sh/w/yo/ci.svg?branch=develop)](https://kaos.sh/w/yo/ci?query=branch:develop) | ### Contributing From ad0f693147d3ced55e341ae28c87a0eef7baed8d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 13 Jun 2024 18:04:33 +0300 Subject: [PATCH 15/20] Regenerate usage svg --- .github/images/usage.svg | 103 ++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/.github/images/usage.svg b/.github/images/usage.svg index 78d3606..244f09b 100644 --- a/.github/images/usage.svg +++ b/.github/images/usage.svg @@ -1,7 +1,7 @@ - - + + - yo Usage + Yo Usage @@ -18,8 +18,31 @@ .italic { font-style: italic; } .underline { text-decoration-line: underline; } .dim { opacity: 0.75; } - .terminal { font-weight: bold; } + .terminal { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; font-weight: 500; font-size: 15px; } + text { fill: #333; } + .terminal { fill: #333; } + .bg { fill: #F0F0F0; stop-color: #F0F0F0; } + .window { fill: #E5E5E5; } + tspan.r { fill: #BA0000; } + tspan.g { fill: #53B900; } + tspan.y { fill: #BA9B00; } + tspan.b { fill: #0060BA; } + tspan.m { fill: #BA00AD; } + tspan.c { fill: #00B7BA; } + tspan.LG { fill: #696969; } + tspan.DG { fill: #AAA; } + tspan.R { fill: #EA4B4B; } + tspan.G { fill: #88DB43; } + tspan.Y { fill: #D3BA3B; } + tspan.B { fill: #3890E2; } + tspan.M { fill: #DB3BD0; } + tspan.C { fill: #39D8DB; } + tspan.W { fill: #BEBEBE; } + ::-moz-selection { color: #222; fill: #222; background: #CCC; } + ::selection { color: #222; fill: #222; background: #CCC; } + + @media (prefers-color-scheme: dark) { text { fill: #F5F5F5; } .terminal { fill: #DDD; } .bg { fill: #222; stop-color: #222; } @@ -41,44 +64,46 @@ tspan.W { fill: #BEBEBE; } ::-moz-selection { color: #CCC; fill: #CCC; background: #444; } ::selection { color: #CCC; fill: #CCC; background: #444; } - + } - - + + + + + + + - - - + Terminal - Terminal - Usage: yo {options} query - Options - --from-file, -f filename .. Read data from file - --no-color, -nc ........... Disable colors in output - --help, -h ................ Show this help message - --version, -v ............. Show version - Examples - cat file.yml | yo '.foo' - Return value for key foo - yo -f file.yml '.foo' - Return value for key foo - yo -f file.yml '.foo | length' - Print value length - yo -f file.yml '.foo[]' - Return all items from array - yo -f file.yml '.bar[2:]' - Return subarray started from item with index 2 - yo -f file.yml '.bar[1,2,5]' - Return items with index 1, 2 and 5 from array - yo -f file.yml '.bar[] | length' - Print array size - yo -f file.yml '.xyz | keys' - Print hash map keys - yo -f file.yml '.xyz | keys | length' - Print number of hash map keys - yo -f file.yml '.xyz | keys | sort' - Print sorted list of keys + Usage: yo {options} query + Options + --from-file, -f filename .. Read data from file + --no-color, -nc ........... Disable colors in output + --help, -h ................ Show this help message + --version, -v ............. Show version + Examples + cat file.yml | yo '.foo' + Return value for key foo + yo -f file.yml '.foo' + Return value for key foo + yo -f file.yml '.foo | length' + Print value length + yo -f file.yml '.foo[]' + Return all items from array + yo -f file.yml '.bar[2:]' + Return subarray started from item with index 2 + yo -f file.yml '.bar[1,2,5]' + Return items with index 1, 2 and 5 from array + yo -f file.yml '.bar[] | length' + Print array size + yo -f file.yml '.xyz | keys' + Print hash map keys + yo -f file.yml '.xyz | keys | length' + Print number of hash map keys + yo -f file.yml '.xyz | keys | sort' + Print sorted list of keys - + From 8076f5252086def712fbb9c9394dbb7ab48ecc2f Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 13 Jun 2024 18:06:05 +0300 Subject: [PATCH 16/20] Version bump --- cli/cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cli.go b/cli/cli.go index 8bf8bc2..32ac074 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -33,7 +33,7 @@ import ( const ( APP = "Yo" - VER = "1.0.0" + VER = "1.0.1" DESC = "Command-line YAML processor" ) From 9fb357534fffb6fc624659b4331fb5a9a95e1ce3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 03:18:32 +0000 Subject: [PATCH 17/20] Bump docker/build-push-action from 5 to 6 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 758de78..5980e6b 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -135,7 +135,7 @@ jobs: - name: Build and push Docker images (Docker) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: push: true context: . @@ -148,7 +148,7 @@ jobs: - name: Build and push Docker images (GHCR) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: push: true context: . From 1f1af55fde4daa9e3637325a2077318189acd7d5 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 24 Jun 2024 14:18:59 +0300 Subject: [PATCH 18/20] Dependencies update --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e348ab6..fba44ed 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/essentialkaos/yo go 1.19 require ( - github.com/essentialkaos/ek/v12 v12.126.1 - github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 + github.com/essentialkaos/ek/v12 v12.127.0 + github.com/essentialkaos/go-simpleyaml/v2 v2.1.5 ) require ( diff --git a/go.sum b/go.sum index 459f8fd..288ddba 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,10 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.126.1 h1:K4tCpu9T3k5Bv6hJ1lmW7Ou0GxjgjBIKRsoZgAGdEhE= -github.com/essentialkaos/ek/v12 v12.126.1/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw= -github.com/essentialkaos/go-simpleyaml/v2 v2.1.4 h1:B2bXdGWaQ6Xy3HTsO2DLBoNV7cbMW3KDmeeOKYLo9z0= -github.com/essentialkaos/go-simpleyaml/v2 v2.1.4/go.mod h1:pVQTleUBC8xBI9+HnTF38xWBZqANNrmMAzwmUemblJg= +github.com/essentialkaos/ek/v12 v12.127.0 h1:fU5A+QbIZ7NTq1K5jGVwAWwuLtBUhsIKuRWYT78hE+Q= +github.com/essentialkaos/ek/v12 v12.127.0/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw= +github.com/essentialkaos/go-simpleyaml/v2 v2.1.5 h1:HrFk4JhgBT5pzEkwFW4MqdgsAW4KN7/Um6rTHq1GTJk= +github.com/essentialkaos/go-simpleyaml/v2 v2.1.5/go.mod h1:m3Ub1npzYSZTgSzW68wUT1ak7p9hOSFvTnyhtwKlvSA= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= From 4ad810fdb073a4d50dd4a6bf7abdec88b4ba4889 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 24 Jun 2024 14:23:04 +0300 Subject: [PATCH 19/20] Code refactoring --- cli/cli.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 32ac074..1d6401b 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -18,6 +18,7 @@ import ( "github.com/essentialkaos/ek/v12/options" "github.com/essentialkaos/ek/v12/support" "github.com/essentialkaos/ek/v12/support/deps" + "github.com/essentialkaos/ek/v12/terminal" "github.com/essentialkaos/ek/v12/terminal/tty" "github.com/essentialkaos/ek/v12/usage" "github.com/essentialkaos/ek/v12/usage/completion/bash" @@ -94,8 +95,9 @@ func Run(gitRev string, gomod []byte) { args, errs := options.Parse(optMap) - if len(errs) != 0 { - printError(errs[0].Error()) + if !errs.IsEmpty() { + terminal.Error("Options parsing errors:") + terminal.Error(errs.String()) os.Exit(1) } @@ -170,14 +172,14 @@ func process(query string) { data, err := readData() if err != nil { - printError(err.Error()) + terminal.Error(err) os.Exit(1) } yaml, err := simpleyaml.NewYaml(data) if err != nil { - printError(err.Error()) + terminal.Error(err) os.Exit(1) } @@ -307,7 +309,7 @@ func processData(processor []string, data []*simpleyaml.Yaml) { case "sort": result = processorFuncSort(result) default: - printError("Unknown function \"%s\"", pf) + terminal.Error("Unknown function \"%s\"", pf) os.Exit(1) } } @@ -543,11 +545,6 @@ func encodeYaml(yaml *simpleyaml.Yaml) { fmt.Println(string(data[:len(data)-1])) } -// printError prints error message to console -func printError(f string, a ...interface{}) { - fmtc.Fprintf(os.Stderr, "{r}"+f+"{!}\n", a...) -} - // ////////////////////////////////////////////////////////////////////////////////// // // IsArrayToken returns true if it array selector token @@ -581,12 +578,7 @@ func printCompletion() int { // printMan prints man page func printMan() { - fmt.Println( - man.Generate( - genUsage(), - genAbout(""), - ), - ) + fmt.Println(man.Generate(genUsage(), genAbout(""))) } // genUsage generates usage info From 162caf468fbf3ea309d4de9a92fe6f738eb8b770 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 24 Jun 2024 14:23:44 +0300 Subject: [PATCH 20/20] Update spec --- common/yo.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/common/yo.spec b/common/yo.spec index a4744e4..b5d5d1a 100644 --- a/common/yo.spec +++ b/common/yo.spec @@ -6,7 +6,7 @@ Summary: Command-line YAML processor Name: yo -Version: 1.0.0 +Version: 1.0.1 Release: 0%{?dist} Group: Applications/System License: Apache License, Version 2.0 @@ -28,14 +28,17 @@ Command-line YAML processor. ################################################################################ %prep -%setup -q -%build +%setup -q if [[ ! -d "%{name}/vendor" ]] ; then - echo "This package requires vendored dependencies" + echo -e "----\nThis package requires vendored dependencies\n----" + exit 1 +elif [[ -f "%{name}/%{name}" ]] ; then + echo -e "----\nSources must not contain precompiled binaries\n----" exit 1 fi +%build pushd %{name} go build %{name}.go cp LICENSE .. @@ -93,6 +96,10 @@ fi ################################################################################ %changelog +* Mon Jun 24 2024 Anton Novojilov - 1.0.1-0 +- Code refactoring +- Dependencies update + * Thu Mar 28 2024 Anton Novojilov - 1.0.0-0 - Improved support information gathering - Code refactoring