[FAB-10147] Named processes and colors!

Change-Id: I979b8ffbe69b87bf2e93613e4357ba8356f7f037
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

integration/runner/configtxgen.go

@@ -54,7 +54,9 @@ func (c *Configtxgen) OutputBlock(extraArgs ...string) *ginkgomon.Runner {
 	)
 	c.setupCommandEnv(cmd)
 	return ginkgomon.New(ginkgomon.Config{
-		Command: cmd,
+		Name:          "config output block",
+		AnsiColorCode: "32m",
+		Command:       cmd,
 	})
 }
 
@@ -71,7 +73,9 @@ func (c *Configtxgen) OutputCreateChannelTx(extraArgs ...string) *ginkgomon.Runn
 	c.setupCommandEnv(cmd)
 
 	return ginkgomon.New(ginkgomon.Config{
-		Command: cmd,
+		Name:          "config create channel",
+		AnsiColorCode: "33m",
+		Command:       cmd,
 	})
 }
 
@@ -89,6 +93,8 @@ func (c *Configtxgen) OutputAnchorPeersUpdate(extraArgs ...string) *ginkgomon.Ru
 	c.setupCommandEnv(cmd)
 
 	return ginkgomon.New(ginkgomon.Config{
-		Command: cmd,
+		Name:          "config update peer",
+		AnsiColorCode: "34m",
+		Command:       cmd,
 	})
 }

integration/runner/cryptogen.go

@@ -25,6 +25,8 @@ type Cryptogen struct {
 // Generate uses cryptogen to generate cryptographic material for fabric.
 func (c *Cryptogen) Generate(extraArgs ...string) *ginkgomon.Runner {
 	return ginkgomon.New(ginkgomon.Config{
+		Name: "cryptogen generate",
+		AnsiColorCode: "31m",
 		Command: exec.Command(
 			c.Path,
 			append([]string{

integration/runner/orderer.go

@@ -41,7 +41,8 @@ func (o *Orderer) New() *ginkgomon.Runner {
 	o.setupEnvironment(cmd)
 
 	return ginkgomon.New(ginkgomon.Config{
-		Name:    "orderer",
-		Command: cmd,
+		Name:          "orderer",
+		AnsiColorCode: "35m",
+		Command:       cmd,
 	})
 }

integration/runner/peer.go

@@ -40,13 +40,13 @@ func (p *Peer) setupEnvironment(cmd *exec.Cmd) {
 	}
 }
 
-func (p *Peer) NodeStart() *ginkgomon.Runner {
+func (p *Peer) NodeStart(index int) *ginkgomon.Runner {
 	cmd := exec.Command(p.Path, "node", "start")
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
-		Name:          "peer",
+		Name:          fmt.Sprintf("peer-%d", index),
+		AnsiColorCode: fmt.Sprintf("%dm", 92+index%6),
 		Command:       cmd,
 	})
 
@@ -58,7 +58,8 @@ func (p *Peer) ChaincodeListInstalled() *ginkgomon.Runner {
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "list installed",
+		AnsiColorCode: "4;33m",
 		Command:       cmd,
 	})
 
@@ -70,7 +71,8 @@ func (p *Peer) ChaincodeListInstantiated(channel string) *ginkgomon.Runner {
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "list instantiated",
+		AnsiColorCode: "4;34m",
 		Command:       cmd,
 	})
 
@@ -88,7 +90,8 @@ func (p *Peer) CreateChannel(channel string, filename string, orderer string) *g
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "channel create",
+		AnsiColorCode: "4;35m",
 		Command:       cmd,
 	})
 
@@ -100,7 +103,8 @@ func (p *Peer) FetchChannel(channel string, filename string, block string, order
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "channel fetch",
+		AnsiColorCode: "4;36m",
 		Command:       cmd,
 	})
 
@@ -112,7 +116,8 @@ func (p *Peer) JoinChannel(transactionFile string) *ginkgomon.Runner {
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "channel join",
+		AnsiColorCode: "4;37m",
 		Command:       cmd,
 	})
 
@@ -124,7 +129,8 @@ func (p *Peer) UpdateChannel(transactionFile string, channel string, orderer str
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "channel update",
+		AnsiColorCode: "4;33m",
 		Command:       cmd,
 	})
 
@@ -136,7 +142,8 @@ func (p *Peer) InstallChaincode(name string, version string, path string) *ginkg
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "install",
+		AnsiColorCode: "4;34m",
 		Command:       cmd,
 	})
 
@@ -148,7 +155,8 @@ func (p *Peer) InstantiateChaincode(name string, version string, orderer string,
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "instantiate",
+		AnsiColorCode: "4;35m",
 		Command:       cmd,
 	})
 
@@ -160,7 +168,8 @@ func (p *Peer) QueryChaincode(name string, channel string, args string) *ginkgom
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "query",
+		AnsiColorCode: "4;36m",
 		Command:       cmd,
 	})
 
@@ -172,7 +181,8 @@ func (p *Peer) InvokeChaincode(name string, channel string, args string, orderer
 	p.setupEnvironment(cmd)
 
 	r := ginkgomon.New(ginkgomon.Config{
-		AnsiColorCode: "92m",
+		Name:          "invoke",
+		AnsiColorCode: "4;37m",
 		Command:       cmd,
 	})
 

integration/runner/peer_test.go

@@ -136,7 +136,7 @@ var _ = Describe("Peer", func() {
 
 	It("starts a peer", func() {
 		peer.MSPConfigPath = filepath.Join(cryptoDir, "peerOrganizations", "org1.example.com", "peers", "peer0.org1.example.com", "msp")
-		peerRunner := peer.NodeStart()
+		peerRunner := peer.NodeStart(0)
 		peerProcess = ifrit.Invoke(peerRunner)
 		Eventually(peerProcess.Ready()).Should(BeClosed())
 		Consistently(peerProcess.Wait()).ShouldNot(Receive())

integration/world/config.go

@@ -205,7 +205,7 @@ func (w *World) peerNetwork() {
 		for peer := 0; peer < peerOrg.PeerCount; peer++ {
 			p = w.Components.Peer()
 			p.ConfigDir = filepath.Join(w.Rootpath, fmt.Sprintf("%s_%d", peerOrg.Domain, peer))
-			peerProcess := ifrit.Invoke(p.NodeStart())
+			peerProcess := ifrit.Invoke(p.NodeStart(peer))
 			Eventually(peerProcess.Ready()).Should(BeClosed())
 			Consistently(peerProcess.Wait()).ShouldNot(Receive())
 			w.LocalProcess = append(w.LocalProcess, peerProcess)