Added Makefile -- gofmt

Makefile

@@ -0,0 +1,18 @@
+BUILD=go build
+
+
+SOURCES=scorsh.go \
+types.go \
+config.go \
+spooler.go \
+commits.go \
+workers.go
+
+all: scorsh
+
+
+scorsh: $(SOURCES) 
+	$(BUILD) scorsh.go types.go config.go spooler.go commits.go workers.go
+
+clean:
+	rm scorsh

commits.go

@@ -6,7 +6,7 @@ import (
 	"golang.org/x/crypto/openpgp"
 	"os"
 	"strings"
-//	"log"
+	//	"log"
 )
 
 func CommitToString(commit *git.Commit) string {
@@ -32,7 +32,7 @@ func check_signature(commit *git.Commit, keys []*openpgp.KeyRing) (signature, si
 
 			_, err_sig :=
 				openpgp.CheckArmoredDetachedSignature(*keyring, strings.NewReader(signed),
-				strings.NewReader(signature))
+					strings.NewReader(signature))
 
 			if err_sig == nil {
 				fmt.Printf("Good signature \n")
@@ -45,7 +45,6 @@ func check_signature(commit *git.Commit, keys []*openpgp.KeyRing) (signature, si
 	return "", "", err
 }
 
-
 // traverse all the commits between two references, looking for scorsh
 // commands
 // fixme: we don't have just one keyring here....

config.go

@@ -40,7 +40,7 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
 	}
 
 	if cfg.LogPrefix != "" {
-		log.SetPrefix(cfg.LogPrefix+ " ")
+		log.SetPrefix(cfg.LogPrefix + " ")
 	}
 
 	// If the user has not set a spooldir, crash loudly
@@ -59,4 +59,3 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
 	return cfg
 
 }
-

scorsh.go

@@ -12,8 +12,7 @@ const debug debugging = true
 
 type debugging bool
 
-
-func (d debugging) log(format string, args ...interface{}){
+func (d debugging) log(format string, args ...interface{}) {
 	if d {
 		log.Printf(format, args...)
 	}
@@ -45,12 +44,11 @@ func SCORSHerr(err int) error {
 
 }
 
-
 func FindMatchingWorkers(master *SCORSHmaster, msg *SCORSHmsg) []*SCORSHworker {
 
 	var ret []*SCORSHworker
 
-	for idx,w := range master.Workers {
+	for idx, w := range master.Workers {
 		if w.Matches(msg.Repo, msg.Branch) {
 			debug.log("--- Worker: %s matches %s:%s\n", w.Name, msg.Repo, msg.Branch)
 			ret = append(ret, &(master.Workers[idx]))
@@ -59,7 +57,6 @@ func FindMatchingWorkers(master *SCORSHmaster, msg *SCORSHmsg) []*SCORSHworker {
 	return ret
 }
 
-
 func Master(master *SCORSHmaster) {
 
 	// master main loop:
@@ -74,7 +71,7 @@ func Master(master *SCORSHmaster) {
 	for {
 		select {
 		// - receive stuff from the spooler
-		case push_msg = <- master.Spooler:
+		case push_msg = <-master.Spooler:
 
 			debug.log("[master] received message: %s\n", push_msg)
 
@@ -97,14 +94,12 @@ func InitMaster() *SCORSHmaster {
 
 	master := ReadGlobalConfig(*conf_file)
 
-	
 	master.Repos = make(map[string][]*SCORSHworker)
 	master.WorkingMsg = make(map[string]int)
 	// This is the mutex-channel on which we receive acks from workers
 	master.StatusChan = make(chan SCORSHmsg, 1)
 	master.Spooler = make(chan SCORSHmsg, 1)
 
-	
 	err_workers := StartWorkers(master)
 	if err_workers != nil {
 		log.Fatal("Error starting workers: ", err_workers)
@@ -119,7 +114,6 @@ func InitMaster() *SCORSHmaster {
 
 }
 
-
 func main() {
 
 	flag.Parse()
@@ -128,6 +122,6 @@ func main() {
 
 	go Master(master)
 
-	<- master.StatusChan
+	<-master.StatusChan
 
 }

spooler.go

@@ -6,13 +6,12 @@ import (
 	"github.com/go-yaml/yaml"
 	"io/ioutil"
 	"log"
-//	"time"
+	//	"time"
 )
 
 // parse a request file and return a SCORSHmessage
 func parse_request(fname string, msg *SCORSHmsg) error {
 
-	
 	debug.log("[parse_request] message at start: %s\n", msg)
 
 	data, err := ioutil.ReadFile(fname)
@@ -25,7 +24,6 @@ func parse_request(fname string, msg *SCORSHmsg) error {
 
 	debug.log("[parse_request] reading message from file: %s\n", fname)
 
-	
 	err = yaml.Unmarshal([]byte(data), msg)
 	if err != nil {
 		return fmt.Errorf("Error parsing message: %s", err)
@@ -34,7 +32,6 @@ func parse_request(fname string, msg *SCORSHmsg) error {
 	return nil
 }
 
-
 func spooler(watcher *fsnotify.Watcher, worker chan SCORSHmsg) {
 
 	log.Println("Spooler started correctly")
@@ -61,7 +58,6 @@ func spooler(watcher *fsnotify.Watcher, worker chan SCORSHmsg) {
 	}
 }
 
-
 func StartSpooler(master *SCORSHmaster) error {
 
 	watcher, err := fsnotify.NewWatcher()

types.go

@@ -55,7 +55,7 @@ type SCORSHworker_state struct {
 // The type SCORSHworker represents the configuration and state of a
 // worker
 type SCORSHworker struct {
-	SCORSHworker_cfg   `yaml:",inline"`
+	SCORSHworker_cfg `yaml:",inline"`
 	SCORSHworker_state
 }
 
@@ -82,8 +82,6 @@ type SCORSHmaster struct {
 	SCORSHmaster_state
 }
 
-
-
 func (cfg *SCORSHmaster) String() string {
 
 	var buff bytes.Buffer
@@ -122,7 +120,6 @@ func (cfg *SCORSHmaster) String() string {
 	return buff.String()
 }
 
-
 func (msg *SCORSHmsg) String() string {
 
 	var buff bytes.Buffer
@@ -139,4 +136,3 @@ func (msg *SCORSHmsg) String() string {
 	return buff.String()
 
 }
-

workers.go

@@ -60,11 +60,10 @@ func (w *SCORSHworker) LoadKeyrings() error {
 func (w *SCORSHworker) LoadTags() error {
 
 	w_tags, err := ioutil.ReadFile(w.Tagfile)
-	if err != nil{
+	if err != nil {
 		return fmt.Errorf("Cannot read worker config: %s", err)
 	}
 
-	
 	err = yaml.Unmarshal(w_tags, w)
 	//err = yaml.Unmarshal(w_tags, tags)
 
@@ -109,9 +108,9 @@ func StartWorkers(master *SCORSHmaster) error {
 
 	log.Printf("num_workers: %d\n", num_workers)
 
-	for w:=0; w<num_workers; w++ {
+	for w := 0; w < num_workers; w++ {
 
-		worker := & (master.Workers[w])
+		worker := &(master.Workers[w])
 		// Set the Status and Msg channels
 		worker.StatusChan = master.StatusChan
 		worker.MsgChan = make(chan SCORSHmsg)
@@ -132,7 +131,7 @@ func StartWorkers(master *SCORSHmaster) error {
 			master.Repos[repo_name] = append(master.Repos[repo_name], worker)
 		}
 		go Worker(worker)
-		<- master.StatusChan
+		<-master.StatusChan
 	}
 	return nil
 }