--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+== 0.2 / 2008-04-11
+* bugfix: store each issue in a separate file to avoid false conflicts
+* added per-command help
+* added 'log' command for recent activity
+* added better exception handling---turn into pretty error messages
+* added text-area commands like /edit, /reset, etc
+* all times now stored in UTC
 == 0.1.2 / 2008-04-04
 * bugfix: add_reference very broken
 == 0.1.1 / 2008-04-04

--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,7 +1,9 @@
 Changelog
 README.txt
 Rakefile
+ReleaseNotes
 bin/ditz
+bin/ditz-convert-from-monolith
 lib/component.rhtml
 lib/ditz.rb
 lib/html.rb

--- a/README.txt
+++ b/README.txt
@@ -8,14 +8,14 @@ http://ditz.rubyforge.org
 
 Ditz is a simple, light-weight distributed issue tracker designed to work with
 distributed version control systems like darcs and git. Ditz maintains an issue
-database file on disk, written in a line-based and human-editable format. This
-file is kept under version control, alongside project code.  Changes in issue
-state is handled by version control like code change: included as part of a
-commit, merged with changes from other developers, conflict-resolved in the
-standard manner, etc.
+database directory on disk, with files written in a line-based and human-
+editable format. This directory is kept under version control alongside
+project code. Changes in issue state is handled by version control like code
+change: included as part of a commit, merged with changes from other
+developers, conflict-resolved in the standard manner, etc.
 
 Ditz provides a simple, console-based interface for creating and updating the
-issue database file, and some rudimentary HTML generation capabilities for
+issue database files, and some rudimentary HTML generation capabilities for
 producing world-readable status pages. It offers no central public method of
 bug submission.
 

--- a/Rakefile
+++ b/Rakefile
@@ -33,16 +33,16 @@ SCREENSHOTS.each do |fn|
 end
 
 task :upload_webpage => WWW_FILES do |t|
-  sh "scp -C #{t.prerequisites * ' '} wmorgan@rubyforge.org:/var/www/gforge-projects/ditz/"
+  sh "rsync -essh -cavz #{t.prerequisites * ' '} wmorgan@rubyforge.org:/var/www/gforge-projects/ditz/"
 end
 
 task :upload_webpage_images => (SCREENSHOTS + SCREENSHOTS_SMALL) do |t|
-  sh "scp -C #{t.prerequisites * ' '} wmorgan@rubyforge.org:/var/www/gforge-projects/ditz/"
+  sh "rsync -essh -cavs #{t.prerequisites * ' '} wmorgan@rubyforge.org:/var/www/gforge-projects/ditz/"
 end
 
 task :upload_report do |t|
   sh "ruby -Ilib bin/ditz html ditz"
-  sh "scp -Cr ditz wmorgan@rubyforge.org:/var/www/gforge-projects/ditz/"
+  sh "rsync -essh -cavz ditz wmorgan@rubyforge.org:/var/www/gforge-projects/ditz/"
 end
 
 # vim: syntax=ruby

--- /dev/null
+++ b/ReleaseNotes
@@ -0,0 +1,8 @@
+0.2
+---
+
+In ditz 0.2, we store issues per file. This avoids many unnecessary conflicts
+that occur in the single-file case.
+
+To upgrade your bugs.yaml to a bugs/ directory, you must run
+ditz-convert-from-monolith.

--- a/bin/ditz
+++ b/bin/ditz
@@ -1,35 +1,55 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+require 'fileutils'
 require 'trollop'; include Trollop
 require "ditz"
 
+PROJECT_FN = "project.yaml"
+CONFIG_FN = ".ditz-config"
+def ISSUE_TO_FN i; "issue-#{i.id}.yaml" end
+
 $opts = options do
   version "ditz #{Ditz::VERSION}"
-  opt :issue_file, "Issue database file", :default => "bugs.yaml"
-  opt :config_file, "Configuration file", :default => File.join(ENV["HOME"], ".ditz-config")
+  opt :issue_dir, "Issue database dir", :default => "bugs"
+  opt :config_file, "Configuration file", :default => File.join(ENV["HOME"], CONFIG_FN)
   opt :verbose, "Verbose output", :default => false
+  opt :no_comment, "Skip asking for a comment", :default => false
 end
 
 cmd = ARGV.shift or die "expecting a ditz command"
 op = Ditz::Operator.new
+dir = $opts[:issue_dir]
 
-case cmd # special cases: init and help
+case cmd # some special cases not handled by Ditz::Operator
 when "init"
-  fn = $opts[:issue_file]
-  die "#{fn} already exists" if File.exists? fn
+  die "#{dir} directory already exists" if File.exists? dir
+  FileUtils.mkdir dir
+  fn = File.join dir, PROJECT_FN
   project = op.init
   project.save! fn
-  puts "Ok, #{fn} created successfully."
+  puts "Ok, #{dir} directory created successfully."
   exit
 when "help"
-  op.help
+  op.do "help", nil, nil, ARGV
   exit
 end
 
-Ditz::debug "loading issues from #{$opts[:issue_file]}"
+project_root = Ditz::find_project_root dir, Dir.pwd
+
+die "No #{dir} directory---use 'ditz init' to initialize" unless project_root != nil and File.exists? project_root
+
+
 project = begin
-  Ditz::Project.from $opts[:issue_file]
+  fn = File.join project_root, PROJECT_FN
+  Ditz::debug "loading project from #{fn}"
+  project = Ditz::Project.from fn
+
+  fn = File.join 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"
+  project
 rescue SystemCallError, Ditz::Project::Error => e
   die "#{e.message} (use 'init' to initialize)"
 end
@@ -39,12 +59,11 @@ project.assign_issue_names!
 project.each_modelobject { |o| o.after_deserialize project }
 
 config = begin
-  fn = ".ditz-config"
-  if File.exists? fn
-    Ditz::debug "loading config from #{fn}"
-    Ditz::Config.from fn
+  if File.exists? CONFIG_FN
+    Ditz::debug "loading local config from #{CONFIG_FN}"
+    Ditz::Config.from CONFIG_FN
   else
-    Ditz::debug "loading config from #{$opts[:config_file]}"
+    Ditz::debug "loading global config from #{$opts[:config_file]}"
     Ditz::Config.from $opts[:config_file]
   end
 rescue SystemCallError, Ditz::ModelObject::ModelError => e
@@ -68,14 +87,46 @@ begin
   op.do cmd, project, config, args
 rescue Ditz::Operator::Error => e
   die e.message
+rescue Interrupt
+  exit 1
 end
 
+## save project.yaml
 dirty = project.each_modelobject { |o| break true if o.changed? } || false
 if dirty
-  Ditz::debug "project is dirty, saving"
+  fn = File.join project_root, PROJECT_FN
+  Ditz::debug "project is dirty, saving #{fn}"
   project.each_modelobject { |o| o.before_serialize project }
-  project.save! $opts[:issue_file]
+  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 project_root, ISSUE_TO_FN(i)
+    Ditz::debug "issue #{i.name} is dirty, saving #{fn}"
+    i.save! fn
+  end
+end
+
+project.deleted_issues.each do |i|
+  fn = File.join project_root, ISSUE_TO_FN(i)
+  Ditz::debug "issue #{i.name} has been deleted, deleting #{fn}"
+  FileUtils.rm fn
+end
+
+unless project.added_issues.empty?
+  puts "You may have to inform your SCM that the following files have been added:"
+  project.added_issues.each { |i| puts "  " + File.join(project_root, ISSUE_TO_FN(i)) }
+end
+
+unless project.deleted_issues.empty?
+  puts "You may have to inform your SCM that the following files have been deleted:"
+  project.deleted_issues.each { |i| puts "  " + File.join(project_root, ISSUE_TO_FN(i)) }
 end
+
 config.save! $opts[:config_file] if config.changed?
 
 # vim: syntax=ruby

--- /dev/null
+++ b/bin/ditz-convert-from-monolith
@@ -0,0 +1,42 @@
+#!/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."