Merge pull request #146 from kindlyops/coral

migrate from cobra to coral

Author: statik

cmd/BUILD.bazel

@@ -27,9 +27,9 @@ go_library(
         "//vendor/github.com/hypebeast/go-osc/osc:go_default_library",
         "//vendor/github.com/kennygrant/sanitize:go_default_library",
         "//vendor/github.com/mattn/go-isatty:go_default_library",
+        "//vendor/github.com/muesli/coral:go_default_library",
         "//vendor/github.com/rs/zerolog:go_default_library",
         "//vendor/github.com/rs/zerolog/log:go_default_library",
-        "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/viper:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:windows": [

cmd/chapters.go

@@ -26,27 +26,27 @@ import (
 	"sync"
 
 	"github.com/kennygrant/sanitize"
+	"github.com/muesli/coral"
 	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 )
 
-var chapterListCmd = &cobra.Command{
+var chapterListCmd = &coral.Command{
 	Use:   "chapterlist <videofile.mp4>",
 	Short: "List chapters in a video container.",
 	Long:  `Use ffprobe to discover all chapter metadata in a video file container.`,
 	Run:   chapterList,
-	Args:  cobra.ExactArgs(1),
+	Args:  coral.ExactArgs(1),
 }
 
-var chapterSplitCmd = &cobra.Command{
+var chapterSplitCmd = &coral.Command{
 	Use:   "chaptersplit <videofile.mp4>",
 	Short: "Split video file into separate files per chapter.",
 	Long:  `Use ffmpeg to copy each chapter from a video file into it's own file.`,
 	Run:   chapterSplit,
-	Args:  cobra.ExactArgs(1),
+	Args:  coral.ExactArgs(1),
 }
 
-func chapterSplit(cmd *cobra.Command, args []string) {
+func chapterSplit(cmd *coral.Command, args []string) {
 	_, err := exec.LookPath("ffprobe")
 
 	if err != nil {
@@ -175,7 +175,7 @@ func getChapters(target string) (ffmprobeResponse, error) {
 	return response, nil
 }
 
-func chapterList(cmd *cobra.Command, args []string) {
+func chapterList(cmd *coral.Command, args []string) {
 	_, err := exec.LookPath("ffprobe")
 
 	if err != nil {

cmd/ivs.go

@@ -21,28 +21,28 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ivs"
 	"github.com/hypebeast/go-osc/osc"
+	"github.com/muesli/coral"
 	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
-var ivsOscBridgeCmd = &cobra.Command{
+var ivsOscBridgeCmd = &coral.Command{
 	Use:   "ivs-bridge <ivs-stream-arn>",
 	Short: "Connect OSC commands to IVS PutMetadata.",
 	Long:  `Use OSC to send messages to IVS using PutMetadata API.`,
 	Run:   ivsOscBridge,
-	Args:  cobra.ExactArgs(1),
+	Args:  coral.ExactArgs(1),
 }
 
-var ivsPutMetadataCmd = &cobra.Command{
+var ivsPutMetadataCmd = &coral.Command{
 	Use:   "ivs-put <ivs-stream-arn> <data payload>",
 	Short: "Send payload to IVS PutMetadata.",
 	Long:  `Send messages to IVS using PutMetadata API.`,
 	Run:   ivsPutMetadata,
-	Args:  cobra.ExactArgs(2), //nolint:gomnd // this is an appropriate magic number
+	Args:  coral.ExactArgs(2), //nolint:gomnd // this is an appropriate magic number
 }
 
-func ivsOscBridge(cmd *cobra.Command, args []string) {
+func ivsOscBridge(cmd *coral.Command, args []string) {
 	arn := args[0]
 	addr := "127.0.0.1:" + viper.GetString("ivs_port")
 
@@ -76,7 +76,7 @@ func ivsOscBridge(cmd *cobra.Command, args []string) {
 	}
 }
 
-func ivsPutMetadata(cmd *cobra.Command, args []string) {
+func ivsPutMetadata(cmd *coral.Command, args []string) {
 	arn := args[0]
 	data := args[1]
 

cmd/lighting.go

@@ -21,20 +21,20 @@ import (
 
 	"github.com/hypebeast/go-osc/osc"
 	"github.com/kindlyops/vbs/embeddy"
+	"github.com/muesli/coral"
 	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
-var lightingBridgeCmd = &cobra.Command{
+var lightingBridgeCmd = &coral.Command{
 	Use:   "lighting-bridge <companion-ip>",
 	Short: "Serve embedded lighting control page",
 	Long:  `Use OSC to send messages to Companion API for lighting control.`,
 	Run:   lightingBridge,
-	Args:  cobra.NoArgs,
+	Args:  coral.NoArgs,
 }
 
-func lightingBridge(cmd *cobra.Command, args []string) {
+func lightingBridge(cmd *coral.Command, args []string) {
 	listenAddr := "127.0.0.1:" + viper.GetString("lighting_port")
 	dist, _ := fs.Sub(embeddy.GetNextFS(), "dist")
 

cmd/play.go

@@ -33,16 +33,16 @@ import (
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/muesli/coral"
 	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 )
 
-var playCmd = &cobra.Command{
+var playCmd = &coral.Command{
 	Use:   "play <videofile.mp4>",
 	Short: "Play a videofile fullscreen with mpv player.",
 	Long:  `Use mpv video player to play a video file fullscreen on the designated display.`,
 	Run:   play,
-	Args:  cobra.ExactArgs(1),
+	Args:  coral.ExactArgs(1),
 }
 
 // keyMap defines a set of keybindings. To work for help it must satisfy
@@ -525,7 +525,7 @@ func (m model) View() string {
 		Render(s)
 }
 
-func play(cmd *cobra.Command, args []string) {
+func play(cmd *coral.Command, args []string) {
 	_, err := exec.LookPath("mpv")
 
 	if err != nil {

cmd/root.go

@@ -21,9 +21,9 @@ import (
 	"time"
 
 	"github.com/mattn/go-isatty"
+	"github.com/muesli/coral"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
@@ -33,7 +33,7 @@ var cfgFile string
 var Debug bool
 
 // rootCmd represents the base command when called without any subcommands.
-var rootCmd = &cobra.Command{
+var rootCmd = &coral.Command{
 	Version: "dev",
 	Use:     "vbs",
 	Short:   "video broadcasting stuff",
@@ -55,15 +55,15 @@ use at your own risk.
 	//	Run: func(cmd *cobra.Command, args []string) { },
 }
 
-var configCmd = &cobra.Command{
+var configCmd = &coral.Command{
 	Use:   "save-config",
 	Short: "Save the current config.",
 	Long:  `Save the current config after merge from files, arguments, and environment.`,
 	Run:   saveConfig,
-	Args:  cobra.NoArgs,
+	Args:  coral.NoArgs,
 }
 
-func saveConfig(cmd *cobra.Command, args []string) {
+func saveConfig(cmd *coral.Command, args []string) {
 	configDir, err := os.UserConfigDir()
 	if err != nil {
 		log.Fatal().Stack().Err(err).Msg("Couldn't locate config dir")
@@ -105,7 +105,7 @@ func init() {
 		log.Logger = log.With().Caller().Logger()
 	}
 
-	cobra.OnInitialize(initConfig)
+	coral.OnInitialize(initConfig)
 
 	// Here you will define your flags and configuration settings.
 	// Cobra supports persistent flags, which, if defined here,

dummy.go

@@ -1,3 +1,4 @@
+//go:build neverbuild
 // +build neverbuild
 
 package main

embeddy/BUILD.bazel

@@ -34,7 +34,7 @@ next(
 )
 
 next(
-    name = "build",
+    name = "next_export",
     outs = ["dist"],
     args = [
         "export $(RULEDIR)",
@@ -53,7 +53,7 @@ static_site_embedder(
 go_library(
     name = "go_default_library",
     srcs = [":embedder"],
-    embedsrcs = [":build"],
+    embedsrcs = [":next_export"],
     importpath = "github.com/kindlyops/vbs/embeddy",
     visibility = ["//visibility:public"],
 )

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/mattn/go-isatty v0.0.14
 	github.com/rs/zerolog v1.26.1
-	github.com/spf13/cobra v1.3.0
 	github.com/spf13/viper v1.10.1
 )
 
@@ -17,6 +16,7 @@ require (
 	github.com/charmbracelet/bubbles v0.10.3
 	github.com/charmbracelet/bubbletea v0.20.0
 	github.com/charmbracelet/lipgloss v0.5.0
+	github.com/muesli/coral v1.0.0
 )
 
 require (
@@ -26,6 +26,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/kr/pretty v0.2.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -44,6 +45,7 @@ require (
 	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )