Merge branch 'feature-authors'

Author: nasdf

cmd/multi/clone.go

@@ -23,7 +23,7 @@ var cloneCommand = &cli.Command{
 			Name:    "branch",
 			Aliases: []string{"b"},
 			Usage:   "Branch name",
-			Value:   "default",
+			Value:   "main",
 		},
 		&cli.IntFlag{
 			Name:    "limit",

cmd/multi/config.go

@@ -12,6 +12,8 @@ import (
 )
 
 const (
+	// DefaultBranch is the name of the default branch.
+	DefaultBranch = "main"
 	// ConfigFile is the name of the config file.
 	ConfigFile = "multi.json"
 	// IgnoreFile is the name of the ignore file.
@@ -38,7 +40,7 @@ type Config struct {
 // NewConfig returns a config with default settings.
 func NewConfig(root string) *Config {
 	return &Config{
-		Branch: "default",
+		Branch: DefaultBranch,
 		Path:   filepath.Join(root, ConfigFile),
 		Root:   root,
 	}

cmd/multi/daemon.go

@@ -7,8 +7,6 @@ import (
 	"path/filepath"
 
 	"github.com/ipfs/go-ds-badger2"
-	"github.com/multiverse-vcs/go-multiverse/data"
-	"github.com/multiverse-vcs/go-multiverse/key"
 	"github.com/multiverse-vcs/go-multiverse/peer"
 	"github.com/multiverse-vcs/go-multiverse/rpc"
 	"github.com/multiverse-vcs/go-multiverse/web"
@@ -49,38 +47,33 @@ func daemonAction(c *cli.Context) error {
 	}
 
 	dpath := filepath.Join(root, "datastore")
-	dstore, err := badger.NewDatastore(dpath, &badger.DefaultOptions)
-	if err != nil {
-		return err
-	}
+	dopts := badger.DefaultOptions
 
-	kpath := filepath.Join(root, "keystore")
-	kstore, err := key.NewKeystore(kpath)
+	dstore, err := badger.NewDatastore(dpath, &dopts)
 	if err != nil {
 		return err
 	}
 
-	key, err := kstore.DefaultKey()
+	config, err := peer.OpenConfig(root)
 	if err != nil {
 		return err
 	}
 
-	client, err := peer.New(c.Context, dstore, key)
+	node, err := peer.New(c.Context, dstore, config)
 	if err != nil {
 		return err
 	}
 
-	peerId, err := client.PeerID()
-	if err != nil {
+	// ensure any changes made offline will be published
+	if err := node.Authors().Publish(c.Context); err != nil {
 		return err
 	}
 
-	store := data.NewStore(dstore)
-	go web.ListenAndServe(client, store)
-	go rpc.ListenAndServe(client, store)
+	go web.ListenAndServe(node)
+	go rpc.ListenAndServe(node)
 
 	fmt.Printf(daemonBanner)
-	fmt.Printf("Peer ID: %s\n", peerId.Pretty())
+	fmt.Printf("Peer ID: %s\n", node.PeerID().Pretty())
 	fmt.Printf("Web URL: %s\n", web.BindAddr)
 
 	quit := make(chan os.Signal, 1)

cmd/multi/import.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"errors"
-	"os"
 	"path/filepath"
 
 	"github.com/multiverse-vcs/go-multiverse/rpc"
@@ -39,17 +37,6 @@ func importAction(c *cli.Context) error {
 		cli.ShowSubcommandHelpAndExit(c, 1)
 	}
 
-	name := c.Args().Get(0)
-
-	cwd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	if _, err := FindConfig(cwd); err == nil {
-		return errors.New("repo already exists")
-	}
-
 	dir, err := filepath.Abs(c.String("dir"))
 	if err != nil {
 		return err
@@ -61,7 +48,7 @@ func importAction(c *cli.Context) error {
 	}
 
 	args := rpc.ImportArgs{
-		Name: name,
+		Name: c.Args().Get(0),
 		Type: c.String("type"),
 		URL:  c.String("url"),
 		Dir:  dir,
@@ -72,7 +59,5 @@ func importAction(c *cli.Context) error {
 		return err
 	}
 
-	config := NewConfig(cwd)
-	config.Name = name
-	return config.Save()
+	return nil
 }

cmd/multi/init.go

@@ -13,15 +13,21 @@ var initCommand = &cli.Command{
 	Name:      "init",
 	Usage:     "Create a repo",
 	ArgsUsage: "<name>",
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:    "branch",
+			Aliases: []string{"b"},
+			Usage:   "Default branch",
+			Value:   DefaultBranch,
+		},
+	},
 }
 
 func initAction(c *cli.Context) error {
 	if c.NArg() < 1 {
 		cli.ShowSubcommandHelpAndExit(c, 1)
 	}
 
-	name := c.Args().Get(0)
-
 	cwd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -37,7 +43,8 @@ func initAction(c *cli.Context) error {
 	}
 
 	args := rpc.InitArgs{
-		Name: name,
+		Name:   c.Args().Get(0),
+		Branch: c.String("branch"),
 	}
 
 	var reply rpc.InitReply
@@ -46,6 +53,7 @@ func initAction(c *cli.Context) error {
 	}
 
 	config := NewConfig(cwd)
-	config.Name = name
+	config.Name = args.Name
+	config.Branch = args.Branch
 	return config.Save()
 }

data/author.go

@@ -0,0 +1,71 @@
+package data
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/ipfs/go-cid"
+	cbornode "github.com/ipfs/go-ipld-cbor"
+	ipld "github.com/ipfs/go-ipld-format"
+	"github.com/multiformats/go-multihash"
+)
+
+// Author contains info about a user.
+type Author struct {
+	// Repositories is a map of repositories.
+	Repositories map[string]cid.Cid `json:"repositories"`
+	// Metadata contains additional data.
+	Metadata map[string]string `json:"metadata"`
+}
+
+// GetAuthor returns the author with the given CID.
+func GetAuthor(ctx context.Context, dag ipld.DAGService, id cid.Cid) (*Author, error) {
+	node, err := dag.Get(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	return AuthorFromCBOR(node.RawData())
+}
+
+// AddAuthor adds a author to the given dag.
+func AddAuthor(ctx context.Context, dag ipld.DAGService, author *Author) (cid.Cid, error) {
+	node, err := cbornode.WrapObject(author, multihash.SHA2_256, -1)
+	if err != nil {
+		return cid.Cid{}, err
+	}
+
+	if err := dag.Add(ctx, node); err != nil {
+		return cid.Cid{}, err
+	}
+
+	return node.Cid(), nil
+}
+
+// AuthorFromJSON decodes a author from json.
+func AuthorFromJSON(data []byte) (*Author, error) {
+	var author Author
+	if err := json.Unmarshal(data, &author); err != nil {
+		return nil, err
+	}
+
+	return &author, nil
+}
+
+// AuthorFromCBOR decodes a author from an ipld node.
+func AuthorFromCBOR(data []byte) (*Author, error) {
+	var author Author
+	if err := cbornode.DecodeInto(data, &author); err != nil {
+		return nil, err
+	}
+
+	return &author, nil
+}
+
+// NewAuthor returns a new author.
+func NewAuthor() *Author {
+	return &Author{
+		Repositories: make(map[string]cid.Cid),
+		Metadata:     make(map[string]string),
+	}
+}

data/commit.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipld-cbor"
+	cbornode "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
 	"github.com/multiformats/go-multihash"
 )
@@ -49,7 +49,7 @@ func AddCommit(ctx context.Context, dag ipld.DAGService, commit *Commit) (cid.Ci
 	return node.Cid(), nil
 }
 
-// CommitFromJON decodes a commit from json.
+// CommitFromJSON decodes a commit from json.
 func CommitFromJSON(data []byte) (*Commit, error) {
 	var commit Commit
 	if err := json.Unmarshal(data, &commit); err != nil {

data/data.go

@@ -23,6 +23,8 @@ var timeAtlasEntry = atlas.BuildEntry(time.Time{}).
 
 func init() {
 	cbornode.RegisterCborType(timeAtlasEntry)
+	cbornode.RegisterCborType(Author{})
 	cbornode.RegisterCborType(Commit{})
+	cbornode.RegisterCborType(Record{})
 	cbornode.RegisterCborType(Repository{})
 }

data/record.go

@@ -0,0 +1,34 @@
+package data
+
+import (
+	cbornode "github.com/ipfs/go-ipld-cbor"
+)
+
+// Record contains named record info.
+type Record struct {
+	// Payload contains the record data.
+	Payload []byte
+	// Sequence is a version identifier.
+	Sequence uint64
+	// Signature is a signature of the payload.
+	Signature []byte
+}
+
+// RecordFromCBOR decodes a record from an ipld node.
+func RecordFromCBOR(data []byte) (*Record, error) {
+	var rec Record
+	if err := cbornode.DecodeInto(data, &rec); err != nil {
+		return nil, err
+	}
+
+	return &rec, nil
+}
+
+// NewRecord returns a record containing the given payload.
+func NewRecord(payload []byte, sequence uint64, signature []byte) *Record {
+	return &Record{
+		Payload:   payload,
+		Sequence:  sequence,
+		Signature: signature,
+	}
+}

data/repository.go

@@ -5,21 +5,15 @@ import (
 	"encoding/json"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-pinner"
-	"github.com/ipfs/go-ipld-cbor"
+	cbornode "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
-	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/multiformats/go-multihash"
 )
 
 // Repository contains all versions of a project.
 type Repository struct {
-	// Author is the peer id of the author.
-	Author peer.ID `json:"author"`
-	// Name is the human friendly name of the repo.
-	Name string `json:"name"`
-	// Description describes the project.
-	Description string `json:"description"`
+	// DefaultBranch is the base branch of the repo.
+	DefaultBranch string `json:"default_branch"`
 	// Branches is a map of names to commit CIDs.
 	Branches map[string]cid.Cid `json:"branches"`
 	// Tags is a map of names to commit CIDs.
@@ -52,20 +46,6 @@ func AddRepository(ctx context.Context, dag ipld.DAGService, repo *Repository) (
 	return node.Cid(), nil
 }
 
-// PinRepository pins a repo using the given pinner.
-func PinRepository(ctx context.Context, pinner pin.Pinner, repo *Repository) (cid.Cid, error) {
-	node, err := cbornode.WrapObject(repo, multihash.SHA2_256, -1)
-	if err != nil {
-		return cid.Cid{}, err
-	}
-
-	if err := pinner.Pin(ctx, node, true); err != nil {
-		return cid.Cid{}, err
-	}
-
-	return node.Cid(), nil
-}
-
 // RepositoryFromJSON decodes a repo from json.
 func RepositoryFromJSON(data []byte) (*Repository, error) {
 	var repo Repository
@@ -87,32 +67,10 @@ func RepositoryFromCBOR(data []byte) (*Repository, error) {
 }
 
 // NewRepository returns a new repo.
-func NewRepository(name string) *Repository {
+func NewRepository() *Repository {
 	return &Repository{
-		Name:     name,
 		Branches: make(map[string]cid.Cid),
 		Tags:     make(map[string]cid.Cid),
 		Metadata: make(map[string]string),
 	}
 }
-
-// DefaultBranch returns the default branch of the repo.
-func (r *Repository) DefaultBranch() string {
-	for branch := range r.Branches {
-		return branch
-	}
-	return ""
-}
-
-// Ref returns the cid of the given ref.
-func (r *Repository) Ref(ref string) (cid.Cid, error) {
-	if id, ok := r.Branches[ref]; ok {
-		return id, nil
-	}
-
-	if id, ok := r.Tags[ref]; ok {
-		return id, nil
-	}
-
-	return cid.Parse(ref)
-}