Reorganize package locations

[#117750485]

Signed-off-by: Chris Hendrix <[email protected]>

Author: XenoPhex

clipr.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"sort"
+
+	"github.com/cloudfoundry-incubator/cli-plugin-repo/web"
+	"github.com/tedsuo/rata"
+	"gopkg.in/yaml.v2"
+)
+
+type CLIPR struct {
+	Port          int    `short:"p" long:"port" default:"8080" description:"Port that the plugin repo listens on"`
+	RepoIndexPath string `short:"f" long:"filepath" default:"repo-index.yml" description:"Path to repo-index file"`
+}
+
+func (cmd *CLIPR) Execute(args []string) error {
+	logger := os.Stdout //turn this into a logger soon
+
+	var plugins web.PluginsJson
+
+	b, err := ioutil.ReadFile(cmd.RepoIndexPath)
+	if err != nil {
+		return err
+	}
+
+	err = yaml.Unmarshal(b, &plugins)
+	if err != nil {
+		return err
+	}
+
+	sort.Sort(plugins)
+
+	handlers := map[string]http.Handler{
+		Index: http.FileServer(http.Dir("ui")),
+		List:  web.NewListPluginsHandler(plugins, logger),
+	}
+
+	router, err := rata.NewRouter(Routes, handlers)
+
+	if err != nil {
+		return err
+	}
+
+	err = http.ListenAndServe(cmd.bindAddr(), router)
+
+	return err
+}
+
+func (cmd *CLIPR) bindAddr() string {
+	return fmt.Sprintf(":%d", cmd.Port)
+}

main.go

@@ -4,23 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"net/http"
-
-	"io/ioutil"
-
-	"github.com/cloudfoundry-incubator/cli-plugin-repo/models"
-	"github.com/cloudfoundry-incubator/cli-plugin-repo/server"
 	"github.com/jessevdk/go-flags"
-	"github.com/tedsuo/rata"
-	"gopkg.in/yaml.v2"
-	"sort"
 )
 
-type CLIPR struct {
-	Port          int    `short:"p" long:"port" default:"8080" description:"Port that the plugin repo listens on"`
-	RepoIndexPath string `short:"f" long:"filepath" default:"repo-index.yml" description:"Path to repo-index file"`
-}
-
 func main() {
 	cmd := &CLIPR{}
 
@@ -38,55 +24,3 @@ func main() {
 		os.Exit(1)
 	}
 }
-
-func (cmd *CLIPR) Execute(args []string) error {
-	logger := os.Stdout //turn this into a logger soon
-
-	var plugins models.PluginsJson
-
-	b, err := ioutil.ReadFile(cmd.RepoIndexPath)
-	if err != nil {
-		return err
-	}
-
-	err = yaml.Unmarshal(b, &plugins)
-	if err != nil {
-		return err
-	}
-
-	sort.Sort(plugins)
-	handles := server.NewServerHandles(plugins, logger)
-
-	handlers := map[string]http.Handler{
-		Index: http.FileServer(http.Dir("ui")),
-		List:  http.HandlerFunc(handles.ListPlugins),
-	}
-
-	router, err := rata.NewRouter(Routes, handlers)
-
-	if err != nil {
-		return err
-	}
-
-	err = http.ListenAndServe(cmd.bindAddr(), router)
-
-	return err
-}
-
-func (cmd *CLIPR) bindAddr() string {
-	return fmt.Sprintf(":%d", cmd.Port)
-}
-
-const (
-	Index = "Index"
-	List  = "List"
-)
-
-var Routes = rata.Routes([]rata.Route{
-	{Path: "/", Method: "GET", Name: Index},
-	{Path: "/js/:file", Method: "GET", Name: Index},
-	{Path: "/css/:file", Method: "GET", Name: Index},
-	{Path: "/font/:file", Method: "GET", Name: Index},
-	{Path: "/images/:file", Method: "GET", Name: Index},
-	{Path: "/list", Method: "GET", Name: List},
-})

main_test.go

@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"strconv"
 
-	"github.com/cloudfoundry-incubator/cli-plugin-repo/models"
+	"github.com/cloudfoundry-incubator/cli-plugin-repo/web"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/types"
 	"gopkg.in/yaml.v2"
@@ -33,7 +33,7 @@ var _ = SynchronizedAfterSuite(func() {}, func() {
 
 var _ = Describe("Database", func() {
 	It("correctly parses the current repo-index.yml", func() {
-		var plugins models.PluginsJson
+		var plugins web.PluginsJson
 
 		b, err := ioutil.ReadFile("repo-index.yml")
 		Expect(err).NotTo(HaveOccurred())

models/models_suite_test.go

@@ -0,0 +1,17 @@
+package main
+
+import "github.com/tedsuo/rata"
+
+const (
+	Index = "Index"
+	List  = "List"
+)
+
+var Routes = rata.Routes([]rata.Route{
+	{Path: "/", Method: "GET", Name: Index},
+	{Path: "/js/:file", Method: "GET", Name: Index},
+	{Path: "/css/:file", Method: "GET", Name: Index},
+	{Path: "/font/:file", Method: "GET", Name: Index},
+	{Path: "/images/:file", Method: "GET", Name: Index},
+	{Path: "/list", Method: "GET", Name: List},
+})

routes.go

@@ -0,0 +1,20 @@
+package web
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+)
+
+func NewListPluginsHandler(plugins PluginsJson, logger io.Writer) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		b, err := json.Marshal(plugins)
+		if err != nil {
+			logger.Write([]byte("Error marshalling plugin models: " + err.Error()))
+			return
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		w.Write(b)
+	})
+}

server/handles.go

@@ -1,4 +1,4 @@
-package models
+package web
 
 import "time"