tot 0.0.1.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAyYWZmMTcyMjE3YzZiNTYzNjM2MTQ5OThjNTBkMDA5MjM2MzI5Ng==
+    NTUwOTA3NmQxYmRlMWVmYTkzZmYxNmZlOTg3ZTI2Nzg3NzM0NGEwZQ==
   data.tar.gz: !binary |-
-    ZTNiMWQyZWM3Y2EwODE1ZDA0ZDVmYjJmZjcxZDQyMjMwY2I5YmNhZQ==
+    NGUxMDhiNDZkNDY3YjhiODg4ZWEzN2Q2NGM2MzY5NjU5MzMwZTU3OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWQ0NWViNmI1MGNhNzk1MzcwZmQyMGUxZmIyOTg3OGE3MWJmNjI5NjhjNGQy
-    MGRkYmU2OWMzODM4ZDJlM2FmOGZhZWMxZjBkYjgwYzI4NThmMjYyNzJkYjBl
-    N2U3ZDRjN2YzNTk2MWQ1NTlmZThjYTk5N2E0YjhmNzE4MTE1Mzk=
+    ZjU0NWNlZTJiYTM3MTRmNDQwMjYwYTkzM2NiY2Y1MWI1YmZiNzMwN2FhZTJh
+    MjdkM2VlOWM3MDI1OWQ5MWJjYTI1NzlhYTM3MjE5NzRiMGRmYTEyNWVmMGZl
+    ZDYzNmUwOWVhNjQ3OGM3OTdlMDg5YTNjOWQ1NGY4MDlkNjhkY2Q=
   data.tar.gz: !binary |-
-    YTI3MTVmYjhhM2Q1OWY3MWUxMjFkMDg5ZDQ2NDI2YjFjYmFkNWU1MTE1OGYw
-    OWI3MTBhZjExNWRkNGQ3NzAyOThmNzdhMTZhNTAwMjFlMmIyMWU5NjBhZTkz
-    ODFjNzU2YzRmMzhkNjRkZTBlZWE4NDc0MzgyMDE5YWExNTg5YjA=
+    ODFlZGU1NmVkYmNjYWI2ZDZiYjIyNGY4MGQ0M2ZhZTNmNmY3OGQ2NGVmOWU4
+    YzE1NTNmNTdmMGJjMjM1OWEzMTNjYzU1NDkxZjI2OGY1M2U3NzU2NzU4NGZm
+    OGZlZGEzOWI2YjM0NzBlN2MxNzQyNjNhZmZmYzVmNDhjODllNTc=

data/lib/tot/version.rb

@@ -1,3 +1,3 @@
 module Tot
-  VERSION = "0.0.1.1"
+  VERSION = "0.0.2"
 end

data/lib/tot.rb

@@ -32,7 +32,7 @@ module Tot
     def load_file
       todo_path = Config.todo_path
       File.open(todo_path,'w'){|file| YAML.dump([],file)} unless File.exists? todo_path
-      @tasks = YAML.load_file(todo_path)
+      @tasks = YAML.load_file(todo_path).sort_by{|i| i['date']}
     end
 
     def dump
@@ -41,16 +41,7 @@ module Tot
       File.open(Config.todo_path,'w'){|file| YAML.dump(@tasks, file)}
     end
 
-    def each
-      @tasks = load_file.sort_by{|i| i['date']}
-      @tasks.each do |todo|
-        yield todo
-      end
-      self
-    end
-
     def add(new_todo)
-      @tasks = load_file
       @tasks.push new_todo
       dump
     end
@@ -61,9 +52,21 @@ module Tot
       dump
     end
 
+    def each
+      @tasks = load_file
+      @tasks.each do |todo|
+        yield todo
+      end
+      self
+    end
+
     def delete_at(at)
       @tasks.delete_at at
     end
+
+    def find_all!(&block)
+      @tasks = self.find_all(&block)
+    end
     def print_color(with_index = false) #{{{
       @tasks.each_with_index do |todo,idx|
         #https://github.com/flori/term-ansicolor/blob/master/examples/example.rb
@@ -153,13 +156,12 @@ module Tot
     desc 'list' , 'list up your todo'
     method_option :tag, :type => :array
     def list
-      @todo_manager.each do |todo|
-        unless options[:tag].nil?
+      if options['tag']
+        @todo_manager.find_all! do |todo|
           options[:tag].all?{|i| todo['tag'].include? i}
-        else
-          true
         end
-      end.print_color(false)
+      end
+      @todo_manager.print_color(false)
     end
 
     desc 'add' , 'add a task'
@@ -176,6 +178,7 @@ module Tot
       system([ENV['EDITOR'],tmpfile].join(' '))
       new_todo['text'] = File.readlines(tmpfile).join
       print new_todo['text']
+      File.delete tmpfile
       @todo_manager.add new_todo
     end
 
@@ -208,8 +211,40 @@ EOF
     end
 
     desc 'edit TITLE', 'edit a task'
-    method_options :text => :boolean, :title => :boolean, :date => :title
-    def edit
+    method_options :text => :boolean, :title => :boolean, :date => :boolean, :tag => :boolean
+    def edit(title)
+      reg = Regexp.new(title,Regexp::IGNORECASE)
+      todos = @todo_manager.find_all{|item| reg.match(item['title'])}
+      if todos.size == 0
+        puts 'No matched task.'
+      elsif todos.size > 1
+        puts todos.size.to_s + ' tasks matched.'
+      else
+        todo = todos[0]
+        old_title = todo['title']
+        if options['title']
+          todo['title'] = Readline.readline('New Title> ').chomp('\n')
+        elsif options['date']
+          todo['date'] = Time.parse(Utils.datetime_filter(Readline.readline('date> ', true).chomp('\n')).to_s)
+        elsif options['tag']
+          todo['tag'] = Readline.readline("tag (old_value: #{todo['tag'].join(' ')})> ", true)
+                          .chomp('\n').split(' ')
+        else
+          tmpfile = "/tmp/tot.markdown"
+          File.open(tmpfile,'w'){|file| file.write todo['text']}
+          system([ENV['EDITOR'],tmpfile].join(' '))
+          todo['text'] = File.readlines(tmpfile).join
+          File.delete tmpfile
+        end
+
+        puts 'Title: ' + todo['title']
+        puts 'Date:  ' + todo['date'].strftime("%Y/%m/%d %H:%M")
+        puts 'Tags:  ' + todo['tag'].to_s
+        puts
+        print todo['text']
+        @todo_manager.delete_at(@todo_manager.find_index{|obj| obj['title'] == old_title})
+        @todo_manager.add todo
+      end
       
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tot
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Shohei Fujii