tudu 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d854c851707b6c6e42759565ec28691f91de494
+  data.tar.gz: 318deac04bd2ad49d539a954320befbc7b9f0852
+SHA512:
+  metadata.gz: d00bf36e7a0b77347a0edff5cea73990034f1a5dda492eaefe196c620d87c161266c651b62ee6a5d28d486c80ee45bca6d58f7bdd6921c5189aa55ab65ea5fe3
+  data.tar.gz: c3100a1d47e957d0ea42778022e6d7d00b590eff9c6e120979b40d01c7eee2f38ec759350611a54696d773ab9377e29d85e22a872dab264556bc429ba18336c4

data/.rubocop.yml

@@ -1,4 +0,0 @@
-LineLength:
-  Enabled: false
-ClassLength:
-  Enabled: false

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-gem "rspec", "~> 2.14.1"
-gem "thor", "~> 0.18.1"
-gem "simplecov", "~> 0.8.2"
-gem "highline", "~> 1.6.20"

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/bin/tudu

@@ -5,6 +5,7 @@ require 'tudu/version'
 require 'tudu_core'
 require 'thor'
 
+# rubocop:disable LineLength
 module Tudu
   # = Tudu CLI
   class CLI < Thor
@@ -78,3 +79,4 @@ module Tudu
   end
 end
 Tudu::CLI.start(ARGV)
+# rubocop:enable LineLength

data/lib/task.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+module Tudu
+  # = Tudu::Task
+  class Task
+    # == task type [todo, doing, done]
+    attr_accessor :type
+    # == task name [uniq]
+    attr_accessor :name
+
+    # == init task with setting task type and task name.
+    def initialize(type, name)
+      @type, @name = type, name
+    end
+
+    def todo?
+      @type == 'todos'
+    end
+
+    def doing?
+      @type == 'doings'
+    end
+
+    def done?
+      @type == 'dones'
+    end
+
+    def ==(other)
+      return true if name == other.name && type == other.type
+      false
+    end
+  end
+end

data/lib/tasks.rb

@@ -1,85 +1,11 @@
 # encoding: utf-8
+require 'task'
+require 'tudu_file_keys'
 
+# rubocop:disable ClassLength
 module Tudu
   # = Tudu::Tasks
   class Tasks
-    # == Tudufile key
-    TUDU_FILE_KEY = :tudufile
-    # == todo key
-    TUDU_TODO_KEY = :todo
-    # == doing key
-    TUDU_DOING_KEY = :doing
-    # == done key
-    TUDU_DONE_KEY = :done
-    # == file's key
-    TUDU_KEYS = [TUDU_FILE_KEY, TUDU_TODO_KEY, TUDU_DOING_KEY, TUDU_DONE_KEY]
-
-    # == Tudufile file name
-    TUDU_FILE = 'Tudufile'
-    # == Tudufile file name
-    TUDU_DIR = 'tudu'
-    # == todo file name
-    TUDU_TODOS_FILE = 'todos'
-    # == todo file path
-    TUDU_TODOS_FILE_PATH = "./#{TUDU_DIR}/#{TUDU_TODOS_FILE}"
-    # == doing file name
-    TUDU_DOINGS_FILE = 'doings'
-    # == doing file path
-    TUDU_DOINGS_FILE_PATH = "./#{TUDU_DIR}/#{TUDU_DOINGS_FILE}"
-    # == done file name
-    TUDU_DONES_FILE = 'dones'
-    # == done file path
-    TUDU_DONES_FILE_PATH = "./#{TUDU_DIR}/#{TUDU_DONES_FILE}"
-    # == file names
-    INIT_FILES = {
-      TUDU_FILE_KEY => TUDU_FILE,
-      TUDU_TODO_KEY => TUDU_TODOS_FILE,
-      TUDU_DOING_KEY => TUDU_DOINGS_FILE,
-      TUDU_DONE_KEY => TUDU_DONES_FILE
-    }
-    # == task file names
-    TASK_FILES = {
-      TUDU_TODO_KEY => TUDU_TODOS_FILE,
-      TUDU_DOING_KEY => TUDU_DOINGS_FILE,
-      TUDU_DONE_KEY => TUDU_DONES_FILE
-    }
-
-    # == Tudufile file template
-    TUDU_FILE_TEMPLATE = <<-EOS
-# encoding: utf-8
-
-# !!!!!!! in tudu ver 0.0.1 this file not using !!!!!!!
-
-# if you want to use notification, set target type. default => :none
-# you can set :none, :mail
-# target_type :mail
-
-# if you want to use notification, set targets. default => []
-# if you choose target_type none, you must not set targets.
-# if you choose mail, you must set target email addresses.
-# targets ["target1@abcdefg", "target2@abcdefg"]
-    EOS
-
-    # == todo file template
-    TUDU_TODOS_FILE_TEMPLATE = ''
-    # == doing file template
-    TUDU_DOINGS_FILE_TEMPLATE = ''
-    # == done file template
-    TUDU_DONES_FILE_TEMPLATE = ''
-
-    # == template files
-    INIT_FILES_TEMPLATE = {
-      TUDU_FILE_KEY => TUDU_FILE_TEMPLATE,
-      TUDU_TODO_KEY => TUDU_TODOS_FILE_TEMPLATE,
-      TUDU_DOING_KEY => TUDU_DOINGS_FILE_TEMPLATE,
-      TUDU_DONE_KEY => TUDU_DONES_FILE_TEMPLATE
-    }
-
-    # == task type [todo, doing, done]
-    attr_accessor :type
-    # == task name [uniq]
-    attr_accessor :name
-
     class << self
       # == add task to todos
       # === Params
@@ -90,7 +16,9 @@ module Tudu
             puts "#{task_name} is already exists."
             next
           end
-          File.open(TUDU_TODOS_FILE_PATH, 'a:UTF-8') { |f|f.puts task_name }
+          File.open(TuduPaths::TUDU_TODOS_FILE_PATH, 'a:UTF-8') do |f|
+            f.puts task_name
+          end
           puts "complete add todo '#{task_name}' to tudu/todos"
         end
       end
@@ -113,7 +41,7 @@ module Tudu
         return if when_choose_no_task?(task, task_name)
         return unless when_choose_type_is_todo?(task, task_name)
         remove task_name
-        File.open(TUDU_DOINGS_FILE_PATH, 'w:UTF-8') { |f|f.puts task_name }
+        write_doing(task_name)
         puts "complete add doings '#{task_name}'"
       end
 
@@ -128,22 +56,22 @@ module Tudu
       # == get todos type tasks.
       # === Returns
       # return Array[Tasks]
-      def get_todos
-        get_tasks(TUDU_TODOS_FILE)
+      def todos
+        get_tasks(TuduPaths::TUDU_TODOS_FILE)
       end
 
       # == get doings type tasks.
       # === Returns
       # return Array[Tasks]
-      def get_doings
-        get_tasks(TUDU_DOINGS_FILE)
+      def doings
+        get_tasks(TuduPaths::TUDU_DOINGS_FILE)
       end
 
       # == get dones type tasks.
       # === Returns
       # return Array[Tasks]
-      def get_dones
-        get_tasks(TUDU_DONES_FILE)
+      def dones
+        get_tasks(TuduPaths::TUDU_DONES_FILE)
       end
 
       # == get each type tasks.
@@ -152,7 +80,7 @@ module Tudu
       # === Returns
       # return Array[Tasks]
       def get_tasks(type = nil)
-        type.nil? ? get_all_tasks : get_each_tasks(type)
+        type.nil? ? all_tasks : get_each_tasks(type)
       end
 
       # == get each type tasks from file.
@@ -161,7 +89,7 @@ module Tudu
       # === Returns
       # return Array[String]
       def get_tasks_from_file(file_name)
-        File.read("./#{TUDU_DIR}/#{file_name}").split("\n")
+        File.read("./#{TuduPaths::TUDU_DIR}/#{file_name}").split("\n")
       end
 
       # == filter tasklist by search_word.
@@ -172,7 +100,7 @@ module Tudu
       # return filterd task list
       def filter_tasks(tasks, search_word)
         return tasks if search_word.nil?
-        tasks.select { |task|task.name.match /.*#{search_word}.*/ }
+        tasks.select { |task|task.name.match(/.*#{search_word}.*/) }
       end
 
       # == find task from all tasks.
@@ -190,8 +118,8 @@ module Tudu
       # return progress
       def progress
         total_count = get_tasks.size
-        dones_count = get_dones.size
-        percent = total_count == 0 ? 0 : (dones_count.to_f / total_count.to_f * 100).round
+        dones_count = dones.size
+        percent = total_count == 0 ? 0 : percentage(dones_count, total_count)
         prefix = "#{dones_count}/#{total_count}|"
         done_bar = '=' * (percent / 10)
         rest_bar = ' ' * (10 - (percent / 10))
@@ -202,32 +130,38 @@ module Tudu
 
       private
 
+      def percentage(base, total)
+        (base.to_f / total.to_f * 100).round
+      end
+
       def get_first_todo_name_if_nil_or_empty(task_name)
-        task_name.nil? || task_name.empty? ? get_todos.first.name : task_name
+        task_name.nil? || task_name.empty? ? todos.first.name : task_name
       end
 
       def get_each_tasks(type)
         tasks = []
-        get_tasks_from_file(type).each { |task|tasks << Tasks.new(type, task) }
+        get_tasks_from_file(type).each { |task|tasks << Task.new(type, task) }
         tasks
       end
 
-      def get_all_tasks
+      def all_tasks
         tasks = []
-        TASK_FILES.each_value { |each_type|tasks += get_each_tasks(each_type) }
+        TuduPaths::TASK_FILES.each_value do |each_type|
+          tasks += get_each_tasks(each_type)
+        end
         tasks
       end
 
-      def has_task?(tasks, task_name)
+      def include_task?(tasks, task_name)
         tasks.include? task_name
       end
 
       def remove_each_task(task_name)
         can_find = false
-        TASK_FILES.each_value do |rf|
+        TuduPaths::TASK_FILES.each_value do |rf|
           tasks = get_tasks_from_file(rf)
-          next unless has_task?(tasks, task_name)
-          remove_task(tasks, task_name, "./#{TUDU_DIR}/#{rf}")
+          next unless include_task?(tasks, task_name)
+          remove_task(tasks, task_name, "./#{TuduPaths::TUDU_DIR}/#{rf}")
           can_find = true
           break
         end
@@ -242,13 +176,13 @@ module Tudu
       end
 
       def when_choose_no_todos?
-        return false unless get_todos.size == 0
+        return false unless todos.size == 0
         puts 'todos is empty.'
         true
       end
 
       def when_choose_no_doings?
-        return true if get_doings.size == 0
+        return true if doings.size == 0
         puts 'todos is empty.'
         false
       end
@@ -261,59 +195,56 @@ module Tudu
 
       def when_choose_type_is_todo?(task, task_name)
         return true if task.todo?
-        puts "#{task_name} is not exists in todos. #{task_name} in #{task.type}"
+        puts "#{task_name} is not exists in todos. #{task_name} in #{task.type}" # rubocop:disable LineLength
         false
       end
 
       def doings_to_dones
-        _doings = get_doings
-        if _doings.size == 0
+        tmp_doings = doings
+        if tmp_doings.size == 0
           puts 'there is no doing task.before done, you must choose task.'
           return false
         end
-        File.open(TUDU_DOINGS_FILE_PATH, 'w:UTF-8') { |f|f.print '' }
-        File.open(TUDU_DONES_FILE_PATH, 'a:UTF-8') { |f|f.puts _doings.first.name }
+        write_doing('')
+        write_done(tmp_doings.first.name)
         true
       end
 
+      def write_doing(text)
+        File.open(TuduPaths::TUDU_DOINGS_FILE_PATH, 'w:UTF-8') do |f|
+          if text.empty?
+            f.print(text)
+          else
+            f.puts text
+          end
+        end
+      end
+
+      def write_done(text)
+        File.open(TuduPaths::TUDU_DONES_FILE_PATH, 'a:UTF-8') do |f|
+          f.puts text
+        end
+      end
+
       def todos_to_doings
-        _todos = get_todos
-        return if finish?(_todos)
-        deleted_todos = _todos.dup
+        tmp_todos = todos
+        return if finish?(tmp_todos)
+        deleted_todos = tmp_todos.dup
         deleted_todos.delete_at 0
-        File.open(TUDU_TODOS_FILE_PATH, 'w:UTF-8') do |f|
+        File.open(TuduPaths::TUDU_TODOS_FILE_PATH, 'w:UTF-8') do |f|
           deleted_todos.each { |task|f.puts task.name }
         end
-        File.open(TUDU_DOINGS_FILE_PATH, 'w:UTF-8') { |f|f.puts _todos.first.name }
+        File.open(TuduPaths::TUDU_DOINGS_FILE_PATH, 'w:UTF-8') do |f|
+          f.puts tmp_todos.first.name
+        end
       end
 
-      def finish?(_todos)
-        return false unless _todos.size == 0
-        puts 'All Tasks Finish!!' if get_doings.size == 0
+      def finish?(tmp_todos)
+        return false unless tmp_todos.size == 0
+        puts 'All Tasks Finish!!' if doings.size == 0
         true
       end
     end
-
-    # == init task with setting task type and task name.
-    def initialize(type, name)
-      @type, @name = type, name
-    end
-
-    def todo?
-      @type == 'todos'
-    end
-
-    def doing?
-      @type == 'doings'
-    end
-
-    def done?
-      @type == 'dones'
-    end
-
-    def ==(other)
-      return true if name == other.name && type == other.type
-      false
-    end
   end
 end
+# rubocop:enable ClassLength

data/lib/tudu/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # =TodoManage Module
 module Tudu
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/tudu_core.rb

@@ -2,15 +2,19 @@
 require 'tudu/version'
 require 'tasks'
 require 'highline'
+require 'tudu_file_keys'
+require 'tudu_paths'
 
 module Tudu
   # Tudu::Core
   class Core
     # == generate files [Tudufile, todos, doings, dones]
     def init
-      Dir.mkdir Tudu::Tasks::TUDU_DIR unless File.exists? Tudu::Tasks::TUDU_DIR
-      Tudu::Tasks::TUDU_KEYS.each do |key|
-        File.open("./tudu/#{Tudu::Tasks::INIT_FILES[key]}", 'w:UTF-8') { |f|f.print Tudu::Tasks::INIT_FILES_TEMPLATE[key] }
+      Dir.mkdir TuduPaths::TUDU_DIR unless File.exist? TuduPaths::TUDU_DIR
+      TuduFileKeys::TUDU_KEYS.each do |key|
+        File.open("./tudu/#{TuduPaths::INIT_FILES[key]}", 'w:UTF-8') do |f|
+          f.print Templates::INIT_FILES_TEMPLATE[key]
+        end
       end
     end
 
@@ -18,28 +22,28 @@ module Tudu
     # === Params
     #- task_names : add task name list
     def add(*task_names)
-      Tudu::Tasks.add(*task_names)
+      Tasks.add(*task_names)
     end
 
     # == remove task to todo
     # === Params
     #- task_names : remove task name list
     def remove(*task_names)
-      Tudu::Tasks.remove(*task_names)
+      Tasks.remove(*task_names)
     end
 
     # == choose todo => doing task
     # === Params
     #- task_name : target task name
     def choose(task_name)
-      Tudu::Tasks.choose task_name
+      Tasks.choose task_name
     end
 
     # == doing to done
     #- if doings size == 0, nothing todo.
     #- after move doing to done, next todo move to doing.
     def done
-      Tudu::Tasks.done
+      Tasks.done
     end
 
     # == search tasks
@@ -47,12 +51,12 @@ module Tudu
     #- search_word : search word. enable regexp.
     #- options : options.
     def tasks(search_word, options)
-      todo_list = todos search_word
-      doing_list = doings search_word
-      done_list = dones search_word
-      todo_list, doing_list, done_list = coloring(options, todo_list, doing_list, done_list)
-      categorise(options, todo_list, doing_list, done_list)
-      todo_list + doing_list + done_list
+      todo_s = todos search_word
+      doing_s = doings search_word
+      done_s = dones search_word
+      todo_s, doing_s, done_s = coloring(options, todo_s, doing_s, done_s)
+      categorise(options, todo_s, doing_s, done_s)
+      todo_s + doing_s + done_s
     end
 
     # == search todos
@@ -80,7 +84,7 @@ module Tudu
     # === Returns
     # return progress
     def progress
-      Tudu::Tasks.progress
+      Tasks.progress
     end
 
     alias_method :now, :doings
@@ -104,23 +108,23 @@ module Tudu
     end
 
     def colored?(options)
-      !options.nil? && options[:color]
+      options && options[:color]
     end
 
     def categorised?(options)
-      !options.nil? && options[:category]
+      options && options[:category]
     end
 
     def todos_task(search_word)
-      Tudu::Tasks.filter_tasks(Tudu::Tasks.get_todos, search_word)
+      Tasks.filter_tasks(Tasks.todos, search_word)
     end
 
     def doings_task(search_word)
-      Tudu::Tasks.filter_tasks(Tudu::Tasks.get_doings, search_word)
+      Tasks.filter_tasks(Tasks.doings, search_word)
     end
 
     def dones_task(search_word)
-      Tudu::Tasks.filter_tasks(Tudu::Tasks.get_dones, search_word)
+      Tasks.filter_tasks(Tasks.dones, search_word)
     end
   end
 end