diff --git a/cmd/brew.go b/cmd/brew.go index af4ea05..5a2e8b0 100644 --- a/cmd/brew.go +++ b/cmd/brew.go @@ -1,8 +1,8 @@ package cmd import ( - intconfig "github.com/foomo/posh/internal/config" - "github.com/foomo/posh/pkg/config" + ownbrewconfig "github.com/foomo/ownbrew/pkg/config" + "github.com/foomo/posh/internal/config" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -18,23 +18,22 @@ var brewCmd = &cobra.Command{ SilenceUsage: true, SilenceErrors: true, PreRunE: func(cmd *cobra.Command, args []string) error { - if err := intconfig.Load(l); err != nil { + if err := config.Load(l); err != nil { return err } return nil }, RunE: func(cmd *cobra.Command, args []string) error { - var cfg config.Ownbrew + var cfg ownbrewconfig.Config if err := viper.UnmarshalKey("ownbrew", &cfg); err != nil { return err } - cfg.Dry = brewCmdFlagDry plg, err := pluginProvider(l) if err != nil { return err } - return plg.Brew(cmd.Context(), cfg) + return plg.Brew(cmd.Context(), cfg, brewCmdFlagDry) }, } diff --git a/embed/scaffold/init/$.posh/internal/plugin.go.gotext b/embed/scaffold/init/$.posh/internal/plugin.go.gotext index b0d85b2..ef58d88 100644 --- a/embed/scaffold/init/$.posh/internal/plugin.go.gotext +++ b/embed/scaffold/init/$.posh/internal/plugin.go.gotext @@ -3,19 +3,21 @@ package internal import ( "context" "fmt" + "log/slog" "strings" + ownbrewconfig "github.com/foomo/ownbrew/pkg/config" + "github.com/foomo/ownbrew/pkg/ownbrew" "github.com/foomo/posh/pkg/command" "github.com/foomo/posh/pkg/config" "github.com/foomo/posh/pkg/log" - "github.com/foomo/posh/integration/ownbrew" "github.com/foomo/posh/pkg/plugin" "github.com/foomo/posh/pkg/prompt" "github.com/foomo/posh/pkg/prompt/check" "github.com/foomo/posh/pkg/prompt/history" "github.com/foomo/posh/pkg/readline" "github.com/foomo/posh/pkg/require" - icommand "{{.module}}/posh/internal/command" + icommand "github.com/posh-test-demo/posh/internal/command" ) type Plugin struct { @@ -51,9 +53,9 @@ func New(l log.Logger) (plugin.Plugin, error) { //nolint: ireturn // ~ Public methods // ------------------------------------------------------------------------------------------------ -func (p *Plugin) Brew(ctx context.Context, cfg config.Ownbrew) error { - brew, err := ownbrew.New(p.l, - ownbrew.WithDry(cfg.Dry), +func (p *Plugin) Brew(ctx context.Context, cfg ownbrewconfig.Config, dry bool) error { + brew, err := ownbrew.New(slog.New(p.l.SlogHandler()), + ownbrew.WithDry(dry), ownbrew.WithBinDir(cfg.BinDir), ownbrew.WithTapDir(cfg.TapDir), ownbrew.WithTempDir(cfg.TempDir), diff --git a/go.mod b/go.mod index 774d7f5..467c178 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/foomo/posh -go 1.23.0 +go 1.23.2 require ( dario.cat/mergo v1.0.1 @@ -10,10 +10,12 @@ require ( github.com/c-bata/go-prompt v0.2.6 github.com/charlievieth/fastwalk v1.0.8 github.com/foomo/fender v1.0.1 + github.com/foomo/ownbrew v0.1.2 github.com/go-git/go-git/v5 v5.12.0 github.com/gofrs/flock v0.12.1 github.com/joho/godotenv v1.5.1 github.com/kubescape/go-git-url v0.0.30 + github.com/neilotoole/slogt v1.1.0 github.com/pkg/errors v0.9.1 github.com/pterm/pterm v0.12.79 github.com/samber/lo v1.47.0 @@ -79,16 +81,15 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.26.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect + golang.org/x/tools v0.25.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect diff --git a/go.sum b/go.sum index 9dfb6c5..abd414a 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,8 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/foomo/fender v1.0.1 h1:sz+5IHWDgwAkYKau6NlgPHxa7v3kLyzScq8MrhKdybM= github.com/foomo/fender v1.0.1/go.mod h1:Out1+dS5S8qJ4VqtxzCj/FDYi4Wtal2NK+8vhCUCrao= +github.com/foomo/ownbrew v0.1.2 h1:KYT1J1ztjARcPrsY8h2hhQ1A41atdEdp6YikYH5LQm0= +github.com/foomo/ownbrew v0.1.2/go.mod h1:lyUFvPABflzcI/cAmQU4vif1DjH8tZ6kogc+Ee44Sag= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/franklinkim/go-prompt v0.2.7-0.20210427061716-a8f4995d7aa5 h1:kXNtle4AoQnngdm+gwt4ku6Llbzw3EFHgZYpL618JaI= @@ -152,6 +154,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/neilotoole/slogt v1.1.0 h1:c7qE92sq+V0yvCuaxph+RQ2jOKL61c4hqS1Bv9W7FZE= +github.com/neilotoole/slogt v1.1.0/go.mod h1:RCrGXkPc/hYybNulqQrMHRtvlQ7F6NktNVLuLwk6V+w= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= @@ -231,23 +235,21 @@ github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1z github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= -go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -255,8 +257,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -287,8 +289,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -296,8 +298,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -306,14 +308,14 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/integration/ownbrew/ownbrew.go b/integration/ownbrew/ownbrew.go deleted file mode 100644 index 45c1cc4..0000000 --- a/integration/ownbrew/ownbrew.go +++ /dev/null @@ -1,347 +0,0 @@ -package ownbrew - -import ( - "bytes" - "context" - "fmt" - "io" - "net/http" - "os" - "os/exec" - "path" - "path/filepath" - "runtime" - "strings" - "time" - - "github.com/foomo/posh/pkg/log" - "github.com/foomo/posh/pkg/util/prints" - "github.com/pkg/errors" -) - -type ( - Ownbrew struct { - l log.Logger - dry bool - binDir string - tapDir string - tempDir string - cellarDir string - packages []Package - timeout time.Duration - } - Option func(*Ownbrew) error -) - -// ------------------------------------------------------------------------------------------------ -// ~ Options -// ------------------------------------------------------------------------------------------------ - -func WithDry(v bool) Option { - return func(o *Ownbrew) error { - o.dry = v - return nil - } -} - -func WithPackages(v ...Package) Option { - return func(o *Ownbrew) error { - o.packages = append(o.packages, v...) - return nil - } -} - -func WithBinDir(v string) Option { - return func(o *Ownbrew) error { - o.binDir = v - return nil - } -} - -func WithTempDir(v string) Option { - return func(o *Ownbrew) error { - o.tempDir = v - return nil - } -} - -func WithTapDir(v string) Option { - return func(o *Ownbrew) error { - o.tapDir = v - return nil - } -} - -func WithCellarDir(v string) Option { - return func(o *Ownbrew) error { - o.cellarDir = v - return nil - } -} - -func WithTimeout(v time.Duration) Option { - return func(o *Ownbrew) error { - o.timeout = v - return nil - } -} - -// ------------------------------------------------------------------------------------------------ -// ~ Constructor -// ------------------------------------------------------------------------------------------------ - -func New(l log.Logger, opts ...Option) (*Ownbrew, error) { - inst := &Ownbrew{ - l: l.Named("ownbrew"), - binDir: "bin", - tempDir: ".posh/tmp", - tapDir: ".posh/ownbrew", - cellarDir: ".posh/bin", - timeout: 3 * time.Minute, - } - for _, opt := range opts { - if opt != nil { - if err := opt(inst); err != nil { - return nil, err - } - } - } - - for _, dir := range []string{inst.binDir, inst.tempDir, inst.tapDir, inst.cellarDir} { - if err := os.MkdirAll(dir, os.ModePerm); err != nil { - return nil, err - } - } - return inst, nil -} - -// ------------------------------------------------------------------------------------------------ -// ~ Public methods -// ------------------------------------------------------------------------------------------------ - -func (o *Ownbrew) Install(ctx context.Context) error { - o.l.Debug("install:", runtime.GOOS, runtime.GOARCH) - - for _, pkg := range o.packages { - var install bool - cellarFilenames, err := o.cellarFilenames(pkg) - if err != nil { - return errors.Wrap(err, "failed to retrieve cellar filename for package") - } - for _, cellarFilename := range cellarFilenames { - if cellarExists, err := o.cellarExists(cellarFilename); err != nil { - return errors.Wrapf(err, "failed to check cellar: %s", cellarFilename) - } else if !cellarExists { - install = true - break - } - } - - if install { - if pkg.Tap == "" { - if err := o.installLocal(ctx, pkg); err != nil { - return errors.Wrap(err, "failed to install local tap") - } - } else { - if err := o.installRemote(ctx, pkg); err != nil { - return errors.Wrap(err, "failed to install remote tap") - } - } - } else { - o.l.Debug("exists:", pkg.String()) - } - - // create symlink - if !o.dry { - for _, name := range pkg.AllNames() { - filename := filepath.Join(o.binDir, name) - cellarFilename, err := o.cellarFilename(name, pkg.Version) - if err != nil { - return errors.Wrap(err, "failed to retrieve cellar filename") - } - o.l.Debug("creating symlink:", cellarFilename, filename) - if err := o.symlink(cellarFilename, filename); err != nil { - return errors.Wrapf(err, "failed to symlink: %s => %s", cellarFilename, filename) - } - } - } - } - return nil -} - -// ------------------------------------------------------------------------------------------------ -// ~ Private methods -// ------------------------------------------------------------------------------------------------ - -func (o *Ownbrew) symlink(source, target string) error { - // remove existing - if err := os.Remove(target); os.IsNotExist(err) { - // continue - } else if err != nil { - return err - } - - prefix, err := filepath.Rel(filepath.Base(target), "") - if err != nil { - return err - } - prefix = strings.TrimSuffix(prefix, ".") - - o.l.Debug("symlink:", prefix+source, target) - return os.Symlink(prefix+source, target) -} - -func (o *Ownbrew) cellarExists(filename string) (bool, error) { - if stat, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) { - return false, nil - } else if err != nil { - return false, errors.Wrapf(err, "failed to stat cellar (%s)", filename) - } else if stat.IsDir() { - return true, fmt.Errorf("not a file (%s)", filename) - } else { - return true, nil - } -} - -func (o *Ownbrew) cellarFilenames(pkg Package) ([]string, error) { - names := pkg.AllNames() - ret := make([]string, len(names)) - for i, name := range names { - filename, err := o.cellarFilename(name, pkg.Version) - if err != nil { - return nil, err - } - ret[i] = filename - } - return ret, nil -} - -func (o *Ownbrew) cellarFilename(name, version string) (string, error) { - ret := filepath.Join( - o.cellarDir, - fmt.Sprintf("%s-%s-%s-%s", name, version, runtime.GOOS, runtime.GOARCH), - ) - - if info, err := os.Stat(ret); errors.Is(err, os.ErrNotExist) { - // continue - } else if err != nil { - return "", errors.Wrap(err, "failed to retrieve fileinfo") - } else if info.IsDir() { - ret = path.Join(ret, name) - } - - return ret, nil -} - -func (o *Ownbrew) installLocal(ctx context.Context, pkg Package) error { - filename := filepath.Join(o.tapDir, pkg.Name+".sh") - o.l.Info("installing local:", pkg.String()) - o.l.Info("filename:", filename) - - if exists, err := o.localTapExists(filename); err != nil { - return err - } else if !exists { - return fmt.Errorf("missing local tap: %s", filename) - } - - if o.dry { - if value, err := os.ReadFile(filename); err != nil { - return errors.Wrap(err, "failed to read file") - } else { - prints.Code(o.l, filename, string(value), "sh") - } - return nil - } - - cmd := exec.CommandContext(ctx, filename, - runtime.GOOS, - runtime.GOARCH, - pkg.Version, - ) - cmd.Env = append( - os.Environ(), - "BIN_DIR="+o.cellarDir, - "TAP_DIR="+o.tapDir, - "TEMP_DIR="+o.tempDir, - ) - cmd.Args = append(cmd.Args, pkg.Args...) - o.l.Debug("running:", cmd.String()) - if out, err := cmd.CombinedOutput(); err != nil { - return errors.Wrap(err, string(out)) - } - - return nil -} - -func (o *Ownbrew) installRemote(ctx context.Context, pkg Package) error { - url, err := pkg.URL() - if err != nil { - return err - } - o.l.Info("installing remote:", pkg.String()) - o.l.Debug("url:", url) - - ctx, cancel := context.WithTimeout(ctx, o.timeout) - defer cancel() - - req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) - if err != nil { - return errors.Wrap(err, "failed to retrieve script") - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - return errors.Wrap(err, "failed to retrieve script") - } else if resp.StatusCode != http.StatusOK { - return fmt.Errorf("failed to retrieve script: %s", resp.Status) - } - defer func() { - _ = resp.Body.Close() - }() - - script, err := io.ReadAll(resp.Body) - if err != nil { - return err - } - - if o.dry { - prints.Code(o.l, url, string(script), "sh") - return nil - } - - cmd := exec.CommandContext(ctx, "bash", "-s", - runtime.GOOS, - runtime.GOARCH, - pkg.Version, - ) - cmd.Env = append( - os.Environ(), - "BIN_DIR="+o.cellarDir, - "TAP_DIR="+o.tapDir, - "TEMP_DIR="+o.tempDir, - ) - cmd.Args = append(cmd.Args, pkg.Args...) - cmd.Stdin = bytes.NewReader(script) - cmd.Stdout = os.Stdout - if o.l.IsLevel(log.LevelDebug) { - cmd.Stderr = os.Stderr - } - if err := cmd.Run(); err != nil { - prints.Code(o.l, url, string(script), "sh") - return errors.Wrap(err, "failed to install") - } - - return nil -} - -func (o *Ownbrew) localTapExists(filename string) (bool, error) { - if stat, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) { - return false, nil - } else if err != nil { - return false, errors.Wrapf(err, "failed to stat tap (%s)", filename) - } else if stat.IsDir() { - return true, fmt.Errorf("not an executeable: %s", filename) - } else { - return true, nil - } -} diff --git a/integration/ownbrew/package.go b/integration/ownbrew/package.go deleted file mode 100644 index 37d82b8..0000000 --- a/integration/ownbrew/package.go +++ /dev/null @@ -1,41 +0,0 @@ -package ownbrew - -import ( - "fmt" - "strings" -) - -type Package struct { - Tap string `json:"tap" yaml:"tap"` - Name string `json:"name" yaml:"name"` - Names []string `json:"names" yaml:"names"` - Args []string `json:"args" yaml:"args"` - Version string `json:"version" yaml:"version"` -} - -func (c Package) AllNames() []string { - names := c.Names - if len(names) == 0 { - names = append(names, c.Name) - } - return names -} - -func (c Package) String() string { - return fmt.Sprintf("Names: %s, Version: %s Tap: %s", c.AllNames(), c.Version, c.Tap) -} - -func (c Package) URL() (string, error) { - // foomo/tap/aws/kubectl - parts := strings.Split(c.Tap, "/") - if len(parts) < 4 { - return "", fmt.Errorf("invalid tap format: %s", c.Tap) - } - return fmt.Sprintf( - "https://raw.githubusercontent.com/%s/ownbrew-%s/main/%s/%s.sh", - parts[0], - parts[1], - parts[2], - parts[3], - ), nil -} diff --git a/pkg/config/ownbrew.go b/pkg/config/ownbrew.go deleted file mode 100644 index c894117..0000000 --- a/pkg/config/ownbrew.go +++ /dev/null @@ -1,14 +0,0 @@ -package config - -import ( - "github.com/foomo/posh/integration/ownbrew" -) - -type Ownbrew struct { - Dry bool `json:"dry" yaml:"dry"` - BinDir string `json:"binDir" yaml:"binDir"` - TapDir string `json:"tapDir" yaml:"tapDir"` - TempDir string `json:"tempDir" yaml:"tempDir"` - CellarDir string `json:"cellarDir" yaml:"cellarDir"` - Packages []ownbrew.Package `json:"packages" yaml:"packages"` -} diff --git a/pkg/log/fmt.go b/pkg/log/fmt.go index 409bfce..ae02881 100644 --- a/pkg/log/fmt.go +++ b/pkg/log/fmt.go @@ -2,6 +2,7 @@ package log import ( "fmt" + "log/slog" "os" ) @@ -138,6 +139,10 @@ func (l *Fmt) Must(err error) { } } +func (l *Fmt) SlogHandler() slog.Handler { + return slog.NewTextHandler(os.Stdout, nil) +} + // ------------------------------------------------------------------------------------------------ // ~ Private methods // ------------------------------------------------------------------------------------------------ diff --git a/pkg/log/logger.go b/pkg/log/logger.go index 8f69fb9..4e8fcda 100644 --- a/pkg/log/logger.go +++ b/pkg/log/logger.go @@ -1,5 +1,9 @@ package log +import ( + "log/slog" +) + type Logger interface { Level() Level IsLevel(level Level) bool @@ -21,4 +25,5 @@ type Logger interface { Fatal(a ...interface{}) Fatalf(format string, a ...interface{}) Must(err error) + SlogHandler() slog.Handler } diff --git a/pkg/log/pterm.go b/pkg/log/pterm.go index 456a122..77307da 100644 --- a/pkg/log/pterm.go +++ b/pkg/log/pterm.go @@ -2,6 +2,7 @@ package log import ( "fmt" + "log/slog" "github.com/pterm/pterm" ) @@ -156,6 +157,10 @@ func (l *PTerm) Must(err error) { } } +func (l *PTerm) SlogHandler() slog.Handler { + return pterm.NewSlogHandler(&pterm.DefaultLogger) +} + // ------------------------------------------------------------------------------------------------ // ~ Private methods // ------------------------------------------------------------------------------------------------ diff --git a/pkg/log/test.go b/pkg/log/test.go index e1c1ce4..65518c4 100644 --- a/pkg/log/test.go +++ b/pkg/log/test.go @@ -2,7 +2,10 @@ package log import ( "fmt" + "log/slog" "testing" + + "github.com/neilotoole/slogt" ) type ( @@ -141,6 +144,10 @@ func (l *Test) Must(err error) { } } +func (l *Test) SlogHandler() slog.Handler { + return slogt.New(l.t).Handler() +} + // ------------------------------------------------------------------------------------------------ // ~ Private methods // ------------------------------------------------------------------------------------------------ diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go index 3340dcb..c052797 100644 --- a/pkg/plugin/plugin.go +++ b/pkg/plugin/plugin.go @@ -3,12 +3,13 @@ package plugin import ( "context" + ownbrewconfig "github.com/foomo/ownbrew/pkg/config" "github.com/foomo/posh/pkg/config" ) type Plugin interface { Prompt(ctx context.Context, cfg config.Prompt) error Execute(ctx context.Context, args []string) error - Brew(ctx context.Context, cfg config.Ownbrew) error + Brew(ctx context.Context, cfg ownbrewconfig.Config, dry bool) error Require(ctx context.Context, cfg config.Require) error }