j 0.4.2 → 0.5.1

data/README.md

@@ -1,12 +1,12 @@
-j - task manager
+j - task manager (v0.5.1)
 =================
 
-j is a simple command-line task manager written in Ruby. Inspired by [t-](http://www.penzba.co.uk/t-/t-.html?HN1) which was written in Python.
+j, stands for jot and is a simple command-line task manager written in Ruby. Inspired by [t-](http://www.penzba.co.uk/t-/t-.html) which was written in Python.
 
 Install:
 --------
 
-*This rubygem is yet to be put-up on a distribution channel. But till then enjoy the source*
+       gem install j
 
 Usage:
 -------
@@ -15,12 +15,20 @@ Usage:
        j
 * List all tasks
        j -a
-* List done tasks
-       j -d
+* List finished tasks
+       j -f
 * Mark a task as done
        j -m <key>
-* Remove a task
-       j -r <key>
-* Clear task list
+  F.ex: `j -m 3`
+* Delete a task
+       j -d <key>
+* Clear task list by deleting the *.todo* file (will be recreated later when needed)
        j -c
+* Display the scroll to use the magic
+       j -h
+
+Key is a number that you will find next to a task, when you list tasks. It isn't the same everytime. So watch out!
+
+All tasks are stored in the *.todo* file in your *$HOME* directory. However, if your current directory contains a *.todo* file, then that file will be used.
+
 

data/bin/j

@@ -1,20 +1,89 @@
 #! /usr/bin/env ruby
 require 'rainbow'
+require 'optparse'
 require File.expand_path('../lib/j', File.dirname(__FILE__))
 
 
 j = J.new
 
+validOptions = ["-a", "--all",
+                "-f", "--finished",
+                "-t", "--todo",
+                "-m", "--mark",
+                "-d", "--delete",
+                "-c", "--clear",
+                "-h", "--help"]
+
+if ARGV.length > 0  and validOptions.include?(ARGV.first)
+
+  options = OptionParser.new do |o|
+    o.banner = "j task manager"
+    
+    o.on('-a', "--all", "List all tasks") do |b|
+      j.listTasks(:all)
+      exit
+    end
+
+    o.on('-t', "--todo", "List todo. Same as using command without options") do |b|
+      j.listTasks(:todo)
+      exit
+    end
+    
+    o.on('-f', "--finished", "List finished tasks") do |b|
+      j.listTasks(:done)
+      exit
+    end
+  
+    o.on('-m KEY', "--mark KEY", "Mark a task a completed") do |key|
+      if j.validKey key
+        j.markTask key
+      else
+        puts o
+      end
+      exit
+    end
+  
+    o.on('-d KEY', "--delete KEY", "Delete a task") do |key|
+      if j.validKey key
+        j.deleteTask key
+      else
+        puts o
+      end
+      exit
+    end
+    
+    o.on('-c', "--clear", "Clears the todo list") do |b|
+      j.clearList
+      exit
+    end
+
+    o.on('-h', "--help", "Displays this message") do |b|
+      puts o
+      exit
+    end
+
+  end
+
+  options.parse!
+
+elsif ARGV.length > 0
+  j.addTask ARGV.join(" ")
+elsif ARGV.length == 0
+  j.listTasks(:todo)
+end
+
+=begin
 if ARGV.count == 0
   j.listTasks
 elsif ARGV.count == 1
-  j.listTasks(:done) if ARGV[0] == "-d"
+  j.listTasks(:done) if ARGV[0] == "-f"
   j.listTasks(:all) if ARGV[0] == "-a"
   j.clearList if ARGV[0]=="-c"
 elsif ARGV.count == 2 and ARGV.first == "-m"
   j.markTask ARGV[1]
-elsif ARGV.count == 2 and ARGV.first == "-r"
+elsif ARGV.count == 2 and ARGV.first == "-d"
   j.deleteTask ARGV[1]
 else
   j.addTask ARGV.join(" ")
 end
+=end

data/j.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = "j"
-  s.version     = "0.4.2"
+  s.version     = "0.5.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Akash Manohar"]
   s.email       = ["akash@akash.im"]
-  s.homepage    = "http://akash.im"
+  s.homepage    = "http://akash.im/j"
   s.summary     = "j task manager - v" + s.version.to_s
   s.description = %q{j, stands for jot and is a simple command-line task manager. Inspired by t- task manager which is written in python}
   

data/lib/j.rb

@@ -3,12 +3,22 @@ require 'etc'
 class J
   def initialize
     userHome = Etc.getpwuid.dir
-    @tFilePath = userHome << '/' << ".todo"
-    
+    if File.exists?(Dir.pwd << "/.todo")
+      @tFilePath = Dir.pwd << "/.todo"
+      if (Dir.pwd == userHome)
+        @globalTodo = true
+      else
+        @globalTodo = false
+      end
+    else
+      @globalTodo = true
+      @tFilePath = userHome << '/' << ".todo"
+    end
   end
 
   def addTask(task)
     taskRecord = createTask task
+    puts "*NEW* " << "TODO".foreground(:red).bright << " " << task
     writeTaskToFile taskRecord
   end
 
@@ -21,7 +31,11 @@ class J
         end
       end
     else
-      puts "No tasks"
+      if @globalTodo
+        puts "No tasks!"
+      else
+        puts "No tasks in project todo list. To delete project todo list use option -c"
+      end
     end
   end
 
@@ -58,15 +72,23 @@ class J
     if File.exists?(@tFilePath)
       File.delete(@tFilePath)
     end
-    puts "Cleared list"
+    if @globalTodo
+      puts "Cleared todo list"
+    else
+      puts "Cleared project todo list"
+    end
   end
+
+  def validKey(key)
+    return true unless key.match(/\A[0-9]+\Z/).nil?
+  end 
   
   private
 
   def dumpTasksToFile
     f = tFile("w+")
     @tasks.each do |task|
-      taskRecord = task[:status] << " " << task[:title]
+      taskRecord = task[:status] << " " << task[:title] << "\n"
       f << taskRecord
     end
     f.close
@@ -100,9 +122,12 @@ class J
   end
 
   def readTasks
+    
     @tasks = []
-    # REcord Pattern: <status:TODO/DONE> <space> <task>
-    taskRecordPattern = /(?<status>\w+)\s(?<title>[\w\s]+)/
+
+    # Record Pattern: <status:TODO/DONE> <space> <task>
+    taskRecordPattern = /(?<status>(TODO|DONE))\s(?<title>.+)\Z/
+
     tFile.readlines.each do |l|
       if (l.length < 2)
         next

metadata

@@ -2,7 +2,7 @@
 name: j
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors: 
 - Akash Manohar
@@ -43,7 +43,7 @@ files:
 - j.gemspec
 - lib/j.rb
 has_rdoc: true
-homepage: http://akash.im
+homepage: http://akash.im/j
 licenses: []
 
 post_install_message: 
@@ -69,6 +69,6 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: j task manager - v0.4.2
+summary: j task manager - v0.5.1
 test_files: []