v0.6.1

README.md

@@ -1,5 +1,6 @@
 # Timeglass
 
+
 ![Timeglass Screenshot](/docs/screenshot.png?raw=true "Timeglass Screenshot")
 
 Fully automated time tracking for Git repositories. It uses hooks and file monitoring to make sure you'll never forget to start or stop your timer ever again. It is written in [Go](http://golang.org/) and runs 100% on your own workstation: no internet or account registration required. 

VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

command/client.go

@@ -8,11 +8,13 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strconv"
 	"strings"
 
 	"github.com/timeglass/glass/_vendor/github.com/hashicorp/errwrap"
 
-	daemon "github.com/timeglass/glass/glass-daemon"
+	"github.com/timeglass/glass/timer"
+	"github.com/timeglass/glass/vcs"
 )
 
 var ErrRequestFailed = errors.New("Couldn't reach background service, did you install it using 'glass install'?")
@@ -31,8 +33,8 @@ func NewClient() *Client {
 }
 
 func (c *Client) Call(method string, params url.Values) ([]byte, error) {
-	loc := fmt.Sprintf("%s/api/%s?%s", c.endpoint, method, params.Encode())
-	resp, err := c.Get(loc)
+	loc := fmt.Sprintf("%s/api/%s", c.endpoint, method)
+	resp, err := c.Post(loc, "application/x-www-form-urlencoded", bytes.NewBuffer([]byte(params.Encode())))
 	if err != nil {
 		return nil, ErrRequestFailed
 	}
@@ -101,9 +103,11 @@ func (c *Client) DeleteTimer(dir string) error {
 	return nil
 }
 
-func (c *Client) ResetTimer(dir string) error {
+func (c *Client) ResetTimer(dir string, staged, unstaged bool) error {
 	params := url.Values{}
 	params.Set("dir", dir)
+	params.Set("staged", strconv.FormatBool(staged))
+	params.Set("unstaged", strconv.FormatBool(unstaged))
 
 	_, err := c.Call("timers.reset", params)
 	if err != nil {
@@ -113,6 +117,22 @@ func (c *Client) ResetTimer(dir string) error {
 	return nil
 }
 
+func (c *Client) StageTimer(dir string, files map[string]*vcs.StagedFile) error {
+	params := url.Values{}
+	params.Set("dir", dir)
+
+	for _, sf := range files {
+		params.Add("files", fmt.Sprintf("%s:%d", sf.Path(), sf.Date().UnixNano()))
+	}
+
+	_, err := c.Call("timers.stage", params)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (c *Client) PauseTimer(dir string) error {
 	params := url.Values{}
 	params.Set("dir", dir)
@@ -125,8 +145,8 @@ func (c *Client) PauseTimer(dir string) error {
 	return nil
 }
 
-func (c *Client) ReadTimer(dir string) (*daemon.Timer, error) {
-	timers := []*daemon.Timer{}
+func (c *Client) ReadTimer(dir string) (*timer.Timer, error) {
+	timers := []*timer.Timer{}
 	params := url.Values{}
 	params.Set("dir", dir)
 

command/punch.go

@@ -61,7 +61,7 @@ func (c *Punch) Run(ctx *cli.Context) error {
 	}
 
 	if input == "" {
-		return fmt.Errorf("Please provide the time you spent as the first argument")
+		return fmt.Errorf("Please provide the time you spent as the first argument or over Stdin")
 	}
 
 	t, err := time.ParseDuration(input)

command/push.go

@@ -10,7 +10,7 @@ import (
 	"github.com/timeglass/glass/_vendor/github.com/mattn/go-isatty"
 
 	"github.com/timeglass/glass/config"
-	daemon "github.com/timeglass/glass/glass-daemon"
+	"github.com/timeglass/glass/timer"
 	"github.com/timeglass/glass/vcs"
 )
 
@@ -48,7 +48,7 @@ func (c *Push) Run(ctx *cli.Context) error {
 		return errwrap.Wrapf("Failed to fetch current working dir: {{err}}", err)
 	}
 
-	sysdir, err := daemon.SystemTimeglassPath()
+	sysdir, err := timer.SystemTimeglassPath()
 	if err != nil {
 		return errwrap.Wrapf(fmt.Sprintf("Failed to get system config path: {{err}}"), err)
 	}

command/reset.go

@@ -31,7 +31,10 @@ func (c *Reset) Usage() string {
 }
 
 func (c *Reset) Flags() []cli.Flag {
-	return []cli.Flag{}
+	return []cli.Flag{
+		cli.BoolFlag{Name: "staged", Usage: "reset staged time as well"},
+		cli.BoolFlag{Name: "keep-unstaged", Usage: "prevent the removal of unstaged time"},
+	}
 }
 
 func (c *Reset) Action() func(ctx *cli.Context) {
@@ -52,7 +55,7 @@ func (c *Reset) Run(ctx *cli.Context) error {
 	c.Printf("Resetting timer to 0s...")
 
 	client := NewClient()
-	err = client.ResetTimer(vc.Root())
+	err = client.ResetTimer(vc.Root(), ctx.Bool("staged"), !ctx.Bool("keep-unstaged"))
 	if err != nil {
 		return errwrap.Wrapf(fmt.Sprintf("Failed to reset timer: {{err}}"), err)
 	}

command/stage.go

@@ -0,0 +1,82 @@
+package command
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/timeglass/glass/_vendor/github.com/codegangsta/cli"
+	"github.com/timeglass/glass/_vendor/github.com/hashicorp/errwrap"
+
+	"github.com/timeglass/glass/vcs"
+)
+
+type Stage struct {
+	*command
+}
+
+func NewStage() *Stage {
+	return &Stage{newCommand()}
+}
+
+func (c *Stage) Name() string {
+	return "stage"
+}
+
+func (c *Stage) Description() string {
+	return fmt.Sprintf("...")
+}
+
+func (c *Stage) Usage() string {
+	return "..."
+}
+
+func (c *Stage) Flags() []cli.Flag {
+	return []cli.Flag{
+		cli.BoolFlag{Name: "all,A", Usage: "Stage time spend on all files currently staged in git"},
+	}
+}
+
+func (c *Stage) Action() func(ctx *cli.Context) {
+	return c.command.Action(c.Run)
+}
+
+func (c *Stage) Run(ctx *cli.Context) error {
+	dir, err := os.Getwd()
+	if err != nil {
+		return errwrap.Wrapf("Failed to fetch current working dir: {{err}}", err)
+	}
+
+	vc, err := vcs.GetVCS(dir)
+	if err != nil {
+		return errwrap.Wrapf("Failed to setup VCS: {{err}}", err)
+	}
+
+	staged, err := vc.Staging()
+	if err != nil {
+		return errwrap.Wrapf(fmt.Sprintf("Failed to get staged files from the VCS: {{err}}"), err)
+	}
+
+	client := NewClient()
+
+	if ctx.Bool("all") {
+		c.Printf("Staging time for %d files:", len(staged))
+		for _, f := range staged {
+			rel, err := filepath.Rel(vc.Root(), f.Path())
+			if err != nil {
+				c.Printf("Failed to determine relative path for '%s'", f.Path())
+			}
+
+			c.Printf(" %s: %s", f.Date(), rel)
+		}
+
+		err := client.StageTimer(vc.Root(), staged)
+		if err != nil {
+			return errwrap.Wrapf(fmt.Sprintf("Failed to stage files: {{err}}"), err)
+		}
+	} else {
+		c.Fatal("Not yet implemented")
+	}
+
+	return nil
+}

command/status.go

@@ -3,6 +3,7 @@ package command
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"text/template"
@@ -11,7 +12,7 @@ import (
 	"github.com/timeglass/glass/_vendor/github.com/hashicorp/errwrap"
 
 	"github.com/timeglass/glass/config"
-	daemon "github.com/timeglass/glass/glass-daemon"
+	"github.com/timeglass/glass/timer"
 	"github.com/timeglass/glass/vcs"
 )
 
@@ -57,7 +58,7 @@ func (c *Status) Run(ctx *cli.Context) error {
 		return errwrap.Wrapf("Failed to setup VCS: {{err}}", err)
 	}
 
-	sysdir, err := daemon.SystemTimeglassPath()
+	sysdir, err := timer.SystemTimeglassPath()
 	if err != nil {
 		return errwrap.Wrapf(fmt.Sprintf("Failed to get system config path: {{err}}"), err)
 	}
@@ -82,17 +83,17 @@ func (c *Status) Run(ctx *cli.Context) error {
 		c.Println("A new version is available, please upgrade: https://github.com/timeglass/glass/releases")
 	}
 
-	//fetch information on the timer specific to this directory
+	//fetch information on the timer specific to this directory.
 	c.Printf("Fetching timer info...")
-	timer, err := client.ReadTimer(vc.Root())
+	t, err := client.ReadTimer(vc.Root())
 	if err != nil {
 		return errwrap.Wrapf(fmt.Sprintf("Failed to fetch timer: {{err}}"), err)
 	}
 
-	if reason := timer.HasFailed(); reason != "" {
-		c.Printf("Timer has failed: %s", reason)
+	if terr := t.Error(); terr != nil {
+		c.Printf("Timer has failed: %s", terr)
 	} else {
-		if timer.IsPaused() {
+		if t.IsPaused() {
 			c.Printf("Timer is currently: PAUSED")
 		} else {
 			c.Printf("Timer is currently: RUNNING")
@@ -107,21 +108,59 @@ func (c *Status) Run(ctx *cli.Context) error {
 	//we got some template specified
 	if tmpls != "" {
 
-		//parse temlate and only report error if we're talking to a human
+		//parse template and only report error if we're talking to a human
 		tmpl, err := template.New("commit-msg").Parse(tmpls)
 		if err != nil {
 			return errwrap.Wrapf(fmt.Sprintf("Failed to parse commit_message: '%s' in configuration as a text/template: {{err}}", conf.CommitMessage), err)
 		}
 
 		//execute template and write to stdout
-		err = tmpl.Execute(os.Stdout, timer.Time())
+		err = tmpl.Execute(os.Stdout, t.Time())
 		if err != nil {
-			return errwrap.Wrapf(fmt.Sprintf("Failed to execute commit_message: template for time '%s': {{err}}", timer.Time()), err)
+			return errwrap.Wrapf(fmt.Sprintf("Failed to execute commit_message: template for time '%s': {{err}}", t.Time()), err)
 		}
 
 	} else {
 		//just print
-		c.Printf("Timer reads: %s", timer.Time())
+		c.Printf("Total time reads: %s", t.Time())
+
+		all := t.Distributor().Timelines()
+		unstaged := map[string]*timer.Timeline{}
+		staged := map[string]*timer.Timeline{}
+		for path, tl := range all {
+			if tl.Unstaged() != 0 {
+				unstaged[path] = tl
+			}
+
+			if tl.Staged() != 0 {
+				staged[path] = tl
+			}
+		}
+
+		if len(staged) > 0 {
+			c.Printf("Staged time:")
+			for path, tl := range staged {
+				rel, err := filepath.Rel(vc.Root(), path)
+				if err != nil {
+					c.Printf("Failed to rel dir: %s", err)
+				}
+
+				c.Printf("- %s: %s", rel, tl.Staged())
+			}
+		}
+
+		if len(unstaged) > 0 {
+			c.Printf("Unstaged time:")
+			for path, tl := range unstaged {
+				rel, err := filepath.Rel(vc.Root(), path)
+				if err != nil {
+					c.Printf("Failed to rel dir: %s", err)
+				}
+
+				c.Printf("- %s: %s", rel, tl.Unstaged())
+			}
+		}
+
 	}
 
 	return nil