koi 0.2.3 → 0.2.4

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/cloudhead/koi"
     gem.authors = ["cloudhead"]
     gem.add_development_dependency "rspec"
-    gem.add_dependency "mutter", ">= 0.4"
+    gem.add_dependency "colored", ">= 1.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/koi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koi}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2010-03-06}
+  s.date = %q{2010-03-07}
   s.default_executable = %q{koi}
   s.description = %q{minimalist console-based task management for hackers}
   s.email = %q{self@cloudhead.net}
@@ -47,14 +47,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<mutter>, [">= 0.4"])
+      s.add_runtime_dependency(%q<colored>, [">= 1.2"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<mutter>, [">= 0.4"])
+      s.add_dependency(%q<colored>, [">= 1.2"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<mutter>, [">= 0.4"])
+    s.add_dependency(%q<colored>, [">= 1.2"])
   end
 end
 

data/lib/koi.rb

@@ -1,7 +1,7 @@
 
 require 'yaml'
-require 'mutter'
 require 'fileutils'
+require 'colored'
 
 module Koi
 
@@ -53,10 +53,10 @@ module Koi
       :init, :add, :list, :tag,
       :done, :did, :log, :status,
       :remove, :float, :sink,
-      :ls, :rm, :rise
+      :ls, :rm, :rise, :x
     ]
     Initializers = [:init, :add]
-    Special = {"!" => :done, "?" => :status}
+    Special = {"!" => :done, "?" => :status, "+" => :float}
 
     def initialize *all
       cmd, param, args, options = all
@@ -65,7 +65,6 @@ module Koi
       @param = param =~ /^\d+$/ ? param.to_i : param
       @options = options || {}
       @db = Koi.init?? Database.new(File.join(Koi.root, Path[:db])) : Database.new
-      @mut = Mutter.new(blue: '#', underline: "''", red: '++', cyan: '@@', green: '!!', yellow: '^').clear(:default)
     end
 
     def run
@@ -106,16 +105,15 @@ module Koi
     end
 
     def status
-      out "in the water (#{@db.select {|e| e.new? }.size})"
+      out "#{@db.select {|e| e.new? }.size} koi in the water"
 
       self.list 5
 
       @db.select  {|e| e[:status] == :completed }.
           sort_by {|e| e[:completed_at] }[0..3].reverse.each do |e|
-        out " #[x]#   !!#{e[:title]}!!"
-      end
+        out " [x] ".blue + "  #{e[:title]}".green
+      end.tap {|l| out if l.length > 0 }
 
-      out
       true
     end
 
@@ -125,10 +123,13 @@ module Koi
     def list count = 10, index = -1
       out
 
-      @db.list[0..count].each do |e|
-        out " #[#{index += 1}]##{e.sticky?? "++ + ++" : "   "}''#{e[:title]}'' @@#{e[:tags].join(' ')}@@" unless e[:status] == :removed
+      @db.list[0..count].reject {|e| e[:status] == :removed }.each do |e|
+        out " [#{index += 1}]".blue           +
+            "#{e.sticky?? " + ".bold : "   "}" +
+            e[:title].underline               +
+            " #{e[:tags].join(' ')}".cyan
       end.tap do |list|
-        out "  !!nothing left to do!!" if list.size.zero?
+        out "  nothing left to do".green if list.size.zero?
       end
 
       out
@@ -167,7 +168,7 @@ module Koi
           } if entity[:"#{status}_at"]
         end.compact
       end.flatten.sort_by {|e| e[:time]}.reverse.each do |entry|
-        out "##{entry[:time]}# ^#{entry[:action]}^ ''#{entry[:title]}''"
+        out "#{entry[:time].blue} #{entry[:action].to_s.bold} #{entry[:title].underline}"
       end
     end
 
@@ -175,7 +176,7 @@ module Koi
       if obj.is_a? Hash
         puts "#{obj[:title]} : #{obj[:status]}"
       else
-        @mut.say obj.to_s
+        puts obj.to_s
       end unless @options[:silent]
     end
 
@@ -200,6 +201,7 @@ module Koi
     end
     alias :done did
     alias :fish did
+    alias :x    did
 
     def save
       File.open(File.join(Koi.root, Path[:db]), 'w') {|f| f.write @db.to_yaml }
@@ -287,7 +289,7 @@ module Koi
                    owner:      ENV['USER'],
                    tags:       [],
                    sticky:     false
-      merge!(data)
+      update data.reduce({}) {|h, (k,v)| h.merge(k.to_sym => v) }
     end
 
     def new?
@@ -303,6 +305,12 @@ module Koi
       self[:"#{st}_at"] = Time.now
     end
 
+    def to_yaml *args
+      reduce({}) do |h, (k, v)|
+        h.merge(k.to_s => v)
+      end.to_yaml *args
+    end
+
     #
     # Handle things like `self.removed?`
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: koi
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: koi
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mutter
+  name: colored
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: "1.2"
     version: 
 description: minimalist console-based task management for hackers
 email: self@cloudhead.net