Updated to use v2 imports (removes dependancy on v1)

various doc updates as well.

artlayer.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/sbrow/ps/runner"
+	"github.com/sbrow/ps/v2/runner"
 )
 
 // ArtLayer reflects some values from an Art Layer in a Photoshop document.

colors.go

@@ -22,9 +22,9 @@ type Color interface {
 func Compare(a, b Color) Color {
 	A := a.RGB()
 	B := b.RGB()
-	Aavg := (A[0] + A[1] + A[2]) / 3
-	Bavg := (B[0] + B[1] + B[2]) / 3
-	if Aavg > Bavg {
+	avgA := (A[0] + A[1] + A[2]) / 3
+	avgB := (B[0] + B[1] + B[2]) / 3
+	if avgA > avgB {
 		return a
 	}
 	return b
@@ -42,7 +42,7 @@ func (r RGB) RGB() [3]int {
 	return [3]int{r.Red, r.Green, r.Blue}
 }
 
-// Hex returns the color coverted to hexidecimal format.
+// Hex returns the color converted to hexadecimal format.
 func (r RGB) Hex() []uint8 {
 	src := []uint8{uint8(r.Red), uint8(r.Green), uint8(r.Blue)}
 	hex := make([]byte, hex.EncodedLen(len(src)))

doc.go

@@ -4,4 +4,5 @@
 // Use it to control Photoshop, edit documents, and perform batch operations.
 //
 // Currently only supports Photoshop CS5 Windows x86_64.
-package ps
+//
+package ps // import "github.com/sbrow/ps/v2"

document.go

@@ -127,7 +127,7 @@ func (d *Document) LayerSet(name string) *LayerSet {
 //
 // TODO(sbrow): Reduce cyclomatic complexity of ActiveDocument().
 func ActiveDocument() (*Document, error) {
-	log.Println("Loading ActiveDoucment")
+	log.Println("Loading ActiveDocument")
 	d := &Document{}
 
 	byt, err := DoJS("activeDocName.jsx")
@@ -248,8 +248,6 @@ func (d *Document) MustExist(name string) Layer {
 // Save saves the Document in place.
 func (d *Document) Save() error {
 	js := fmt.Sprintf("var d=app.open(File('%s'));\nd.save();", d.FullName())
-	if _, err := DoJS("compilejs", js); err != nil {
+	_, err := DoJS("compilejs", js)
 	return err
 }
-	return nil
-}

document_test.go

@@ -82,10 +82,10 @@ func TestDocument_Save(t *testing.T) {
 	}
 
 	defer func() {
-		if err := DoAction("DK", "Undo"); err != nil {
+		if err = DoAction("DK", "Undo"); err != nil {
 			t.Error(err)
 		}
-		err := d.Save()
+		err = d.Save()
 		if err != nil {
 			t.Fatal(err)
 		}

go.mod

@@ -1 +1 @@
-module github.com/sbrow/ps
+module github.com/sbrow/ps/v2

layerset.go

@@ -209,7 +209,7 @@ func (l *LayerSet) SetVisible(b bool) error {
 	return nil
 }
 
-// SetPos snaps the given layerset boundry to the given point.
+// SetPos snaps the given layerset boundary to the given point.
 // Valid options for bound are: "TL", "TR", "BL", "BR"
 func (l *LayerSet) SetPos(x, y int, bound string) {
 	if !l.visible || (x == 0 && y == 0) {

ps.go

@@ -12,7 +12,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/sbrow/ps/runner"
+	"github.com/sbrow/ps/v2/runner"
 )
 
 // The full path to this directory.

ps_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/sbrow/ps/runner"
+	"github.com/sbrow/ps/v2/runner"
 )
 
 /*