Rename programmer in upload

Author: matteosuppo

Diff for: conn.go

@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/arduino/arduino-create-agent/programmer"
+	"github.com/arduino/arduino-create-agent/upload"
 	"github.com/arduino/arduino-create-agent/utilities"
 	"github.com/gin-gonic/gin"
 	"github.com/googollee/go-socket.io"
@@ -63,7 +63,7 @@ type Upload struct {
 	Rewrite     string           `json:"rewrite"`
 	Commandline string           `json:"commandline"`
 	Signature   string           `json:"signature"`
-	Extra       programmer.Extra `json:"extra"`
+	Extra       upload.Extra `json:"extra"`
 	Hex         []byte           `json:"hex"`
 	Filename    string           `json:"filename"`
 	ExtraFiles  []AdditionalFile `json:"extrafiles"`
@@ -128,35 +128,35 @@ func uploadHandler(c *gin.Context) {
 
 	go func() {
 		// Resolve commandline
-		commandline, err := programmer.Resolve(data.Port, data.Board, filePath, data.Commandline, data.Extra, &Tools)
+		commandline, err := upload.Resolve(data.Port, data.Board, filePath, data.Commandline, data.Extra, &Tools)
 		if err != nil {
-			send(map[string]string{"ProgrammerStatus": "Error", "Msg": err.Error()})
+			send(map[string]string{"uploadStatus": "Error", "Msg": err.Error()})
 			return
 		}
 
 		l := PLogger{Verbose: data.Extra.Verbose}
 
 		// Upload
 		if data.Extra.Network {
-			send(map[string]string{"ProgrammerStatus": "Starting", "Cmd": "Network"})
-			err = programmer.Network(data.Port, data.Board, filePath, commandline, data.Extra.Auth, l)
+			send(map[string]string{"uploadStatus": "Starting", "Cmd": "Network"})
+			err = upload.Network(data.Port, data.Board, filePath, commandline, data.Extra.Auth, l)
 		} else {
-			send(map[string]string{"ProgrammerStatus": "Starting", "Cmd": "Serial"})
-			err = programmer.Serial(data.Port, commandline, data.Extra, l)
+			send(map[string]string{"uploadStatus": "Starting", "Cmd": "Serial"})
+			err = upload.Serial(data.Port, commandline, data.Extra, l)
 		}
 
 		// Handle result
 		if err != nil {
-			send(map[string]string{"ProgrammerStatus": "Error", "Msg": err.Error()})
+			send(map[string]string{"uploadStatus": "Error", "Msg": err.Error()})
 			return
 		}
-		send(map[string]string{"ProgrammerStatus": "Done", "Flash": "Ok"})
+		send(map[string]string{"uploadStatus": "Done", "Flash": "Ok"})
 	}()
 
 	c.String(http.StatusAccepted, "")
 }
 
-// PLogger sends the info from the programmer to the websocket
+// PLogger sends the info from the upload to the websocket
 type PLogger struct {
 	Verbose bool
 }
@@ -172,7 +172,7 @@ func (l PLogger) Debug(args ...interface{}) {
 func (l PLogger) Info(args ...interface{}) {
 	output := fmt.Sprint(args...)
 	log.Println(output)
-	send(map[string]string{"ProgrammerStatus": "Busy", "Msg": output})
+	send(map[string]string{"uploadStatus": "Busy", "Msg": output})
 }
 
 func send(args map[string]string) {

Diff for: discovery.go

@@ -126,6 +126,7 @@ func getPorts() ([]OsSerialPort, error) {
 	arrPorts := []OsSerialPort{}
 	go func(results chan *bonjour.ServiceEntry, exitCh chan<- bool) {
 		for e := range results {
+			log.Printf("%+v", e)
 			if e.AddrIPv4 != nil {
 				arrPorts = append(arrPorts, OsSerialPort{Name: e.AddrIPv4.String(), IdProduct: e.Instance, IdVendor: strings.Join(e.Text[:], " "), NetworkPort: true})
 			}

Diff for: hub.go

@@ -3,22 +3,18 @@ package main
 import (
 	"fmt"
 
-	log "github.com/Sirupsen/logrus"
-	"github.com/arduino/arduino-create-agent/programmer"
-	"github.com/kardianos/osext"
-	//"os"
-	"os/exec"
-	//"path"
-	//"path/filepath"
-	//"runtime"
-	//"debug"
 	"encoding/json"
 	"io"
 	"os"
+	"os/exec"
 	"runtime"
 	"runtime/debug"
 	"strconv"
 	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/arduino/arduino-create-agent/upload"
+	"github.com/kardianos/osext"
 )
 
 type hub struct {
@@ -169,12 +165,12 @@ func checkCmd(m []byte) {
 			go spErr("You did not specify a port to close")
 		}
 
-	} else if strings.HasPrefix(sl, "killprogrammer") {
+	} else if strings.HasPrefix(sl, "killupload") {
 		// kill the running process (assumes singleton for now)
 		go func() {
-			programmer.Kill()
-			h.broadcastSys <- []byte("{\"ProgrammerStatus\": \"Killed\"}")
-			log.Println("{\"ProgrammerStatus\": \"Killed\"}")
+			upload.Kill()
+			h.broadcastSys <- []byte("{\"uploadStatus\": \"Killed\"}")
+			log.Println("{\"uploadStatus\": \"Killed\"}")
 		}()
 
 	} else if strings.HasPrefix(sl, "sendjsonraw") {

Diff for: serial.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/arduino/arduino-create-agent/programmer"
+	"github.com/arduino/arduino-create-agent/upload"
 )
 
 type writeRequest struct {
@@ -455,7 +455,7 @@ func discoverLoop() {
 
 	go func() {
 		for {
-			if !programmer.Busy {
+			if !upload.Busy {
 				spListDual(false)
 			}
 			time.Sleep(2 * time.Second)

Diff for: programmer/README.md renamed to upload/README.md

@@ -1,4 +1,4 @@
-// Package programmer allows to upload sketches into a board connected to the computer
+// Package upload allows to upload sketches into a board connected to the computer
 // It can do it via serial port or via network
 //
 // **Usage for a serial upload**
@@ -7,7 +7,7 @@
 //
 //   ```go
 //   commandline = ``"/usr/bin/avrdude" "-C/usr/bin/avrdude.conf" -v -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D "-Uflash:w:./sketch.hex:i"``
-//   err := programmer.Serial("/dev/ttyACM0", commandline, programmer.Extra{}, nil)
+//   err := upload.Serial("/dev/ttyACM0", commandline, upload.Extra{}, nil)
 //   ```
 //
 // note that the commandline contains the path of the sketch (sketch.hex)
@@ -17,7 +17,7 @@
 // Make sure that you have a compiled sketch somewhere on your disk
 //
 //   ```go
-//    err := programmer.Network("127.0.10.120", "arduino:avr:yun, "./sketch.hex", "", programmer.Auth{}, nil)
+//    err := upload.Network("127.0.10.120", "arduino:avr:yun, "./sketch.hex", "", upload.Auth{}, nil)
 //   ```
 //
 // The commandline can be empty or it can contain instructions (depends on the board)
@@ -28,7 +28,7 @@
 //
 //   ```go
 //    t := tools.Tools{}
-//    commandline = programmer.Resolve("/dev/ttyACM0", "arduino:avr:leonardo", "./sketch.hex", commandline, programmer.Extra{}, t)
+//    commandline = upload.Resolve("/dev/ttyACM0", "arduino:avr:leonardo", "./sketch.hex", commandline, upload.Extra{}, t)
 //    ```
 //
 // t must implement the locater interface (the Tools package does!)
@@ -39,6 +39,6 @@
 //   ```go
 //    logger := logrus.New()
 //    logger.Level = logrus.DebugLevel
-//    programmer.Serial("/dev/ttyACM0", commandline, programmer.Extra{}, logger)
+//    upload.Serial("/dev/ttyACM0", commandline, upload.Extra{}, logger)
 //    ```
-package programmer
+package upload

Diff for: programmer/doc.go renamed to upload/doc.go

@@ -1,4 +1,4 @@
-package programmer
+package upload
 
 import (
 	"bufio"

Diff for: programmer/programmer.go renamed to upload/upload.go

@@ -1,12 +1,12 @@
-package programmer_test
+package upload_test
 
 import (
 	"log"
 	"strings"
 	"testing"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/arduino/arduino-create-agent/programmer"
+	"github.com/arduino/arduino-create-agent/upload"
 	homedir "github.com/mitchellh/go-homedir"
 )
 
@@ -21,11 +21,11 @@ var TestSerialData = []struct {
 	Name        string
 	Port        string
 	Commandline string
-	Extra       programmer.Extra
+	Extra       upload.Extra
 }{
 	{
 		"leonardo", "/dev/ttyACM0",
-		`"~/.arduino-create/avrdude/6.3.0-arduino6/bin/avrdude" "-C~/.arduino-create/avrdude/6.3.0-arduino6/etc/avrdude.conf" -v -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D "-Uflash:w:./programmer_test.hex:i"`, programmer.Extra{Use1200bpsTouch: true, WaitForUploadPort: true}},
+		`"~/.arduino-create/avrdude/6.3.0-arduino6/bin/avrdude" "-C~/.arduino-create/avrdude/6.3.0-arduino6/etc/avrdude.conf" -v -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D "-Uflash:w:./upload_test.hex:i"`, upload.Extra{Use1200bpsTouch: true, WaitForUploadPort: true}},
 }
 
 func TestSerial(t *testing.T) {
@@ -36,7 +36,7 @@ func TestSerial(t *testing.T) {
 
 	for _, test := range TestSerialData {
 		commandline := strings.Replace(test.Commandline, "~", home, -1)
-		err := programmer.Serial(test.Port, commandline, test.Extra, logger)
+		err := upload.Serial(test.Port, commandline, test.Extra, logger)
 		log.Println(err)
 	}
 }
@@ -47,11 +47,11 @@ var TestNetworkData = []struct {
 	Board       string
 	File        string
 	Commandline string
-	Auth        programmer.Auth
+	Auth        upload.Auth
 }{
 	{
 		"yun", "", "", "",
-		``, programmer.Auth{}},
+		``, upload.Auth{}},
 }
 
 func TestNetwork(t *testing.T) {
@@ -62,7 +62,7 @@ func TestNetwork(t *testing.T) {
 
 	for _, test := range TestNetworkData {
 		commandline := strings.Replace(test.Commandline, "~", home, -1)
-		err := programmer.Network(test.Port, test.Board, test.File, commandline, test.Auth, logger)
+		err := upload.Network(test.Port, test.Board, test.File, commandline, test.Auth, logger)
 		log.Println(err)
 	}
 }
@@ -72,17 +72,17 @@ var TestResolveData = []struct {
 	Board       string
 	File        string
 	Commandline string
-	Extra       programmer.Extra
+	Extra       upload.Extra
 	Result      string
 }{
-	{"/dev/ttyACM0", "arduino:avr:leonardo", "./programmer_test.hex",
-		`"{runtime.tools.avrdude.path}/bin/avrdude" "-C{runtime.tools.avrdude.path}/etc/avrdude.conf" {upload.verbose} {upload.verify} -patmega32u4 -cavr109 -P{serial.port} -b57600 -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"`, programmer.Extra{Use1200bpsTouch: true, WaitForUploadPort: true},
-		`"$loc$loc{runtime.tools.avrdude.path}/bin/avrdude" "-C{runtime.tools.avrdude.path}/etc/avrdude.conf"  $loc{upload.verify} -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D "-Uflash:w:./programmer_test.hex:i"`},
+	{"/dev/ttyACM0", "arduino:avr:leonardo", "./upload_test.hex",
+		`"{runtime.tools.avrdude.path}/bin/avrdude" "-C{runtime.tools.avrdude.path}/etc/avrdude.conf" {upload.verbose} {upload.verify} -patmega32u4 -cavr109 -P{serial.port} -b57600 -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"`, upload.Extra{Use1200bpsTouch: true, WaitForUploadPort: true},
+		`"$loc$loc{runtime.tools.avrdude.path}/bin/avrdude" "-C{runtime.tools.avrdude.path}/etc/avrdude.conf"  $loc{upload.verify} -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D "-Uflash:w:./upload_test.hex:i"`},
 }
 
 func TestResolve(t *testing.T) {
 	for _, test := range TestResolveData {
-		result, _ := programmer.Resolve(test.Port, test.Board, test.File, test.Commandline, test.Extra, mockTools{})
+		result, _ := upload.Resolve(test.Port, test.Board, test.File, test.Commandline, test.Extra, mockTools{})
 		if result != test.Result {
 			t.Error("expected " + test.Result + ", got " + result)
 			continue

Diff for: programmer/programmer_test.go renamed to upload/upload_test.go

@@ -1,4 +1,4 @@
-package programmer
+package upload
 
 // Logger is an interface implemented by most loggers (like logrus)
 type Logger interface {

Diff for: programmer/programmer_test.hex renamed to upload/upload_test.hex

@@ -1,4 +1,4 @@
-package programmer
+package upload
 
 import "testing"