Added Travis CI config and fixed some broken tests

.gitmodules

@@ -43,9 +43,3 @@
 [submodule "vendor/github.com/prometheus/procfs"]
 	path = vendor/github.com/prometheus/procfs
 	url = https://github.com/prometheus/procfs
-[submodule "vendor/github.com/sasha-s/go-deadlock"]
-	path = vendor/github.com/sasha-s/go-deadlock
-	url = https://github.com/sasha-s/go-deadlock
-[submodule "vendor/github.com/petermattis/goid"]
-	path = vendor/github.com/petermattis/goid
-	url = https://github.com/petermattis/goid

Makefile

@@ -6,7 +6,7 @@ APP=eris
 PACKAGE=irc
 REPO?=prologic/$(APP)
 TAG?=latest
-BUILD?=dev
+BUILD?=-dev
 
 all: dev
 

README.md

@@ -1,11 +1,5 @@
 # eris - IRC Server / Daemon written in Go
 
-[![Build Status](https://travis-ci.org/prologic/eris.svg)](https://travis-ci.org/prologic/eris)
-[![Go Report Card](https://goreportcard.com/badge/github.com/prologic/eris)](https://goreportcard.com/report/github.com/prologic/eris)
-[![Coverage](https://coveralls.io/repos/prologic/eris/badge.svg)](https://coveralls.io/r/prologic/eris)
-[![GoDoc](https://godoc.org/github.com/prologic/eris?status.svg)](https://godoc.org/github.com/prologic/eris)
-[![Wiki](https://img.shields.io/badge/docs-wiki-blue.svg)](https://github.com/prologic/eris/wiki)
-
 > This project and repository is based off of [ergonomadic](https://github.com/edmund-huber/ergonomadic)
 > and much of my original contributions were made in my [fork of ergonomadic](https://github.com/prologic/ergonomadic)
 > but the upstream project was ultimately shutdown.

irc/config.go

@@ -33,10 +33,6 @@ type Config struct {
 	sync.Mutex
 	filename string
 
-	Network struct {
-		Name string
-	}
-
 	Server struct {
 		PassConfig  `yaml:",inline"`
 		Listen      []string
@@ -101,10 +97,6 @@ func LoadConfig(filename string) (config *Config, err error) {
 
 	config.filename = filename
 
-	if config.Network.Name == "" {
-		return nil, errors.New("Network name missing")
-	}
-
 	if config.Server.Name == "" {
 		return nil, errors.New("Server name missing")
 	}

irc/password.go

@@ -68,7 +68,7 @@ func (store *MemoryPasswordStore) Verify(username, password string) error {
 	hash, ok := store.Get(username)
 	if !ok {
 		log.Debugf("username %s not found", username)
-		return fmt.Errorf("account not found: %s", username)
+		return fmt.Errorf("account not found: %S", username)
 	}
 
 	return store.hasher.Compare(hash, []byte(password))

irc/reply.go

@@ -173,12 +173,8 @@ func RplCap(client *Client, subCommand CapSubCommand, arg interface{}) string {
 // numeric replies
 
 func (target *Client) RplWelcome() {
-	target.NumericReply(
-		RPL_WELCOME,
-		":Welcome to the %s Internet Relay Network %s",
-		target.server.Network(),
-		target.Id(),
-	)
+	target.NumericReply(RPL_WELCOME,
+		":Welcome to the Internet Relay Network %s", target.Id())
 }
 
 func (target *Client) RplYourHost() {

irc/server.go

@@ -37,7 +37,6 @@ type Server struct {
 	idle        chan *Client
 	motdFile    string
 	name        Name
-	network     Name
 	description string
 	newConns    chan net.Conn
 	operators   map[Name][]byte
@@ -64,7 +63,6 @@ func NewServer(config *Config) *Server {
 		idle:        make(chan *Client),
 		motdFile:    config.Server.MOTD,
 		name:        NewName(config.Server.Name),
-		network:     NewName(config.Network.Name),
 		description: config.Server.Description,
 		newConns:    make(chan net.Conn),
 		operators:   config.Operators(),
@@ -316,7 +314,6 @@ func (s *Server) Rehash() error {
 
 	s.motdFile = s.config.Server.MOTD
 	s.name = NewName(s.config.Server.Name)
-	s.network = NewName(s.config.Network.Name)
 	s.description = s.config.Server.Description
 	s.operators = s.config.Operators()
 
@@ -327,10 +324,6 @@ func (s *Server) Id() Name {
 	return s.name
 }
 
-func (s *Server) Network() Name {
-	return s.network
-}
-
 func (s *Server) String() string {
 	return s.name.String()
 }

irc/version.go

@@ -1,18 +1,14 @@
 package irc
 
-import (
-	"fmt"
-)
-
 var (
 	//PackageName package name
 	Package = "eris"
 
 	// Version release version
-	Version = "1.6.1"
+	Version = "1.6.0"
 
 	// Build will be overwritten automatically by the build system
-	Build = "dev"
+	Build = "-dev"
 
 	// GitCommit will be overwritten automatically by the build system
 	GitCommit = "HEAD"
@@ -20,5 +16,5 @@ var (
 
 // FullVersion display the full version and build
 func FullVersion() string {
-	return fmt.Sprintf("%s-%s-%s@%s", Package, Version, Build, GitCommit)
+	return Package + " v" + Version + Build + " (" + GitCommit + ")"
 }

ircd.yml

@@ -1,7 +1,3 @@
-network:
-  # network name
-  name: Local
-
 server:
   # server name
   name: localhost.localdomain

scripts/release.sh

@@ -21,7 +21,7 @@ fi
 echo -n "Building binaries ... "
 
 GOOS=linux GOARCH=amd64 go build -o ./bin/eris-Linux-x86_64 .
-GOOS=linux GOARCH=arm64 go build -o ./bin/eris-Linux-arm_64 .
+GOOS=linux GOARCH=arm64 go build -o ./bin/eris-Linux-x86_64 .
 GOOS=darwin GOARCH=amd64 go build -o ./bin/eris-Darwin-x86_64 .
 GOOS=windows GOARCH=amd64 go build -o ./bin/eris-Windows-x86_64.exe .