Merge branch 'ipfs-master'

Author: postables

add.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"io"
 	"os"
-	"path"
+	"path/filepath"
 
 	files "github.com/ipfs/go-ipfs-files"
 )
@@ -98,7 +98,7 @@ func (s *Shell) AddDir(dir string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	slf := files.NewSliceDirectory([]files.DirEntry{files.FileEntry(path.Base(dir), sf)})
+	slf := files.NewSliceDirectory([]files.DirEntry{files.FileEntry(filepath.Base(dir), sf)})
 	reader := files.NewMultiFileReader(slf, true)
 
 	resp, err := s.Request("add").

logger.go

@@ -0,0 +1,41 @@
+package shell
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+)
+
+// Logger is used to handle incoming logs from the ipfs node
+type Logger struct {
+	resp io.ReadCloser
+	dec  *json.Decoder
+}
+
+// Next is used to retrieve the next event from the logging system
+func (l Logger) Next() (map[string]interface{}, error) {
+	var out map[string]interface{}
+	return out, l.dec.Decode(&out)
+}
+
+// Close is used to close our reader
+func (l Logger) Close() error {
+	return l.resp.Close()
+}
+
+// GetLogs is used to retrieve a parsable logger object
+func (s *Shell) GetLogs(ctx context.Context) (Logger, error) {
+	resp, err := s.Request("log/tail").Send(ctx)
+	if err != nil {
+		return Logger{}, err
+	}
+	if resp.Error != nil {
+		resp.Output.Close()
+		return Logger{}, resp.Error
+	}
+	return newLogger(resp.Output), nil
+}
+
+func newLogger(resp io.ReadCloser) Logger {
+	return Logger{resp, json.NewDecoder(resp)}
+}

logger_test.go

@@ -0,0 +1,26 @@
+package shell
+
+import (
+	"context"
+	"testing"
+)
+
+func TestLogger(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	sh := NewShell(shellUrl)
+	logger, err := sh.GetLogs(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		if err := logger.Close(); err != nil {
+			t.Fatal(err)
+		}
+	}()
+	if l, err := logger.Next(); err != nil {
+		t.Fatal(err)
+	} else if l == nil {
+		t.Fatal("no logs found")
+	}
+}

shell_test.go

@@ -320,7 +320,7 @@ func TestDagPut(t *testing.T) {
 
 	c, err := s.DagPut(`{"x": "abc","y":"def"}`, "json", "cbor")
 	is.Nil(err)
-	is.Equal(c, "zdpuAt47YjE9XTgSxUBkiYCbmnktKajQNheQBGASHj3FfYf8M")
+	is.Equal(c, "bafyreidrm3r2k6vlxqp2fk47sboeycf7apddib47w7cyagrajtpaxxl2pi")
 }
 
 func TestDagPutWithOpts(t *testing.T) {
@@ -329,7 +329,7 @@ func TestDagPutWithOpts(t *testing.T) {
 
 	c, err := s.DagPutWithOpts(`{"x": "abc","y":"def"}`, options.Dag.Pin("true"))
 	is.Nil(err)
-	is.Equal(c, "zdpuAt47YjE9XTgSxUBkiYCbmnktKajQNheQBGASHj3FfYf8M")
+	is.Equal(c, "bafyreidrm3r2k6vlxqp2fk47sboeycf7apddib47w7cyagrajtpaxxl2pi")
 }
 
 func TestStatsBW(t *testing.T) {