Refactor into event and speaker packages

Signed-off-by: Matt Stratton <[email protected]>

Author: mattstratton

cmd/event.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	rice "github.com/GeertJohan/go.rice"
-	"github.com/devopsdays/devopsdays-cli/create"
+	"github.com/devopsdays/devopsdays-cli/event"
 	"github.com/devopsdays/devopsdays-cli/helpers"
 	"github.com/spf13/cobra"
 )
@@ -42,7 +42,7 @@ var createEventCmd = &cobra.Command{
   devopsdays-cli create event -c New York --year 2017`,
 
 	Run: func(cmd *cobra.Command, args []string) {
-		create.Event(City, Year)
+		event.CreateEvent(City, Year)
 	},
 }
 

cmd/speaker.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/devopsdays/devopsdays-cli/create"
+	"github.com/devopsdays/devopsdays-cli/speaker"
 	"github.com/spf13/cobra"
 )
 
@@ -36,7 +36,7 @@ var createSpeakerCmd = &cobra.Command{
 
 	Args: cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		create.Speaker("", City, Year)
+		speaker.CreateSpeaker("", City, Year)
 	},
 }
 

create/event.go renamed to event/event.go

@@ -1,4 +1,5 @@
-package create
+// Package event provides the functions for creating, editing, and showing events
+package event
 
 import (
 	"errors"
@@ -118,8 +119,8 @@ var qsCreateEvent = []*survey.Question{
 	},
 }
 
-// Event takes input from the user to create a new event
-func Event(city, year string) (err error) {
+// CreateEvent takes input from the user to create a new event
+func CreateEvent(city, year string) (err error) {
 
 	answers := struct {
 		Twitter         string

create/templates.go renamed to event/templates.go

@@ -1,4 +1,4 @@
-package create
+package event
 
 const eventTmpl = `name: "{{ .Name }}" # The name of the event. Four digit year with the city name in lower-case, with no spaces.
 year: "{{ .Year }}" # The year of the event. Make sure it is in quotes.
@@ -90,17 +90,3 @@ sponsor_levels:
   - id: community
     label: Community
     `
-
-const speakerTmpl = `+++
-Title = "{{ .Title }}"
-type = "speaker"
-{{ with .Website }}website = "{{ . }}"{{ end }}
-{{ with .Twitter }}twitter = "{{ . }}"{{ end }}
-{{ with .Facebook }}facebook = "{{ . }}"{{ end }}
-{{ with .Linkedin }}linkedin = "{{ . }}"{{ end }}
-{{ with .Github }}github = "{{ . }}"{{ end }}
-{{ with .Gitlab }}gitlab = "{{ . }}"{{ end }}
-{{ with .ImagePath }}image = "{{ . }}"{{ end }}
-+++
-{{ with .Bio }}{{.}}{{ end }}
-`

sampleData/content/events/2018-canterlot/speakers/apple-jack.md

@@ -0,0 +1,12 @@
++++
+Title = "Rainbow Dash"
+type = "speaker"
+
+
+
+
+
+
+
++++
+

sampleData/content/events/2018-canterlot/speakers/rainbow-dash.md

@@ -1,7 +1,7 @@
 name: "2018-canterlot" # The name of the event. Four digit year with the city name in lower-case, with no spaces.
 year: "2018" # The year of the event. Make sure it is in quotes.
 city: "Canterlot" # The displayed city name of the event. Capitalize it.
-event_twitter: "canterlot" # Change this to the twitter handle for your event such as devopsdayschi or devopsdaysmsp
+event_twitter: "" # Change this to the twitter handle for your event such as devopsdayschi or devopsdaysmsp
 description: "Devopsdays is coming to Canterlot!" # Edit this to suit your preferences
 ga_tracking_id: "" # If you have your own Google Analytics tracking ID, enter it here. Example: "UA-74738648-1"
 

sampleData/data/events/2018-canterlot.yml

@@ -1,5 +1,5 @@
-// Package create provides functions to create new content.
-package create
+// Package speaker provides functions to add, create, edit, delete, and show speakers
+package speaker
 
 import (
 	"errors"
@@ -116,8 +116,8 @@ var qsCreateSpeaker = []*survey.Question{
 	},
 }
 
-// Speaker takes input from the user to create a new speaker
-func Speaker(speakerName, city, year string) (err error) {
+// CreateSpeaker takes input from the user to create a new speaker
+func CreateSpeaker(speakerName, city, year string) (err error) {
 
 	answers := struct {
 		Name      string

create/speaker.go renamed to speaker/speaker.go

@@ -1,4 +1,4 @@
-package create
+package speaker
 
 import (
 	"testing"

create/speaker_test.go renamed to speaker/speaker_test.go

@@ -0,0 +1,15 @@
+package speaker
+
+const speakerTmpl = `+++
+Title = "{{ .Title }}"
+type = "speaker"
+{{ with .Website }}website = "{{ . }}"{{ end }}
+{{ with .Twitter }}twitter = "{{ . }}"{{ end }}
+{{ with .Facebook }}facebook = "{{ . }}"{{ end }}
+{{ with .Linkedin }}linkedin = "{{ . }}"{{ end }}
+{{ with .Github }}github = "{{ . }}"{{ end }}
+{{ with .Gitlab }}gitlab = "{{ . }}"{{ end }}
+{{ with .ImagePath }}image = "{{ . }}"{{ end }}
++++
+{{ with .Bio }}{{.}}{{ end }}
+`