swatch 0.3 → 0.3.1

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = Changelog
 
+== 0.3.1
+ * Implement a simple "what" command
+
 == 0.3
  * Add test for the library
  * Add the elapsed time when you go out a task

data/README.rdoc

@@ -16,6 +16,9 @@ Getting out:
 Timing a todo.txt task:
   swatch in -t 42
 
+What am I currently tracking:
+  swatch what
+
 == Config
 
 Swatch look for the ~/.swatchrc file. If it's present swatch will parse it to get track_file and todo_file path.
@@ -26,4 +29,6 @@ Exemple :
 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
+* Implement report functionnality
+* Add option to only print duration of the "what" command
+* Add option to start/end task at a certain time

data/bin/swatch

@@ -19,7 +19,7 @@ require_relative '../lib/swatch'
 # ###############
 
 CONF_FILE = File.expand_path("~/.swatchrc")
-VERSION = '0.3'
+VERSION = '0.3.1'
 
 if File.exist? CONF_FILE
   config = ParseConfig.new(CONF_FILE)
@@ -61,8 +61,8 @@ cmd_opts = case cmd
                opt :todo, "Track a todo.txt task", :type => :int, :short => "-t"
              end
            when "out", "o"
-           when "what" || "w"
-           when "report" || "r"
+           when "what", "w"
+           when "report", "r"
            end
 
 #puts "Global options: #{global_opts.inspect}"
@@ -81,6 +81,7 @@ when "in", "i"
   end
 when "out", "o"
   Swatch::task_out
-when "what" || "w"
-when "report" || "r"
+when "what", "w"
+   Swatch::what_task
+when "report", "r"
 end

data/lib/swatch.rb

@@ -11,109 +11,119 @@ require_relative './numeric.rb'
 
 module Swatch
 
-  module_function
-
-  # Test if there is a task currently running. Return true if there is
-  def running_task?
-    line = ''
-    IO.popen("tail -n 1 #{TRACK_FILE}") { |f| line = f.gets }
-    #puts line
-    if(line != nil && (!line.match '^.+\t\d+\t\d+$'))
-      true
-    else
-      false
-    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 }
-    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 + ", #{(Time.now.to_i - get_last_task_stime.to_i).duration}"
-      open(TRACK_FILE, "a"){|f|
-        f.print "\t#{Time.now.to_i}\n"
-      }
+   module_function
+
+   # Test if there is a task currently running. Return true if there is
+   def running_task?
+      line = ''
+      IO.popen("tail -n 1 #{TRACK_FILE}") { |f| line = f.gets }
+      #puts line
+      if(line != nil && (!line.match '^.+\t\d+\t\d+$'))
+         true
+      else
+         false
+      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 }
+      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 + ", #{(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
+
+   # Start a task
+   def task_in (task)
+      # don't go here if ARGV is null !
+      if task.strip.empty?
+         puts "No task specified"
+         return false
+      end
+
+      # if there is a task running, we get out of it
+      if running_task?
+         #puts "There is a task running, getting out of this one"
+         task_out
+      end
+
+      if(!File.exist?(TRACK_FILE))
+         #puts "Create a new task file"
+         out = File.new(TRACK_FILE, "w")
+      else
+         #puts "Use #{TRACK_FILE}"
+         out = File.open(TRACK_FILE, "a")
+      end
+
+      #print the task in the file
+      out.print "#{task}\t#{Time.now.to_i}"
+      out.close
+
+      puts "Start task: #{task}"
       return true
-    else
-      puts "There is no task running"
-      return false
-    end
-  end
-
-  # Start a task
-  def task_in (task)
-    # don't go here if ARGV is null !
-    if task.strip.empty?
-      puts "No task specified"
-      return false
-    end
-
-    # if there is a task running, we get out of it
-    if running_task?
-      #puts "There is a task running, getting out of this one"
-      task_out
-    end
-
-    if(!File.exist?(TRACK_FILE))
-      #puts "Create a new task file"
-      out = File.new(TRACK_FILE, "w")
-    else
-      #puts "Use #{TRACK_FILE}"
-      out = File.open(TRACK_FILE, "a")
-    end
-
-    #print the task in the file
-    out.print "#{task}\t#{Time.now.to_i}"
-    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
-    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
-  def task_in_todo (nb)
-     t = get_todo (nb)
-    if t
-      task_in t.chomp
-    else
-      puts "No task specified"
-    end
-  end
+   end
+
+   # Return the todo associated to the given number
+   def get_todo (nb)
+      # TODO: parse todo to remove the priority
+      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
+   def task_in_todo (nb)
+      t = get_todo (nb)
+      if t
+         task_in t.chomp
+      else
+         puts "No task specified"
+      end
+   end
+
+   # What task are currently running
+   def what_task
+      if running_task?
+         puts "Current task: " + get_last_task_name + ", #{(Time.now.to_i - get_last_task_stime.to_i).duration}"
+      else
+         puts "No task running!"
+      end
+   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swatch
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-03 00:00:00.000000000 +01:00
+date: 2011-03-07 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &13186500 !ruby/object:Gem::Requirement
+  requirement: &12461520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13186500
+  version_requirements: *12461520
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &13186060 !ruby/object:Gem::Requirement
+  requirement: &12461080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13186060
+  version_requirements: *12461080
 description: ! 'Swatch is a simple timetracking script in Ruby.
 
   It can be used in conjonction of the todo.txt script