Merge pull request #2063 from rsteube/xdotool-mv-actions

xdotool: move actions

completers/xdotool_completer/cmd/behave.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(behaveCmd).PositionalCompletion(
 		carapace.Batch(
-			action.ActionWindows(),
+			xdotool.ActionWindows(),
 			carapace.ActionValues("%1", "%@"),
 		).ToA(),
 		carapace.ActionValuesDescribed(

completers/xdotool_completer/cmd/click.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +23,7 @@ func init() {
 	rootCmd.AddCommand(clickCmd)
 
 	carapace.Gen(clickCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 
 	carapace.Gen(clickCmd).PositionalCompletion(

completers/xdotool_completer/cmd/getDesktopForWindow.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(getDesktopForWindowCmd)
 
 	carapace.Gen(getDesktopForWindowCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/getwindowclassname.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(getwindowclassnameCmd)
 
 	carapace.Gen(getwindowclassnameCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/getwindowgeometry.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(getwindowgeometryCmd)
 
 	carapace.Gen(getwindowgeometryCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/getwindowname.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(getwindownameCmd)
 
 	carapace.Gen(getwindownameCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/getwindowpid.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(getwindowpidCmd)
 
 	carapace.Gen(getwindowpidCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/key.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -21,10 +21,10 @@ func init() {
 	rootCmd.AddCommand(keyCmd)
 
 	carapace.Gen(keyCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 
 	carapace.Gen(keyCmd).PositionalAnyCompletion(
-		action.ActionKeys().UniqueList("+"),
+		xdotool.ActionKeys().UniqueList("+"),
 	)
 }

completers/xdotool_completer/cmd/keydown.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -21,10 +21,10 @@ func init() {
 	rootCmd.AddCommand(keydownCmd)
 
 	carapace.Gen(keydownCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 
 	carapace.Gen(keydownCmd).PositionalAnyCompletion(
-		action.ActionKeys().UniqueList("+"),
+		xdotool.ActionKeys().UniqueList("+"),
 	)
 }

completers/xdotool_completer/cmd/keyup.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -21,10 +21,10 @@ func init() {
 	rootCmd.AddCommand(keyupCmd)
 
 	carapace.Gen(keyupCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 
 	carapace.Gen(keyupCmd).PositionalAnyCompletion(
-		action.ActionKeys().UniqueList("+"),
+		xdotool.ActionKeys().UniqueList("+"),
 	)
 }

completers/xdotool_completer/cmd/mousedown.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +23,7 @@ func init() {
 	rootCmd.AddCommand(mousedownCmd)
 
 	carapace.Gen(mousedownCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 
 	carapace.Gen(mousedownCmd).PositionalCompletion(

completers/xdotool_completer/cmd/mousemove.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -25,6 +25,6 @@ func init() {
 
 	carapace.Gen(mousemoveCmd).FlagCompletion(carapace.ActionMap{
 		"screen": os.ActionScreens(true),
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 }

completers/xdotool_completer/cmd/mouseup.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +23,7 @@ func init() {
 	rootCmd.AddCommand(mouseupCmd)
 
 	carapace.Gen(mouseupCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 
 	carapace.Gen(mouseupCmd).PositionalCompletion(

completers/xdotool_completer/cmd/search.go

@@ -2,9 +2,9 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
 	"github.com/rsteube/carapace-bin/pkg/actions/ps"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -33,7 +33,7 @@ func init() {
 	rootCmd.AddCommand(searchCmd)
 
 	carapace.Gen(searchCmd).FlagCompletion(carapace.ActionMap{
-		"desktop": action.ActionDesktops(),
+		"desktop": xdotool.ActionDesktops(),
 		"pid":     ps.ActionProcessIds(),
 		"screen":  os.ActionScreens(true),
 	})

completers/xdotool_completer/cmd/setDesktop.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(setDesktopCmd)
 
 	carapace.Gen(setDesktopCmd).PositionalCompletion(
-		action.ActionDesktops(),
+		xdotool.ActionDesktops(),
 	)
 }

completers/xdotool_completer/cmd/setDesktopForWindow.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +18,7 @@ func init() {
 	rootCmd.AddCommand(setDesktopForWindowCmd)
 
 	carapace.Gen(setDesktopForWindowCmd).PositionalCompletion(
-		action.ActionWindows(),
-		action.ActionDesktops(),
+		xdotool.ActionWindows(),
+		xdotool.ActionDesktops(),
 	)
 }

completers/xdotool_completer/cmd/type.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -21,6 +21,6 @@ func init() {
 	rootCmd.AddCommand(typeCmd)
 
 	carapace.Gen(typeCmd).FlagCompletion(carapace.ActionMap{
-		"window": action.ActionWindows(),
+		"window": xdotool.ActionWindows(),
 	})
 }

completers/xdotool_completer/cmd/windowactivate.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(windowactivateCmd)
 
 	carapace.Gen(windowactivateCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/windowclose.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(windowcloseCmd)
 
 	carapace.Gen(windowcloseCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/windowfocus.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,6 @@ func init() {
 	rootCmd.AddCommand(windowfocusCmd)
 
 	carapace.Gen(windowfocusCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }

completers/xdotool_completer/cmd/windowkill.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/xdotool_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/xdotool"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(windowkillCmd)
 
 	carapace.Gen(windowkillCmd).PositionalCompletion(
-		action.ActionWindows(),
+		xdotool.ActionWindows(),
 	)
 }