Merge pull request #7 from cbusbey/makefile

adds makefile for easy compilation, more readme

Author: cbusbey

.gitignore

@@ -1,4 +1,2 @@
 *.swp
 tmp
-tradeclient
-executor

.travis.yml

@@ -11,4 +11,4 @@ matrix:
 
 install: 
 
-script: go build ./cmd/...
+script: make

Makefile

@@ -0,0 +1,2 @@
+all:
+	go install ./cmd/...

README.md

@@ -16,7 +16,11 @@ To build and run the examples, you will first need [Go](http://www.golang.org) i
 
 For local dev first make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH).
 
-Next, using [Git](https://git-scm.com/), clone this repository into `$GOPATH/src/github.com/quickfixgo/examples`. All the necessary dependencies are either vendored, so you just need to type `go build ./cmd/...`. This will compile the example code. If this exits with exit status 0, then everything is working!
+Next, using [Git](https://git-scm.com/), clone this repository into `$GOPATH/src/github.com/quickfixgo/examples`. All the necessary dependencies are either vendored, so you just need to type `make`. This will compile and install the examples into `$GOPATH/bin`. If this exits with exit status 0, then everything is working!
+
+```sh
+$ make
+```
 
 Licensing
 ---------

cmd/executor/executor.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"path"
 
 	"github.com/quickfixgo/quickfix"
 	"github.com/quickfixgo/quickfix/enum"
@@ -428,49 +429,10 @@ func (e *executor) OnFIX50NewOrderSingle(msg fix50nos.NewOrderSingle, sessionID
 	return
 }
 
-/*
-func (e *executor) OnFIX50NewOrderSingle(msg fix50nos.NewOrderSingle, sessionID quickfix.SessionID) (err quickfix.MessageRejectError) {
-	if msg.OrdType != enum.OrdType_LIMIT {
-		err = quickfix.ValueIsIncorrect(tag.OrdType)
-		return
-	}
-
-	if msg.Price == nil {
-		err = quickfix.ConditionallyRequiredFieldMissing(tag.Price)
-		return
-	}
-
-	if msg.OrderQtyData.OrderQty == nil {
-		err = quickfix.ConditionallyRequiredFieldMissing(tag.OrderQty)
-		return
-	}
-
-	execReport := fix50er.ExecutionReport{
-		ClOrdID:      &msg.ClOrdID,
-		Instrument:   msg.Instrument,
-		Account:      msg.Account,
-		OrderID:      e.genOrderID(),
-		ExecID:       strconv.Itoa(e.genExecID()),
-		ExecType:     enum.ExecType_FILL,
-		OrdStatus:    enum.OrdStatus_FILLED,
-		Side:         msg.Side,
-		OrderQtyData: msg.OrderQtyData,
-		LastQty:      msg.OrderQtyData.OrderQty,
-		LeavesQty:    0,
-		CumQty:       *msg.OrderQtyData.OrderQty,
-		LastPx:       msg.Price,
-		AvgPx:        msg.Price,
-	}
-
-	quickfix.SendToTarget(execReport, sessionID)
-
-	return
-}*/
-
 func main() {
 	flag.Parse()
 
-	cfgFileName := "executor.cfg"
+	cfgFileName := path.Join("config", "executor.cfg")
 	if flag.NArg() > 0 {
 		cfgFileName = flag.Arg(0)
 	}

cmd/ordermatch/market.go renamed to cmd/ordermatch/internal/market.go

@@ -1,10 +1,11 @@
-package main
+package internal
 
 import (
 	"fmt"
-	"github.com/quickfixgo/quickfix/enum"
 	"sort"
 	"time"
+
+	"github.com/quickfixgo/quickfix/enum"
 )
 
 type orderList struct {

cmd/ordermatch/order.go renamed to cmd/ordermatch/internal/order.go

@@ -1,4 +1,4 @@
-package main
+package internal
 
 import (
 	"time"

cmd/ordermatch/ordermatcher.go renamed to cmd/ordermatch/internal/ordermatcher.go

@@ -1,4 +1,4 @@
-package main
+package internal
 
 import "fmt"
 

cmd/ordermatch/ordermatch.go

@@ -6,8 +6,10 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"path"
 	"strconv"
 
+	"github.com/quickfixgo/examples/cmd/ordermatch/internal"
 	"github.com/quickfixgo/quickfix"
 	"github.com/quickfixgo/quickfix/enum"
 	"github.com/quickfixgo/quickfix/field"
@@ -20,14 +22,14 @@ import (
 //Application implements the quickfix.Application interface
 type Application struct {
 	*quickfix.MessageRouter
-	*OrderMatcher
+	*internal.OrderMatcher
 	execID int
 }
 
 func newApplication() *Application {
 	app := &Application{
 		MessageRouter: quickfix.NewMessageRouter(),
-		OrderMatcher:  NewOrderMatcher(),
+		OrderMatcher:  internal.NewOrderMatcher(),
 	}
 	app.AddRoute(newordersingle.Route(app.onNewOrderSingle))
 	app.AddRoute(ordercancelrequest.Route(app.onOrderCancelRequest))
@@ -104,7 +106,7 @@ func (a *Application) onNewOrderSingle(msg newordersingle.NewOrderSingle, sessio
 		return err
 	}
 
-	order := Order{
+	order := internal.Order{
 		ClOrdID:      clOrdID.String(),
 		Symbol:       symbol.String(),
 		SenderCompID: senderCompID.String(),
@@ -157,19 +159,19 @@ func (a *Application) onMarketDataRequest(msg marketdatarequest.MarketDataReques
 	return
 }
 
-func (a *Application) acceptOrder(order Order) {
+func (a *Application) acceptOrder(order internal.Order) {
 	a.updateOrder(order, enum.OrdStatus_NEW)
 }
 
-func (a *Application) fillOrder(order Order) {
+func (a *Application) fillOrder(order internal.Order) {
 	status := enum.OrdStatus_FILLED
 	if !order.IsClosed() {
 		status = enum.OrdStatus_PARTIALLY_FILLED
 	}
 	a.updateOrder(order, status)
 }
 
-func (a *Application) cancelOrder(order Order) {
+func (a *Application) cancelOrder(order internal.Order) {
 	a.updateOrder(order, enum.OrdStatus_CANCELED)
 }
 
@@ -178,7 +180,7 @@ func (a *Application) genExecID() string {
 	return strconv.Itoa(a.execID)
 }
 
-func (a *Application) updateOrder(order Order, status string) {
+func (a *Application) updateOrder(order internal.Order, status string) {
 	execReport := executionreport.New(
 		field.NewOrderID(order.ClOrdID),
 		field.NewExecID(a.genExecID()),
@@ -203,7 +205,7 @@ func (a *Application) updateOrder(order Order, status string) {
 func main() {
 	flag.Parse()
 
-	cfgFileName := "ordermatch.cfg"
+	cfgFileName := path.Join("config", "ordermatch.cfg")
 	if flag.NArg() > 0 {
 		cfgFileName = flag.Arg(0)
 	}

cmd/tradeclient/internal/console.go

@@ -531,7 +531,7 @@ func QueryEnterOrder() (err error) {
 	return quickfix.Send(order)
 }
 
-func queryCancelOrder() (err error) {
+func QueryCancelOrder() (err error) {
 	defer func() {
 		if e := recover(); e != nil {
 			err = e.(error)
@@ -572,7 +572,7 @@ func queryCancelOrder() (err error) {
 	return
 }
 
-func queryMarketDataRequest() error {
+func QueryMarketDataRequest() error {
 	beginString, err := queryVersion()
 	if err != nil {
 		return err