Add profile option

.gx/lastpubver

@@ -1 +1 @@
-1.3.3: QmPCdWsL88nB7fzvhLRhBMo1QVLtt6Vm7ee7N9ZoUsqpPL
+1.4.0: QmXnGBw6fDN6EGwUBRnVvuoTFXZFL92f3KfYv2MpRq9kFk

main.go

@@ -136,6 +136,10 @@ var initCmd = cli.Command{
 			Name:  "type",
 			Usage: "select type of nodes to initialize",
 		},
+		cli.StringFlag{
+			Name:  "profile",
+			Usage: "initialize nodes with the specified profile",
+		},
 	},
 	Action: func(c *cli.Context) error {
 		if c.Int("count") == 0 {
@@ -152,6 +156,7 @@ var initCmd = cli.Command{
 			PortStart: c.Int("port"),
 			Override:  c.String("cfg"),
 			NodeType:  c.String("type"),
+			Profile:   c.String("profile"),
 		}
 
 		err := util.IpfsInit(cfg)

package.json

@@ -44,6 +44,6 @@
   "license": "",
   "name": "iptb",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "1.3.3"
+  "version": "1.4.0"
 }
 

sharness/t0020-stop.sh

@@ -20,7 +20,7 @@ test_expect_success "iptb stop works" '
 
 for i in {0..2}; do
 	test_expect_success "daemon '$i' was shut down gracefully" '
-		cat testbed/'$i'/daemon.stderr | tail -1 | grep "Gracefully shut down daemon"
+		cat testbed/'$i'/daemon.stderr | grep "Gracefully shut down daemon"
 	'
 done
 

sharness/t0030-profile.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+test_description="iptb init --profile"
+
+. lib/test-lib.sh
+
+IPTB_ROOT=.
+
+test_expect_success "iptb init works" '
+	../bin/iptb init -n 3 --profile=badgerds
+'
+
+for i in {0..2}; do
+	test_expect_success "node '$i' has badger datastore" '
+		IPATH=$(iptb get path '$i')
+
+		test -d "${IPATH}/badgerds"
+	'
+done
+
+
+test_done

util/localnode.go

@@ -24,8 +24,9 @@ import (
 var ErrTimeout = errors.New("timeout")
 
 type LocalNode struct {
-	Dir    string
-	PeerID string
+	Dir     string
+	PeerID  string
+	Profile string
 }
 
 func (n *LocalNode) Init() error {
@@ -34,7 +35,12 @@ func (n *LocalNode) Init() error {
 		return err
 	}
 
-	cmd := exec.Command("ipfs", "init", "-b=1024")
+	arg := []string{"init", "-b=1024"}
+	if n.Profile != "" {
+		arg = append(arg, "--profile="+n.Profile)
+	}
+
+	cmd := exec.Command("ipfs", arg...)
 	cmd.Env, err = n.envForDaemon()
 	if err != nil {
 		return err

util/util.go

@@ -64,6 +64,7 @@ type InitCfg struct {
 	Websocket bool
 	Override  string
 	NodeType  string
+	Profile   string
 }
 
 func (c *InitCfg) swarmAddrForPeer(i int) string {
@@ -195,7 +196,8 @@ func (ns *NodeSpec) Load() (IpfsNode, error) {
 	switch ns.Type {
 	case "local":
 		ln := &LocalNode{
-			Dir: ns.Dir,
+			Dir:     ns.Dir,
+			Profile: ns.Extra["profile"].(string),
 		}
 
 		if _, err := os.Stat(filepath.Join(ln.Dir, "config")); err == nil {
@@ -269,13 +271,17 @@ func initSpecs(cfg *InitCfg) ([]*NodeSpec, error) {
 				Type: "docker",
 				Dir:  dir,
 				Extra: map[string]interface{}{
-					"image": img,
+					"image":   img,
+					"profile": cfg.Profile,
 				},
 			}
 		default:
 			ns = &NodeSpec{
 				Type: "local",
 				Dir:  dir,
+				Extra: map[string]interface{}{
+					"profile": cfg.Profile,
+				},
 			}
 		}
 		specs = append(specs, ns)