koi 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/bin/koi

@@ -3,24 +3,28 @@ require 'optparse'
 
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
+if RUBY_VERSION.split('.')[1].to_i < 9
+  abort "ruby 1.9 is required to run koi"
+end
+
 require 'koi'
 
 args = ARGV.dup
 
-options = {verbose: false, silent: false}
+options = {:verbose => false, :silent => false}
 
 OptionParser.new do |o|
-  o.banner = "usage: it COMMAND [ARGS]"
+  o.banner = "usage: koi COMMAND [ARGS]"
   o.separator ""
-  
+
   o.on_tail("-s", "--silent", "turn output off") do
     options[:silent] = true
   end
-  
+
   o.on_tail("-v", "--verbose", "enable verbose mode") do
     options[:verbose] = true
   end
 end.parse!(args)
 
-Koi::Command.new(args[0] || :status, args[1] || nil, args[2] || [], options).run
+Koi::Command.new(args[0] || :status, args[1..-1], options).run
 

data/koi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koi}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-03-07}
+  s.date = %q{2010-03-10}
   s.default_executable = %q{koi}
   s.description = %q{minimalist console-based task management for hackers}
   s.email = %q{self@cloudhead.net}

data/lib/koi.rb

@@ -28,7 +28,7 @@ module Koi
   end
 
   def self.run *args
-    cmd = Command.new(*args)
+    cmd = Command.new(args.first, args[1..-1])
     cmd[:silent] = true
     cmd.run
   end
@@ -53,16 +53,15 @@ module Koi
       :init, :add, :list, :tag,
       :done, :did, :log, :status,
       :remove, :float, :sink,
-      :ls, :rm, :rise, :x
+      :ls, :rm, :rise, :x, :show
     ]
     Initializers = [:init, :add]
     Special = {"!" => :done, "?" => :status, "+" => :float}
 
     def initialize *all
-      cmd, param, args, options = all
+      cmd, args, options = all
       @command = Special[cmd] || cmd.to_sym
-      @args = [args || []].flatten
-      @param = param =~ /^\d+$/ ? param.to_i : param
+      @args = (args || []).map {|a| a =~ /^\d+$/ ? a.to_i : a }
       @options = options || {}
       @db = Koi.init?? Database.new(File.join(Koi.root, Path[:db])) : Database.new
     end
@@ -70,15 +69,12 @@ module Koi
     def run
       if Commands.include? @command
         if Koi.init? or Initializers.include? @command
-          if !@param or @command == :add or @param = @db.find(@param)
-            @param ||= @db.last if [:float, :sink, :rm, :tag, :done].include? @command
-            if send(@command, *[@param, *@args].compact.flatten)
+          send(@command, *(@args.length == 1 ? @args.first : @args)).tap do |result|
+            if result
               save
             else
               err "error running #@command"
             end
-          else
-            err "task wasn't found"
           end
         else
            err "'koi' is not initialized here, please run `koi init`"
@@ -86,6 +82,8 @@ module Koi
       else
         err "#{@command} is not a valid command."
       end
+    rescue Database::EntityNotFound
+      err "the koi wasn't found"
     end
 
     def []= key, val
@@ -104,10 +102,11 @@ module Koi
       end
     end
 
-    def status
-      out "#{@db.select {|e| e.new? }.size} koi in the water"
+    def status options = {}
+      todo = @db.select {|e| e.new? }.size
+      out "#{todo} koi in the water" unless todo.zero?
 
-      self.list 5
+      self.list @db.list[0..5]
 
       @db.select  {|e| e[:status] == :completed }.
           sort_by {|e| e[:completed_at] }[0..3].reverse.each do |e|
@@ -117,27 +116,33 @@ module Koi
       true
     end
 
+    def show tags
+      tags = [tags].flatten
+      self.list @db.select {|e| e if (tags & e[:tags]).any? }
+    end
+
     #
     # List current tasks
     #
-    def list count = 10, index = -1
+    def list entities = @db.list[0..10]
       out
 
-      @db.list[0..count].reject {|e| e[:status] == :removed }.each do |e|
-        out " [#{index += 1}]".blue           +
+      entities.reject {|e| e[:status] == :removed }.each_with_index do |e, i|
+        out " [#{i}]".blue                     +
             "#{e.sticky?? " + ".bold : "   "}" +
-            e[:title].underline               +
+            e[:title].underline                +
             " #{e[:tags].join(' ')}".cyan
       end.tap do |list|
-        out "  nothing left to do".green if list.size.zero?
+        out "  there are no koi in the water".green if list.size.zero?
       end
 
       out
-      true
+      entities
     end
     alias :ls list
 
     def swim entry, n
+      entry = @db.find(entry)
       v = @db.index(entry) + @db.size / 3 * n
       @db.delete entry
       @db.insert([[v, 0].max, @db.size].min, entry)
@@ -152,6 +157,7 @@ module Koi
     end
 
     def float entry
+      entry = @db.find(entry)
       entry[:sticky] = ! entry[:sticky]
       true
     end
@@ -191,11 +197,17 @@ module Koi
       @db << Entity.new(title: entry, tags: tags, target: target)
     end
 
-    def tag entry, tags
-      entry[:tags] << tags
+    def tag *args
+      entry, *tags = args
+      entry = @db.find(entry)
+      entry[:tags] += tags
+      entry[:tags].uniq!
+
+      true
     end
 
     def did entry = 0
+      entry = @db.find(entry)
       entry.status = :completed
       entry[:completed_by] = ENV['USER']
     end
@@ -211,7 +223,7 @@ module Koi
     # Mark task as :removed (doesn't show up anywhere)
     #
     def remove entry
-      entry.status = :removed
+      @db.find(entry).status = :removed
     end
     alias :rm remove
     alias :kill remove
@@ -219,6 +231,7 @@ module Koi
 
   class Database
     include Enumerable
+    EntityNotFound = Class.new(RuntimeError)
 
     def initialize path = nil
       if @path = path
@@ -236,6 +249,8 @@ module Koi
         (entities.select(&:sticky?) + entities.reject(&:sticky?))[key]
       else
         raise ArgumentError, "key must be a String or Fixnum, but is #{key.class}"
+      end.tap do |result|
+        raise EntityNotFound if result.nil?
       end
     end
     alias :[] find

data/spec/koi_spec.rb

@@ -2,6 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Koi do
   TASK = "buy milk"
+  Koi::Path[:root] = '._koi'
+  Koi::Path[:db] = '._koi/database.yml'
+  Koi::Path[:paths] = '._koi/paths'
 
   context "in a new project" do
     before(:each) do
@@ -75,7 +78,7 @@ describe Koi do
       end
 
       it "should tag tasks" do
-        Koi.run(:tag, TASKS[1], ["food"])
+        Koi.run(:tag, TASKS[1], "food")
         @db.load.find(TASKS[1])[:tags].should include("food")
       end
 
@@ -89,6 +92,11 @@ describe Koi do
         @db.load.last[:title].should == TASKS[1]
       end
 
+      it "should show tasks with specific tags" do
+        Koi.run(:tag, TASKS[1], "#food")
+        Koi.run(:show, ["#food"]).first[:title].should == TASKS[1]
+      end
+
       it "should sticky tasks" do
         Koi.run(:float, TASKS[2])
         @db.load.list[0][:title].should == TASKS[2]
@@ -100,5 +108,10 @@ describe Koi do
       end
     end
   end
+
+  after(:all) do
+    FileUtils.rm_rf(Koi::Path[:root])
+    FileUtils.rm_rf(File.join(ENV['HOME'], Koi::Path[:root]))
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: koi
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -05:00
+date: 2010-03-10 00:00:00 -05:00
 default_executable: koi
 dependencies: 
 - !ruby/object:Gem::Dependency