todo-void 0.1.1 → 0.1.2.alpha

data/lib/todo_store.rb

@@ -32,7 +32,7 @@ class TodoStore
     end
     @list = TodoList.new(todos)
   end
- 
+
   def convert_raw_todo(raw_todo)
     todo = Todo.new raw_todo[0]
     unless raw_todo[2].nil?

data/lib/todo_view.rb

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

data/lib/todo_void.rb

@@ -27,7 +27,7 @@ class TodoVoid
     end
     @output
   end
-  
+
   private
   def flag?(flag)
     @args[0] == flag
@@ -35,7 +35,7 @@ class TodoVoid
 
   def extract_tags(tag_arg)
     return [] unless tag_arg
-    
+
     flag, tags = tag_arg.split("=")
     tags = tags.gsub("'", "")
     tags = tags.split(',')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: todo-void
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Robert Curth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -104,13 +104,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24