Merge pull request #178 from getantibody/cobra

Replaced cli with cobra

Gopkg.toml

@@ -1,20 +1,7 @@
-
 [[dependencies]]
   name = "github.com/getantibody/folder"
   version = "v1.0.0"
 
 [[dependencies]]
   name = "github.com/stretchr/testify"
   version = "^1.1.4"
-
-[[dependencies]]
-  name = "github.com/urfave/cli"
-  version = "^1.19.1"
-
-[[dependencies]]
-  branch = "master"
-  name = "golang.org/x/crypto"
-
-[[dependencies]]
-  branch = "master"
-  name = "golang.org/x/sync"

Makefile

@@ -38,7 +38,7 @@ lint: ## Run all the linters
 ci: lint test ## Run all the tests and code checks
 
 build: ## Build a beta version
-	go build -o goreleaser ./cmd/antibody/main.go
+	go build
 
 # Absolutely awesome: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 help:

antibody.go → antibodylib/antibody.go

@@ -1,4 +1,4 @@
-package antibody
+package antibodylib
 
 import (
 	"bufio"

antibody_test.go → antibodylib/antibody_test.go

@@ -1,4 +1,4 @@
-package antibody_test
+package antibodylib_test
 
 import (
 	"bytes"
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/getantibody/antibody"
+	"github.com/getantibody/antibody/antibodylib"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -24,7 +24,7 @@ func TestAntibody(t *testing.T) {
 		"  # trick play",
 		"/tmp kind:path",
 	}
-	sh, err := antibody.New(
+	sh, err := antibodylib.New(
 		home,
 		bytes.NewBufferString(strings.Join(bundles, "\n")),
 	).Bundle()
@@ -42,18 +42,18 @@ func TestAntibodyError(t *testing.T) {
 	assert := assert.New(t)
 	home := home()
 	bundles := bytes.NewBufferString("invalid-repo")
-	sh, err := antibody.New(home, bundles).Bundle()
+	sh, err := antibodylib.New(home, bundles).Bundle()
 	assert.Error(err)
 	assert.Empty(sh)
 }
 
 func TestHome(t *testing.T) {
-	assert.Contains(t, antibody.Home(), "antibody")
+	assert.Contains(t, antibodylib.Home(), "antibody")
 }
 
 func TestHomeFromEnvironmentVariable(t *testing.T) {
 	assert.NoError(t, os.Setenv("ANTIBODY_HOME", "/tmp"))
-	assert.Equal(t, "/tmp", antibody.Home())
+	assert.Equal(t, "/tmp", antibodylib.Home())
 }
 
 func home() string {

antibodylib/info.go

@@ -0,0 +1,4 @@
+package antibodylib
+
+// Version is antibody's version
+var Version = "dev"

sort.go → antibodylib/sort.go

@@ -1,4 +1,4 @@
-package antibody
+package antibodylib
 
 import (
 	"sort"

cmd/bundle.go

@@ -0,0 +1,37 @@
+package cmd
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/getantibody/antibody/antibodylib"
+	"github.com/spf13/cobra"
+	"golang.org/x/crypto/ssh/terminal"
+)
+
+var bundleCmd = &cobra.Command{
+	Use:     "bundle",
+	Aliases: []string{"b"},
+	Short:   "downloads a bundle and prints its source line",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var input io.Reader
+		if !terminal.IsTerminal(int(os.Stdin.Fd())) && len(args) == 0 {
+			input = os.Stdin
+		} else {
+			input = bytes.NewBufferString(strings.Join(args, " "))
+		}
+		sh, err := antibodylib.New(antibodylib.Home(), input).Bundle()
+		if err != nil {
+			return err
+		}
+		fmt.Println(sh)
+		return nil
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(bundleCmd)
+}

cmd/home.go

@@ -0,0 +1,21 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/getantibody/antibody/antibodylib"
+	"github.com/spf13/cobra"
+)
+
+var homeCmd = &cobra.Command{
+	Use:     "home",
+	Short:   "shows the current antibody home folder",
+	Aliases: []string{"prefix", "p"},
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println(antibodylib.Home())
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(homeCmd)
+}