Some betterment of things

cmd/jkl/create.go

@@ -28,7 +28,7 @@ var ErrCcmdJiraProjectRequired = errors.New("Jira project needs to be set")
 
 func (ccmd *CreateCmd) Create() error {
 	var b = bytes.NewBufferString(CREATE_TEMPLATE)
-	var iss *jkl.Issue
+	var iss *jkl.JiraIssue
 	var err error
 	if ccmd.file != "" {
 		iss, err = GetIssueFromFile(ccmd.file, b)

cmd/jkl/editor.go

@@ -40,7 +40,7 @@ func copyInitial(dst io.WriteSeeker, initial io.Reader) {
 	dst.Seek(0, 0)
 }
 
-func GetIssueFromTmpFile(initial io.Reader) (*jkl.Issue, error) {
+func GetIssueFromTmpFile(initial io.Reader) (*jkl.JiraIssue, error) {
 	f, err := ioutil.TempFile(os.TempDir(), "jkl")
 	if err != nil {
 		return nil, err
@@ -87,7 +87,7 @@ func GetTextFromFile(file *os.File) (io.Reader, error) {
 	return file, err
 }
 
-func GetIssueFromFile(filename string, initial io.Reader) (*jkl.Issue, error) {
+func GetIssueFromFile(filename string, initial io.Reader) (*jkl.JiraIssue, error) {
 	f, err := os.Open(filename)
 	if err != nil {
 		return nil, err
@@ -104,8 +104,8 @@ func GetIssueFromFile(filename string, initial io.Reader) (*jkl.Issue, error) {
 
 var spacex = regexp.MustCompile(`\s`)
 
-func IssueFromFile(f io.Reader) *jkl.Issue {
-	iss := &jkl.Issue{Fields: &jkl.Fields{}}
+func IssueFromFile(f io.Reader) *jkl.JiraIssue {
+	iss := &jkl.JiraIssue{Fields: &jkl.Fields{}}
 	riss := reflect.ValueOf(iss).Elem()
 	fieldsField := riss.FieldByName("Fields").Elem()
 	currentField := reflect.Value{}
@@ -143,6 +143,6 @@ func IssueFromFile(f io.Reader) *jkl.Issue {
 	return iss
 }
 
-func IssueFromList(list []string) *jkl.Issue {
+func IssueFromList(list []string) *jkl.JiraIssue {
 	return IssueFromFile(bytes.NewBufferString(strings.Join(list, "\n")))
 }

cmd/jkl/jkl.go

@@ -5,14 +5,11 @@ import (
 	"fmt"
 	"log"
 
-	"os"
-
-	"github.com/joho/godotenv"
-	"strings"
+	"otremblay.com/jkl"
 )
 
 func main() {
-	findRCFile()
+	jkl.FindRCFile()
 	flag.Parse()
 	if len(flag.Args()) == 0 {
 		fmt.Print(usage)
@@ -23,22 +20,6 @@ func main() {
 	}
 }
 
-func findRCFile() {
-	dir, err := os.Getwd()
-	if err != nil {
-
-		log.Fatalln(err)
-	}
-	path := strings.Split(dir, "/")
-	for i := len(path) - 1; i > 0; i-- {
-		err := godotenv.Load(strings.Join(path[0:i], "/") + "/.jklrc")
-		if err == nil {
-			return
-		}
-	}
-	log.Fatalln("No .jklrc found")
-}
-
 func runcmd(args []string) error {
 	switch args[0] {
 	case "list":

cmd/jkl/jkl_test.go

@@ -0,0 +1,5 @@
+package main
+
+
+
+

cmd/jkl/list.go

@@ -8,14 +8,16 @@ import (
 	"text/template"
 
 	"fmt"
+
 	"golang.org/x/crypto/ssh/terminal"
 	"otremblay.com/jkl"
 )
 
-type listissue jkl.Issue
+type listissue jkl.JiraIssue
+
 func (l *listissue) URL() string {
-i := jkl.Issue(*l)
-return (&i).URL()
+	i := jkl.JiraIssue(*l)
+	return (&i).URL()
 }
 
 func (l *listissue) Color() string {

cmd/jklfs/jklfile.go

@@ -32,7 +32,7 @@ func (f *jklfile) String() string {
 func (f *jklfile) Write(data []byte, off int64) (uint32, fuse.Status) {
 	n, err := f.File.WriteAt(data, off)
 	if err != nil {
-		return fuse.EACCES
+		return uint32(0),fuse.EACCES
 	}
 	return uint32(n), fuse.OK
 }

cmd/jklfs/jklfs.go

@@ -16,7 +16,7 @@ import (
 
 type jklfs struct {
 	pathfs.FileSystem
-	issuePerDirs map[string]*jkl.Issue
+	issuePerDirs map[string]*jkl.JiraIssue
 }
 
 func (j *jklfs) GetAttr(name string, context *fuse.Context) (*fuse.Attr, fuse.Status) {
@@ -90,7 +90,7 @@ func main() {
 	if len(flag.Args()) < 1 {
 		log.Fatal("Usage:\n  jklfs MOUNTPOINT")
 	}
-	nfs := pathfs.NewPathNodeFs(&jklfs{pathfs.NewDefaultFileSystem(), map[string]*jkl.Issue{}}, nil)
+	nfs := pathfs.NewPathNodeFs(&jklfs{pathfs.NewDefaultFileSystem(), map[string]*jkl.JiraIssue{}}, nil)
 	server, _, err := nodefs.MountRoot(flag.Arg(0), nfs.Root(), nil)
 	if err != nil {
 		log.Fatalf("Mount fail: %v\n", err)