thartm 0.0.23 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.1.1

data/bin/rrtm

@@ -31,8 +31,8 @@ cli = CommandLineInterface.new(@@config['key'],@@config['secret'],@@config['toke
 if ARGV[0]
 begin
 	cli.send ARGV[0] 
-rescue
-	puts "command #{ARGV[0]} is not available"
+rescue Exception => e
+	puts e, "command #{ARGV[0]} is not available"
 	cli.help
 end
 else

data/lib/thartm.rb

@@ -29,7 +29,17 @@ class Rrtm
 		end
 		return allTaskList
 	end
-
+	
+	def findList(name)
+		flist = ''
+		name.chomp!
+		@lists.each do |k,v|
+			if v[:name] == name
+				flist = v[:id]
+			end
+		end
+		return flist
+	end
 	def lists
 		lists = @rtm.lists.getList
 	end
@@ -44,12 +54,12 @@ class Rrtm
 	end
 
 	
-	def addTask(text, * args ) 
-		if args.length == 1
-			listname = args[0]
+	def addTask(name) 
+		if name =~ /^(@(\w|\s)+@)/
+			listname = name.match(/^(@(\w|\s)+@)/)[0][1..-2]
+			name.sub!(/^(@(\w|\s)+@)/,'')
 		end
-	
-		listid = 0
+		listid = allTaskList
 		if listname
 		@lists.each do |k,v|
 			if v[:name].match(listname)
@@ -58,11 +68,7 @@ class Rrtm
 		end
 		end
 
-		if listid != 0
-			@rtm.tasks.add :timeline => @timeline, :name =>  text, :parse => '1', :list_id => listid
-		else
-			@rtm.tasks.add :timeline => @timeline, :name =>  text, :parse => '1'
-		end
+		@rtm.tasks.add :timeline => @timeline, :name =>  name, :parse => '1', :list_id => listid
 	end
 
 	def findTask(id)
@@ -104,11 +110,26 @@ class CommandLineInterface
 
 	def tasks
 		t = Array.new
-		tasks = @rtm.tasksAllTaskList	
+		if ARGV[1]
+			l = @rtm.findList(ARGV[1..-1].join(" "))
+			begin
+				tasks = @rtm.tasks :list_id => l
+			rescue Exception => e	
+				puts e,"list not found"
+				return ''
+			end
+		else
+
+			tasks = @rtm.tasksAllTaskList	
 
+		end
 		tasks.each do |key,val|
-			val.each do |k,v|
-				t.push(v) unless v.complete? # do not add c ompleted tasks
+			if val.class == RememberTheMilkHash
+				val.each do |k,v|
+					t.push(v) unless v.complete? # do not add c ompleted tasks
+				end
+			elsif val.class == RememberTheMilkTask
+					t.push(val) unless val.complete? # do not add c ompleted tasks
 			end
 		end
 
@@ -126,15 +147,25 @@ class CommandLineInterface
 		end
 
 		# compose string result
-		s = ''
 		t.each do |tt|
-			s += tt[:id] + ":  "  +   tt[:name].to_s + " -- " + tt.due.to_s + "\n"
+			s = tt[:id] + ":  "  +   tt[:name].to_s + " -- " + tt.due.to_s + "\n"
+            color(s,tt)
 		end
-		puts s 
 	end
 
+    def color(s,t)
+        p = case t[:task][0][:priority] 
+            when 'N' then printf("\e[0m%s \e[0m",s)
+            when '1' then printf("\e[31;40m%s \e[0m",s)
+            when '2' then printf("\e[32;40m%s \e[0m",s)
+            when '3' then printf("\e[32;40m%s \e[0m",s)
+            else puts "err"
+        end
+        
+    end
+
 	def add 
-		@rtm.addTask(ARGV[1], ARGV[2] )
+		@rtm.addTask(ARGV[1..-1].join(" "))
 	end
 
 	def lists
@@ -146,11 +177,19 @@ class CommandLineInterface
 	end
 	
 	def complete
+		begin 
 		@rtm.completeTask(ARGV[1])
+		rescue 
+			p "invalid task id"
+		end
 	end
 
 	def postpone
+		begin 
 		@rtm.postpone(ARGV[1])
+		rescue 
+			p "invalid task id"
+		end
 	end
 	
 	def tz
@@ -193,10 +232,11 @@ usage rrtm <command> <params>
 
 help: print this help and exits
 lists: show available tasks lists
-tasks: show not completed tasks
-add name [lists name]: adds a task to the lists
-complete id: mark task with id "id" as completed
-postpone id: postpone task by one day
+tasks [list name]: show not completed tasks
+add <name>: name can be a task or in the form @list name@ task
+add "<name>" : input is better parsed within quotes: task #Listname !priority_value(1..3) 
+complete <id>: mark task with id "id" as completed
+postpone <id>: postpone task by one day
 first: show first uncompleted task
 '
 	puts s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thartm
 version: !ruby/object:Gem::Version 
-  version: 0.0.23
+  version: 0.1.1
 platform: ruby
 authors: 
 - tha
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-06-10 00:00:00 +02:00
 default_executable: rrtm
 dependencies: 
 - !ruby/object:Gem::Dependency