tot 0.0.2.1 → 0.0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmEwNjViNTUxZTgxNDNkYjk5NGMzOGNiNzlkMTcwNjBlYTU2ZWI5MQ==
+    YTg5NmIxMDU2ZGExYTkwNzUyMzU0MWI3OGY1Zjc3MWM1N2RkNGI5ZQ==
   data.tar.gz: !binary |-
-    OWIwMDI5MGY0YzZjOWE2YjU1YzAzZDBjMTBhZmJjOGJjYjc4M2Q3NA==
+    MzBhYzdmNjE5NjIxMGNhZDVkN2ZkOWM4MTg1ODAyZWIxZjdhN2NkOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjY4YWNhNDRjN2ZmZTk1MmQxMTQzYmM4YjMwNmJhYjg0M2MyNWVkMDE1NzMy
-    OWM3MWJiZmY0OWNlMDgwNTVmZDk5NWJhZWZlODNiZTgwZDQ1NjY2MGE5MWI3
-    M2RhYTQzZjI0ZGQ1OTA0NmM0ZWQxODEyYWFmOWY4MTlmMDRiN2I=
+    NWIzZWRkNWI1NTM4MDQ1Njk3ZDVjZmRmZjQ4NjVlYzRhMGQ4NDQwMGQ3NjMw
+    YmZjMDgzZmFkOTU0ZDhjYTQ4YWNiMWRiNjRmOTFiMzE1MjQxY2JmOTlmOWMw
+    OWVjZTE5MDIwY2E5YjAzYzA1MTFlYjMzMTRhYWYxNTc1OWY0YTg=
   data.tar.gz: !binary |-
-    MWNiOGIzZGQ5ZjE2OThkMzJjMzg0MTZjZGY4MGVmM2RlYjNhNTFjM2QzNTA3
-    ZjYzZjVkOTBjN2NkZTg4YjA4ZjQ2MjE3ZDdhMGE5Y2I5OTA5NWEyNTdlYWUx
-    NDE1NmVjYWMyNTZlOTJmNWM0YTdiZDQyZGEyY2YzNGJkYmNhNDg=
+    ZDEzMzZkYTM4ZWFiN2FlNjcwNjQzOGE0MTc5OTQ2OWQ2YTg1YTE4OGViYTZh
+    YjgwNjhlM2VkZTAxOGYyZDJlZTMxMDU1MWZjM2IyNDc3MmJkMDg0NmQ3YjQ4
+    ZDg5N2NhMzljZGNiNTdiNmIxY2UyNDFhZTU5NGFiYTY4YTA0MzI=

data/README.md

@@ -1,6 +1,6 @@
 # Tot
 
-Manage your todo on your terminal.
+Manage your todo on your terminal, inspired by [console-task-checker](https://github.com/alice1017/console-task-checker).
 
 ## Installation
 

data/lib/tot/version.rb

@@ -1,3 +1,3 @@
 module Tot
-  VERSION = "0.0.2.1"
+  VERSION = "0.0.2.2"
 end

data/lib/tot.rb

@@ -6,6 +6,8 @@ require "fileutils"
 require "yaml"
 require "time"
 require "term/ansicolor"
+require "tempfile"
+require 'shellwords'
 
 module Tot
   module Config #{{{
@@ -50,10 +52,6 @@ module Tot
       @tasks.push new_todo
     end
     
-    def delete(at)
-      @tasks.delete_at(at)
-    end
-
     def each
       @tasks = load_file
       @tasks.each do |todo|
@@ -66,6 +64,11 @@ module Tot
       @tasks.delete_at at
     end
 
+    def delete_by_title(title)
+      @tasks.delete_at(@tasks.find_index{|obj| obj['title'] == title})
+      @tasks
+    end
+
     def find_all!(&block)
       @tasks = self.find_all(&block)
     end
@@ -78,19 +81,39 @@ module Tot
         when 0..1
           print Term::ANSIColor.bold, Term::ANSIColor.red
         when 2..3
-          print Term::ANSIColor.yellow
+          print Term::ANSIColor.bold, Term::ANSIColor.yellow
+        when 4..7
+          print Term::ANSIColor.bold, Term::ANSIColor.magenta
         else
-          print Term::ANSIColor.white
+          print Term::ANSIColor.green
         end
 
         puts [("<<#{idx}>>" if with_index),
               todo['date'].strftime("%Y/%m/%d %H:%M"),
               todo['title'],
-              ['[',todo['tag'],']'].flatten.join(' ')].join(' ') 
+              '['+todo['tag'].flatten.join(',')+']'].keep_if{|i| not i.nil?}.join(' | ')
         print Term::ANSIColor.reset
       end
       self
     end #}}}
+
+    # This method is incomplete, returns array of title for now.
+    def stdin_parser(lines) #{{{
+      lines = lines.split(/\n/) unless lines.class == Array
+      lines.map {|line|
+        line.chomp.gsub(/\e\[\d+m/,"").split('|').map(&:strip)
+      }.keep_if{|i| i != []}
+      .map {|l| 
+        task = {}
+        task[:date] = Time.parse(l[0])
+        task[:title] = l[1]
+        task[:tag] = YAML.load(l[2])
+        task
+      }
+    rescue
+      raise RuntimeError, 'Stdin lines are invalid.'
+    end #}}}
+
     #module_function :load_file, :dump, :listup, :add
   end #}}}
 
@@ -146,13 +169,24 @@ module Tot
       ret
     end #}}}
 
-    module_function :datetime_filter
+    def stdin_incoming? #{{{
+      (File.pipe?(STDIN) || File.select([STDIN], [], [], 0) != nil)
+    end #}}}
+
+    module_function :datetime_filter,:stdin_incoming?
   end #}}}
 
   class CLI < Thor
+    TTY = open("/dev/tty")
     def initialize(*args)
       super
       @todo_manager = TodoManager.new
+      @stdin_tasks = []
+      # The following lines needs to be fixed when I correct stdin_parser.
+      if Utils.stdin_incoming?
+        @stdin_lines = STDIN.readlines
+        @stdin_tasks = @todo_manager.stdin_parser(@stdin_lines)
+      end
     end
 
     desc 'list' , 'list up your todo' #{{{
@@ -177,27 +211,46 @@ module Tot
     desc 'add' , 'add a task' #{{{
     def add
       new_todo = {}
-      new_todo['title'] = Readline.readline('title> ', true).chomp('\n')
-      new_todo['date'] = Time.parse(Utils.datetime_filter(Readline.readline('date> ', true).chomp('\n')).to_s)
+      new_todo['title'] = Readline.readline('title> ', true).chomp('\n').strip
+      begin
+          new_todo['date'] = Time.parse(Utils.datetime_filter(Readline.readline('date> ', true).chomp('\n')).to_s)
+      rescue
+          puts "Invalid input. Please retry."
+          retry
+      end
       new_todo['tag'] = Readline.readline('tag (separate by space)> ', true)
                           .chomp('\n').split(' ')
-      tmpfile = "/tmp/tot.markdown"
       # File.open(tmpfile,"w"){|file|
       #   file.puts "\n\n# This line will be ignored."
       # }
-      system([ENV['EDITOR'],tmpfile].join(' '))
-      new_todo['text'] = File.readlines(tmpfile).join
+
+      #tmpfile = "/tmp/tot.markdown"
+      #system([ENV['EDITOR'],tmpfile].join(' '))
+      Tempfile.open("/tmp/tot_",".markdown") do |t|
+        IO.copy_stream(STDIN, t) unless STDIN.tty?
+        STDIN.reopen(TTY)
+        system([ENV['EDITOR'], t.path, ">", TTY.path].join(" "))
+        new_todo['text'] = t.read
+      end
+      #new_todo['text'] = File.readlines(tmpfile).join
       print new_todo['text']
-      File.delete tmpfile
+      #File.delete tmpfile
       @todo_manager.add new_todo
       @todo_manager.save
     end #}}}
 
     desc 'delete', 'delete a task' #{{{
     def delete
-      @todo_manager.print_color(true)
-      @todo_manager.delete_at Readline.readline('Which Task?> ',false).chomp('\n').to_i
-      @todo_manager.save
+      if @stdin_tasks.empty?
+        @todo_manager.print_color(true)
+        @todo_manager.delete_at Readline.readline('Which Task?> ',false).chomp('\n').to_i
+        @todo_manager.save
+      elsif #@stdin_tasks.size >= 1
+        @stdin_tasks.each do |stdin_task|
+          @todo_manager.delete_by_title(stdin_task[:title])
+        end
+        @todo_manager.save
+      end
     end #}}}
 
     desc 'show', <<-EOF #{{{
@@ -206,12 +259,25 @@ TITLE does not need to be complete.
 EOF
     method_option :filter, :type => :array, :aliases => "-f",:default => nil
     def show
+
+      #### stdinあり
+      if Utils.stdin_incoming?
+        todos = []
+        @stdin_tasks.each do |stdin_task|
+          todos.push @todo_manager.find_all!{|item| stdin_task[:title].match(item['title'])}
+        end
+        todos.flatten.each { |todo| puts '-'*30;print_todo(todo)}
+        return
+      end
+
+      #### stdinなし
       reg = nil
       if options['filter']
         reg = Regexp.new(options['filter'].join('.*'),Regexp::IGNORECASE)
       else
         reg = /.*/
       end
+
       todo = nil
       todos = @todo_manager.find_all!{|item| reg.match(item['title'])}
       if todos.size == 0
@@ -223,17 +289,25 @@ EOF
       else
         todo = todos.first
       end
-      puts 'Title: ' + todo['title']
-      puts 'Date:  ' + todo['date'].strftime("%Y/%m/%d %H:%M")
-      puts
-      print todo['text']
-      
+
+      print_todo(todo)
     end #}}}
 
     desc 'edit', 'edit a task' #{{{
     method_options :text => :boolean, :title => :boolean, :date => :boolean, :tag => :boolean
     method_option :filter, :type => :array, :aliases => "-f",:default => nil
     def edit
+      #### stdinあり
+      if Utils.stdin_incoming?
+        todos = []
+        @stdin_tasks.each do |stdin_task|
+          todos.push @todo_manager.find_all!{|item| stdin_task[:title] == item['title']}
+        end
+        todos.flatten.each { |todo| edit_todo(todo,options)}
+        return
+      end
+
+      #### stdinなし
       reg = nil
       if options['filter']
         reg = Regexp.new(options['filter'].join('.*'),Regexp::IGNORECASE)
@@ -251,32 +325,50 @@ EOF
       else
         todo = todos.first
       end
+      
+      edit_todo(todo,options)
+    end #}}}
 
-      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
+    no_commands do #{{{
+      def edit_todo(todo,options={})
+        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_" + Shellwords.shellescape(todo['title']) + ".markdown"
+          tmpfile = "/tmp/tot.markdown"
 
-      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
-      @todo_manager.save
+          fileio = File.open(tmpfile,'w')
+          fileio.write todo['text']
+          fileio.flush
+          fileio.close
+          STDIN.reopen(TTY)
+          system([ENV['EDITOR'], tmpfile, ">", TTY.path].join(" "))
+          todo['text'] = File.readlines(tmpfile).join
+          puts todo
+
+          File.delete tmpfile
+        end
+
+        @todo_manager.refresh
+        @todo_manager.delete_by_title(old_title)
+        @todo_manager.add todo
+        @todo_manager.save
+      end
     end #}}}
 
+    no_commands do #{{{
+      def print_todo(todo)
+        puts 'Title: ' + todo['title']
+        puts 'Date:  ' + todo['date'].strftime("%Y/%m/%d %H:%M")
+        puts
+        print todo['text']
+      end
+    end #}}}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tot
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.2.2
 platform: ruby
 authors:
 - Shohei Fujii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler