Convert to library

Author: matteosuppo

boards.go

@@ -1,4 +1,4 @@
-package main
+package agent
 
 import exec "github.com/arduino/arduino-create-agent/exec"
 

cli/agent/main.go

@@ -0,0 +1,45 @@
+/*
+ * This file is part of arduino-create-agent.
+ *
+ * arduino-create-agent is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
+ */
+package main
+
+import (
+	"flag"
+
+	"github.com/arduino/arduino-create-agent"
+)
+
+func main() {
+	var (
+		hibernate = flag.Bool("hibernate", false, "start hibernated")
+	)
+	opts := agent.Opts{
+		Hibernate: *hibernate,
+	}
+	agent.Start(opts)
+}

commands_v1.go

@@ -26,7 +26,7 @@
  *
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
-package main
+package agent
 
 import (
 	"github.com/arduino/arduino-create-agent/app"

connect_v1.go

@@ -26,7 +26,7 @@
  *
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
-package main
+package agent
 
 import (
 	"bytes"

discover_v1.go

@@ -26,7 +26,7 @@
  *
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
-package main
+package agent
 
 import (
 	"github.com/arduino/arduino-create-agent/app"

main.go

@@ -28,7 +28,7 @@
  */
 //go:generate go run cli/gen/main.go
 
-package main
+package agent
 
 import (
 	"flag"
@@ -50,11 +50,22 @@ import (
 	"github.com/kardianos/osext"
 )
 
-func main() {
+// Opts is a configuration struct used to change the behaviour of the agent
+type Opts struct {
+	// If Hibernate is true the agent will display a grey trayicon and won't answer
+	// to any request
+	Hibernate bool
+
+	// HTTPPort and HTTPSPort are the ports over which the agent will listen
+	// If they are not provided the agent will choose a free port in the range 8990-8999
+	HTTPPort, HTTPSPort int
+}
+
+// Start a webserver listening on the provided ports
+func Start(opts Opts) {
 	var (
-		hibernate = flag.Bool("hibernate", false, "start hibernated")
-		version   = "x.x.x-dev" //don't modify it, Jenkins will take care
-		revision  = "xxxxxxxx"  //don't modify it, Jenkins will take care
+		version  = "x.x.x-dev" //don't modify it, Jenkins will take care
+		revision = "xxxxxxxx"  //don't modify it, Jenkins will take care
 	)
 
 	flag.Parse()
@@ -89,14 +100,22 @@ func main() {
 	app.MountPublicController(service, public)
 
 	// Mount systray
-	restart := restartFunc("", !*hibernate)
+	restart := restartFunc("", !opts.Hibernate)
 	shutdown := func() {
 		os.Exit(0)
 	}
 
+	// Find boards
 	http, https := findPorts()
+	if opts.HTTPPort != 0 {
+		http = opts.HTTPPort
+	}
+	if opts.HTTPSPort != 0 {
+		http = opts.HTTPSPort
+	}
+
 	address := "http://localhost:" + strconv.Itoa(http)
-	if !*hibernate {
+	if !opts.Hibernate {
 		// Start http service
 		go func() {
 			if err := service.ListenAndServe(":" + strconv.Itoa(http)); err != nil {
@@ -111,7 +130,7 @@ func main() {
 		}()
 	}
 
-	setupSystray(*hibernate, version, revision, address, restart, shutdown)
+	setupSystray(opts.Hibernate, version, revision, address, restart, shutdown)
 }
 
 // findPorts returns the first two available ports for http and https listening

public.go

@@ -26,7 +26,7 @@
  *
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
-package main
+package agent
 
 import (
 	"github.com/goadesign/goa"

systray.go

@@ -26,7 +26,7 @@
  *
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
-package main
+package agent
 
 import (
 	"os"

tools_v1.go

@@ -1,4 +1,32 @@
-package main
+/*
+ * This file is part of arduino-create-agent.
+ *
+ * arduino-create-agent is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
+ */
+ package agent
 
 import (
 	"github.com/arduino/arduino-create-agent/app"

upload_v1.go

@@ -26,7 +26,7 @@
  *
  * Copyright 2017 ARDUINO AG (http://www.arduino.cc/)
  */
-package main
+package agent
 
 import (
 	"github.com/arduino/arduino-create-agent/app"