Call programmer

Author: matteosuppo

programmer/programmer.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/arduino/arduino-create-agent/utilities"
 	"github.com/facchinm/go-serial"
+	shellwords "github.com/mattn/go-shellwords"
 	"github.com/pkg/errors"
 )
 
@@ -84,18 +85,18 @@ func Resolve(port, board, file, commandline string, extra Extra, t locater) (str
 }
 
 // Do performs a command on a port with a board attached to it
-func Do(port, board, file, commandline string, extra Extra, t locater, l logger) {
-	debug(l, port, board, file, commandline)
+func Do(port, commandline string, extra Extra, l logger) error {
 	if extra.Network {
 		doNetwork()
 	} else {
-		doSerial(port, board, file, commandline, extra, t, l)
+		return doSerial(port, commandline, extra, l)
 	}
+	return nil
 }
 
 func doNetwork() {}
 
-func doSerial(port, board, file, commandline string, extra Extra, t locater, l logger) error {
+func doSerial(port, commandline string, extra Extra, l logger) error {
 	// some boards needs to be resetted
 	if extra.Use1200bpsTouch {
 		var err error
@@ -105,7 +106,12 @@ func doSerial(port, board, file, commandline string, extra Extra, t locater, l l
 		}
 	}
 
-	return nil
+	z, err := shellwords.Parse(commandline)
+	if err != nil {
+		return errors.Wrapf(err, "Parse commandline")
+	}
+
+	return program(z[0], z[1:], l)
 }
 
 // reset opens the port at 1200bps. It returns the new port name (which could change
@@ -246,7 +252,7 @@ func program(binary string, args []string, l logger) error {
 
 	go func() {
 		for stderrCopy.Scan() {
-			info(l, stdoutCopy.Text())
+			info(l, stderrCopy.Text())
 		}
 	}()
 

programmer/programmer_test.go

@@ -1,10 +1,13 @@
 package programmer_test
 
 import (
+	"log"
+	"strings"
 	"testing"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/programmer"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 type mockTools struct{}
@@ -16,21 +19,24 @@ func (mockTools) GetLocation(el string) (string, error) {
 var TestSerialData = []struct {
 	Name        string
 	Port        string
-	Board       string
-	File        string
 	Commandline string
 	Extra       programmer.Extra
 }{
-	{"leonardo", "/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}},
+	{
+		"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}},
 }
 
 func TestSerial(t *testing.T) {
 	logger := logrus.New()
 	logger.Level = logrus.DebugLevel
 
+	home, _ := homedir.Dir()
+
 	for _, test := range TestSerialData {
-		programmer.Do(test.Port, test.Board, test.File, test.Commandline, test.Extra, mockTools{}, logger)
+		commandline := strings.Replace(test.Commandline, "~", home, -1)
+		err := programmer.Do(test.Port, commandline, test.Extra, logger)
+		log.Println(err)
 	}
 	t.Fail()
 }