ditz 0.1.2 → 0.2

data/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

data/Rakefile

@@ -42,7 +42,7 @@ 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

data/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.

data/bin/ditz

@@ -1,35 +1,51 @@
 #!/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} (c) 2008 William Morgan"
-  opt :issue_file, "Issue database file", :default => "bugs.yaml"
-  opt :config_file, "Configuration file", :default => File.join(ENV["HOME"], ".ditz-config")
+  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 :verbose, "Verbose output", :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]}"
+die "No #{dir} directory---use 'ditz init' to initialize" unless File.exists? dir
+
 project = begin
-  Ditz::Project.from $opts[:issue_file]
+  fn = File.join dir, PROJECT_FN
+  Ditz::debug "loading project from #{fn}"
+  project = Ditz::Project.from fn
+
+  fn = File.join dir, "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 +55,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
@@ -64,14 +79,50 @@ args = []
 args << ARGV.shift until ARGV.empty?
 
 Ditz::debug "executing command #{cmd}"
-op.do cmd, project, config, *args
+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 dir, 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 dir, 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 dir, 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(dir, 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(dir, ISSUE_TO_FN(i)) }
+end
+
 config.save! $opts[:config_file] if config.changed?
 
 # vim: syntax=ruby

data/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."

data/lib/component.rhtml

@@ -13,6 +13,6 @@
 
 <%= render "issue_table", :show_component => false, :show_release => true %>
 
-<p class="footer">Generated <%= Time.now %> by <a href="http://ditz.rubyforge.org/">ditz</a>.
+<p class="footer">Generated by <a href="http://ditz.rubyforge.org/">ditz</a>.
 </body>
 </html>

data/lib/ditz.rb

@@ -1,6 +1,6 @@
 module Ditz
 
-VERSION = "0.1.2"
+VERSION = "0.2"
 
 def debug s
   puts "# #{s}" if $opts[:verbose]

data/lib/index.rhtml

@@ -77,7 +77,7 @@
   </ul>
 <% end %>
 
-<p class="footer">Generated <%= Time.now %> by <a href="http://ditz.rubyforge.org/">ditz</a>.
+<p class="footer">Generated by <a href="http://ditz.rubyforge.org/">ditz</a>.
 
 </body>
 </html>

data/lib/issue.rhtml

@@ -101,6 +101,6 @@
 <% end %>
 </table>
 
-<p class="footer">Generated <%= Time.now %> by <a href="http://ditz.rubyforge.org/">ditz</a>.
+<p class="footer">Generated by <a href="http://ditz.rubyforge.org/">ditz</a>.
 </body>
 </html>

data/lib/lowline.rb

@@ -1,15 +1,16 @@
-require 'util'
+require 'tempfile'
+require "util"
 
 class Numeric
   def to_pretty_s
-    if self < 20
-      %w(no one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen sixteen seventeen eighteen nineteen)[self]
-    else
-      to_s
-    end
+    %w(no one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen sixteen seventeen eighteen nineteen)[self] || to_s
   end
 end
 
+class NilClass
+  def multiline prefix=nil; "" end
+end
+
 class String
   def ucfirst; self[0..0].upcase + self[1..-1] end
   def dcfirst; self[0..0].downcase + self[1..-1] end
@@ -17,6 +18,7 @@ class String
   def underline; self + "\n" + ("-" * self.length) end
   def multiline prefix=""; blank? ? "" : "\n" + self.gsub(/^/, prefix) end
   def pluralize n; n.to_pretty_s + " " + (n == 1 ? self : self + "s") end # oh yeah
+  def multistrip; strip.gsub(/\n\n+/, "\n\n") end
 end
 
 class Array
@@ -52,6 +54,20 @@ class Time
 end
 
 module Lowline
+  def run_editor
+    f = Tempfile.new "ditz"
+    yield f
+    f.close
+
+    editor = ENV["EDITOR"] || "/usr/bin/vi"
+    cmd = "#{editor} #{f.path.inspect}"
+
+    mtime = File.mtime f.path
+    system cmd or raise Error, "cannot execute command: #{cmd.inspect}"
+
+    File.mtime(f.path) == mtime ? nil : f.path
+  end
+
   def ask q, opts={}
     default_s = case opts[:default]
       when nil; nil
@@ -77,16 +93,35 @@ module Lowline
     end
   end
 
+  def ask_via_editor q, default=nil
+    fn = run_editor do |f|
+      f.puts q.gsub(/^/, "## ")
+      f.puts "##"
+      f.puts "## Enter your text below. Lines starting with a '#' will be ignored."
+      f.puts
+      f.puts default if default
+    end
+    return unless fn
+    IO.read(fn).gsub(/^#.*$/, "").multistrip
+  end
+
   def ask_multiline q
-    puts "#{q} (ctrl-d or . by itself to stop):"
+    puts "#{q} (ctrl-d, ., or /stop to stop, /edit to edit, /reset to reset):"
     ans = ""
     while true
       print "> "
-      line = gets
-      break if line =~ /^\.$/ || line.nil?
-      ans << line.strip + "\n"
+      case(line = gets) && line.strip!
+      when /^\.$/, nil, "/stop"
+        break
+      when "/reset"
+        return ask_multiline(q)
+      when "/edit"
+        return ask_via_editor(q, ans)
+      else
+        ans << line + "\n"
+      end
     end
-    ans.sub(/\n+$/, "")
+    ans.multistrip
   end
 
   def ask_yon q
@@ -129,6 +164,8 @@ module Lowline
     puts "Choose a #{name}:"
     stuff.each_with_index do |c, i|
       pretty = case to_string
+      when block_given? && to_string # heh
+        yield c
       when Symbol
         c.send to_string
       when Proc

data/lib/model-objects.rb

@@ -38,10 +38,16 @@ class Project < ModelObject
 
   field :name, :default_generator => lambda { File.basename(Dir.pwd) }
   field :version, :default => Ditz::VERSION, :ask => false
-  field :issues, :multi => true, :ask => false
   field :components, :multi => true, :generator => :get_components
   field :releases, :multi => true, :ask => false
 
+  ## issues are not model fields proper, so we build up their interface here.
+  attr_accessor :issues
+  def add_issue issue; added_issues << issue; issues << issue end
+  def drop_issue issue; deleted_issues << issue if issues.delete issue end
+  def added_issues; @added_issues ||= [] end
+  def deleted_issues; @deleted_issues ||= [] end
+
   def get_components
     puts <<EOS
 Issues can be tracked across the project as a whole, or the project can be
@@ -54,18 +60,15 @@ EOS
   end
 
   def issue_for issue_name
-    issues.find { |i| i.name == issue_name } or
-      raise Error, "has no issue with name #{issue_name.inspect}"
+    issues.find { |i| i.name == issue_name }
   end
 
   def component_for component_name
-    components.find { |i| i.name == component_name } or
-      raise Error, "has no component with name #{component_name.inspect}"
+    components.find { |i| i.name == component_name }
   end
 
   def release_for release_name
-    releases.find { |i| i.name == release_name } or
-      raise Error, "has no release with name #{release_name.inspect}"
+    releases.find { |i| i.name == release_name }
   end
 
   def issues_for_release release
@@ -83,7 +86,7 @@ EOS
   def assign_issue_names!
     prefixes = components.map { |c| [c.name, c.name.gsub(/^\s+/, "-").downcase] }.to_h
     ids = components.map { |c| [c.name, 0] }.to_h
-    issues.each do |i|
+    issues.sort_by { |i| i.creation_time }.each do |i|
       i.name = "#{prefixes[i.component]}-#{ids[i.component] += 1}"
     end
   end

data/lib/model.rb

@@ -3,6 +3,13 @@ require "lowline"; include Lowline
 require "util"
 require 'sha1'
 
+class Time
+  alias :old_to_yaml :to_yaml
+  def to_yaml(opts = {})
+    self.utc.old_to_yaml(opts)
+  end
+end
+
 module Ditz
 
 class ModelObject
@@ -82,8 +89,7 @@ class ModelObject
   end
 
   def save! fn
-    Ditz::debug "saving configuration to #{fn}"
-    FileUtils.mv fn, "#{fn}~", :force => true rescue nil
+    #FileUtils.mv fn, "#{fn}~", :force => true rescue nil
     File.open(fn, "w") { |f| f.puts to_yaml }
   end
 
@@ -92,12 +98,7 @@ class ModelObject
     self
   end
 
-  def initialize
-    @changed = false
-    @log_events = []
-  end
-
-  def changed?; @changed end
+  def changed?; @changed ||= false end
   def changed!; @changed = true end
 
   def self.create_interactively opts={}

data/lib/operator.rb

@@ -1,6 +1,4 @@
-require 'tempfile'
 require 'fileutils'
-
 require "html"
 
 module Ditz
@@ -12,18 +10,82 @@ class Operator
     def method_to_op meth; meth.to_s.gsub("_", "-") end
     def op_to_method op; op.gsub("-", "_").intern end
 
-    def operation method, desc
+    def operation method, desc, *args_spec
       @operations ||= {}
-      @operations[method] = desc
+      @operations[method] = { :desc => desc, :args_spec => args_spec }
     end
 
     def operations
       @operations.map { |k, v| [method_to_op(k), v] }.sort_by { |k, v| k }
     end
     def has_operation? op; @operations.member? op_to_method(op) end
+
+    def parse_releases_arg project, releases_arg
+      ret = []
+
+      releases, show_unassigned, force_show = case releases_arg
+        when nil; [project.releases, true, false]
+        when "unassigned"; [[], true, true]
+        else
+          release = project.release_for(releases_arg)
+          raise Error, "no release with name #{releases_arg}" unless release
+          [[release], false, true]
+        end
+
+      releases.each do |r|
+        next if r.released? unless force_show
+
+        bugs = project.issues.
+          select { |i| i.type == :bugfix && i.release == r.name }
+        feats = project.issues.
+          select { |i| i.type == :feature && i.release == r.name }
+
+        #next if bugs.empty? && feats.empty? unless force_show
+
+        ret << [r, bugs, feats]
+      end
+
+      return ret unless show_unassigned
+
+      bugs = project.issues.select { |i| i.type == :bugfix && i.release.nil? }
+      feats = project.issues.select { |i| i.type == :feature && i.release.nil? }
+
+      return ret if bugs.empty? && feats.empty? unless force_show
+      ret << [nil, bugs, feats]
+    end
+    private :parse_releases_arg
+
+    def build_args project, method, args
+      command = "command '#{method_to_op method}'"
+      built_args = @operations[method][:args_spec].map do |spec|
+        val = args.shift
+        case spec
+        when :issue
+          raise Error, "#{command} requires an issue name" unless val
+          project.issue_for(val) or raise Error, "no issue with name #{val}"
+        when :release
+          raise Error, "#{command} requires a release name" unless val
+          project.release_for(val) or raise Error, "no release with name #{val}"
+        when :maybe_release
+          parse_releases_arg project, val
+        when :string
+          raise Error, "#{command} requires a string" unless val
+          val
+        else
+          val # no translation for other types
+        end
+      end
+      raise Error, "too many arguments for #{command}" unless args.empty?
+      built_args
+    end
+  end
+
+  def do op, project, config, args
+    meth = self.class.op_to_method(op)
+    built_args = self.class.build_args project, meth, args
+    send meth, project, config, *built_args
   end
 
-  def do op, *a; send self.class.op_to_method(op), *a end
   %w(operations has_operation?).each do |m|
     define_method(m) { |*a| self.class.send m, *a }
   end
@@ -33,15 +95,40 @@ class Operator
     Project.create_interactively
   end
 
-  operation :help, "List all registered commands"
-  def help
+  operation :help, "List all registered commands", :maybe_command
+  def help project, config, command
+    return help_single(command) if command
     puts <<EOS
-Registered commands:
+Ditz commands:
+
 EOS
     ops = self.class.operations
-    len = ops.map { |name, desc| name.to_s.length }.max
-    ops.each { |name, desc| printf "%#{len}s: %s\n", name, desc }
-    puts
+    len = ops.map { |name, op| name.to_s.length }.max
+    ops.each do |name, opts|
+      printf "  %#{len}s: %s\n", name, opts[:desc]
+    end
+    puts <<EOS
+
+Use 'ditz help <command>' for details.
+EOS
+  end
+
+  def help_single command
+    name, opts = self.class.operations.find { |name, spec| name == command }
+    raise Error, "no such ditz command '#{command}'" unless name
+    args = opts[:args_spec].map do |spec|
+      case spec.to_s
+      when /^maybe_(.*)$/
+        "[#{$1}]"
+      else
+        "<#{spec.to_s}>"
+      end
+    end.join(" ")
+
+    puts <<EOS
+#{opts[:desc]}.
+Usage: ditz #{name} #{args}
+EOS
   end
 
   operation :add, "Add a bug/feature request"
@@ -54,9 +141,8 @@ EOS
     puts "Added issue #{issue.name}."
   end
 
-  operation :drop, "Drop a bug/feature request"
-  def drop project, config, issue_name
-    issue = project.issue_for issue_name
+  operation :drop, "Drop a bug/feature request", :issue
+  def drop project, config, issue
     project.drop_issue issue
     puts "Dropped #{issue.name}. Note that other issue names may have changed."
   end
@@ -77,56 +163,19 @@ EOS
     puts "Added component #{component.name}."
   end
 
-  operation :add_reference, "Add a reference to an issue"
-  def add_reference project, config, issue_name
-    issue = project.issue_for issue_name
+  operation :add_reference, "Add a reference to an issue", :issue
+  def add_reference project, config, issue
+    puts "Adding a reference to #{issue.name}: #{issue.title}."
     reference = ask "Reference"
     comment = ask_multiline "Comments"
     issue.add_reference reference
     issue.log "added reference #{issue.references.size}", config.user, comment
-    puts "Added reference to #{issue.name}"
-  end
-
-  def parse_releases_arg project, releases_arg
-    ret = []
-
-    releases, show_unassigned, force_show = case releases_arg
-      when nil; [project.releases, true, false]
-      when "unassigned"; [[], true, true]
-      else
-        [[project.release_for(releases_arg)], false, true]
-      end
-
-    releases.each do |r|
-      next if r.released? unless force_show
-
-      bugs = project.issues.
-        select { |i| i.type == :bugfix && i.release == r.name }
-      feats = project.issues.
-        select { |i| i.type == :feature && i.release == r.name }
-
-      #next if bugs.empty? && feats.empty? unless force_show
-
-      ret << [r, bugs, feats]
-    end
-
-    return ret unless show_unassigned
-
-    bugs = project.issues.select { |i| i.type == :bugfix && i.release.nil? }
-    feats = project.issues.select { |i| i.type == :feature && i.release.nil? }
-
-    return ret if bugs.empty? && feats.empty? unless force_show
-    ret << [nil, bugs, feats]
+    puts "Added reference to #{issue.name}."
   end
 
-  operation :status, "Show project status"
-  def status project, config, release=nil
-    if project.releases.empty?
-      puts "No releases."
-      return
-    end
-
-    parse_releases_arg(project, release).each do |r, bugs, feats|
+  operation :status, "Show project status", :maybe_release
+  def status project, config, releases
+    releases.each do |r, bugs, feats|
       title, bar = [r ? r.name : "unassigned", status_bar_for(bugs + feats)]
 
       ncbugs = bugs.count_of { |b| b.closed? }
@@ -134,7 +183,9 @@ EOS
       pcbugs = 100.0 * (bugs.empty? ? 1.0 : ncbugs.to_f / bugs.size)
       pcfeats = 100.0 * (feats.empty? ? 1.0 : ncfeats.to_f / feats.size)
 
-      special = if bugs.empty? && feats.empty?
+      special = if r && r.released?
+        "(released)"
+      elsif bugs.empty? && feats.empty?
         "(no issues)"
       elsif ncbugs == bugs.size && ncfeats == feats.size
         "(ready for release)"
@@ -145,6 +196,11 @@ EOS
       printf "%-10s %2d/%2d (%3.0f%%) bugs, %2d/%2d (%3.0f%%) features %s\n",
         title, ncbugs, bugs.size, pcbugs, ncfeats, feats.size, pcfeats, special
     end
+
+    if project.releases.empty?
+      puts "No releases."
+      return
+    end
   end
 
   def status_bar_for issues
@@ -155,24 +211,25 @@ EOS
   end
 
   def todo_list_for issues
+    return if issues.empty?
     name_len = issues.max_of { |i| i.name.length }
     issues.map do |i|
       sprintf "%s %#{name_len}s: %s\n", i.status_widget, i.name, i.title
     end.join
   end
 
-  operation :todo, "Generate todo list"
-  def todo project, config, release=nil
-    actually_do_todo project, config, release, false
+  operation :todo, "Generate todo list", :maybe_release
+  def todo project, config, releases
+    actually_do_todo project, config, releases, false
   end
 
-  operation :todo_full, "Generate full todo list, including completed items"
-  def todo_full project, config, release=nil
-    actually_do_todo project, config, release, true
+  operation :todo_full, "Generate full todo list, including completed items", :maybe_release
+  def todo_full project, config, releases
+    actually_do_todo project, config, releases, true
   end
 
-  def actually_do_todo project, config, release, full
-    parse_releases_arg(project, release).each do |r, bugs, feats|
+  def actually_do_todo project, config, releases, full
+    releases.each do |r, bugs, feats|
       if r
         puts "Version #{r.name} (#{r.status}):"
       else
@@ -180,14 +237,13 @@ EOS
       end
       issues = bugs + feats
       issues = issues.select { |i| i.open? } unless full
-      print todo_list_for(issues.sort_by { |i| i.sort_order })
+      puts(todo_list_for(issues.sort_by { |i| i.sort_order }) || "No open issues.")
       puts
     end
   end
 
-  operation :show, "Describe a single issue"
-  def show project, config, name
-    issue = project.issue_for name
+  operation :show, "Describe a single issue", :issue
+  def show project, config, issue
     status = case issue.status
     when :closed
       "#{issue.status_string}: #{issue.disposition_string}"
@@ -198,11 +254,13 @@ EOS
 #{"Issue #{issue.name}".underline}
       Title: #{issue.title}
 Description: #{issue.interpolated_desc(project.issues).multiline "  "}
+       Type: #{issue.type}
      Status: #{status}
     Creator: #{issue.reporter}
         Age: #{issue.creation_time.ago}
     Release: #{issue.release}
  References: #{issue.references.listify "  "}
+ Identifier: #{issue.id}
 
 Event log:
 #{format_log_events issue.log_events}
@@ -216,25 +274,24 @@ EOS
     end.join("\n")
   end
 
-  operation :start, "Start work on an issue"
-  def start project, config, name
-    issue = project.issue_for name
+  operation :start, "Start work on an issue", :issue
+  def start project, config, issue
+    puts "Starting work on issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments"
     issue.start_work config.user, comment
     puts "Recorded start of work for #{issue.name}."
   end
 
-  operation :stop, "Stop work on an issue"
-  def stop project, config, name
-    issue = project.issue_for name
+  operation :stop, "Stop work on an issue", :issue
+  def stop project, config, issue
+    puts "Stopping work on issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments"
     issue.stop_work config.user, comment
     puts "Recorded work stop for #{issue.name}."
   end
 
-  operation :close, "Close an issue"
-  def close project, config, name
-    issue = project.issue_for name
+  operation :close, "Close an issue", :issue
+  def close project, config, issue
     puts "Closing issue #{issue.name}: #{issue.title}."
     disp = ask_for_selection Issue::DISPOSITIONS, "disposition", lambda { |x| Issue::DISPOSITION_STRINGS[x] || x.to_s }
     comment = ask_multiline "Comments"
@@ -242,31 +299,39 @@ EOS
     puts "Closed issue #{issue.name} with disposition #{issue.disposition_string}."
   end
 
-  operation :assign, "Assign an issue to a release"
-  def assign project, config, issue_name
-    issue = project.issue_for issue_name
+  operation :assign, "Assign an issue to a release", :issue
+  def assign project, config, issue
     puts "Issue #{issue.name} currently " + if issue.release
       "assigned to release #{issue.release}."
     else
       "not assigned to any release."
     end
-    release = ask_for_selection project.releases, "release", :name
+
+    releases = project.releases.sort_by { |r| (r.release_time || 0).to_i }
+    releases -= [releases.find { |r| r.name == issue.release }] if issue.release
+    release = ask_for_selection(releases, "release") do |r|
+      r.name + if r.released?
+        " (released #{r.release_time.pretty_date})"
+      else
+        " (unreleased)"
+      end
+    end
     comment = ask_multiline "Comments"
     issue.assign_to_release release, config.user, comment
-    puts "Assigned #{issue.name} to #{release.name}"
+    puts "Assigned #{issue.name} to #{release.name}."
   end
 
-  operation :unassign, "Unassign an issue from any releases"
-  def unassign project, config, issue_name
-    issue = project.issue_for issue_name
+  operation :unassign, "Unassign an issue from any releases", :issue
+  def unassign project, config, issue
+    puts "Unassigning issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments"
     issue.unassign config.user, comment
     puts "Unassigned #{issue.name}."
   end
 
-  operation :comment, "Comment on an issue"
-  def comment project, config, issue_name
-    issue = project.issue_for issue_name
+  operation :comment, "Comment on an issue", :issue
+  def comment project, config, issue
+    puts "Commenting on issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments"
     issue.log "commented", config.user, comment
     puts "Comments recorded for #{issue.name}."
@@ -274,32 +339,31 @@ EOS
 
   operation :releases, "Show releases"
   def releases project, config
-    project.releases.each do |r|
+    a, b = project.releases.partition { |r| r.released? }
+    (b + a.sort_by { |r| r.release_time }).each do |r|
       status = r.released? ? "released #{r.release_time.pretty_date}" : r.status
       puts "#{r.name} (#{status})"
     end
   end
 
-  operation :release, "Release a release"
-  def release project, config, release_name
-    release = project.release_for release_name
+  operation :release, "Release a release", :release
+  def release project, config, release
     comment = ask_multiline "Comments"
     release.release! project, config.user, comment
     puts "Release #{release.name} released!"
   end
 
-  operation :changelog, "Generate a changelog for a release"
-  def changelog project, config, relnames
-    parse_releases_arg(project, relnames).each do |r, bugs, feats|
-      puts "== #{r.name} / #{r.release_time.pretty_date}" if r.released?
-      feats.select { |f| f.closed? }.each { |i| puts "* #{i.title}" }
-      bugs.select { |f| f.closed? }.each { |i| puts "* bugfix: #{i.title}" }
-    end
+  operation :changelog, "Generate a changelog for a release", :release
+  def changelog project, config, r
+    feats, bugs = project.issues_for_release(r).partition { |i| i.feature? }
+    puts "== #{r.name} / #{r.released? ? r.release_time.pretty_date : 'unreleased'}"
+    feats.select { |f| f.closed? }.each { |i| puts "* #{i.title}" }
+    bugs.select { |f| f.closed? }.each { |i| puts "* bugfix: #{i.title}" }
   end
 
-  operation :html, "Generate html status pages"
-  def html project, config, dir="html"
-    #FileUtils.rm_rf dir
+  operation :html, "Generate html status pages", :maybe_dir
+  def html project, config, dir
+    dir ||= "html"
     Dir.mkdir dir unless File.exists? dir
 
     ## find the ERB templates. this is my brilliant approach
@@ -360,6 +424,7 @@ EOS
         :past_releases => past_rels, :upcoming_releases => upcoming_rels,
         :components => project.components)
     end
+    puts "Local generated URL: file://#{File.expand_path(fn)}"
   end
 
   operation :validate, "Validate project status"
@@ -367,36 +432,46 @@ EOS
     ## a no-op
   end
 
-  operation :grep, "Show issues matching a string or regular expression"
+  operation :grep, "Show issues matching a string or regular expression", :string
   def grep project, config, match
     re = /#{match}/
     issues = project.issues.select { |i| i.title =~ re || i.desc =~ re }
-    print_todo issues
+    puts(todo_list_for(issues) || "No matching issues.")
   end
 
-  operation :edit, "Edit an issue"
-  def edit project, config, issue_name
-    issue = project.issue_for issue_name
+  operation :log, "Show recent activity"
+  def log project, config
+    project.issues.map { |i| i.log_events.map { |e| [e, i] } }.
+      flatten_one_level.sort_by { |e| e.first.first }.reverse.
+      each do |(date, author, what, comment), i|
+      puts <<EOS
+date  : #{date.localtime} (#{date.ago} ago)
+author: #{author}
+
+  #{i.name}: #{i.title}
+  #{what}
+  #{comment.multiline "  "}
+EOS
+    puts unless comment.blank?
+    end
+  end
+
+  operation :edit, "Edit an issue", :issue
+  def edit project, config, issue
     data = { :title => issue.title, :description => issue.desc,
              :reporter => issue.reporter }
 
-    f = Tempfile.new("ditz")
-    f.puts data.to_yaml
-    f.close
-    editor = ENV["EDITOR"] || "/usr/bin/vi"
-    cmd = "#{editor} #{f.path.inspect}"
-    Ditz::debug "running: #{cmd}"
+    fn = run_editor { |f| f.puts data.to_yaml }
 
-    mtime = File.mtime f.path
-    system cmd or raise Error, "cannot execute command: #{cmd.inspect}"
-    if File.mtime(f.path) == mtime
+    unless fn
       puts "Aborted."
       return
     end
 
     comment = ask_multiline "Comments"
+
     begin
-      edits = YAML.load_file f.path
+      edits = YAML.load_file fn
       if issue.change edits, config.user, comment
         puts "Changed recorded."
       else

data/lib/release.rhtml

@@ -61,7 +61,7 @@
 <% end %>
 </table>
 
-<p class="footer">Generated <%= Time.now %> by <a href="http://ditz.rubyforge.org/">ditz</a>.
+<p class="footer">Generated by <a href="http://ditz.rubyforge.org/">ditz</a>.
 
 </body>
 </html>

data/lib/unassigned.rhtml

@@ -22,6 +22,6 @@
 <% end %>
 </table>
 
-<p class="footer">Generated <%= Time.now %> by <a href="http://ditz.rubyforge.org/">ditz</a>.
+<p class="footer">Generated by <a href="http://ditz.rubyforge.org/">ditz</a>.
 </body>
 </html>

data/lib/util.rb

@@ -30,4 +30,15 @@ class Array
   def to_h
     Hash[*flatten]
   end
+
+  def flatten_one_level
+    inject([]) do |ret, e|
+      case e
+      when Array
+        ret + e
+      else
+        ret << e
+      end
+    end
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ditz
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2008-04-04 00:00:00 -07:00
+  version: "0.2"
+date: 2008-04-11 07:00:00 Z
 summary: A simple issue tracker designed to integrate well with distributed version control systems like git and darcs. State is saved to a YAML file kept under version control, allowing issues to be closed/added/modified as part of a commit.
 require_paths: 
 - lib
@@ -32,7 +32,9 @@ files:
 - Changelog
 - README.txt
 - Rakefile
+- ReleaseNotes
 - bin/ditz
+- bin/ditz-convert-from-monolith
 - lib/component.rhtml
 - lib/ditz.rb
 - lib/html.rb
@@ -56,6 +58,7 @@ extra_rdoc_files:
 - README.txt
 executables: 
 - ditz
+- ditz-convert-from-monolith
 extensions: []
 
 requirements: []