Enable bare strings for noms (struct|set|list|map) arguments.

E.g., `noms map set foo bar` rather than `noms map set '"foo"' '"bar"'`.

This required changing tons.

cmd/noms/noms.go

@@ -12,13 +12,15 @@ import (
 	"strings"
 	"time"
 
+	"github.com/attic-labs/kingpin"
+
 	"github.com/attic-labs/noms/cmd/noms/splore"
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/util/exit"
 	"github.com/attic-labs/noms/go/util/profile"
 	"github.com/attic-labs/noms/go/util/verbose"
+
 	flag "github.com/juju/gnuflag"
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 var commands = []*util.Command{
@@ -65,6 +67,7 @@ func usageString() string {
 
 func main() {
 	// allow short (-h) help
+	kingpin.EnableFileExpansion = false
 	kingpin.CommandLine.HelpFlag.Short('h')
 	noms := kingpin.New("noms", usageString())
 

cmd/noms/noms_blob.go

@@ -8,9 +8,10 @@ import (
 	"runtime"
 	"strconv"
 
+	"github.com/attic-labs/kingpin"
+
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/d"
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func nomsBlob(noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) {

cmd/noms/noms_list.go

@@ -7,13 +7,13 @@ package main
 import (
 	"fmt"
 
+	"github.com/attic-labs/kingpin"
+
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/d"
 	"github.com/attic-labs/noms/go/diff"
 	"github.com/attic-labs/noms/go/spec"
 	"github.com/attic-labs/noms/go/types"
-
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func nomsList(noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) {
@@ -106,14 +106,10 @@ func applyListInserts(sp spec.Spec, rootVal types.Value, basePath types.Path, po
 	db := sp.GetDatabase()
 	patch := diff.Patch{}
 	for i := 0; i < len(args); i++ {
-		vp, err := spec.NewAbsolutePath(args[i])
+		vv, err := argumentToValue(args[i], db)
 		if err != nil {
 			d.CheckError(fmt.Errorf("Invalid value: %s at position %d: %s", args[i], i, err))
 		}
-		vv := vp.Resolve(db)
-		if vv == nil {
-			d.CheckError(fmt.Errorf("Invalid value: %s at position %d", args[i], i))
-		}
 		patch = append(patch, diff.Difference{
 			Path:       append(basePath, types.NewIndexPath(types.Number(pos+uint64(i)))),
 			ChangeType: types.DiffChangeAdded,

cmd/noms/noms_map.go

@@ -7,13 +7,13 @@ package main
 import (
 	"fmt"
 
+	"github.com/attic-labs/kingpin"
+
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/d"
 	"github.com/attic-labs/noms/go/diff"
 	"github.com/attic-labs/noms/go/spec"
 	"github.com/attic-labs/noms/go/types"
-
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func nomsMap(noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) {
@@ -90,14 +90,10 @@ func applyMapEdits(sp spec.Spec, rootVal types.Value, basePath types.Path, args
 	patch := diff.Patch{}
 	for i := 0; i < len(args); i += 2 {
 		kp := parseKeyPart(args, i)
-		vp, err := spec.NewAbsolutePath(args[i+1])
+		vv, err := argumentToValue(args[i+1], db)
 		if err != nil {
 			d.CheckError(fmt.Errorf("Invalid value: %s at position %d: %s", args[i+1], i+1, err))
 		}
-		vv := vp.Resolve(db)
-		if vv == nil {
-			d.CheckError(fmt.Errorf("Invalid value: %s at position %d", args[i+1], i+1))
-		}
 		patch = append(patch, diff.Difference{
 			Path:       append(basePath, kp),
 			ChangeType: types.DiffChangeModified,

cmd/noms/noms_set.go

@@ -5,15 +5,18 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
+	"strconv"
+
+	"github.com/attic-labs/kingpin"
 
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/d"
+	"github.com/attic-labs/noms/go/datas"
 	"github.com/attic-labs/noms/go/diff"
 	"github.com/attic-labs/noms/go/spec"
 	"github.com/attic-labs/noms/go/types"
-
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func nomsSet(noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) {
@@ -76,13 +79,9 @@ func applySetEdits(sp spec.Spec, rootVal types.Value, basePath types.Path, ct ty
 	db := sp.GetDatabase()
 	patch := diff.Patch{}
 	for i := 0; i < len(args); i++ {
-		vp, err := spec.NewAbsolutePath(args[i])
+		vv, err := argumentToValue(args[i], db)
 		if err != nil {
-			d.CheckError(fmt.Errorf("Invalid value: %s at position %d: %s", args[i], i, err))
-		}
-		vv := vp.Resolve(db)
-		if vv == nil {
-			d.CheckError(fmt.Errorf("Invalid value: %s at position %d", args[i], i))
+			d.CheckErrorNoUsage(err)
 		}
 		var pp types.PathPart
 		if types.ValueCanBePathIndex(vv) {
@@ -102,3 +101,45 @@ func applySetEdits(sp spec.Spec, rootVal types.Value, basePath types.Path, ct ty
 	}
 	appplyPatch(sp, rootVal, basePath, patch)
 }
+
+func argumentToValue(arg string, db datas.Database) (types.Value, error) {
+	d.PanicIfTrue(arg == "")
+
+	if arg == "true" {
+		return types.Bool(true), nil
+	}
+	if arg == "false" {
+		return types.Bool(false), nil
+	}
+	if arg[0] == '"' {
+		buf := bytes.Buffer{}
+		for i := 1; i < len(arg); i++ {
+			c := arg[i]
+			if c == '"' {
+				if i != len(arg)-1 {
+					break
+				}
+				return types.String(buf.String()), nil
+			}
+			if c == '\\' {
+				i++
+				c = arg[i]
+				if c != '\\' && c != '"' {
+					return nil, fmt.Errorf("Invalid string argument: %s: Only '\\' and '\"' can be escaped")
+				}
+			}
+			buf.WriteByte(c)
+		}
+		return nil, fmt.Errorf("Invalid string argument: %s", arg)
+	}
+	if arg[0] == '@' {
+		p, err := spec.NewAbsolutePath(arg[1:])
+		d.PanicIfError(err)
+		return p.Resolve(db), nil
+	}
+	if n, err := strconv.ParseFloat(arg, 64); err == nil {
+		return types.Number(n), nil
+	}
+
+	return types.String(arg), nil
+}

cmd/noms/noms_stats.go

@@ -7,7 +7,7 @@ package main
 import (
 	"fmt"
 
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	"github.com/attic-labs/kingpin"
 
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/config"

cmd/noms/noms_struct.go

@@ -7,13 +7,13 @@ package main
 import (
 	"fmt"
 
+	"github.com/attic-labs/kingpin"
+
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/d"
 	"github.com/attic-labs/noms/go/diff"
 	"github.com/attic-labs/noms/go/spec"
 	"github.com/attic-labs/noms/go/types"
-
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func nomsStruct(noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) {
@@ -109,14 +109,10 @@ func applyStructEdits(sp spec.Spec, rootVal types.Value, basePath types.Path, ar
 		if !types.IsValidStructFieldName(args[i]) {
 			d.CheckError(fmt.Errorf("Invalid field name: %s at position: %d", args[i], i))
 		}
-		p, err := spec.NewAbsolutePath(args[i+1])
+		nv, err := argumentToValue(args[i+1], db)
 		if err != nil {
 			d.CheckError(fmt.Errorf("Invalid field value: %s at position %d: %s", args[i+1], i+1, err))
 		}
-		nv := p.Resolve(db)
-		if nv == nil {
-			d.CheckError(fmt.Errorf("Invalid field value: %s at position: %d", args[i+1], i+1))
-		}
 		patch = append(patch, diff.Difference{
 			Path:       append(basePath, types.FieldPath{Name: args[i]}),
 			ChangeType: types.DiffChangeModified,

cmd/noms/splore/noms_splore.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"reflect"
 
+	"github.com/attic-labs/kingpin"
 	"github.com/attic-labs/noms/cmd/util"
 	"github.com/attic-labs/noms/go/config"
 	"github.com/attic-labs/noms/go/d"
@@ -19,7 +20,6 @@ import (
 	"github.com/attic-labs/noms/go/util/verbose"
 	humanize "github.com/dustin/go-humanize"
 	"github.com/skratchdot/open-golang/open"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var httpServe = http.Serve // override for tests

cmd/util/kingpin_command.go

@@ -4,7 +4,7 @@
 
 package util
 
-import kingpin "gopkg.in/alecthomas/kingpin.v2"
+import "github.com/attic-labs/kingpin"
 
 type KingpinHandler func(input string) (exitCode int)
 type KingpinCommand func(*kingpin.Application) (*kingpin.CmdClause, KingpinHandler)

go/spec/absolute_path.go

@@ -24,10 +24,6 @@ var datasetCapturePrefixRe = regexp.MustCompile("^(" + datas.DatasetRe.String()
 // For more on paths, absolute paths, and specs, see:
 // https://github.com/attic-labs/noms/blob/master/doc/spelling.md.
 type AbsolutePath struct {
-	// A literal value, like `true` or `42`, or `"foo"`. Only kinds Bool,
-	// Number, and String are supported. This allows absolute paths to be used
-	// to specify primitive new data in addition to referencing existing data.
-	Value types.Value
 	// Dataset is the dataset this AbsolutePath is rooted at. Only one of
 	// Dataset and Hash should be set.
 	Dataset string
@@ -65,12 +61,6 @@ func NewAbsolutePath(str string) (AbsolutePath, error) {
 
 		pathStr = tail[hash.StringLen:]
 	} else {
-		idx, h, rem, err := types.ParsePathIndex(str)
-		if idx != nil && h.IsEmpty() && rem == "" && err == nil {
-			return AbsolutePath{
-				Value: idx,
-			}, nil
-		}
 		datasetParts := datasetCapturePrefixRe.FindStringSubmatch(str)
 		if datasetParts == nil {
 			return AbsolutePath{}, fmt.Errorf("Invalid dataset name: %s", str)
@@ -94,10 +84,6 @@ func NewAbsolutePath(str string) (AbsolutePath, error) {
 
 // Resolve returns the Value reachable by 'p' in 'db'.
 func (p AbsolutePath) Resolve(db datas.Database) (val types.Value) {
-	if p.Value != nil {
-		return p.Value
-	}
-
 	if len(p.Dataset) > 0 {
 		var ok bool
 		ds := db.GetDataset(p.Dataset)
@@ -117,18 +103,14 @@ func (p AbsolutePath) Resolve(db datas.Database) (val types.Value) {
 }
 
 func (p AbsolutePath) IsEmpty() bool {
-	return p.Value == nil && p.Dataset == "" && p.Hash.IsEmpty()
+	return p.Dataset == "" && p.Hash.IsEmpty()
 }
 
 func (p AbsolutePath) String() (str string) {
 	if p.IsEmpty() {
 		return ""
 	}
 
-	if p.Value != nil {
-		return types.EncodedIndexValue(p.Value)
-	}
-
 	if len(p.Dataset) > 0 {
 		str = p.Dataset
 	} else if !p.Hash.IsEmpty() {

go/spec/absolute_path_test.go

@@ -35,7 +35,7 @@ func TestAbsolutePaths(t *testing.T) {
 	storage := &chunks.MemoryStorage{}
 	db := datas.NewDatabase(storage.NewView())
 
-	s0, s1, s2 := types.String("foo"), types.String("bar"), types.String("")
+	s0, s1 := types.String("foo"), types.String("bar")
 	list := types.NewList(db, s0, s1)
 	emptySet := types.NewSet(db)
 
@@ -72,12 +72,6 @@ func TestAbsolutePaths(t *testing.T) {
 	resolvesTo(s1, "#"+s1.Hash().String())
 	resolvesTo(s0, "#"+list.Hash().String()+"[0]")
 	resolvesTo(s1, "#"+list.Hash().String()+"[1]")
-	resolvesTo(s0, "\"foo\"")
-	resolvesTo(s2, "\"\"")
-	resolvesTo(types.Bool(true), "true")
-	resolvesTo(types.Bool(false), "false")
-	resolvesTo(types.Number(42), "42")
-	resolvesTo(types.Number(88.8), "88.8")
 
 	resolvesTo(nil, "foo")
 	resolvesTo(nil, "foo.parents")