todo-void 0.1.1.pre → 0.1.1

data/interactors/todo_interactor.rb

@@ -6,8 +6,11 @@ class TodoInteractor
     @store = store
   end
   
-  def add_todo(description)
-    @store.save(Todo.new(description))
+  def add_todo(description, tags=[])
+    todo = Todo.new(description)
+    todo.tags = tags
+
+    @store.save(todo)
   end
 
   def list_all

data/lib/todo.rb

@@ -2,11 +2,12 @@ require 'openssl'
 
 class Todo
   attr_reader :description
-  attr_accessor :status, :finished_at
+  attr_accessor :tags, :status, :finished_at
 
   def initialize(description)
     @description = description
     @status = :pending
+    @tags = []
   end
 
   def id

data/lib/todo_list.rb

@@ -1,8 +1,2 @@
 require 'set'
-
-class TodoList < Set
-  def update(todo)
-    delete(todo)
-    add(todo)
-  end
-end
+class TodoList < Set; end

data/lib/todo_store.rb

@@ -13,7 +13,8 @@ class TodoStore
   end
 
   def update(todo)
-    @list.update(todo)
+    @list.delete(todo)
+    @list.add(todo)
     write
   end
 
@@ -37,6 +38,9 @@ class TodoStore
     unless raw_todo[2].nil?
       todo.finished_at =  DateTime.parse(raw_todo[2]).to_time
     end
+    unless raw_todo[3].nil?
+      todo.tags = raw_todo[3].split('|')
+    end
     todo.status = raw_todo[1].to_sym
     todo
   end
@@ -44,7 +48,8 @@ class TodoStore
   def write
     CSV.open(todo_file, "w") do |csv|
       @list.each do |todo|
-        csv << [todo.description, todo.status, todo.finished_at]
+        tags = todo.tags.join('|')
+        csv << [todo.description, todo.status, todo.finished_at, tags]
       end
     end
   end

data/lib/todo_view.rb

@@ -6,12 +6,15 @@ class TodoView
   end
 
   def render
-    if @todo.status == :finished
+    output = if @todo.status == :finished
       "#{@todo.id} #{@todo.description}".foreground(:black)
     elsif @todo.status == :started
       "#{@todo.id.foreground(:green)} #{@todo.description}"
     else
       "#{@todo.id.foreground(:yellow)} #{@todo.description}"
     end
+
+    output += " (#{@todo.tags.join(', ')})".foreground(:green) unless @todo.tags.empty?
+    output
   end
 end

data/lib/todo_void.rb

@@ -3,7 +3,8 @@ require_relative '../interactors/status_changes_interactor.rb'
 require_relative './todo_list_view'
 
 class TodoVoid
-  def initialize(args=[])
+  def initialize(args=[], interactor = TodoInteractor.new)
+    @todo_interactor = interactor
     @args = args
     @output = ""
   end
@@ -18,7 +19,8 @@ class TodoVoid
     elsif flag?('--help')
       @output = read_help
     elsif @args[0]
-      TodoInteractor.new.add_todo(@args[0])
+      tags = extract_tags(@args[1])
+      @todo_interactor.add_todo(@args[0], tags)
     else
       todos = TodoInteractor.new.list_all
       @output = TodoListView.render(todos)
@@ -31,6 +33,15 @@ class TodoVoid
     @args[0] == flag
   end
 
+  def extract_tags(tag_arg)
+    return [] unless tag_arg
+    
+    flag, tags = tag_arg.split("=")
+    tags = tags.gsub("'", "")
+    tags = tags.split(',')
+    tags.map! {|tag| tag.strip}
+  end
+
   def hash
     @args[1]
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: todo-void
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre
-  prerelease: 6
+  version: 0.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Robert Curth
@@ -108,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24