koi 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/koi.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{koi}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-10-20}
+  s.date = %q{2010-03-06}
   s.default_executable = %q{koi}
   s.description = %q{minimalist console-based task management for hackers}
   s.email = %q{self@cloudhead.net}
@@ -57,3 +57,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mutter>, [">= 0.4"])
   end
 end
+

data/lib/koi.rb

@@ -5,12 +5,16 @@ require 'fileutils'
 
 module Koi
 
-  Path = {root: ".koi", db: ".koi/database.yml"}
+  Path = {root: ".koi", db: ".koi/database.yml", paths: ".koi/paths"}
 
   def self.init dir = Dir.pwd
     unless init?
       FileUtils.mkdir File.join(dir, Path[:root])
       FileUtils.touch File.join(dir, Path[:db])
+      FileUtils.mkdir File.join(ENV['HOME'], Path[:root]) rescue nil
+      File.open(File.join(ENV['HOME'], Path[:paths]), 'a+') do |f|
+        f.write File.expand_path(dir).to_s
+      end
     end
   end
 
@@ -20,15 +24,15 @@ module Koi
   end
 
   def self.init? dir = root
-    File.exist? File.join(dir, Path[:root]) if dir
+    File.exist? File.join(dir, Path[:db]) if dir
   end
-  
+
   def self.run *args
     cmd = Command.new(*args)
     cmd[:silent] = true
     cmd.run
   end
-  
+
   def self.version
     File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).strip
   end
@@ -49,7 +53,7 @@ module Koi
       :init, :add, :list, :tag,
       :done, :did, :log, :status,
       :remove, :float, :sink,
-      :ls, :rm
+      :ls, :rm, :rise
     ]
     Initializers = [:init, :add]
     Special = {"!" => :done, "?" => :status}
@@ -61,13 +65,14 @@ 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: "''", cyan: '@@', green: '!!', yellow: '^').clear(:default)
+      @mut = Mutter.new(blue: '#', underline: "''", red: '++', cyan: '@@', green: '!!', yellow: '^').clear(:default)
     end
 
     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)
               save
             else
@@ -77,39 +82,37 @@ module Koi
             err "task wasn't found"
           end
         else
-           err "'it' is not initialized here, please run `it init`"
+           err "'koi' is not initialized here, please run `koi init`"
         end
       else
         err "#{@command} is not a valid command."
       end
     end
-    
+
     def []= key, val
       @options[key] = val
     end
-    
+
     def [] key
       @options[key]
     end
 
     def init
       unless Koi.init
-        err "'it' has already been initialized here"
+        err "'koi' has already been initialized here"
       else
         true
       end
     end
-    
+
     def status
       out "in the water (#{@db.select {|e| e.new? }.size})"
 
       self.list 5
 
-      out "recently fished (#{@db.select {|e| e.completed? }.size})"
-
       @db.select  {|e| e[:status] == :completed }.
           sort_by {|e| e[:completed_at] }[0..3].reverse.each do |e|
-        out "- !!#{e[:title]}!!"
+        out " #[x]#   !!#{e[:title]}!!"
       end
 
       out
@@ -121,9 +124,9 @@ module Koi
     #
     def list count = 10, index = -1
       out
-      
-      @db.select {|e| e.new? }[0..count].each do |e|
-        out "#[#{index += 1}]# ''#{e[:title]}'' @@#{e[:tags].join(' ')}@@" unless e[:status] == :removed
+
+      @db.list[0..count].each do |e|
+        out " #[#{index += 1}]##{e.sticky?? "++ + ++" : "   "}''#{e[:title]}'' @@#{e[:tags].join(' ')}@@" unless e[:status] == :removed
       end.tap do |list|
         out "  !!nothing left to do!!" if list.size.zero?
       end
@@ -132,11 +135,24 @@ module Koi
       true
     end
     alias :ls list
-    
-    def float
+
+    def swim entry, n
+      v = @db.index(entry) + @db.size / 3 * n
+      @db.delete entry
+      @db.insert([[v, 0].max, @db.size].min, entry)
+    end
+
+    def rise entry
+      swim entry, -1
+    end
+
+    def sink entry
+      swim entry, 1
     end
 
-    def sink
+    def float entry
+      entry[:sticky] = ! entry[:sticky]
+      true
     end
 
     #
@@ -145,9 +161,9 @@ module Koi
     def log
       @db.map do |entity|
         Entity::Status.map do |status|
-          { title: entity[:title],
+          { title:  entity[:title],
             action: status,
-            time: entity[:"#{status}_at"]
+            time:   entity[:"#{status}_at"].strftime("%Y/%m/%d %H:%m")
           } if entity[:"#{status}_at"]
         end.compact
       end.flatten.sort_by {|e| e[:time]}.reverse.each do |entry|
@@ -188,7 +204,7 @@ module Koi
     def save
       File.open(File.join(Koi.root, Path[:db]), 'w') {|f| f.write @db.to_yaml }
     end
-    
+
     #
     # Mark task as :removed (doesn't show up anywhere)
     #
@@ -214,13 +230,32 @@ module Koi
       if key.is_a? String
         @data.find {|e| e[:title].include? key }
       elsif key.is_a? Fixnum
-        @data.select {|e| e[:status] == :created}[key]
+        entities = @data.select {|e| e[:status] == :created}
+        (entities.select(&:sticky?) + entities.reject(&:sticky?))[key]
       else
         raise ArgumentError, "key must be a String or Fixnum, but is #{key.class}"
       end
     end
     alias :[] find
-    
+
+    def fresh
+      @data.select {|e| e.new? }
+    end
+
+    def list
+      fresh.select(&:sticky?) + fresh.reject(&:sticky?)
+    end
+
+    #
+    # Hash-like methods on @data
+    #
+    def size;  fresh.size  end
+    def first; fresh.first end
+    def last;  fresh.last  end
+    def delete(arg)   @data.delete  arg  end
+    def insert(*args) @data.insert *args end
+    def index(*args, &blk) @data.index *args, &blk end
+
     def load path = @path || Path[:db]
       @data = if db = YAML.load_file(path)
         db.map {|e| Entity.new(e) }
@@ -250,17 +285,19 @@ module Koi
       self.replace status:     :created,
                    created_at: Time.now,
                    owner:      ENV['USER'],
-                   velocity:   0,
-                   freshness:  0,
-                   depth:      0,
-                   tags:       []
+                   tags:       [],
+                   sticky:     false
       merge!(data)
     end
-    
+
     def new?
       self[:status] == :created
     end
 
+    def sticky?
+      self[:sticky]
+    end
+
     def status= st
       self[:status] = st
       self[:"#{st}_at"] = Time.now

data/spec/koi_spec.rb

@@ -6,12 +6,21 @@ describe Koi do
   context "in a new project" do
     before(:each) do
       FileUtils.rm_rf(Koi::Path[:root])
+      FileUtils.rm_rf(File.join(ENV['HOME'], Koi::Path[:root]))
     end
 
-    it "should initialize the directory" do
+    it "should initialize the .koi directory" do
       Koi.run(:init)
-      File.exist?(Koi::Path[:root]).should be_true
-      File.exist?(Koi::Path[:db]).should be_true
+      File.exist?(Koi::Path[:root]).should == true
+      File.exist?(Koi::Path[:db]).should == true
+    end
+
+    it "should create a .koi in ~" do
+      Koi.run(:init)
+      File.exist?(File.join(ENV['HOME'], Koi::Path[:root])).
+        should == true
+      File.read(File.join(ENV['HOME'], Koi::Path[:paths])).
+        split(/\n/).should include(File.expand_path(Dir.pwd))
     end
 
     it "should warn that the project isn't initialized" do
@@ -23,12 +32,12 @@ describe Koi do
     before(:all) do
       Koi.init!
     end
- 
+
     context "with no tasks" do
       it "shouldn't try to init" do
         -> {Koi.run(:init)}.should raise_error(SystemExit)
       end
-      
+
       it "should warn about invalid commands" do
         -> {Koi.run(:choo)}.should raise_error(SystemExit)
       end
@@ -70,9 +79,26 @@ describe Koi do
         @db.load.find(TASKS[1])[:tags].should include("food")
       end
 
+      it "should rise tasks" do
+        Koi.run(:rise, TASKS[2])
+        @db.load[1][:title].should == TASKS[2]
+      end
+
+      it "should sink tasks" do
+        Koi.run(:sink, TASKS[1])
+        @db.load.last[:title].should == TASKS[1]
+      end
+
+      it "should sticky tasks" do
+        Koi.run(:float, TASKS[2])
+        @db.load.list[0][:title].should == TASKS[2]
+        @db.load.find(TASKS[2])[:sticky].should be_true
+      end
+
       it "should warn when the task wasn't found" do
         -> {Koi.run(:did, "celery")}.should raise_error(SystemExit)
       end
     end
   end
 end
+

metadata

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