content: refactor content store for API

After iterating on the GRPC API, the changes required for the actual
implementation are now included in the content store. The begin change
is the move to a single, atomic `Ingester.Writer` method for locking
content ingestion on a key. From this, comes several new interface
definitions.

The main benefit here is the clarification between `Status` and `Info`
that came out of the GPRC API. `Status` tells the status of a write,
whereas `Info` is for querying metadata about various blobs.

Signed-off-by: Stephen J Day <stephen.day@docker.com>

cmd/dist/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	contextpkg "context"
 	"fmt"
 	"os"
 
@@ -9,6 +10,10 @@ import (
 	"github.com/urfave/cli"
 )
 
+var (
+	background = contextpkg.Background()
+)
+
 func main() {
 	app := cli.NewApp()
 	app.Name = "dist"
@@ -27,20 +32,38 @@ distribution tool
 			Name:  "debug",
 			Usage: "enable debug output in logs",
 		},
+		cli.DurationFlag{
+			Name:   "timeout",
+			Usage:  "total timeout for fetch",
+			EnvVar: "CONTAINERD_FETCH_TIMEOUT",
+		},
+		cli.StringFlag{
+			Name:  "root",
+			Usage: "path to content store root",
+			Value: "/tmp/content", // TODO(stevvooe): for now, just use the PWD/.content
+		},
 	}
 	app.Commands = []cli.Command{
 		fetchCommand,
 		ingestCommand,
 		activeCommand,
-		pathCommand,
+		getCommand,
 		deleteCommand,
 		listCommand,
 		applyCommand,
 	}
 	app.Before = func(context *cli.Context) error {
-		if context.GlobalBool("debug") {
+		var (
+			debug   = context.GlobalBool("debug")
+			timeout = context.GlobalDuration("timeout")
+		)
+		if debug {
 			logrus.SetLevel(logrus.DebugLevel)
 		}
+
+		if timeout > 0 {
+			background, _ = contextpkg.WithTimeout(background, timeout)
+		}
 		return nil
 	}
 	if err := app.Run(os.Args); err != nil {