Create Library Package

Reorganize code to create a separate lib package so the code can be used
as a library in other go applications.

Move commands into a separate command package.

Add get, post, and session commands.

.travis.yml

@@ -22,8 +22,8 @@ script:
 - git config --global user.name "Your Name"
 - test -z "$(go fmt)"
 - go vet
-- go test -v
-- go test -v -race
+- go test -v ./...
+- go test -v -race ./...
 - export OS_TARGETS="darwin windows linux"
 - export ARCH_TARGETS="386 amd64"
 - export GO_LINKER_VALUE=$(git describe --tags --always)

active.go → command/active.go

@@ -1,11 +1,15 @@
-package main
+package command
 
 import (
 	"encoding/json"
 	"fmt"
 	"os/exec"
 	"runtime"
 	"sort"
+
+	. "github.com/heroku/force/config"
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdActive = &Command{

apex.go → command/apex.go

@@ -1,9 +1,12 @@
-package main
+package command
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdApex = &Command{

apiversion.go → command/apiversion.go

@@ -1,13 +1,12 @@
-package main
+package command
 
 import (
 	"fmt"
-	"os"
 	"regexp"
-)
 
-var apiVersionNumber = "40.0"
-var apiVersion = fmt.Sprintf("v%s", apiVersionNumber)
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
+)
 
 var cmdApiVersion = &Command{
 	Run:   runApiVersion,
@@ -27,21 +26,18 @@ func init() {
 }
 
 func runApiVersion(cmd *Command, args []string) {
-	force, _ := ActiveForce()
 	if len(args) == 1 {
-		apiVersionNumber = args[0]
+		apiVersionNumber := args[0]
 		matched, err := regexp.MatchString("^\\d{2}\\.0$", apiVersionNumber)
 		if err != nil {
 			ErrorAndExit("%v", err)
 		}
 		if !matched {
 			ErrorAndExit("apiversion must be in the form of nn.0.")
 		}
-		apiVersion = fmt.Sprintf("v%s", apiVersionNumber)
-		force.Credentials.ApiVersion = apiVersionNumber
-		ForceSaveLogin(*force.Credentials, os.Stdout)
+		UpdateApiVersion(apiVersionNumber)
 	} else if len(args) == 0 {
-		fmt.Println(apiVersion)
+		fmt.Println(ApiVersion())
 	} else {
 		ErrorAndExit("The apiversion command only accepts a single argument in the form of nn.0")
 	}

attrs.go → command/attrs.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/url"

aura.go → command/aura.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"encoding/json"
@@ -7,6 +7,9 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 // Brief comment to fire commit
@@ -63,6 +66,7 @@ func init() {
 
 var (
 	auraentityname string
+	metadataType   string
 )
 
 func runAura(cmd *Command, args []string) {

bigobject.go → command/bigobject.go

@@ -1,11 +1,14 @@
-package main
+package command
 
 import (
 	"bitbucket.org/pkg/inflect"
 	"fmt"
 	"os"
 	"strconv"
 	"strings"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdBigObject = &Command{
@@ -74,7 +77,7 @@ func init() {
 
 func runBigObject(cmd *Command, args []string) {
 	if len(args) == 0 {
-		cmd.printUsage()
+		cmd.PrintUsage()
 	} else {
 		if err := cmd.Flag.Parse(args[1:]); err != nil {
 			os.Exit(2)

bulk.go → command/bulk.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 /*
 
@@ -56,6 +56,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"strings"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdBulk = &Command{
@@ -136,7 +139,7 @@ func init() {
 
 func runBulk2(cmd *Command, args []string) {
 	if len(command) == 0 {
-		cmd.printUsage()
+		cmd.PrintUsage()
 		return
 	}
 	commandVersion = "new"
@@ -205,7 +208,7 @@ func runBulk(cmd *Command, args []string) {
 		return
 	}
 	if len(args) == 0 {
-		cmd.printUsage()
+		cmd.PrintUsage()
 		return
 	}
 

command.go → command/command.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"flag"
@@ -9,6 +9,46 @@ import (
 var flagEnv string
 var flagProcfile string
 
+var Commands = []*Command{
+	cmdApiVersion,
+	cmdUseDXAuth,
+	cmdLogin,
+	cmdLogout,
+	cmdLogins,
+	cmdCreate,
+	cmdActive,
+	cmdWhoami,
+	cmdDescribe,
+	cmdSobject,
+	cmdBigObject,
+	cmdField,
+	cmdRecord,
+	cmdBulk,
+	cmdFetch,
+	cmdImport,
+	cmdExport,
+	cmdQuery,
+	cmdApex,
+	cmdGet,
+	cmdPost,
+	cmdSession,
+	cmdTrace,
+	cmdLog,
+	cmdEventLogFile,
+	cmdOauth,
+	cmdTest,
+	cmdSecurity,
+	cmdVersion,
+	cmdUpdate,
+	cmdPush,
+	cmdAura,
+	cmdPassword,
+	cmdNotifySet,
+	cmdLimits,
+	cmdHelp,
+	cmdDataPipe,
+}
+
 type Command struct {
 	// args does not include the command name
 	Run  func(cmd *Command, args []string)
@@ -19,7 +59,7 @@ type Command struct {
 	Long  string // `forego help cmd` output
 }
 
-func (c *Command) printUsage() {
+func (c *Command) PrintUsage() {
 	if c.Runnable() {
 		fmt.Printf("Usage: force %s\n\n", c.Usage)
 	}

command/command_suite_test.go

@@ -0,0 +1,13 @@
+package command_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestCommand(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Command Suite")
+}

command_test.go → command/command_test.go

@@ -1,13 +1,14 @@
-package main
+package command_test
 
 import (
 	"github.com/bmizerany/assert"
+	. "github.com/heroku/force/command"
 	"testing"
 )
 
 // test that all avialable commands come with at least a name and short usage information
 func TestUsage(t *testing.T) {
-	for _, cmd := range commands {
+	for _, cmd := range Commands {
 		assert.NotEqual(t, cmd.Name(), "")
 		assert.NotEqual(t, cmd.Short, "")
 	}

create.go → command/create.go

@@ -1,8 +1,11 @@
-package main
+package command
 
 import (
 	"fmt"
 	"strings"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdCreate = &Command{
@@ -34,7 +37,7 @@ func init() {
 func runCreate(cmd *Command, args []string) {
 	force, _ := ActiveForce()
 	if len(what) == 0 || len(itemName) == 0 {
-		cmd.printUsage()
+		cmd.PrintUsage()
 	} else {
 		attrs := make(map[string]string)
 		switch what {

datapipe.go → command/datapipe.go

@@ -1,9 +1,12 @@
-package main
+package command
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdDataPipe = &Command{
@@ -76,8 +79,8 @@ func init() {
 	cmdDataPipe.Flag.StringVar(&masterlabel, "l", "", "set master label")
 	cmdDataPipe.Flag.StringVar(&scriptcontent, "scriptcontent", defaultContent, "set script content")
 	cmdDataPipe.Flag.StringVar(&scriptcontent, "c", defaultContent, "set script content")
-	cmdDataPipe.Flag.StringVar(&apiversion, "apiversion", apiVersionNumber, "set api version")
-	cmdDataPipe.Flag.StringVar(&apiversion, "v", apiVersionNumber, "set api version")
+	cmdDataPipe.Flag.StringVar(&apiversion, "apiversion", ApiVersionNumber(), "set api version")
+	cmdDataPipe.Flag.StringVar(&apiversion, "v", ApiVersionNumber(), "set api version")
 	cmdDataPipe.Flag.StringVar(&scripttype, "scripttype", "Pig", "set script type")
 	cmdDataPipe.Flag.StringVar(&scripttype, "t", "Pig", "set script type")
 	cmdDataPipe.Flag.StringVar(&query, "q", "", "SOQL query string on DataPipeline object")
@@ -91,7 +94,7 @@ func init() {
 
 func runDataPipe(cmd *Command, args []string) {
 	if len(args) == 0 {
-		cmd.printUsage()
+		cmd.PrintUsage()
 	} else {
 		if err := cmd.Flag.Parse(args[1:]); err != nil {
 			os.Exit(2)

describe.go → command/describe.go

@@ -1,8 +1,10 @@
-package main
+package command
 
 import (
 	"encoding/xml"
-	//"fmt"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdDescribe = &Command{

eventlogfile.go → command/eventlogfile.go

@@ -1,6 +1,11 @@
-package main
+package command
 
-import "fmt"
+import (
+	"fmt"
+
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
+)
 
 var cmdEventLogFile = &Command{
 	Run:   getEventLogFile,

export.go → command/export.go

@@ -1,11 +1,15 @@
-package main
+package command
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/heroku/force/config"
+	. "github.com/heroku/force/error"
+	. "github.com/heroku/force/lib"
 )
 
 var cmdExport = &Command{
@@ -187,7 +191,7 @@ func runExport(cmd *Command, args []string) {
 	}
 
 	if root == "" {
-		root, err = GetSourceDir()
+		root, err = config.GetSourceDir()
 		if err != nil {
 			fmt.Printf("Error obtaining root directory\n")
 			ErrorAndExit(err.Error())