tlog 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTZkODM0YzY2Mjg1ZTUyZjllYjlhOWY4NDlhNjI5NzZmZjM0ZTlkNw==
+    ZjVhNjc5ZTAzNTFmMThkMjRhZWUyYThlZDUyNjRkOGZjZDc5ZTM5Yg==
   data.tar.gz: !binary |-
-    ZTc4ZWQyMTY1ZTUxM2QzNzNlMWRjNTQ1N2EwYjgyY2VhNWZlNDkxNw==
+    ZjgxZTcxMzlhZmE5NzAxZjhiZGIzZmQ4YTRhYjQ2MzUwNzJhMGJkOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmY5N2M4YTM0MzQ4YWRlODYxMjY1OGNmNTY5Nzc5OTczMDA4OGI3MzgyMTE4
-    ODdjMmNmNDU4OTFiZjk5ODBjMzUwYzc4YzlhOWQyMjM3Zjg0YzczMjBhMmE4
-    ZTIwNDgwYjkzYzYwMDk2MGU2MTkxNjQ0YWQzZDFlYzYyY2Q3NDc=
+    YjE0ZmQ1NTBjMDIxMzVjMzUxYjI5NzI5NDBlOTFjOGE1OGYzMDcxOThmMjYx
+    NmJhZTUyYjIzZDg4ODQxNzlkNWRmMGQ5OTI1MmM2NTE2NmJjYWI5ZWVjMDA4
+    MWRhYTZlOTZjYmJhYjcwODc5OWZmMzI0OTc0ZWZmMmM3OTlkOGY=
   data.tar.gz: !binary |-
-    ZTNhNDdlMzA4ZjU5MTZkYTg0OTE4YzA3MjNmNTVhM2IzYjBjYzNhZTE3MDFk
-    ZDliZmY0NGFkYzQwYWEyYjI3OGE4MTE5NThjNjM1MjE1YzA3NWM0N2ZjMjcz
-    MzUzYWNkZGJmM2EyZDNiMDY4NjU1ODE2YTdhZWNmNmMzMDIyZTI=
+    MzEzZjgyMTQyZDdiYjM5ODk5YjFhMmIxZTYyYjVhZDQ5YmRiODRhZTVlMWY3
+    MDljNGU1ZTczZmYxZmIyYTA1ZDIwMjM1YjkzNTBiYjkxZGE5NTExNDRjMjZk
+    NzM0YWUyNTU5NmI3NjU1MjQ1ZTMxYWEwNzJkZTdkNTViNWNjNTY=

data/lib/tlog.rb

@@ -1,6 +1,6 @@
 
 module Tlog
-	Version = "0.2.4"
+	Version = "0.2.5"
 
 	module Storage
 	end

data/lib/tlog/command/display.rb

@@ -1,5 +1,4 @@
 
-# I will forever love whoever re-writes this class
 class Tlog::Command::Display < Tlog::Command
 
   def name

data/lib/tlog/command/stop.rb

@@ -1,3 +1,4 @@
+
 class Tlog::Command::Stop < Tlog::Command
 
   def name 
@@ -11,26 +12,29 @@ 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")
+    current_branch = storage.current_branch
+    if input.options[:all]
+      commit_output = commit_working_changes(input.options[:message])
+      commit_message = input.options[:message]
+      output.line("#{commit_output}")
     end
   end
 
   def options(parser, options)
-    parser.banner = "usage: tlog stop"
+    parser.banner = "usage: tlo stop"
+
+    parser.on("-a", "--all", "Stop current time log and commit tracked working changes") do |all|
+      options[:all] = all
+    end
 
-    parser.on("-am", "--am <commit message>", "Stop current time log and commit tracked working changes") do |message|
+    parser.on("-m", "--message <commit_message>", "The commit message you want to be associated with this commit") do |message|
       options[:message] = message
     end
   end
 
   private
 
-  def stop(message = nil)
+  def stop
     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

data/lib/tlog/storage/disk.rb

@@ -126,7 +126,7 @@ class Tlog::Storage::Disk
     if current_log_name == log_name
       duration += time_since_start
     end
-    log_entries(log_name).each do |entry| # should just be able to do log.entries.each
+    log_entries(log_name).each do |entry|
       duration += entry.length
     end
     duration
@@ -178,13 +178,17 @@ class Tlog::Storage::Disk
     Pathname.new(logs_path).children.select { |c| c.directory? } if Dir.exists?(logs_path)
   end
 
-  # Code from 'ticgit', temporarily switches to tlog branch 
+  def current_branch
+    git.lib.branch_current
+  end
+
+  # Temporarily switches to tlog branch 
   def in_branch(branch_exists = true)
     unless File.directory?(@tlog_working)
       FileUtils.mkdir_p(@tlog_working)
     end
 
-    old_current = git.lib.branch_current
+    old_current = current_branch
     begin
       git.lib.change_head_branch('tlog')
       git.with_index(@tlog_index) do 
@@ -208,8 +212,6 @@ class Tlog::Storage::Disk
   def decode_log_path(log_path)
     if Dir.exists?(log_path)
       log = Tlog::Entity::Log.new(log_path)
-      #log_storage.log_path = log_path # add this to the log class...i think task_store may not be neccessary
-      #lgolog.entries = log_storage.entries
     end
     return log
   end
@@ -251,7 +253,7 @@ class Tlog::Storage::Disk
         FileUtils.rm(checkout_path)
       end
     else
-      fals
+      false
     end
   end 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tlog
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Chris Wendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander