--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.swp
 bugs.yaml~
 .ditz-config
+.ditz-plugins

--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,16 @@
+== 0.3 / 2008-06-04
+* readline support for all text entry
+* hook system. Use ditz -l to see possible hooks.
+* new commands: archive, shortlog, set-component
+* improved commands: log, assign, add-release
+* new issue type: 'tasks'
+* 'ditz' by itself shows the todo list
+* zsh tab completion for subcommands
+* local config can now specify bugs directory location
+* issue name interpolation now on all issue fields
+* bugfix: various HTML generation bugs
+* bugfix: ditz now works from project subdirectories
+* bugfix: removed UNIX-specific environment variable assumptions
 == 0.2 / 2008-04-11
 * bugfix: store each issue in a separate file to avoid false conflicts
 * added per-command help

--- a/Manifest.txt
+++ b/Manifest.txt
@@ -5,6 +5,7 @@ ReleaseNotes
 bin/ditz
 bin/ditz-convert-from-monolith
 lib/ditz.rb
+lib/hook.rb
 lib/html.rb
 lib/index.rhtml
 lib/issue.rhtml
@@ -14,7 +15,9 @@ lib/lowline.rb
 lib/model-objects.rb
 lib/model.rb
 lib/operator.rb
+lib/plugins/git-features.rb
 lib/release.rhtml
 lib/style.css
 lib/util.rb
-lib/hook.rb
+lib/view.rb
+lib/views.rb

--- a/Rakefile
+++ b/Rakefile
@@ -17,7 +17,7 @@ Hoe.new('ditz', Ditz::VERSION) do |p|
   p.url = "http://ditz.rubyforge.org"
   p.changes = p.paragraphs_of('Changelog', 0..0).join("\n\n")
   p.email = "wmorgan-ditz@masanjin.net"
-  p.extra_deps = [['trollop', '>= 1.7']]
+  p.extra_deps = [['trollop', '>= 1.8.2']]
 end
 
 WWW_FILES = FileList["www/*"] + %w(README.txt)

--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,16 @@
+0.3
+---
+Ditz now works from project subdirectories, and you can have a .ditz-config in
+the project root for project-specific configuration. (This is not merged with
+the global config, so this file overrides everything in ~/.ditz-config.)
+
+You can specify an :issue_dir key in this file, which can be a relative path to
+the directory containing project.yaml. So if you want to rename that directory,
+or keep it somewhere else, now you can.
+
+There's also a new hook system for plugging in your own code. Run ditz -l to
+see a list of available hooks.
+
 0.2
 ---
 

--- a/bin/ditz
+++ b/bin/ditz
@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 
-# requires are splitted in two for efficiency reasons
-# ditz should be really fast when using it for
-# completion.
+## requires are split in two for efficiency reasons: ditz should be really
+## fast when using it for completion.
 require 'operator'
-
 op = Ditz::Operator.new
 
-# a secret option for shell completion
+## a secret option for shell completion
 if ARGV.include? '--commands'
   puts op.class.operations.map { |name, _| name }
   exit 0
@@ -15,16 +13,37 @@ end
 
 require 'rubygems'
 require 'fileutils'
+require 'pathname'
 require 'trollop'; include Trollop
 require "ditz"
 
 PROJECT_FN = "project.yaml"
 CONFIG_FN = ".ditz-config"
+PLUGIN_FN = ".ditz-plugins"
+
+## helper for recursive search
+def find_dir_containing target, start=Pathname.new(".")
+  return start if (start + target).exist?
+  unless start.parent.realpath == start.realpath
+    find_dir_containing target, start.parent
+  end
+end
+
+## my brilliant solution to the 'gem datadir' problem
+def find_ditz_file fn
+  dir = $:.find { |p| File.exist? File.expand_path(File.join(p, fn)) }
+  raise "can't find #{fn} in any load path" unless dir
+  File.expand_path File.join(dir, fn)
+end
+
+config_dir = find_dir_containing CONFIG_FN
+plugin_dir = find_dir_containing PLUGIN_FN
 
 $opts = options do
   version "ditz #{Ditz::VERSION}"
   opt :issue_dir, "Issue database dir", :default => "bugs"
-  opt :config_file, "Configuration file", :default => File.join(ENV["HOME"], CONFIG_FN)
+  opt :config_file, "Configuration file", :default => File.join(config_dir || ".", CONFIG_FN)
+  opt :plugins_file, "Plugins file", :default => File.join(plugin_dir || ".", PLUGIN_FN)
   opt :verbose, "Verbose output", :default => false
   opt :no_comment, "Skip asking for a comment", :default => false
   opt :list_hooks, "List all hooks and descriptions, and quit.", :short => 'l', :default => false
@@ -68,34 +87,59 @@ if $opts[:list_hooks]
   Ditz::HookManager.print_hooks
   exit 0
 end
-cmd = ARGV.shift or die "expecting a ditz command"
-dir = Pathname.new($opts[:issue_dir])
-Ditz::Issue::ISSUE_DIR = dir
 
-case cmd # some special cases not handled by Ditz::Operator
+plugins = begin
+  Ditz::debug "loading plugins from #{$opts[:plugins_file]}"
+  YAML::load_file$opts[:plugins_file]
+rescue SystemCallError => e
+  Ditz::debug "can't load plugins file: #{e.message}"
+  []
+end
+
+plugins.each do |p|
+  fn = find_ditz_file "plugins/#{p}.rb"
+  Ditz::debug "loading plugin #{p.inspect} from #{fn}"
+  load fn
+end
+
+config = begin
+  Ditz::debug "loading config from #{$opts[:config_file]}"
+  Ditz::Config.from $opts[:config_file]
+rescue SystemCallError => e
+  puts <<EOS
+I wasn't able to find a configuration file #{$opts[:config_file]}.
+We'll set it up right now.
+EOS
+  Ditz::Config.create_interactively.save! $opts[:config_file]
+end
+
+cmd = ARGV.shift || "todo"
+issue_dir = Pathname.new(config.issue_dir || $opts[:issue_dir])
+
+case cmd # some special commands not handled by Ditz::Operator
 when "init"
-  die "#{dir} directory already exists" if dir.exist?
-  dir.mkdir
-  fn = dir + PROJECT_FN
+  die "#{issue_dir} directory already exists" if issue_dir.exist?
+  issue_dir.mkdir
+  fn = issue_dir + PROJECT_FN
   project = op.init
   project.save! fn
-  puts "Ok, #{dir} directory created successfully."
+  puts "Ok, #{issue_dir} directory created successfully."
   exit
 when "help"
   op.do "help", nil, nil, ARGV
   exit
 end
 
-project_root = Ditz::find_project_root Pathname.pwd, Pathname.new('.'), dir
-die "No #{dir} directory---use 'ditz init' to initialize" unless project_root != nil and project_root.exist?
-Dir.chdir project_root
+project_root = find_dir_containing(issue_dir + PROJECT_FN)
+die "No #{issue_dir} directory---use 'ditz init' to initialize" unless project_root
+project_root += issue_dir
 
 project = begin
-  fn = dir + PROJECT_FN
+  fn = project_root + PROJECT_FN
   Ditz::debug "loading project from #{fn}"
   project = Ditz::Project.from fn
 
-  fn = dir + "issue-*.yaml"
+  fn = project_root + "issue-*.yaml"
   Ditz::debug "loading issues from #{fn}"
   project.issues = Dir[fn].map { |fn| Ditz::Issue.from fn }
   Ditz::debug "found #{project.issues.size} issues"
@@ -107,24 +151,9 @@ end
 project.each_modelobject { |o| o.after_deserialize project }
 project.issues.each { |o| o.after_deserialize project }
 project.validate!
+project.issues.each { |p| p.project = project}
 project.assign_issue_names!
 
-config = begin
-  if File.exists? CONFIG_FN
-    Ditz::debug "loading local config from #{CONFIG_FN}"
-    Ditz::Config.from CONFIG_FN
-  else
-    Ditz::debug "loading global config from #{$opts[:config_file]}"
-    Ditz::Config.from $opts[:config_file]
-  end
-rescue SystemCallError, Ditz::ModelObject::ModelError => e
-  puts <<EOS
-I wasn't able to find a configuration file #{$opts[:config_file]}.
-We'll set it up right now.
-EOS
-  Ditz::Config.create_interactively
-end
-
 unless op.has_operation? cmd
   die "no such command: #{cmd}"
 end
@@ -140,28 +169,26 @@ begin
   op.do cmd, project, config, args
 rescue Ditz::Operator::Error => e
   die e.message
-rescue Interrupt
+rescue Errno::EPIPE, Interrupt
   exit 1
 end
 
 ## save project.yaml
 dirty = project.each_modelobject { |o| break true if o.changed? } || false
 if dirty
-  fn = dir + PROJECT_FN
+  fn = project_root + PROJECT_FN
   Ditz::debug "project is dirty, saving #{fn}"
-  project.each_modelobject { |o| o.before_serialize project }
   project.save! fn
 end
 
-changed_issues = project.issues.select { |i| i.changed? }
-
 ## project issues are not model fields proper, so they must be
 ## saved independently.
+changed_issues = project.issues.select { |i| i.changed? }
 changed_issues.each do |i|
-  i.before_serialize project
-  fn = i.pathname
-  Ditz::debug "issue #{i.name} is dirty, saving #{fn}"
-  i.save! fn
+  i.pathname ||= (project_root + "issue-#{i.id}.yaml")
+  i.project ||= project # hack: not set on new issues
+  Ditz::debug "issue #{i.name} is dirty, saving #{i.pathname}"
+  i.save! i.pathname
 end
 
 project.deleted_issues.each do |i|

--- a/bin/ditz-convert-from-monolith
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'fileutils'
-require "ditz"
-
-PROJECT_FN = "project.yaml"
-CONFIG_FN = ".ditz-config"
-def ISSUE_TO_FN i; "issue-#{i.id}.yaml" end
-
-dir = "bugs"
-project = Ditz::Project.from "bugs.yaml"
-puts "making #{dir}"
-FileUtils.mkdir dir
-project.changed!
-project.issues.each { |i| i.changed! }
-
-project.validate!
-project.assign_issue_names!
-project.each_modelobject { |o| o.after_deserialize project }
-
-## save project.yaml
-dirty = project.each_modelobject { |o| break true if o.changed? } || false
-if dirty
-  fn = File.join dir, PROJECT_FN
-  puts "writing #{fn}"
-  project.each_modelobject { |o| o.before_serialize project }
-  project.save! fn
-end
-
-## project issues are not model fields proper, so they must be
-## saved independently.
-project.issues.each do |i|
-  if i.changed?
-    i.before_serialize project
-    fn = File.join dir, ISSUE_TO_FN(i)
-    puts "writing #{fn}"
-    i.save! fn
-  end
-end
-
-puts "You can delete bugs.yaml now."

--- /dev/null
+++ b/contrib/completion/ditz.bash
@@ -0,0 +1,17 @@
+# ditz bash completion
+# 
+# author: Christian Garbs
+#
+# based on bzr.simple by Martin Pool
+
+_ditz() 
+{
+    cur=${COMP_WORDS[COMP_CWORD]}
+    if [ $COMP_CWORD -eq 1 ]; then
+	COMPREPLY=( $( compgen -W "$(ditz --commands)" $cur ) )
+    elif [ $COMP_CWORD -eq 2 ]; then
+	COMPREPLY=( $( compgen -W "$(ditz todo-full 2>/dev/null | grep '^. ' | cut -c 3- | cut -d : -f 1)" $cur ) )
+    fi 
+}
+
+complete -F _ditz -o default ditz

--- a/lib/ditz.rb
+++ b/lib/ditz.rb
@@ -1,8 +1,6 @@
-require 'pathname'
 module Ditz
 
-VERSION = "0.2"
-@has_readline=false
+VERSION = "0.3"
 
 def debug s
   puts "# #{s}" if $opts[:verbose]
@@ -13,33 +11,20 @@ def self.has_readline?
   @has_readline
 end
 
-def find_project_root(pwd, project_root, dir)
-  np = pwd.join project_root, dir, "project.yaml"
-  if np.exist?
-    return project_root
-  else
-    if pwd + project_root != pwd + project_root.parent
-      find_project_root pwd, project_root.parent, dir
-    else
-      return nil
-    end
-  end
+def self.has_readline= val
+  @has_readline = val
 end
-
-def self.has_readline=(val)
-  @has_readline=val
-end
-
-module_function :find_project_root
 end
 
 begin
+  Ditz::has_readline = false
   require 'readline'
-  Ditz::has_readline=true
+  Ditz::has_readline = true
 rescue LoadError
   # do nothing
 end
 
 require 'model-objects'
 require 'operator'
+require 'views'
 require 'hook'

--- a/lib/hook.rb
+++ b/lib/hook.rb
@@ -1,40 +1,43 @@
 module Ditz
-  module HookManager
-    module_function
+  class HookManager
+    def initialize
+      @descs = {}
+      @blocks = {}
+    end
 
-    @@descs = {}
-    @@blocks = {}
+    @@instance = nil
+    def self.method_missing m, *a, &b
+      @@instance ||= self.new
+      @@instance.send m, *a, &b
+    end
 
     def register name, desc
-      raise "Ditz::HookManager.register needs a symbol not #{name.inspect}" unless name.is_a? Symbol
-      @@descs[name] = desc
-      @@blocks[name] = []
+      @descs[name] = desc
+      @blocks[name] = []
     end
 
     def on *names, &block
-      for name in names do
-        raise "unregistered hook #{name.inspect}" unless @@descs[name]
-        @@blocks[name] << block
+      names.each do |name|
+        raise "unregistered hook #{name.inspect}" unless @descs[name]
+        @blocks[name] << block
       end
     end
 
     def run name, *args
-      raise "unregistered hook #{name.inspect}" unless @@descs[name]
+      raise "unregistered hook #{name.inspect}" unless @descs[name]
       blocks = hooks_for name
       return false if blocks.empty?
-      for block in blocks do
-        block[*args]
-      end
+      blocks.each { |block| block[*args] }
       true
     end
 
     def print_hooks f=$stdout
 puts <<EOS
-Ditz have #{@@descs.size} registered hooks:
+Ditz has #{@descs.size} registered hooks:
 
 EOS
 
-      @@descs.map{ |k,v| [k.to_s,v] }.sort.each do |(name, desc)|
+      @descs.map{ |k,v| [k.to_s,v] }.sort.each do |name, desc|
         f.puts <<EOS
 #{name}
 #{"-" * name.length}
@@ -46,13 +49,12 @@ EOS
     def enabled? name; !hooks_for(name).empty? end
 
     def hooks_for name
-      if @@blocks[name].nil? || @@blocks[name].empty?
+      if @blocks[name].nil? || @blocks[name].empty?
         fns = File.join(ENV['HOME'], '.ditz', 'hooks', '*.rb') 
         Dir[fns].each { |fn| load fn }
       end
 
-      @@blocks[name] || []
+      @blocks[name] || []
     end
   end
-
 end

--- a/lib/html.rb
+++ b/lib/html.rb
@@ -5,17 +5,41 @@ module Ditz
 ## pass through any variables needed for template generation, and add a bunch
 ## of HTML formatting utility methods.
 class ErbHtml
-  def initialize template_dir, template_name, links, mapping={}
-    @template_name = template_name
+  def initialize template_dir, links, binding={}
     @template_dir = template_dir
     @links = links
-    @mapping = mapping
+    @binding = binding
+  end
+
+  ## return an ErbHtml object that has the current binding plus extra_binding merged in
+  def clone_for_binding extra_binding={}
+    extra_binding.empty? ? self : ErbHtml.new(@template_dir, @links, @binding.merge(extra_binding))
+  end
+
+  def render_template template_name, extra_binding={}
+    if extra_binding.empty?
+      @@erbs ||= {}
+      @@erbs[template_name] ||= ERB.new IO.read(File.join(@template_dir, "#{template_name}.rhtml"))
+      @@erbs[template_name].result binding
+    else
+      clone_for_binding(extra_binding).render_template template_name
+    end
+  end
 
-    @@erbs ||= {}
-    @@erbs[template_name] ||= ERB.new(IO.readlines(File.join(template_dir, "#{template_name}.rhtml")).join)
+  def render_string s, extra_binding={}
+    if extra_binding.empty?
+      ERB.new(s).result binding
+    else
+      clone_for_binding(extra_binding).render_string s
+    end
   end
 
+  ###
+  ### the following methods are meant to be called from the ERB itself
+  ###
+
   def h o; o.to_s.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;") end
+  def t o; o.strftime "%Y-%m-%d %H:%M %Z" end
   def p o; "<p>" + h(o.to_s).gsub("\n\n", "</p><p>") + "</p>" end
   def obscured_email e; h e.gsub(/@.*?(>|$)/, "@...\\1") end
   def link_to o, name
@@ -25,16 +49,17 @@ class ErbHtml
     "<a href=\"#{dest}\">#{name}</a>"
   end
 
-  def render template_name, morevars={}
-    ErbHtml.new(@template_dir, template_name, @links, @mapping.merge(morevars)).to_s
+  def link_issue_names project, s
+    project.issues.inject(s) do |s, i|
+      s.gsub(/\b#{i.name}\b/, link_to(i, i.closed? ? "#{i.title} (#{i.disposition})" : i.title))
+    end
   end
 
-  def method_missing meth, *a
-    @mapping.member?(meth) ? @mapping[meth] : super
-  end
+  ## render a nested ERB
+  alias :render :render_template
 
-  def to_s
-    @@erbs[@template_name].result binding
+  def method_missing meth, *a
+    @binding.member?(meth) ? @binding[meth] : super
   end
 end
 

--- a/lib/index.rhtml
+++ b/lib/index.rhtml
@@ -26,7 +26,11 @@
         no issues
       <% else %>
         <%= sprintf "%.0f%%", pct_done %> complete;
-        <%= open_issues.map { |n,is| n.to_s.pluralize is.size }.join(' and ') %> open.
+        <% if open_issues.empty? %>
+          ready for release!
+        <% else %>
+          <%= open_issues.map { |n,is| n.to_s.pluralize is.size }.join(' and ') %> open.
+        <% end %>
       <% end %>
     </li>
   <% end %>
@@ -50,7 +54,11 @@
   open_issues = issues.select { |i| i.open? }
 %>
 <p>
-  <%= link_to "unassigned", "unassigned issue".pluralize(issues.size).capitalize %>; <%= open_issues.size.to_pretty_s %> open.
+  <% if issues.empty? %>
+    No unassigned issues.
+  <% else %>
+    <%= link_to "unassigned", "unassigned issue".pluralize(issues.size).capitalize %>; <%= open_issues.size.to_pretty_s %> of them open.
+  <% end %>
 </p>
 
 <% if components.size > 1 %>
@@ -61,10 +69,13 @@
       open_issues = project.group_issues(project.issues_for_component(c).select { |i| i.open? })
     %>
     <li>
-      <%= link_to c, c.name %>:
       <% if open_issues.empty? %>
+        <span class="dimmed">
+        <%= link_to c, c.name %>:
         no open issues.
+        </span>
       <% else %>
+        <%= link_to c, c.name %>:
         <%= open_issues.map { |n,is| n.to_s.pluralize is.size }.join(' and ') %> open.
       <% end %>
     </li>
@@ -72,6 +83,34 @@
   </ul>
 <% end %>
 
+<h2>Recently modified issues</h2>
+
+<table>
+<% project.issues.map { |i| i.log_events.map { |e| [e, i] } }.
+      flatten_one_level.
+      sort_by { |e| e.first.first }.
+      uniq_by { |stuff, i| i }.
+      sort_by { |e| e.first.first }.
+      reverse[0 ... 10].
+      each do |(date, author, what, comment), i| %>
+  <tr>
+    <td><%= date.pretty_date %></td>
+    <td class="issuestatus_<%= i.status %>">
+      <% if i.closed? %>
+        <%= i.disposition_string %>
+      <% else %>
+        <%= i.status_string %>
+      <% end %>
+    </td>
+    <td class="issuename">
+      <%= link_to i, i.title %>
+      <%= i.bug? ? '(bug)' : '' %>
+    </td>
+    <td><%= what %></td>
+  </tr>
+<% end %>
+</table>
+
 <p class="footer">Generated by <a href="http://ditz.rubyforge.org/">ditz</a>.
 
 </body>

--- a/lib/issue.rhtml
+++ b/lib/issue.rhtml
@@ -9,13 +9,9 @@
 
 <%