Remove debug output from ls

.gitignore

@@ -21,6 +21,3 @@
 .vscode/configurationCache.log
 .vscode/dryrun.log
 .vscode/targets.log
-
-# packaging
-/build

Makefile

@@ -1,108 +1,29 @@
 V ?= 0
 Q = $(if $(filter 1, $V),, @)
-BINDIR=$(CURDIR)/bin
-PREFIX=/usr
-DESTDIR=bin
-BUILDDIR=$(CURDIR)/build
-MANDIR=$(PREFIX)/share/man/man1
 
-PKGREVISION=1
+BIN_DIR=./bin
-
-DEBBUILDDIR=$(BUILDDIR)/deb
-DEBTMPLDIR=$(CURDIR)/packaging/debian
-DEBDATE=$(shell date -R)
-DEBORIGSRC=lume_$(DEBVERSION).orig.tar.xz
-DEBORIGSRCDIR=lume-$(DEBVERSION)
-DEBREVISION=$(PKGREVISION)
-
-RPMVERSION=$(subst -,_,$(LUME_VERSION))
-RPMBUILDDIR=$(BUILDDIR)/rpm
-RPMTMPLDIR=$(CURDIR)/packaging/rpm
-RPMDATE=$(shell date "+%a %b %d %Y")
-RPMORIGSRC=lume-$(RPMVERSION).tar.xz
-RPMORIGSRCDIR=lume-$(RPMVERSION)
-RPMREVISION=$(PKGREVISION)
 
 ifeq ($(OS), Windows_NT)
-    EXE=$(BINDIR)/lume.exe
+    EXE=$(BIN_DIR)/lume.exe
 	RM=del /f /q
 	BUILD_DATE=$(shell powershell Get-Date -Format "yyyy-MM-ddThh:mm:sszzz")
 else
-    EXE=$(BINDIR)/lume
+    EXE=$(BIN_DIR)/lume
     RM=rm -f
 	BUILD_DATE=$(shell date --iso-8601=seconds)
 endif
 
 LUME_VERSION ?= $(shell git describe --tags --always)
 GIT_COMMIT := $(shell git rev-parse --short HEAD)
-GIT_TAG=$(shell git describe --tags --abbrev=0)
+LDFLAGS := $(LDFLAGS) \
-LDFLAGS = \
 	-X git.kill0.net/chill9/lume/cmd.Version=$(LUME_VERSION) \
 	-X git.kill0.net/chill9/lume/cmd.BuildDate=$(BUILD_DATE) \
 	-X git.kill0.net/chill9/lume/cmd.GitCommit=$(GIT_COMMIT)
 
-ifneq (,$(findstring -,$(LUME_VERSION)))
-	DEBVERSION=$(GIT_TAG)+git$(shell date +%Y%m%d)+$(GIT_COMMIT)
-else
-	DEBVERSION=$(LUME_VERSION)
-endif
-
 .PHONY: build
 build:
 	$(Q) go build -o $(EXE) -ldflags="$(LDFLAGS)" ./cmd/lume
 
 .PHONY: clean
-clean: deb-clean rpm-clean
+clean:
 	$(Q) $(RM) $(EXE)
-
-install-man:
-	install -p -D -m 0644 lume.1 $(DESTDIR)$(MANDIR)/lume.1
-
-.PHONY: install
-install: install-man
-	$(Q) install -p -D -m 0755 $(EXE) $(DESTDIR)${PREFIX}/bin/lume
-	$(Q) install -p -D -m 0644 .lumerc.sample $(DESTDIR)${PREFIX}/share/lume/lumerc
-
-.PHONY: deb
-deb: deb-clean
-	$(Q) mkdir -p $(DEBBUILDDIR)
-	$(Q) git archive --format tar --prefix lume-$(DEBVERSION)/ $(LUME_VERSION) | xz > $(DEBBUILDDIR)/$(DEBORIGSRC)
-	$(Q) tar xf $(DEBBUILDDIR)/$(DEBORIGSRC) -C $(DEBBUILDDIR)
-	$(Q) mkdir $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian
-	$(Q) mkdir $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/source
-	$(Q) sed -e 's/__VERSION__/$(DEBVERSION)/g' -e 's/__REVISION__/$(DEBREVISION)/g' $(DEBTMPLDIR)/rules > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/rules
-	$(Q) chmod 0755 $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/rules
-	$(Q) sed -e 's/__VERSION__/$(DEBVERSION)/g' -e 's/__DATE__/$(DEBDATE)/g' -e 's/__REVISION__/$(DEBREVISION)/g' $(DEBTMPLDIR)/changelog > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/changelog
-	$(Q) echo 10 > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/compat
-	$(Q) echo "3.0 (quilt)" > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/source/format
-	$(Q) cp $(DEBTMPLDIR)/control $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/control
-	$(Q) cp $(DEBTMPLDIR)/copyright $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/copyright
-	$(Q) cp $(DEBTMPLDIR)/lume.manpages $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/lume.manpages
-	$(Q) cd $(DEBBUILDDIR)/$(DEBORIGSRCDIR) && dpkg-buildpackage -us -uc
-	$(Q) mv $(DEBBUILDDIR)/*.dsc $(BUILDDIR)
-	$(Q) mv $(DEBBUILDDIR)/*.changes $(BUILDDIR)
-	$(Q) mv $(DEBBUILDDIR)/*.buildinfo $(BUILDDIR)
-	$(Q) mv $(DEBBUILDDIR)/*.deb $(BUILDDIR)
-	$(Q) mv $(DEBBUILDDIR)/*.tar.* $(BUILDDIR)
-
-.PHONY: rpm
-rpm: rpm-clean
-	$(Q) mkdir -p $(RPMBUILDDIR)/SPECS
-	$(Q) mkdir -p $(RPMBUILDDIR)/SOURCES
-	$(Q) sed -e 's/__VERSION__/$(RPMVERSION)/g' -e 's/__DATE__/$(RPMDATE)/g' -e 's/__REVISION__/$(RPMREVISION)/g' $(RPMTMPLDIR)/lume.spec > $(RPMBUILDDIR)/SPECS/lume.spec
-	$(Q) git archive --format tar --prefix $(RPMORIGSRCDIR)/ $(LUME_VERSION) | xz > $(RPMBUILDDIR)/SOURCES/$(RPMORIGSRC)
-	$(Q) rpmbuild --define "_topdir $(RPMBUILDDIR)"  -ba $(RPMBUILDDIR)/SPECS/lume.spec
-	$(Q) mv $(RPMBUILDDIR)/RPMS/*/*.rpm $(BUILDDIR)
-	$(Q) mv $(RPMBUILDDIR)/SRPMS/*.rpm $(BUILDDIR)
-
-deb-clean:
-	$(Q) rm -rf $(DEBBUILDDIR)
-	$(Q) rm -f $(BUILDDIR)/*.dsc
-	$(Q) rm -f $(BUILDDIR)/*.changes
-	$(Q) rm -f $(BUILDDIR)/*.buildinfo
-	$(Q) rm -f $(BUILDDIR)/*.deb
-	$(Q) rm -f $(BUILDDIR)/*.tar.*
-
-rpm-clean:
-	$(Q) rm -rf $(RPMBUILDDIR)
-	$(Q) rm -f $(BUILDDIR)/*.rpm

cmd/breathe.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 
 	"git.kill0.net/chill9/lifx-go"
 )
@@ -17,8 +16,7 @@ func NewCmdBreathe() Command {
 			selector := fs.String("selector", defaultSelector, "Set the selector")
 			fs.StringVar(selector, "s", defaultSelector, "Set the selector")
 
-			color := fs.String("color", defaultColor, "The color to use for the breathe effect")
+			fs.String("color", defaultColor, "The color to use for the breathe effect")
-			fs.StringVar(color, "c", defaultColor, "The color to use for the breathe effect")
 
 			fs.String("from-color", defaultColor, "The color to start the effect from")
 
@@ -45,10 +43,7 @@ func BreatheCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	breathe := lifx.NewBreathe()
 	selector := ctx.Flags.String("selector")
-	format, err := getOutputFormatFromFlags(ctx.Flags)
+	format := ctx.Flags.String("output-format")
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -103,7 +98,7 @@ func BreatheCmd(ctx Context) (int, error) {
 	}
 
 	p = NewPrinter(format)
-	fmt.Print(p.Results(r.Results))
+	p.Results(r.Results)
 
 	return ExitSuccess, nil
 }

cmd/command.go

@@ -1,7 +1,6 @@
 package lumecmd
 
 import (
-	"errors"
 	"flag"
 	"fmt"
 	"strconv"
@@ -101,22 +100,6 @@ func GetCommand(name string) (Command, bool) {
 func mergeGlobalFlags(fs *flag.FlagSet) {
 	fs.Bool("debug", false, "Enable debug mode")
 
-	formatTable := fs.Bool("table", false, "Format output as an ASCII table")
+	outputFormat := fs.String("output-format", defaultOutputFormat, "Set the output format")
-	fs.BoolVar(formatTable, "t", false, "Format output as an ASCII table")
+	fs.StringVar(outputFormat, "o", defaultOutputFormat, "Set the output format")
-
-	fs.Bool("simple", false, "Format output simply")
-}
-
-func getOutputFormatFromFlags(fs Flags) (string, error) {
-	formatSimple := fs.Bool("simple")
-	formatTable := fs.Bool("table")
-
-	switch {
-	case formatSimple && formatTable:
-		return "", errors.New("only one output format permitted")
-	case formatTable:
-		return "table", nil
-	default:
-		return "simple", nil
-	}
 }

cmd/config.go

@@ -12,7 +12,6 @@ import (
 
 const lumercFile string = ".lumerc"
 const lumeConfigFile string = "lume.conf"
-const defaultPowerIndicator rune = '●'
 
 type Config struct {
 	AccessToken  string               `toml:"access_token"`
@@ -20,7 +19,6 @@ type Config struct {
 	Colors       map[string][]float32 `toml:"colors"`
 	userAgent    string
 	Debug        bool `toml:"debug"`
-	Indicator    string `toml:"indicator"`
 }
 
 var (
@@ -35,7 +33,6 @@ func NewConfig() *Config {
 	c.userAgent = initUserAgent()
 	c.Debug = false
 	c.OutputFormat = "simple"
-	c.Indicator = string(defaultPowerIndicator)
 	return c
 }
 
@@ -51,10 +48,6 @@ func (c *Config) Validate() error {
 		return errors.New("access_token is not set")
 	}
 
-	if len([]rune(c.Indicator)) != 1 {
-		return errors.New("indicator must be a single rune")
-	}
-
 	if err = c.validateColors(); err != nil {
 		return err
 	}
@@ -94,6 +87,8 @@ func LoadConfig(s string) (*Config, error) {
 	var err error
 	var c *Config = GetConfig()
 
+	*c = DefaultConfig
+
 	if _, err := toml.Decode(s, &c); err != nil {
 		err = fmt.Errorf("fatal: failed to parse; %w", err)
 	}
@@ -106,6 +101,8 @@ func LoadConfigFile(configPath string) (*Config, error) {
 
 	var c *Config = GetConfig()
 
+	*c = DefaultConfig
+
 	if _, err := toml.DecodeFile(configPath, &c); err != nil {
 		err = fmt.Errorf("fatal: failed to parse %s; %w", configPath, err)
 	}

cmd/help.go

@@ -3,7 +3,6 @@ package lumecmd
 import (
 	"fmt"
 	"sort"
-	"strings"
 )
 
 func NewCmdHelp() Command {
@@ -17,21 +16,15 @@ func NewCmdHelp() Command {
 
 func HelpCmd(ctx Context) (int, error) {
 	if len(ctx.Args) == 0 {
-		fmt.Print(printHelp(commandRegistry))
+		printHelp(commandRegistry)
 	} else if len(ctx.Args) >= 1 {
-		if cmdHelp, err := printCmdHelp(ctx.Args[0]); err == nil {
+		printCmdHelp(ctx.Args[0])
-			fmt.Print(cmdHelp)
-		} else {
-			fmt.Print(err)
-		}
 	}
 
 	return ExitSuccess, nil
 }
 
-func printHelp(commands map[string]Command) string {
+func printHelp(commands map[string]Command) {
-	var b strings.Builder
-
 	var maxLen, cmdLen int
 	var keys []string
 
@@ -43,45 +36,34 @@ func printHelp(commands map[string]Command) string {
 		}
 	}
 
-	fmt.Fprintf(&b, "usage:\n  lume <command> [<args...>]")
+	fmt.Printf("usage:\n  lume <command> [<args...>]")
-	fmt.Fprintln(&b)
+	fmt.Println()
-	fmt.Fprintln(&b, "\ncommands:")
+	fmt.Println("\ncommands:")
 
 	sort.Strings(keys)
-
 	for _, k := range keys {
 		c := commands[k]
-		fmt.Fprintf(&b, "  %-*s    %s\n", maxLen, c.Name, c.Short)
+		fmt.Printf("  %-*s    %s\n", maxLen, c.Name, c.Short)
+	}
 }
 
-	return b.String()
+func printCmdHelp(name string) error {
-}
-
-func printCmdHelp(name string) (string, error) {
-	var b strings.Builder
-
 	subCmd, ok := commandRegistry[name]
-
 	if !ok {
-		return "", fmt.Errorf("unknown commnnd: %s\n", name)
+		return fmt.Errorf("unknown commnnd: %s\n", name)
 	}
 
 	if subCmd.Use != "" {
-		fmt.Fprintf(&b, "usage:\n  lume %s %s\n", subCmd.Name, subCmd.Use)
+		fmt.Printf("usage:\n  lume %s %s\n", subCmd.Name, subCmd.Use)
 	} else {
-		fmt.Fprintf(&b, "usage:\n  lume %s\n", subCmd.Name)
+		fmt.Printf("usage:\n  lume %s\n", subCmd.Name)
 	}
 
 	if subCmd.Flags != nil {
-		out := subCmd.Flags.Output()
+		fmt.Println()
-		defer subCmd.Flags.SetOutput(out)
+		fmt.Print("flags:\n")
-
-		fmt.Fprintln(&b)
-		fmt.Fprint(&b, "flags:\n")
-
-		subCmd.Flags.SetOutput(&b)
 		subCmd.Flags.PrintDefaults()
 	}
 
-	return b.String(), nil
+	return nil
 }

cmd/ls.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 )
 
 func NewCmdLs() Command {
@@ -27,10 +26,7 @@ func LsCmd(ctx Context) (int, error) {
 
 	c := ctx.Client
 	selector := ctx.Flags.String("selector")
-	format, err := getOutputFormatFromFlags(ctx.Flags)
+	format := ctx.Flags.String("output-format")
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -43,7 +39,7 @@ func LsCmd(ctx Context) (int, error) {
 	}
 
 	p = NewPrinter(format)
-	fmt.Print(p.Lights(lights))
+	p.Lights(lights)
 
 	return ExitSuccess, nil
 }

cmd/main.go

@@ -20,7 +20,6 @@ func init() {
 	RegisterCommand(NewCmdToggle())
 	RegisterCommand(NewCmdVersion())
 	RegisterCommand(NewCmdBreathe())
-	RegisterCommand(NewCmdValidate())
 }
 
 var Version string

cmd/poweroff.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 
 	"git.kill0.net/chill9/lifx-go"
 )
@@ -33,11 +32,8 @@ func PoweroffCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	duration := ctx.Flags.Float64("duration")
 	selector := ctx.Flags.String("selector")
+	format := ctx.Flags.String("output-format")
 	state := lifx.State{Power: "off", Duration: duration}
-	format, err := getOutputFormatFromFlags(ctx.Flags)
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -49,7 +45,7 @@ func PoweroffCmd(ctx Context) (int, error) {
 	}
 
 	p = NewPrinter(format)
-	fmt.Print(p.Results(r.Results))
+	p.Results(r.Results)
 
 	return ExitSuccess, nil
 }

cmd/poweron.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 
 	"git.kill0.net/chill9/lifx-go"
 )
@@ -33,11 +32,8 @@ func PoweronCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	duration := ctx.Flags.Float64("duration")
 	selector := ctx.Flags.String("selector")
+	format := ctx.Flags.String("output-format")
 	state := lifx.State{Power: "on", Duration: duration}
-	format, err := getOutputFormatFromFlags(ctx.Flags)
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -49,7 +45,7 @@ func PoweronCmd(ctx Context) (int, error) {
 	}
 
 	p = NewPrinter(format)
-	fmt.Print(p.Results(r.Results))
+	p.Results(r.Results)
 
 	return ExitSuccess, nil
 }

cmd/print.go

@@ -2,8 +2,7 @@ package lumecmd
 
 import (
 	"fmt"
-	"io"
+	"os"
-	"strings"
 	"time"
 
 	"git.kill0.net/chill9/lifx-go"
@@ -12,8 +11,8 @@ import (
 )
 
 type Printer interface {
-	Results(results []lifx.Result) string
+	Results(results []lifx.Result)
-	Lights(lights []lifx.Light) string
+	Lights(lights []lifx.Light)
 }
 
 type defaultPrinter struct{}
@@ -29,19 +28,17 @@ func NewPrinter(format string) Printer {
 	}
 }
 
-func (dp *defaultPrinter) Results(results []lifx.Result) string {
+func (dp *defaultPrinter) Results(results []lifx.Result) {
-	var b strings.Builder
-
 	sortResults(results)
 
-	table := tablewriter.NewWriter(&b)
+	table := tablewriter.NewWriter(os.Stdout)
 	_, rows := makeResultsTable(results)
 
 	for _, v := range rows {
 		table.Append(v)
 	}
 
-	fmt.Fprintf(&b, "total %d\n", len(results))
+	fmt.Printf("total %d\n", len(results))
 	table.SetAlignment(tablewriter.ALIGN_LEFT)
 	table.SetAutoWrapText(false)
 	table.SetBorder(false)
@@ -52,16 +49,12 @@ func (dp *defaultPrinter) Results(results []lifx.Result) string {
 	table.SetRowSeparator("")
 	table.SetTablePadding(" ")
 	table.Render()
-
-	return b.String()
 }
 
-func (tp *tablePrinter) Results(results []lifx.Result) string {
+func (tp *tablePrinter) Results(results []lifx.Result) {
-	var b strings.Builder
-
 	sortResults(results)
 
-	table := tablewriter.NewWriter(&b)
+	table := tablewriter.NewWriter(os.Stdout)
 	hdr, rows := makeResultsTable(results)
 
 	for _, v := range rows {
@@ -70,23 +63,19 @@ func (tp *tablePrinter) Results(results []lifx.Result) string {
 
 	table.SetHeader(hdr)
 	table.Render()
-
-	return b.String()
 }
 
-func (dp *defaultPrinter) Lights(lights []lifx.Light) string {
+func (dp *defaultPrinter) Lights(lights []lifx.Light) {
-	var b strings.Builder
-
 	sortLights(lights)
 
-	table := tablewriter.NewWriter(&b)
+	table := tablewriter.NewWriter(os.Stdout)
 	_, rows := makeLightsTable(lights)
 
 	for _, v := range rows {
 		table.Append(v)
 	}
 
-	fmt.Fprintf(&b, "total %d\n", len(lights))
+	fmt.Printf("total %d\n", len(lights))
 	table.SetAlignment(tablewriter.ALIGN_LEFT)
 	table.SetAutoWrapText(false)
 	table.SetBorder(false)
@@ -97,16 +86,12 @@ func (dp *defaultPrinter) Lights(lights []lifx.Light) string {
 	table.SetRowSeparator("")
 	table.SetTablePadding(" ")
 	table.Render()
-
-	return b.String()
 }
 
-func (tp *tablePrinter) Lights(lights []lifx.Light) string {
+func (tp *tablePrinter) Lights(lights []lifx.Light) {
-	var b strings.Builder
-
 	sortLights(lights)
 
-	table := tablewriter.NewWriter(&b)
+	table := tablewriter.NewWriter(os.Stdout)
 	hdr, rows := makeLightsTable(lights)
 
 	for _, v := range rows {
@@ -115,17 +100,6 @@ func (tp *tablePrinter) Lights(lights []lifx.Light) string {
 
 	table.SetHeader(hdr)
 	table.Render()
-
-	return b.String()
-}
-
-func ColorizeIndicator(s string) string {
-	c := color.New(color.FgRed)
-	if s == "on" {
-		c = color.New(color.FgGreen)
-	}
-
-	return c.Sprint(GetConfig().Indicator)
 }
 
 func ColorizePower(s string) string {
@@ -155,17 +129,11 @@ func PrintfWithIndent(indent int, format string, a ...interface{}) (n int, err e
 	return fmt.Printf(format, a...)
 }
 
-func FprintfWithIndent(w io.Writer, indent int, format string, a ...interface{}) (n int, err error) {
-	format = fmt.Sprintf("%*s%s", indent, "", format)
-	return fmt.Fprintf(w, format, a...)
-}
-
 func makeLightsTable(lights []lifx.Light) (hdr []string, rows [][]string) {
-	hdr = []string{"", "ID", "Location", "Group", "Label", "Last Seen", "Power"}
+	hdr = []string{"ID", "Location", "Group", "Label", "Last Seen", "Power"}
 
 	for _, l := range lights {
 		rows = append(rows, []string{
-			fmt.Sprint(ColorizeIndicator(l.Power)),
 			fmt.Sprint(l.Id),
 			fmt.Sprint(l.Location.Name),
 			fmt.Sprint(l.Group.Name),

cmd/setcolor.go

@@ -54,10 +54,7 @@ func SetColorCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	state := lifx.State{}
 	selector := ctx.Flags.String("selector")
-	format, err := getOutputFormatFromFlags(ctx.Flags)
+	format := ctx.Flags.String("output-format")
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -130,7 +127,7 @@ func SetColorCmd(ctx Context) (int, error) {
 
 	if !fast {
 		p = NewPrinter(format)
-		fmt.Print(p.Results(r.Results))
+		p.Results(r.Results)
 	}
 
 	return ExitSuccess, nil

cmd/setstate.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 
 	"git.kill0.net/chill9/lifx-go"
 )
@@ -48,10 +47,7 @@ func SetStateCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	state := lifx.State{}
 	selector := ctx.Flags.String("selector")
-	format, err := getOutputFormatFromFlags(ctx.Flags)
+	format := ctx.Flags.String("output-format")
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -97,7 +93,7 @@ func SetStateCmd(ctx Context) (int, error) {
 
 	if !fast {
 		p = NewPrinter(format)
-		fmt.Print(p.Results(r.Results))
+		p.Results(r.Results)
 	}
 
 	return ExitSuccess, nil

cmd/setwhite.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 
 	"git.kill0.net/chill9/lifx-go"
 )
@@ -51,10 +50,7 @@ func SetWhiteCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	state := lifx.State{}
 	selector := ctx.Flags.String("selector")
-	format, err := getOutputFormatFromFlags(ctx.Flags)
+	format := ctx.Flags.String("output-format")
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -115,7 +111,7 @@ func SetWhiteCmd(ctx Context) (int, error) {
 
 	if !fast {
 		p = NewPrinter(format)
-		fmt.Print(p.Results(r.Results))
+		p.Results(r.Results)
 	}
 
 	return ExitSuccess, nil

cmd/show.go

@@ -3,7 +3,6 @@ package lumecmd
 import (
 	"flag"
 	"fmt"
-	"strings"
 )
 
 const Tabstop int = 2
@@ -27,8 +26,6 @@ func NewCmdShow() Command {
 
 func ShowCmd(ctx Context) (int, error) {
 	var indent int
-	var b strings.Builder
-
 	c := ctx.Client
 	selector := ctx.Flags.String("selector")
 	lights, err := c.ListLights(selector)
@@ -41,52 +38,48 @@ func ShowCmd(ctx Context) (int, error) {
 
 	for i, l := range lights {
 		indent = 0
-		fmt.Fprintf(
+		fmt.Printf(
-			&b,
+			"Light ID: %s, %s, Power: %s\n",
-			"%s Light ID: %s, %s, Power: %s\n",
-			ColorizeIndicator(l.Power),
 			l.Id,
 			connected(l.Connected),
 			ColorizePower(l.Power),
 		)
-		indent += Tabstop + 2
-		FprintfWithIndent(&b, indent, "Label: %s, ID: %s\n", l.Label, l.Id)
-		FprintfWithIndent(&b, indent, "UUID: %s\n", l.UUID)
-		FprintfWithIndent(&b, indent, "Location: %s, ID: %s\n", l.Location.Name, l.Location.Id)
-		FprintfWithIndent(&b, indent, "Group: %s, ID: %s\n", l.Group.Name, l.Group.Id)
-		FprintfWithIndent(&b, indent, "Color: Hue: %.1f, Saturation: %.1f%%, Kelvin: %d\n",
-			*l.Color.H, *l.Color.S, *l.Color.K)
-		FprintfWithIndent(&b, indent, "Brightness: %.1f%%\n", l.Brightness*100)
-		if l.Effect != "" {
-			FprintfWithIndent(&b, indent, "Effect: %s\n", l.Effect)
-		}
-		FprintfWithIndent(&b, indent, "Product: %s\n", l.Product.Name)
-		FprintfWithIndent(&b, indent, "Capabilities: ")
-		fmt.Fprintf(&b, "Color: %s, ", YesNo(l.Product.Capabilities.HasColor))
-		fmt.Fprintf(&b, "Variable Color Temp: %s, ", YesNo(l.Product.Capabilities.HasVariableColorTemp))
-		fmt.Fprintf(&b, "IR: %s, ", YesNo(l.Product.Capabilities.HasIR))
-		fmt.Fprintf(&b, "Chain: %s, ", YesNo(l.Product.Capabilities.HasChain))
-		fmt.Fprintf(&b, "Multizone: %s, ", YesNo(l.Product.Capabilities.HasMultizone))
-		fmt.Fprintf(&b, "Min Kelvin: %.1f, ", l.Product.Capabilities.MinKelvin)
-		fmt.Fprintf(&b, "Max Kelvin: %.1f ", l.Product.Capabilities.MaxKelvin)
-		fmt.Fprintln(&b)
-		// List applicable selectors (most to least specific)
-		FprintfWithIndent(&b, indent, "Selectors:\n")
 		indent += Tabstop
-		FprintfWithIndent(&b, indent, "id:%s\n", l.Id)
+		PrintfWithIndent(indent, "Label: %s, ID: %s\n", l.Label, l.Id)
-		FprintfWithIndent(&b, indent, "label:%s\n", l.Label)
+		PrintfWithIndent(indent, "UUID: %s\n", l.UUID)
-		FprintfWithIndent(&b, indent, "group_id:%s\n", l.Group.Id)
+		PrintfWithIndent(indent, "Location: %s, ID: %s\n", l.Location.Name, l.Location.Id)
-		FprintfWithIndent(&b, indent, "group:%s\n", l.Group.Name)
+		PrintfWithIndent(indent, "Group: %s, ID: %s\n", l.Group.Name, l.Group.Id)
-		FprintfWithIndent(&b, indent, "location_id:%s\n", l.Location.Id)
+		PrintfWithIndent(indent, "Color: Hue: %.1f, Saturation: %.1f%%, Kelvin: %d\n",
-		FprintfWithIndent(&b, indent, "location:%s\n", l.Location.Name)
+			*l.Color.H, *l.Color.S, *l.Color.K)
+		PrintfWithIndent(indent, "Brightness: %.1f%%\n", l.Brightness*100)
+		if l.Effect != "" {
+			PrintfWithIndent(indent, "Effect: %s\n", l.Effect)
+		}
+		PrintfWithIndent(indent, "Product: %s\n", l.Product.Name)
+		PrintfWithIndent(indent, "Capabilities: ")
+		fmt.Printf("Color: %s, ", YesNo(l.Product.Capabilities.HasColor))
+		fmt.Printf("Variable Color Temp: %s, ", YesNo(l.Product.Capabilities.HasVariableColorTemp))
+		fmt.Printf("IR: %s, ", YesNo(l.Product.Capabilities.HasIR))
+		fmt.Printf("Chain: %s, ", YesNo(l.Product.Capabilities.HasChain))
+		fmt.Printf("Multizone: %s, ", YesNo(l.Product.Capabilities.HasMultizone))
+		fmt.Printf("Min Kelvin: %.1f, ", l.Product.Capabilities.MinKelvin)
+		fmt.Printf("Max Kelvin: %.1f ", l.Product.Capabilities.MaxKelvin)
+		fmt.Println()
+		// List applicable selectors (most to least specific)
+		PrintfWithIndent(indent, "Selectors:\n")
+		indent += Tabstop
+		PrintfWithIndent(indent, "id:%s\n", l.Id)
+		PrintfWithIndent(indent, "label:%s\n", l.Label)
+		PrintfWithIndent(indent, "group_id:%s\n", l.Group.Id)
+		PrintfWithIndent(indent, "group:%s\n", l.Group.Name)
+		PrintfWithIndent(indent, "location_id:%s\n", l.Location.Id)
+		PrintfWithIndent(indent, "location:%s\n", l.Location.Name)
 		indent -= Tabstop
-		FprintfWithIndent(&b, indent, "Last Seen: %s (%.1fs ago)\n", l.LastSeen, l.SecondsLastSeen)
+		PrintfWithIndent(indent, "Last Seen: %s (%.1fs ago)\n", l.LastSeen, l.SecondsLastSeen)
 
 		if i < len(lights)-1 {
-			fmt.Fprintln(&b)
+			fmt.Println()
 		}
-
-		fmt.Print(b.String())
 	}
 	return ExitSuccess, nil
 }

cmd/toggle.go

@@ -2,7 +2,6 @@ package lumecmd
 
 import (
 	"flag"
-	"fmt"
 )
 
 func NewCmdToggle() Command {
@@ -31,10 +30,7 @@ func ToggleCmd(ctx Context) (int, error) {
 	c := ctx.Client
 	duration := ctx.Flags.Float64("duration")
 	selector := ctx.Flags.String("selector")
-	format, err := getOutputFormatFromFlags(ctx.Flags)
+	format := ctx.Flags.String("output-format")
-	if err != nil {
-		return ExitFailure, err
-	}
 
 	if format == "" && ctx.Config.OutputFormat != "" {
 		format = ctx.Config.OutputFormat
@@ -46,7 +42,7 @@ func ToggleCmd(ctx Context) (int, error) {
 	}
 
 	p = NewPrinter(format)
-	fmt.Print(p.Results(r.Results))
+	p.Results(r.Results)
 
 	return ExitSuccess, nil
 }

cmd/validate.go

@@ -1,51 +0,0 @@
-package lumecmd
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"strings"
-
-	"git.kill0.net/chill9/lifx-go"
-)
-
-func NewCmdValidate() Command {
-	return Command{
-		Name: "validate",
-		Func: ValidateCmd,
-		Flags: func() *flag.FlagSet {
-			fs := flag.NewFlagSet("validate", flag.ExitOnError)
-
-			return fs
-		}(),
-		Use:   "<command>",
-		Short: "Validate a color string",
-	}
-}
-
-func ValidateCmd(ctx Context) (int, error) {
-	var b strings.Builder
-	c := ctx.Client
-
-	if len(ctx.Args) != 1 {
-		fmt.Print(printCmdHelp(ctx.Name))
-		return ExitFailure, nil
-	}
-
-	color := lifx.NamedColor(ctx.Args[0])
-
-	i, err := c.ValidateColor(color)
-	if err != nil {
-		return ExitFailure, err
-	}
-
-	if validColor, ok := i.(*lifx.HSBKColor); ok {
-		fmt.Fprintln(&b, validColor)
-	} else {
-		return ExitFailure, errors.New("go type %T but wanted *HSBKColor")
-	}
-
-	fmt.Print(b.String())
-
-	return ExitSuccess, nil
-}

go.mod

@@ -3,7 +3,7 @@ module git.kill0.net/chill9/lume
 go 1.15
 
 require (
-	git.kill0.net/chill9/lifx-go v0.0.0-20210418161634-4c1678b62c73
+	git.kill0.net/chill9/lifx-go v0.0.0-20210329222320-2107a0586447
 	github.com/BurntSushi/toml v0.3.1
 	github.com/fatih/color v1.10.0
 	github.com/mattn/go-runewidth v0.0.10 // indirect

go.sum

@@ -4,8 +4,6 @@ git.kill0.net/chill9/lifx-go v0.0.0-20210323044657-dbe1c40e1621 h1:koWq2W08Hjmvs
 git.kill0.net/chill9/lifx-go v0.0.0-20210323044657-dbe1c40e1621/go.mod h1:jInpjEqTBhrFpQKk7zPIWISvgjjfS2djXeKB3yB/8dY=
 git.kill0.net/chill9/lifx-go v0.0.0-20210329222320-2107a0586447 h1:tN+zR5aszesrZRrhS3uOqAIWLcADCIH7GFJ6SOQS9r0=
 git.kill0.net/chill9/lifx-go v0.0.0-20210329222320-2107a0586447/go.mod h1:jInpjEqTBhrFpQKk7zPIWISvgjjfS2djXeKB3yB/8dY=
-git.kill0.net/chill9/lifx-go v0.0.0-20210418161634-4c1678b62c73 h1:fteCAelwAcfam2Q8eeJFyK4+sXGOpR6Me5YMKBi+MYY=
-git.kill0.net/chill9/lifx-go v0.0.0-20210418161634-4c1678b62c73/go.mod h1:jInpjEqTBhrFpQKk7zPIWISvgjjfS2djXeKB3yB/8dY=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=

lume.1

@@ -1,186 +0,0 @@
-.Dd $Mdocdate$
-
-.Dt lume \&1 "User Commands"
-
-.Sh NAME
-.Nm lume
-.Nd CLI tool for the LIFX HTTP API
-
-.Sh SYNOPSIS
-.Nm lume
-.Ar COMMAND
-.Op Ar OPTIONS ...
-
-.Sh COMMANDS
-.Bl -tag -width Ds
-.It Xo Ic breathe
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Fl c | Fl Fl color
-.Op Fl Fl from-color Ns = Ns Ar color
-.Op Fl Fl cycles Ns = Ns Ar cycles
-.Op Fl Fl peak Ns = Ns Ar peak
-.Op Fl Fl period Ns = Ns Ar period
-.Op Fl Fl persist
-.Op Fl Fl power-on
-.Xc
-.It Xo Ic help
-.Op Ar COMMAND
-.Xc
-Print the help message. If a command is specified, then show the subcommand's help message.
-.It Xo Ic ls
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Xc
-List the lights and their basic state
-.It Xo Ic poweroff
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Op Fl d | Fl Fl duration
-.Xc
-Power off lights
-.It Xo Ic poweron
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Op Fl d | Fl Fl duration
-.Xc
-Power off lights
-.It Xo Ic set-color
-.Op Fl b Ar brightness | Fl Fl brightness Ns = Ns Ar brightness
-.Op Fl d | Fl Fl duration
-.Op Fl f Ar fast | Fl Fl fast Ns = Ns Ar fast
-.Op Fl H Ar hue | Fl Fl hue Ns = Ns Ar hue
-.Op Fl n Ar name | Fl Fl name Ns = Ns Ar name
-.Op Fl p Ar power | Fl Fl power Ns = Ns Ar power
-.Op Fl r Ar rgb | Fl Fl rgb Ns = Ns Ar rgb
-.Op Fl S Ar saturation | Fl Fl saturation Ns = Ns Ar saturation
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Xc
-Set light color
-.It Xo Ic set-state
-.Op Fl b Ar brightness | Fl Fl brightness Ns = Ns Ar brightness
-.Op Fl c | Fl Fl color
-.Op Fl d | Fl Fl duration
-.Op Fl f Ar fast | Fl Fl fast Ns = Ns Ar fast
-.Op Fl i Ar infrared | Fl Fl infrared Ns = Ns Ar infrared
-.Op Fl p Ar power | Fl Fl power Ns = Ns Ar power
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Xc
-Set light properties
-.It Xo Ic set-white
-.Op Fl b Ar brightness | Fl Fl brightness Ns = Ns Ar brightness
-.Op Fl d | Fl Fl duration
-.Op Fl f Ar fast | Fl Fl fast Ns = Ns Ar fast
-.Op Fl i Ar infrared | Fl Fl infrared Ns = Ns Ar infrared
-.Op Fl k Ar kelvin | Fl Fl kelvin Ns = Ns Ar kelvin
-.Op Fl n Ar name | Fl Fl name Ns = Ns Ar name
-.Op Fl p Ar power | Fl Fl power Ns = Ns Ar power
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Xc
-Set light white levels
-.It Xo Ic show
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Xc
-Show extended details about the lights
-.It Xo Ic toggle
-.Op Fl d | Fl Fl duration
-.Op Fl s Ar selector | Fl Fl selector Ns = Ns Ar selector
-.Op Fl Fl simple | Fl Fl table
-.Xc
-Toggle the power
-.It Xo Ic validate
-.Ar color_string
-.Xc
-Validate a color string
-.It Xo Ic version
-.Xc
-Print the version
-.El
-
-.Sh OPTIONS 
-.Bl -tag -width Ds
-.It Fl b , Fl Fl brightness Ns = Ns Ar brightness
-The brightness level from 0.0 to 1.0. Overrides any brightness set in color (if any)
-.It Fl c , Fl Fl color Ns = Ns Ar color
-This color to use for the action.
-.Pp
-When used with the
-.Nm breathe
-effect, this
-is the "to" color.
-.It Fl Fl cycles Ns = Ns Ar cycles
-The number of times to repeat the effect. Defaults to 1.0 cycle.
-.It Fl d , Fl Fl duration Ns = Ns Ar duration
-The time in seconds to spend performing the action. Range: 0.0 – 3155760000.0 (100 years).
-.It Fl f , Fl Fl fast
-Execute the action fast without any state checks or waiting for the result from the HTTP API
-.It Fl Fl from-color Ns = Ns Ar color
-The color to start the
-.Nm breathe
-effect from. If this parameter is omitted
-then the color the bulb is currently set to is used instead.
-.It Fl H , Fl Fl hue Ns = Ns Ar hue
-Sets the hue. Range 0 - 360.
-.It Fl i , Fl Fl infrared Ns = Ns Ar infrared
-Sets the maximum  brightness of the infrared channel from 0.0 to 1.0.
-.It Fl k , Fl Fl kelvin Ns = Ns Ar kelvin
-Set the kelvin value. The saturation is automatically set to 0.
-.It Fl n , Fl Fl name Ns = Ns Ar name
-Set the color using a named color from
-.Pa lumerc
-.It Fl Fl peak Ns = Ns Ar peak
-Defines where in a period the target color is at its maximum. Minimum 0.0,
-maximum 1.0. Defaults to 0.5.
-.It Fl Fl period Ns = Ns Ar period
-The time in seconds for one cycle of the
-.Nm breathe
-effect. Defaults to 1.0
-second.
-.It Fl Fl persist
-If false set the light back to its previous value when effect ends, if true
-leave the last effect color.
-.It Fl p , Fl Fl power Ns = Ns Ar [ on | off ]
-Set the power state
-.It Fl Fl power-on
-If true, turn the bulb on if it is not already on.
-.It Fl r , Fl Fl rgb Ns = Ns Ar R,G,B
-Set the color via a comma delimited R,G,B string. Values range from 0 - 255.
-.It Fl S , Fl Fl saturation Ns = Ns Ar saturation
-Set the saturation. Range 0.0 - 1.0.
-.It Fl s , Fl Fl selector Ns = Ns Ar selector
-The selector is used to group lights together belonging in the same account
-.Pp
-Selectors can be in the following format: all, label:[value], id:[value], group_id:[value], group:[value], location_id:[value], location:[value], scene_id:[value]
-.Pp
-The default selector is "all"
-.Sh FILES
-.Bl -tag -width "~/.config/lume/lume.conf" -compact
-.It Pa ~/.lumerc
-Default
-.Nm
-configuration file
-.It Pa ~/.config/lume/lume.conf
-XDG config home
-.Nm
-configuration file
-.Sh EXAMPLES
-Sample
-.Pa lumerc
-file:
-.Bd -literal -offset indent
-access_token = "token"
-# indicator = "●"
-# output_format = "table"
-
-[colors]
-purple_candy = [ 280.0, 0.29, 0.71 ]
-wasabi = [ 120.0, 1.0, 0.7 ]
-honeydew = [ 120.0, 1.0, 0.97 ]
-green_mist = [ 92.0, 0.72, 0.75 ]
-pea = [ 90.0, 0.42, 0.47 ]
-cat_eye = [ 76.0, 0.74, 0.61 ]
-seagreen = [ 160.0, 1.0, 0.50 ]
-blue_mist = [ 202.0, 0.97, 0.75 ]
-.Ed

packaging/debian/changelog

@@ -1,5 +0,0 @@
-lume (__VERSION__-__REVISION__) unstable; urgency=medium
-
-  * Package generated with make deb
-
- -- Ryan Cavicchioni <ryan@cavi.cc>  __DATE__

packaging/debian/control

@@ -1,14 +0,0 @@
-Source: lume
-Section: unknown
-Priority: optional
-Maintainer: Ryan Cavicchioni <ryan@cavi.cc>
-Build-Depends: debhelper (>= 10)
-Standards-Version: 4.1.2
-Homepage: https://git.kill0.net/chill9/lume
-Vcs-Git: https://git.kill0.net/chill9/lume.git
-Vcs-Browser: https://git.kill0.net/chill9/lume.git
-
-Package: lume
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A CLI tool for the LIFX HTTP API

packaging/debian/copyright

@@ -1,28 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: lume
-Source: https://git.kill0.net/chill9/lume
-
-Files: *
-Copyright: 2021 Ryan Cavicchioni <ryan@cavi.cc>
-License: MPL-2.0
-
-License: MPL-2.0
- Licensed under the Mozilla Public License License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.  You may
- obtain a copy of the License at
- .
- https://www.mozilla.org/en-US/MPL/2.0/
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Mozilla Public License version 2.0
- license can be found in "/usr/share/common-licenses/MPL-2.0".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

packaging/debian/lume.manpages

@@ -1 +0,0 @@
-lume.1

packaging/debian/rules

@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-
-DISTRIBUTION = $(shell lsb_release -sr)
-VERSION = __VERSION__
-REVISION = __REVISION__
-PACKAGEVERSION = $(VERSION)-$(REVISION)
-
-%:
-	dh $@
-
-override_dh_auto_clean:
-override_dh_auto_test:
-override_dh_auto_build:
-	make
-override_dh_auto_install:
-	make install DESTDIR=debian/lume
-
-override_dh_gencontrol:
-	dh_gencontrol -- -v$(PACKAGEVERSION)

packaging/rpm/lume.spec

@@ -1,33 +0,0 @@
-Name:           lume
-Version:        __VERSION__
-Release:        __REVISION__%{?dist}
-Summary:        A CLI tool for the LIFX HTTP API
-
-License:        MPL
-URL:            https://git.kill0.net/chill9/lume
-Source:         %{name}-%{version}.tar.xz
-
-%global debug_package %{nil}
-
-%description
-
-%prep
-%setup
-
-%build
-%make_build
-
-%install
-%make_install DESTDIR=%{buildroot}
-
-
-%files
-%{_bindir}/lume
-%license LICENSE
-/usr/share/lume/lumerc
-%doc %{_mandir}/man1/lume.1.*
-
-
-%changelog
-* __DATE__ Ryan Cavicchioni <ryan@cavi.cc>
-- lume __VERSION__