tlog 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThlZDlmZWNmMTFjMGVhNzM1NGJjNTlhOWU1ZWRjMjY5ZGNlOTkzNw==
+    MTZkODM0YzY2Mjg1ZTUyZjllYjlhOWY4NDlhNjI5NzZmZjM0ZTlkNw==
   data.tar.gz: !binary |-
-    MWZhNmY1ODRmNDU4NTQyNDYwMDMzYTRmMzBlMWE5M2RiM2Q5ZjEyMw==
+    ZTc4ZWQyMTY1ZTUxM2QzNzNlMWRjNTQ1N2EwYjgyY2VhNWZlNDkxNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzY5ZjcxNmE3Yzc3ZmZiZDQ0ZjVmZjRhMTYzYzI5MDE2NWExNjQxNDMxNmE4
-    NWQ0MWI5ZTBiYWU5Y2FjYzViYjQxMzdmOTZkNmNiODk5ZWI0NzE0NjEzYTAx
-    Y2Q2ODAyM2I3Y2FlZjJiN2RmNTNkN2U3ZjMyYTBkNGZiOTQ1YzU=
+    MmY5N2M4YTM0MzQ4YWRlODYxMjY1OGNmNTY5Nzc5OTczMDA4OGI3MzgyMTE4
+    ODdjMmNmNDU4OTFiZjk5ODBjMzUwYzc4YzlhOWQyMjM3Zjg0YzczMjBhMmE4
+    ZTIwNDgwYjkzYzYwMDk2MGU2MTkxNjQ0YWQzZDFlYzYyY2Q3NDc=
   data.tar.gz: !binary |-
-    N2E5NzkyMDE3MzkxMzFlZDlmYjk1ZTYzZjIyZjczODNlNWQ0ZWJiZGNkYjdi
-    MDU3Njk5MTZhMzA4NGY1MGQyODQ1ZDlmYzViZTdmOWRkYzAyZmZkZjUzZGNk
-    MjFmYWE2NzgwYmMxOTMxYmQxM2NlZWNkNTIwODUwMmVjOGVhZjI=
+    ZTNhNDdlMzA4ZjU5MTZkYTg0OTE4YzA3MjNmNTVhM2IzYjBjYzNhZTE3MDFk
+    ZDliZmY0NGFkYzQwYWEyYjI3OGE4MTE5NThjNjM1MjE1YzA3NWM0N2ZjMjcz
+    MzUzYWNkZGJmM2EyZDNiMDY4NjU1ODE2YTdhZWNmNmMzMDIyZTI=

data/README.md

@@ -1,15 +1,19 @@
 tlog
 ============================================
 
-A git-based CLI to help you with time tracking on your projects.
+tlog is a git-based tool to help you with time and ticket tracking on your projects. 
 
 ## Installing
 ```bash
 $ sudo gem install tlog
 ```
 
-# Usage
+## Usage
 * Navigate to a directory that has a git repo
+* Create time logs for project tasks
+* Assign a time goal, owner, points value, or state to each time log
+* Track time working on a task
+* Collaborate by sharing time logs with other people working on your project
 
 ## Create a time log
 
@@ -27,6 +31,49 @@ $ tlog create example --goal 4hr
 ```bash
 $ tlog create example --state OPEN --points 10
 ```
+
+## Using time logs
+
+#### Check out a time log
+```bash
+$ tlog checkout example
+```
+
+#### Start a new task the checked-out time log
+```bash
+$ tlog start -d "My task description"
+```
+
+#### Update the state of the checked-out time log
+```bash
+$ tlog state CLOSED
+```
+
+#### Update the points value of the checked-out time log
+```bash
+$ tlog points 10
+```
+
+#### Update the owner of the checked-out time log
+```bash
+$ tlog owner cewendel
+```
+
+#### Stop the current task
+```bash
+$ tlog stop example
+```
+
+#### Stop the current task and commit your tracked working changes to the current branch
+```bash
+$ tlog stop example -am "My commit message"
+```
+
+#### Delete a time log
+```bash
+$ tlog delete example
+```
+
 ## Displaying time logs
 
 #### Display all time logs
@@ -152,9 +199,9 @@ Owner:  andrew
 	Time left:                                 0:59:33
 ```
 
-#### Show active time logs and label the checked-out log or the in-progress log
+#### Show all time logs and label the checked-out log or the in-progress log
 ```bash
-$ tlog active
+$ tlog all
 All Time Logs:
 testing
 feature1(in-progress)
@@ -162,43 +209,6 @@ bug fix
 feature2
 ```
 
-## Using time logs
-
-#### Check out a time log
-```bash
-$ tlog checkout example
-```
-
-#### Start a new task the checked-out time log
-```bash
-$ tlog start -d "My task description"
-```
-
-#### Update the state of the checked-out time log
-```bash
-$ tlog state CLOSED
-```
-
-#### Update the points value of the checked-out time log
-```bash
-$ tlog points 10
-```
-
-#### Update the owner of the checked-out time log
-```bash
-$ tlog owner cewendel
-```
-
-#### Stop the current task
-```bash
-$ tlog stop example
-```
-
-#### Delete a time log
-```bash
-$ tlog delete example
-```
-
 ## Collaboration
 
 tlog makes for easy time and ticket tracking when working with a team. Assuming you have a remote repo that you and others are pushing to, use the `tlog push` and `tlog pull` commands to keep your time logs up to date.

data/lib/tlog.rb

@@ -1,6 +1,6 @@
 
 module Tlog
-	Version = "0.2.3"
+	Version = "0.2.4"
 
 	module Storage
 	end
@@ -29,7 +29,7 @@ require 'tlog/command_suite'
 require 'tlog/command'
 require 'tlog/command/start'
 require 'tlog/command/stop'
-require 'tlog/command/active'
+require 'tlog/command/all'
 require 'tlog/command/delete'
 require 'tlog/command/display'
 require 'tlog/command/create'

data/lib/tlog/command/{active.rb → all.rb}

@@ -1,12 +1,12 @@
 
-class Tlog::Command::Active < Tlog::Command
+class Tlog::Command::All < Tlog::Command
 
   def name 
-    "active"
+    "all"
   end 
 
   def description
-    "prints out all active time logs, the time log in-progress if there is one. Or the currently checked-out time log"
+    "prints out all time logs, the time log in-progress if there is one. Or the currently checked-out time log"
   end
 
   def execute(input, output)

data/lib/tlog/command/stop.rb

@@ -11,15 +11,26 @@ class Tlog::Command::Stop < Tlog::Command
   def execute(input, output)
     updated_log = stop
     output.line("Stopped '#{updated_log.name}'")
+
+    # Commit working changes if neccessary
+    commit_message = input.options[:message]
+    if commit_message
+      commit_working_changes(commit_message)
+      output.line("'#{commit_message}': Commiting working changes on current branch")
+    end
   end
 
   def options(parser, options)
     parser.banner = "usage: tlog stop"
+
+    parser.on("-am", "--am <commit message>", "Stop current time log and commit tracked working changes") do |message|
+      options[:message] = message
+    end
   end
 
   private
 
-  def stop
+  def stop(message = nil)
     storage.in_branch do |wd|
       checked_out_log = storage.checkout_value
       raise Tlog::Error::CheckoutInvalid, "No time log is checked out" unless checked_out_log
@@ -32,4 +43,7 @@ class Tlog::Command::Stop < Tlog::Command
     end
   end
 
+  def commit_working_changes(message)
+    storage.commit_working_changes(message)
+  end
 end

data/lib/tlog/command_suite.rb

@@ -9,7 +9,7 @@ class Tlog::Command_Suite
         Tlog::Command::Start.new,
         Tlog::Command::Stop.new,
         Tlog::Command::Help.new,
-        Tlog::Command::Active.new,
+        Tlog::Command::All.new,
         Tlog::Command::Delete.new,
         Tlog::Command::Display.new,
         Tlog::Command::Create.new,

data/lib/tlog/storage/disk.rb

@@ -198,6 +198,11 @@ class Tlog::Storage::Disk
     end
   end
 
+  def commit_working_changes(message)
+    # Commit tracked working changes in current branch
+    git.commit_all(message)
+  end
+
   private
 
   def decode_log_path(log_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tlog
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Wendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -95,7 +95,7 @@ files:
 - lib/tlog.rb
 - lib/tlog/application.rb
 - lib/tlog/command.rb
-- lib/tlog/command/active.rb
+- lib/tlog/command/all.rb
 - lib/tlog/command/checkout.rb
 - lib/tlog/command/create.rb
 - lib/tlog/command/delete.rb