Refactor out almost all of the helpers package

mattstratton · mattstratton · commit 6b2fc08ad8ed · 2017-10-06T06:27:47.000-05:00
Signed-off-by: Matt Stratton &lt;matt.stratton@gmail.com&gt;
diff --git a/cmd/editEvent.go b/cmd/editEvent.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/devopsdays/devopsdays-cli/helpers"
+	"github.com/devopsdays/devopsdays-cli/helpers/paths"
 	"github.com/devopsdays/devopsdays-cli/model"
 	"gopkg.in/yaml.v2"
 )
@@ -155,7 +156,7 @@ func editEvent(event model.Event) (err error) {
 
 func eventStruct(city, year string) (event model.Event) {
 	// var event Event
-	yamlFile, err := ioutil.ReadFile(helpers.EventDataPath(webdir, city, year))
+	yamlFile, err := ioutil.ReadFile(paths.EventDataPath(webdir, city, year))
 	err = yaml.Unmarshal(yamlFile, &event)
 	if err != nil {
 		panic(err)
@@ -203,7 +204,7 @@ func editField(event model.Event, field, value string) {
 	// f := reflect.Indirect(r).FieldByName(field)
 	reflect.ValueOf(&event).Elem().FieldByName(field).SetString(value)
 	y, _ := yaml.Marshal(&event)
-	ioutil.WriteFile((helpers.EventDataPath(webdir, event.City, event.Year)), y, 0755)
+	ioutil.WriteFile((paths.EventDataPath(webdir, event.City, event.Year)), y, 0755)
 	return
 }
 
@@ -216,7 +217,7 @@ func updateOrganizer(event model.Event, name, field, value string) {
 			fmt.Println(r)
 			spew.Dump(event.TeamMembers)
 			y, _ := yaml.Marshal(&event)
-			ioutil.WriteFile((helpers.EventDataPath(webdir, event.City, event.Year)), y, 0755)
+			ioutil.WriteFile((paths.EventDataPath(webdir, event.City, event.Year)), y, 0755)
 		}
 	}
 }
diff --git a/cmd/event.go b/cmd/event.go
@@ -13,6 +13,7 @@ import (
 	rice "github.com/GeertJohan/go.rice"
 	"github.com/devopsdays/devopsdays-cli/event"
 	"github.com/devopsdays/devopsdays-cli/helpers"
+	"github.com/devopsdays/devopsdays-cli/helpers/paths"
 	"github.com/spf13/cobra"
 )
 
@@ -62,7 +63,7 @@ to quickly create a Cobra application.`,
 		city := ""
 		year := ""
 		if city != "" {
-			if helpers.CheckEvent(city, year) == false {
+			if event.CheckEvent(city, year) == false {
 				log.Fatal("That city does not exist.")
 			}
 			myEvent := eventStruct(city, year)
@@ -73,7 +74,7 @@ to quickly create a Cobra application.`,
 			city, _ := reader.ReadString('\n')
 			fmt.Println("Enter the year:")
 			year, _ := reader.ReadString('\n')
-			if helpers.CheckEvent(city, year) == false {
+			if event.CheckEvent(city, year) == false {
 				log.Fatal("That city does not exist.")
 			}
 			myEvent := eventStruct(city, year)
@@ -224,10 +225,10 @@ func createEventFile(city, year, twitter string) (string, error) {
 		strings.TrimSpace(city),
 		strings.TrimSpace(year),
 		slug,
-		helpers.CityClean(city),
+		event.CityClean(city),
 		strings.TrimSpace(twitter),
 	}
-	f, err := os.Create(helpers.EventDataPath(webdir, city, year))
+	f, err := os.Create(paths.EventDataPath(webdir, city, year))
 	if err != nil {
 		return "", err
 	}
@@ -236,13 +237,13 @@ func createEventFile(city, year, twitter string) (string, error) {
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		fmt.Println("Created event file for", city, "for year", year, "at", helpers.EventDataPath(webdir, city, year))
+		fmt.Println("Created event file for", city, "for year", year, "at", paths.EventDataPath(webdir, city, year))
 	}
 	return city, nil
 }
 
 func createEventContentDir(city, year string) (string, error) {
-	err := os.MkdirAll((helpers.EventContentPath(city, year)), 0755)
+	err := os.MkdirAll((paths.EventContentPath(city, year)), 0755)
 	if err != nil {
 		return "", err
 	}
@@ -281,9 +282,9 @@ func createEventContentFile(city, year, page string) (string, error) { // add pa
 		strings.TrimSpace(city),
 		strings.TrimSpace(year),
 		slug,
-		helpers.CityClean(city),
+		event.CityClean(city),
 	}
-	filePath := filepath.Join((helpers.EventContentPath(city, year)), (page + ".md"))
+	filePath := filepath.Join((paths.EventContentPath(city, year)), (page + ".md"))
 	f, err := os.Create(filePath)
 	if err != nil {
 		return "Cannot create", err
diff --git a/event/check_event.go b/event/check_event.go
@@ -1,10 +1,14 @@
-package helpers
+package event
 
-import "os"
+import (
+	"os"
+
+	"github.com/devopsdays/devopsdays-cli/helpers/paths"
+)
 
 // CheckEvent takes in two arguments, the city and the year, and returns true if the city  exists.
 func CheckEvent(city, year string) bool {
-	if _, err := os.Stat(EventDataPath(GetWebdir(), city, year)); err == nil {
+	if _, err := os.Stat(paths.EventDataPath(paths.GetWebdir(), city, year)); err == nil {
 		return true
 	}
 	return false
diff --git a/event/check_event_test.go b/event/check_event_test.go
@@ -1,4 +1,4 @@
-package helpers
+package event
 
 import (
 	"testing"
diff --git a/event/city_clean.go b/event/city_clean.go
@@ -1,4 +1,4 @@
-package helpers
+package event
 
 import "strings"
 
diff --git a/event/city_clean_test.go b/event/city_clean_test.go
@@ -1,4 +1,4 @@
-package helpers
+package event
 
 import (
 	"testing"
diff --git a/event/event.go b/event/event.go
@@ -11,6 +11,8 @@ import (
 
 	"github.com/alecthomas/template"
 	helpers "github.com/devopsdays/devopsdays-cli/helpers"
+	paths "github.com/devopsdays/devopsdays-cli/helpers/paths"
+	"github.com/devopsdays/devopsdays-cli/images"
 	"github.com/devopsdays/devopsdays-cli/model"
 	"github.com/fatih/color"
 	survey "gopkg.in/AlecAivazis/survey.v1"
@@ -155,10 +157,10 @@ func CreateEvent(city, year string) (err error) {
 		return
 	}
 
-	orgEmail := []string{"organizers-", strings.Replace(strings.TrimSpace(strings.ToLower(helpers.CityClean(city))), " ", "-", 10), "-", strings.TrimSpace(year), "@devopsdays.org"}
-	proposalEmail := []string{"proposals-", helpers.CityClean(city), "-", strings.TrimSpace(year), "@devopsdays.org"}
+	orgEmail := []string{"organizers-", strings.Replace(strings.TrimSpace(strings.ToLower(CityClean(city))), " ", "-", 10), "-", strings.TrimSpace(year), "@devopsdays.org"}
+	proposalEmail := []string{"proposals-", CityClean(city), "-", strings.TrimSpace(year), "@devopsdays.org"}
 	myEvent := model.Event{
-		Name:            strings.Join([]string{strings.TrimSpace(year), "-", helpers.CityClean(city)}, ""),
+		Name:            strings.Join([]string{strings.TrimSpace(year), "-", CityClean(city)}, ""),
 		Year:            year,
 		City:            city,
 		EventTwitter:    answers.Twitter,
@@ -173,14 +175,14 @@ func CreateEvent(city, year string) (err error) {
 		ProposalEmail:   strings.Join(proposalEmail, ""),
 	}
 
-	NewEvent(myEvent, helpers.CityClean(city), year)
+	NewEvent(myEvent, CityClean(city), year)
 
 	if answers.LogoPath != "" {
-		err = EventLogo(answers.LogoPath, helpers.CityClean(city), year)
+		err = EventLogo(answers.LogoPath, CityClean(city), year)
 	}
 
 	if answers.SquareLogoPath != "" {
-		err = EventLogoSquare(answers.SquareLogoPath, helpers.CityClean(city), year)
+		err = EventLogoSquare(answers.SquareLogoPath, CityClean(city), year)
 	}
 
 	return
@@ -195,23 +197,23 @@ func NewEvent(event model.Event, city string, year string) (err error) {
 		log.Fatal("Parse: ", err)
 		return
 	}
-	f, err := os.Create(helpers.EventDataPath(helpers.GetWebdir(), city, year))
+	f, err := os.Create(paths.EventDataPath(paths.GetWebdir(), city, year))
 	defer f.Close()
 	t.Execute(f, event)
 
 	if err != nil {
 		fmt.Println(err)
 	} else {
 		fmt.Fprintf(color.Output, "\n\n\nCreated event file for %s\n", color.GreenString(event.City))
-		fmt.Fprintf(color.Output, "at %s\n\n\n", color.BlueString(helpers.EventDataPath(helpers.GetWebdir(), city, year)))
+		fmt.Fprintf(color.Output, "at %s\n\n\n", color.BlueString(paths.EventDataPath(paths.GetWebdir(), city, year)))
 	}
 	return
 }
 
 // EventLogo takes in a path to an event's main logo and copies/renames it to the proper destination
 func EventLogo(srcPath, city, year string) (err error) {
 
-	eventStaticPath, err := helpers.EventStaticPath(city, year)
+	eventStaticPath, err := paths.EventStaticPath(city, year)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -227,12 +229,12 @@ func EventLogo(srcPath, city, year string) (err error) {
 
 // EventLogoSquare takes in a path the event's square logo, and crops/resizes it and copies it to the proper destination
 func EventLogoSquare(srcPath, city, year string) (err error) {
-	eventStaticPath, err := helpers.EventStaticPath(city, year)
+	eventStaticPath, err := paths.EventStaticPath(city, year)
 	if err != nil {
 		log.Fatal(err)
 	}
 	destPath := filepath.Join(eventStaticPath, "logo-square.png")
-	helpers.ResizeImage(srcPath, destPath, "png", 600, 600)
+	images.ResizeImage(srcPath, destPath, "png", 600, 600)
 
 	// @TODO update helpers.ResizeImage to return error code and do something with it here
 
diff --git a/helpers/copy_file.go b/helpers/copy_file.go
@@ -1,7 +1,6 @@
 package helpers
 
 import (
-	"fmt"
 	"io"
 	"os"
 )
@@ -27,6 +26,6 @@ func CopyFile(srcPath, destPath string) (err error) {
 		return err
 	}
 
-	fmt.Printf("Copied %v bytes\n", n)
+	// fmt.Printf("Copied %v bytes\n", n)
 	return nil
 }
diff --git a/helpers/paths/event_content_path.go b/helpers/paths/event_content_path.go
@@ -1,4 +1,4 @@
-package helpers
+package paths
 
 import (
 	"log"
diff --git a/helpers/paths/event_content_path_test.go b/helpers/paths/event_content_path_test.go
@@ -1,4 +1,4 @@
-package helpers
+package paths
 
 import (
 	"testing"
diff --git a/helpers/paths/event_data_path.go b/helpers/paths/event_data_path.go
@@ -1,4 +1,4 @@
-package helpers
+package paths
 
 import (
 	"path/filepath"
diff --git a/helpers/paths/event_data_path_test.go b/helpers/paths/event_data_path_test.go
@@ -1,4 +1,4 @@
-package helpers
+package paths
 
 import (
 	"testing"
diff --git a/helpers/paths/event_static_path.go b/helpers/paths/event_static_path.go
@@ -1,4 +1,4 @@
-package helpers
+package paths
 
 import (
 	"os"
diff --git a/helpers/paths/webdir.go b/helpers/paths/webdir.go
@@ -1,4 +1,4 @@
-package helpers
+package paths
 
 import (
 	"fmt"
diff --git a/images/images.go b/images/images.go
@@ -0,0 +1,2 @@
+// Package images provides functions for manipulating images in the application
+package images
diff --git a/images/resize_image.go b/images/resize_image.go
@@ -1,4 +1,4 @@
-package helpers
+package images
 
 import (
 	"fmt"
diff --git a/names/name_clean.go b/names/name_clean.go
@@ -1,4 +1,4 @@
-package helpers
+package names
 
 import "strings"
 
diff --git a/names/name_clean_test.go b/names/name_clean_test.go
@@ -1,4 +1,4 @@
-package helpers
+package names
 
 import (
 	"testing"
diff --git a/sampleData/data/events/2018-canterlot.yml b/sampleData/data/events/2018-canterlot.yml
@@ -28,7 +28,7 @@ masthead_background: ""
 # Location
 #
 coordinates: "" # The coordinates of your city. Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html
-location: "" # Defaults to city, but you can make it the venue name.
+location: "Pony tent" # Defaults to city, but you can make it the venue name.
 #
 location_address: "" #Optional - use the street address of your venue. This will show up on the welcome page if set.
 
diff --git a/speaker/check_speaker.go b/speaker/check_speaker.go
@@ -1,15 +1,17 @@
-package helpers
+package speaker
 
 import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/devopsdays/devopsdays-cli/helpers/paths"
 )
 
 // CheckSpeaker takes in three arguments, the city, the year, and the cleaned name of a speaker, and returns true if the speaker already exists.
 func CheckSpeaker(city, year, speaker string) bool {
 	s := []string{strings.TrimSpace(speaker), ".md"}
-	if _, err := os.Stat(filepath.Join(EventContentPath(city, year), "speakers", strings.Join(s, ""))); err == nil {
+	if _, err := os.Stat(filepath.Join(paths.EventContentPath(city, year), "speakers", strings.Join(s, ""))); err == nil {
 		return true
 	}
 	return false
diff --git a/speaker/check_speaker_test.go b/speaker/check_speaker_test.go
@@ -1,4 +1,4 @@
-package helpers
+package speaker
 
 import (
 	"testing"
diff --git a/speaker/speaker.go b/speaker/speaker.go
diff --git a/talks/get_talks.go b/talks/get_talks.go

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/davecgh/go-spew/spew"`
`13`	`13`	`"github.com/devopsdays/devopsdays-cli/helpers"`
	`14`	`+ "github.com/devopsdays/devopsdays-cli/helpers/paths"`
`14`	`15`	`"github.com/devopsdays/devopsdays-cli/model"`
`15`	`16`	`"gopkg.in/yaml.v2"`
`16`	`17`	`)`
`@@ -155,7 +156,7 @@ func editEvent(event model.Event) (err error) {`
`155`	`156`
`156`	`157`	`func eventStruct(city, year string) (event model.Event) {`
`157`	`158`	`// var event Event`
`158`		`- yamlFile, err := ioutil.ReadFile(helpers.EventDataPath(webdir, city, year))`
	`159`	`+ yamlFile, err := ioutil.ReadFile(paths.EventDataPath(webdir, city, year))`
`159`	`160`	`err = yaml.Unmarshal(yamlFile, &event)`
`160`	`161`	`if err != nil {`
`161`	`162`	`panic(err)`
`@@ -203,7 +204,7 @@ func editField(event model.Event, field, value string) {`
`203`	`204`	`// f := reflect.Indirect(r).FieldByName(field)`
`204`	`205`	`reflect.ValueOf(&event).Elem().FieldByName(field).SetString(value)`
`205`	`206`	`y, _ := yaml.Marshal(&event)`
`206`		`- ioutil.WriteFile((helpers.EventDataPath(webdir, event.City, event.Year)), y, 0755)`
	`207`	`+ ioutil.WriteFile((paths.EventDataPath(webdir, event.City, event.Year)), y, 0755)`
`207`	`208`	`return`
`208`	`209`	`}`
`209`	`210`
`@@ -216,7 +217,7 @@ func updateOrganizer(event model.Event, name, field, value string) {`
`216`	`217`	`fmt.Println(r)`
`217`	`218`	`spew.Dump(event.TeamMembers)`
`218`	`219`	`y, _ := yaml.Marshal(&event)`
`219`		`- ioutil.WriteFile((helpers.EventDataPath(webdir, event.City, event.Year)), y, 0755)`
	`220`	`+ ioutil.WriteFile((paths.EventDataPath(webdir, event.City, event.Year)), y, 0755)`
`220`	`221`	`}`
`221`	`222`	`}`
`222`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package helpers`
	`1`	`+package event`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package helpers`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "fmt"`
`5`	`4`	`"io"`
`6`	`5`	`"os"`
`7`	`6`	`)`
`@@ -27,6 +26,6 @@ func CopyFile(srcPath, destPath string) (err error) {`
`27`	`26`	`return err`
`28`	`27`	`}`
`29`	`28`
`30`		`- fmt.Printf("Copied %v bytes\n", n)`
	`29`	`+ // fmt.Printf("Copied %v bytes\n", n)`
`31`	`30`	`return nil`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package helpers`
	`1`	`+package paths`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"log"`