log_remote and log_local commands

Author: mipmip

src/cmd_clone.go

@@ -18,11 +18,11 @@ func cmdClone() *cli.Command {
         Aliases: []string{"i"},
         Usage:   "alternative ssh-key from `FILE`",
       },
-      &cli.StringFlag{
-        Name:    "branch",
-        Aliases: []string{"b"},
-        Usage:   "other then default branch",
-      },
+//      &cli.StringFlag{
+//        Name:    "branch",
+//        Aliases: []string{"b"},
+//        Usage:   "other then default branch",
+//      },
       &cli.BoolFlag{
         Name: "insecure",
         Aliases: []string{"s"},

src/cmd_log_local.go

@@ -0,0 +1,57 @@
+package main
+import (
+  "fmt"
+  "encoding/json"
+  "time"
+  "github.com/urfave/cli/v2"
+  "github.com/go-git/go-git/v5"
+  "github.com/go-git/go-git/v5/plumbing/object"
+)
+
+func cmdLogLocal() *cli.Command {
+
+  return &cli.Command{
+    Name:  "log_local",
+    Usage: "show logs from local repo",
+    Action: func(c *cli.Context) error {
+
+      directory := c.Args().Get(0)
+
+      r, err := git.PlainOpen(directory)
+      CheckIfError(err)
+
+      ref, err := r.Head()
+      CheckIfError(err)
+
+      since := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)
+      until := time.Date(2099, 1, 30, 0, 0, 0, 0, time.UTC)
+      cIter, err := r.Log(&git.LogOptions{From: ref.Hash(), Since: &since, Until: &until})
+      CheckIfError(err)
+
+      var jsonCommits []*jsonCommitEntry
+
+      err = cIter.ForEach(func(c *object.Commit) error {
+
+        commitEntry := &jsonCommitEntry{
+          Author:  c.Author.String(),
+          Message: c.Message,
+          Ref: c.Hash.String(),
+          Date: c.Author.When.Format(DateFormat),
+        }
+
+        jsonCommits = append(jsonCommits, commitEntry)
+
+        return nil
+      })
+      CheckIfError(err)
+
+      data, _ := json.Marshal(jsonCommits)
+      fmt.Println(string(data))
+
+      return nil
+    },
+
+  }
+}
+
+

src/cmd_log.go renamed to src/cmd_log_remote.go

@@ -1,19 +1,18 @@
 package main
 import (
   "fmt"
-  "os"
+  "encoding/json"
   "time"
   "github.com/urfave/cli/v2"
   "github.com/go-git/go-git/v5"
-
   "github.com/go-git/go-git/v5/plumbing/object"
   "github.com/go-git/go-git/v5/storage/memory"
 )
 
-func cmdLog() *cli.Command {
+func cmdLogRemote() *cli.Command {
 
   return &cli.Command{
-    Name:  "log",
+    Name:  "log_remote",
     Usage: "show logs from remote",
     Flags: []cli.Flag{
       &cli.StringFlag{
@@ -30,41 +29,45 @@ func cmdLog() *cli.Command {
     Action: func(c *cli.Context) error {
 
       url := c.Args().Get(0)
-      directory := c.Args().Get(1)
+      //directory := c.Args().Get(1)
       auth := setAuth(c.String("ssh-key"), c.Bool("insecure"))
       //branch := c.String("branch")
 
-      Info("git log %s %s", url, directory)
-
       r, err := git.Clone(memory.NewStorage(), nil, &git.CloneOptions{
         URL:      url,
-        Progress: os.Stdout,
         Auth:     auth,
       })
 
       CheckIfError(err)
 
-      // Gets the HEAD history from HEAD, just like this command:
-      Info("git log")
-
-      // ... retrieves the branch pointed by HEAD
       ref, err := r.Head()
       CheckIfError(err)
 
-      // ... retrieves the commit history
-      since := time.Date(2019, 1, 1, 0, 0, 0, 0, time.UTC)
-      until := time.Date(2019, 7, 30, 0, 0, 0, 0, time.UTC)
+      since := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)
+      until := time.Date(2099, 1, 30, 0, 0, 0, 0, time.UTC)
       cIter, err := r.Log(&git.LogOptions{From: ref.Hash(), Since: &since, Until: &until})
       CheckIfError(err)
 
-      // ... just iterates over the commits, printing it
+      var jsonCommits []*jsonCommitEntry
+
       err = cIter.ForEach(func(c *object.Commit) error {
-        fmt.Println(c)
+
+        commitEntry := &jsonCommitEntry{
+          Author:  c.Author.String(),
+          Message: c.Message,
+          Ref: c.Hash.String(),
+          Date: c.Author.When.Format(DateFormat),
+        }
+
+        jsonCommits = append(jsonCommits, commitEntry)
 
         return nil
       })
       CheckIfError(err)
 
+      data, _ := json.Marshal(jsonCommits)
+      fmt.Println(string(data))
+
       return nil
     },
 

src/main.go

@@ -16,6 +16,14 @@ import (
 )
 
 const version = "v0.5.2"
+const DateFormat = "Mon Jan 02 15:04:05 2006 -0700"
+
+type jsonCommitEntry struct {
+  Message string `json:"message"`
+  Author  string `json:"author"`
+  Date    string `json:"date"`
+  Ref    string `json:"ref"`
+}
 
 func setAuth(keyfilepath string, ignoreHostkey bool) transport.AuthMethod {
 
@@ -59,8 +67,8 @@ func main() {
     cmdAddAll(),
     cmdClone(),
     cmdCommit(),
-    cmdLog(),
-    cmdGit2test(),
+    cmdLogLocal(),
+    cmdLogRemote(),
     cmdPull(),
     cmdPush(),
     cmdResetHard(),