tdoo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4ea10f20869c412048938a3237066857457729
-  data.tar.gz: 10b23ca1aaab053ab1f98a4ba147d74f8edc5348
+  metadata.gz: 04db06e81be29428459a1aa908d21a4783b77f65
+  data.tar.gz: a34ac90f6f22a9df5c745caf62a700f2d91be4dc
 SHA512:
-  metadata.gz: c2660439f97a7e8405c8fa1c45677f510ce162a1df0fe2648b68ec81d5871065a8ed7983947182edf42090decb93e05b0cc6e061c5c8d9ee224c68df2eae1037
-  data.tar.gz: ed9623b62a829cce62b68392eb2dfc368f1495f7435ca467ac1aea17125c0cc29916f6e61da218b5deeb07b3fe8d014516ae70a07a41b4605211b880f282b088
+  metadata.gz: 340abbfc995671672af1350ad246e0d9af0bc2d8f19983eb079600b6a9826192440593803560e11a3f1e58da3ff75229c5511ac31c8d19a05c438e1b58843a6b
+  data.tar.gz: 3feb257ed75227c0c014f0f3033127aef259124af28774d88b6b88afeb36b546f8ffda0caa249f5dc52c708869cf516fc9e67501f8321129f65964cc0a90ab2e

data/bin/tdoo

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby
 require 'gli'
-require 'rainbow'
+require 'tdoo'
 
 include GLI::App
+
 program_desc 'A mini todo command-line application'
 
+version Tdoo::VERSION
+
 desc 'Path to the todo file'
 default_value '~/.tdoo.txt'
 arg_name 'todo_file'
@@ -12,8 +15,8 @@ flag [:f,:filename]
 
 desc 'Create a new task in the task list'
 long_desc "
-A task has a name and a priority. By default, new tasks has the lowest
-priority, though this can be overridden
+A task has a name and belongs to a project that you need to specify.
+e.g. tdoo new -p today \"Happy coding!\"
 "
 arg_name 'task'
 command [:new, :n] do |c|
@@ -21,9 +24,6 @@ command [:new, :n] do |c|
   c.arg_name 'project'
   c.flag [:p, :project]
 
-  c.desc 'put the new task first in the task list'
-  c.switch :f
-
   c.action do |global_options,options,task_names|
     data = File.expand_path(global_options[:filename])
     unless File.exist?(data)
@@ -31,8 +31,9 @@ command [:new, :n] do |c|
       File.new(data, 'w+')
     end 
 
+    formatter = Tdoo::Format::Pretty.new
     File.open(data, 'a+') do |todo_file|
-      raise "You must specify the project's name that new tasks belong to" if options[:p].nil?
+      raise "You must specify the project's name that new tasks belong to... 'tdoo new -h' for help!" if options[:p].nil?
 
       if task_names.empty?
         puts "Reading new tasks from stdin..."
@@ -49,80 +50,100 @@ command [:new, :n] do |c|
       task_names.each_with_index do |task, index|
         t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
         todo_file.puts [project, index+tasks, task, t].join(',')
-        puts [project, index+tasks, task, ].join(',')
+        formatter.format_todo(project, index+tasks, task, t)
       end
+
+      formatter.after
     end
   end
 end
 
 desc 'List all tasks'
+long_desc "
+By default, the format of the output is pretty. A task has two status, todo and done, that will be
+different colors. Red is for todo tasks and green is for done tasks instead.
+e.g. tdoo list -p today
+"
 command [:list, :ls] do |c|
-  c.desc 'Format of the output (pretty for TTY, csv otherwise)'
-  c.arg_name 'csv|pretty'
-  c.flag :format
 
   c.desc 'List all tasks belong to a certain project'
   c.arg_name 'project'
   c.flag [:p, :project]
 
   c.action do |global_options,options,args|
-    if options[:format].nil?
-      options[:format] = STDOUT.tty? ? 'pretty' : 'csv'
-    end
 
+    formatter = Tdoo::Format::Pretty.new
+    project_flag = options[:p].nil? ? false : true
     data = File.read(File.expand_path(global_options[:filename])) 
-    if options[:p].nil?
-      data.each_line do |line|
-        completed = line.chomp.split(',').count
+    data.each_line do |line|
+      field = line.chomp.split(',')
+      project = field[0]
+      completed = field.count
+      if project_flag
+        if (completed == 4) && (project == options[:p])
+          formatter.format_todo(field[0], field[1], field[2], field[3])
+        elsif project == options[:p]
+          formatter.format_done(field[0], field[1], field[2], field[3], field[4])
+        end 
+      else
         if completed == 4
-          puts line.color(:red)
+          formatter.format_todo(field[0], field[1], field[2], field[3])
         else
-          puts line.color(:green)
-        end
-      end
-    else
-      data.each_line do |line|
-        project = line.chomp.split(',')[0]
-        completed = line.chomp.split(',').count
-        if project == options[:p]
-          if completed == 4
-            puts line.color(:red)
-          else
-            puts line.color(:green)
-          end
+          formatter.format_done(field[0], field[1], field[2], field[3], field[4])
         end
       end
     end
+
+    formatter.after
   end
 end
 
 desc 'Complete a task'
 arg_name 'task_number'
+long_desc "
+Done tasks will be added the completed time after the end of task. 
+However, done tasks will be deleted permanently if you turn the delete switch on.
+e.g. tdoo done -d -p today 0
+"
 command [:done, :d] do |c|
   c.desc 'specify the project\'s name that done tasks belong to'
   c.arg_name 'project'
   c.flag [:p, :project]
 
+  c.desc 'delete the done tasks'
+  c.switch [:d, :delete]
+
   c.action do |global_options,options,task_number|
     old_file = File.expand_path(global_options[:filename])
     new_file = old_file + '.new'  
+    delete_switch = options[:d] ? true : false
 
+    formatter = Tdoo::Format::Pretty.new
     File.open(old_file, 'r') do |todo_file|
-      raise "You must specify the project's name that done tasks belong to" if options[:p].nil?
+      raise "You must specify the project's name that done tasks belong to...'tdoo done -h' for help!" if options[:p].nil?
+      raise "you must point the done task number out...'tdoo done -h' for help!" if task_number.empty?
 
+      # Open a new file and write into tasks which meet some conditions. 
+      # A done task can be split up into 5 pieces. 
       File.open(new_file, 'w+') do |new_todo_file|
         todo_file.readlines.each do |line|
           field = line.chomp.split(',')
           project, number = field[0], field[1]
           if (project == options[:p]) && (field[1] == task_number.first) && (field.count == 4)
             t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-            new_todo_file.puts("#{line.chomp}"+",#{t}")
+            new_todo_file.puts("#{line.chomp}"+",#{t}") unless delete_switch 
+            formatter.format_done(field[0], field[1], field[2], field[3], t) 
+          elsif (project == options[:p]) && (field[1] == task_number.first) && (field.count == 5)
+            new_todo_file.puts(line) unless delete_switch
+            formatter.format_done(field[0], field[1], field[2], field[3], field[4]) 
           else
             new_todo_file.puts(line)
           end
         end
       end
     end
+
+    formatter.after
     `rm #{old_file} && mv #{new_file} #{old_file}`
   end
 end

data/lib/tdoo.rb

@@ -1 +1,2 @@
-require 'tdoo/version.rb'
+require 'tdoo/version.rb'
+require 'tdoo/format/pretty'

data/lib/tdoo/format/pretty.rb

@@ -0,0 +1,42 @@
+require 'terminal-table'
+require 'rainbow'
+require 'time'
+
+module Tdoo
+  module Format
+    class Pretty
+      def initialize
+        @table = Terminal::Table.new headings: %w(project id name created completed)
+      end
+      
+      def format_todo(project, index, task, created)
+        row = []
+        row << project.color(:blue)
+        row << index
+        row << task.color(:red)
+        row << as_date(created).color(:red)
+        row << ''
+        @table << row
+      end
+
+      def format_done(project, index, task, created, completed)
+        row = []
+        row << project.color(:blue)
+        row << index
+        row << task.color(:green)
+        row << as_date(created).color(:green)
+        row << as_date(completed).color(:green)
+        @table << row
+      end
+
+      def after
+        puts @table.to_s
+      end
+
+      private
+      def as_date(string)
+        Time.parse(string).strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+  end
+end

data/lib/tdoo/version.rb

@@ -1,3 +1,3 @@
 module Tdoo
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdoo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - v4lour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,30 +80,37 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: You can create, list and check tasks via this simple gem.
 email: v4lour@gmail.com
 executables:
 - tdoo
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- tdoo.rdoc
+extra_rdoc_files: []
 files:
 - bin/tdoo
 - lib/tdoo/version.rb
+- lib/tdoo/format/pretty.rb
 - lib/tdoo.rb
-- README.rdoc
-- tdoo.rdoc
-homepage: http://schil.me/
+homepage: https://github.com/v4lour/tdoo.git
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --title
-- tdoo
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 - lib

data/README.rdoc

@@ -1 +0,0 @@
-A mini todo command-line app

data/tdoo.rdoc

@@ -1,5 +0,0 @@
-= tdoo
-
-Generate this with
-    tdoo rdoc
-After you have described your command line interface