swatch 0.2.2 → 0.3

data/CHANGELOG.rdoc

@@ -0,0 +1,20 @@
+= Changelog
+
+== 0.3
+ * Add test for the library
+ * Add the elapsed time when you go out a task
+ * Remove the priority of todo.txt in the .swatch.txt file
+ * Clean some comment
+ * Correct bug discovered by the newly created test
+
+== 0.2.2
+Minor update to add dependencies to Trollop and parseconfig
+
+== 0.2.1
+Minor update to add config file support
+
+== 0.2
+Add a simple support of todo.txt
+
+== 0.1
+First usable version, with no support of todo.txt

data/LICENSE

@@ -0,0 +1,8 @@
+------------------------------------------------------------------------------
+ "THE BEER-WARE LICENSE" (Revision 42):
+ <mayeu.tik@gmail.com> wrote this gem. As long as you retain this notice you
+ can do whatever you want with this stuff. If we meet some day, and you think
+ this stuff is worth it, you can buy me a beer in return. Matthieu Maury
+------------------------------------------------------------------------------
+
+

data/README.rdoc

@@ -0,0 +1,29 @@
+= Swatch
+
+A simple command line utility in Ruby to track your time.
+Can be use with todo.txt task list.
+
+== Usage
+
+  swatch command [option] arg
+
+Going in a task :
+  swatch in My awesome task
+
+Getting out:
+  swatch out
+
+Timing a todo.txt task:
+  swatch in -t 42
+
+== Config
+
+Swatch look for the ~/.swatchrc file. If it's present swatch will parse it to get track_file and todo_file path.
+Exemple :
+  track_file = "~/todo/swatchtrack.txt"
+  todo_file = "~/todo/todo.txt"
+
+By default (i.e if there is no ~/.swatchrc file), swatch will look for todo file in ~/.todo.txt and track_file in ~/.swatch.txt.
+
+== Todo
+* parse todo to remove the priority

data/bin/swatch

@@ -10,15 +10,16 @@
 #
 
 require 'trollop'
-require 'swatch'
-require ('parseconfig')
+require 'parseconfig'
+
+require_relative '../lib/swatch'
 
 # ###############
 # Global variable
 # ###############
 
 CONF_FILE = File.expand_path("~/.swatchrc")
-VERSION = '0.2.2'
+VERSION = '0.3'
 
 if File.exist? CONF_FILE
   config = ParseConfig.new(CONF_FILE)
@@ -83,5 +84,3 @@ when "out", "o"
 when "what" || "w"
 when "report" || "r"
 end
-
-

data/lib/numeric.rb

@@ -0,0 +1,26 @@
+#
+# Extend the numeric class with the "duration" method that print a
+# duration in human langage.
+# This code was found at:
+# http://stackoverflow.com/questions/1679266/can-ruby-print-out-time-difference-duration-readily
+#
+
+class Numeric
+   def duration
+      secs  = self.to_int
+      mins  = secs / 60
+      hours = mins / 60
+      days  = hours / 24
+
+      if days > 0
+         "#{days} days and #{hours % 24} hours"
+      elsif hours > 0
+         "#{hours} hours and #{mins % 60} minutes"
+      elsif mins > 0
+         "#{mins} minutes and #{secs % 60} seconds"
+      elsif secs >= 0
+         "#{secs} seconds"
+      end
+   end
+end
+

data/lib/swatch.rb

@@ -7,6 +7,8 @@
 #------------------------------------------------------------------------------
 #
 
+require_relative './numeric.rb'
+
 module Swatch
 
   module_function
@@ -23,23 +25,45 @@ module Swatch
     end
   end
 
+  # Return the start time of a running task
+  def get_last_task_stime
+    line = ''
+    IO.popen("tail -n 1 #{TRACK_FILE}") { |f| line = f.gets }
+    if line == nil
+      return false
+    end
+
+    line.split("\t").pop
+  end
+
   # Return the name of the last task
   def get_last_task_name
     line = ''
     IO.popen("tail -n 1 #{TRACK_FILE}") { |f| line = f.gets }
-    m = line.match '^(.+)\t\d+(\t\d+)?'
-    m[1]
+    if line == nil
+      return false
+    end
+
+    line = line.split "\t"
+    if running_task?
+      line.pop
+    else
+      line.pop 2
+    end
+    line.join "\t"
   end
 
   # Go out of the current task running
   def task_out
     if running_task?
-      puts "Stop task: " + get_last_task_name
-      f = File.open(TRACK_FILE, "a")
-      f.print "\t#{Time.now.to_i}\n"
-      f.close
+      puts "Stop task: " + get_last_task_name + ", #{(Time.now.to_i - get_last_task_stime.to_i).duration}"
+      open(TRACK_FILE, "a"){|f|
+        f.print "\t#{Time.now.to_i}\n"
+      }
+      return true
     else
       puts "There is no task running"
+      return false
     end
   end
 
@@ -48,7 +72,7 @@ module Swatch
     # don't go here if ARGV is null !
     if task.strip.empty?
       puts "No task specified"
-      exit
+      return false
     end
 
     # if there is a task running, we get out of it
@@ -70,12 +94,17 @@ module Swatch
     out.close
 
     puts "Start task: #{task}"
+    return true
   end
 
   # Return the todo associated to the given number
   def get_todo (nb)
     # TODO: parse todo to remove the priority
-    IO.readlines(TODO_FILE)[nb-1]
+    line = IO.readlines(TODO_FILE)[nb-1]
+    if line.match '^\(([A-Z])\)'
+      line.slice!(0..4)
+    end
+    line
   end
 
   # Going in a task with a todo from todo.txt

metadata

@@ -1,77 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: swatch
-version: !ruby/object:Gem::Version 
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: '0.3'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matthieu Maury
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-03-03 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: trollop
+  requirement: &13186500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *13186500
+- !ruby/object:Gem::Dependency
   name: parseconfig
+  requirement: &13186060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: |
-  Swatch is a simple timetracking script in Ruby.
+  prerelease: false
+  version_requirements: *13186060
+description: ! 'Swatch is a simple timetracking script in Ruby.
+
   It can be used in conjonction of the todo.txt script
 
+'
 email: mayeu.tik@gmail.com
-executables: 
+executables:
 - swatch
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/swatch.rb
+- lib/numeric.rb
+- README.rdoc
+- CHANGELOG.rdoc
+- LICENSE
+- bin/swatch
 has_rdoc: true
 homepage: http://github.com/Mayeutik/swatch
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: A simple cli timetracking script that can be use with todo.txt
 test_files: []
-