ditz 0.3 → 0.4

data/lib/issue.rhtml

@@ -73,8 +73,13 @@
       <%= issue.status_string %><% if issue.closed? %>: <%= issue.disposition_string %><% end %>
     </td>
   </tr>
+
+  <%= extra_summary_html %>
+
 </table>
 
+<%= extra_details_html %>
+
 <h2>Issue log</h2>
 
 <table>
@@ -84,7 +89,7 @@
 <% else %>
   <tr class="logentryodd">
 <% end %>
-  <td class="logtime"><%=h time %></td>
+  <td class="logtime"><%=t time %></td>
   <td class="logwho"><%=obscured_email who %></td>
   <td class="logwhat"><%=h what %></td>
   </tr>

data/lib/issue_table.rhtml

@@ -2,10 +2,14 @@
 <% issues.sort_by { |i| i.sort_order }.each do |i| %>
   <tr>
     <td class="issuestatus_<%= i.status %>">
-      <%= i.status_string %><% if i.closed? %>: <%= i.disposition_string %><% end %>
+      <% if i.closed? %>
+        <%= i.disposition_string %>
+      <% else %>
+        <%= i.status_string %>
+      <% end %>
     </td>
     <td class="issuename">
-      <%= link_to i, i.title %>
+      <%= fancy_issue_link_for i %>
       <%= i.bug? ? '(bug)' : '' %>
     </td>
     <% if show_release %>

data/lib/lowline.rb

@@ -7,22 +7,15 @@ class Numeric
   end
 end
 
-class NilClass
-  def multiline prefix=nil; "" end
-end
-
 class String
   def dcfirst; self[0..0].downcase + self[1..-1] end
   def blank?; self =~ /\A\s*\z/ end
   def underline; self + "\n" + ("-" * self.length) end
-  def multiline prefix="", cleanstart=true
-    return "" if blank?
-    (cleanstart ? "\n" : "") + gsub(/^/, prefix)
-  end
   def pluralize n, b=true
     s = (n == 1 ? self : (self == 'bugfix' ? 'bugfixes' : self + "s")) # oh yeah
     b ? n.to_pretty_s + " " + s : s
   end
+  def shortened_email; self =~ /<?(\S+?)@.+/ ? $1 : self end
   def multistrip; strip.gsub(/\n\n+/, "\n\n") end
 end
 

data/lib/model-objects.rb

@@ -73,8 +73,10 @@ EOS
     releases.find { |i| i.name == release_name }
   end
 
+  def unreleased_releases; releases.select { |r| r.unreleased? } end
+
   def issues_for_release release
-    issues.select { |i| i.release == release.name }
+    release == :unassigned ? unassigned_issues : issues.select { |i| i.release == release.name }
   end
 
   def issues_for_component component
@@ -186,8 +188,11 @@ class Issue < ModelObject
   def closed?; status == :closed end
   def open?; !closed? end
   def in_progress?; status == :in_progress end
+  def unstarted?; !in_progress? end
   def bug?; type == :bugfix end
   def feature?; type == :feature end
+  def unassigned?; release.nil? end
+  def assigned?; !unassigned? end
 
   def start_work who, comment; change_status :in_progress, who, comment end
   def stop_work who, comment
@@ -197,7 +202,7 @@ class Issue < ModelObject
 
   def close disp, who, comment
     raise Error, "unknown disposition #{disp}" unless DISPOSITIONS.member? disp
-    log "closed issue with disposition #{disp}", who, comment
+    log "closed with disposition #{disp}", who, comment
     self.status = :closed
     self.disposition = disp
   end

data/lib/model.rb

@@ -18,6 +18,7 @@ class ModelObject
   def initialize
     @values = {}
     @serialized_values = {}
+    self.class.fields.map { |f, opts| @values[f] = [] if opts[:multi] }
   end
 
   ## yamlability
@@ -27,7 +28,14 @@ class ModelObject
   def self.inherited subclass
     YAML.add_domain_type(yaml_domain, subclass.yaml_other_thing) do |type, val|
       o = subclass.new
-      val.each { |k, v| o.send "__serialized_#{k}=", v }
+      val.each do |k, v|
+        m = "__serialized_#{k}="
+        if o.respond_to? m
+          o.send m, v
+        else
+          $stderr.puts "warning: unknown field #{k.inspect} in YAML for #{type}; ignoring"
+        end
+      end
       o.unchanged!
       o
     end
@@ -137,8 +145,8 @@ class ModelObject
     self
   end
 
-	def to_yaml opts={}
-		YAML::quick_emit(object_id, opts) do |out|
+  def to_yaml opts={}
+    YAML::quick_emit(object_id, opts) do |out|
       out.map(taguri, nil) do |map|
         self.class.fields.each do |f, fops|
           v = if @serialized_values.member?(f)
@@ -151,7 +159,7 @@ class ModelObject
         end
       end
     end
-	end
+  end
 
   def log what, who, comment
     add_log_event([Time.now, who, what, comment || ""])

data/lib/operator.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require "html"
 
 module Ditz
 
@@ -20,72 +19,79 @@ class Operator
     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
+    ## parse the specs, and the commandline arguments, and resolve them. does
+    ## typechecking but currently doesn't check for open_issues actually being
+    ## open, unstarted_issues being unstarted, etc. probably will check for
+    ## this in the future.
+    def build_args project, method, args
+      specs = @operations[method][:args_spec]
+      command = "command '#{method_to_op method}'"
 
-      releases.each do |r|
-        next if r.released? unless force_show
-        groups = project.group_issues(project.issues_for_release(r))
-        #next if groups.empty? unless force_show
-        ret << [r, groups]
+      if specs.empty? && args == ["<options>"]
+        die_with_completions project, method, nil
       end
 
-      return ret unless show_unassigned
-      groups = project.group_issues(project.unassigned_issues)
-      return ret if groups.empty? unless force_show
-      ret << [nil, groups]
-    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|
+      built_args = specs.map do |spec|
+        optional = spec.to_s =~ /^maybe_/
+        spec = spec.to_s.gsub(/^maybe_/, "").intern # :(
         val = args.shift
-        generate_choices(project, method, spec) if val == '<options>'
+
+        case val
+        when nil
+          next if optional
+          specname = spec.to_s.gsub("_", " ")
+          article = specname =~ /^[aeiou]/ ? "an" : "a"
+          raise Error, "#{command} requires #{article} #{specname}"
+        when "<options>"
+          die_with_completions project, method, spec
+        end
+
         case spec
-        when :issue
-          raise Error, "#{command} requires an issue name" unless val
+        when :issue, :open_issue, :unstarted_issue, :started_issue, :assigned_issue
+          ## issue completion sticks the title on there, so this will strip it off
           valr = val.sub(/\A(\w+-\d+)_.*$/,'\1')
           project.issue_for(valr) 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
-          project.release_for(val) or raise Error, "no release with name #{val}" if val
-        when :maybe_component
+        when :release, :unreleased_release
+          if val == "unassigned"
+            :unassigned
+          else
+            project.release_for(val) or raise Error, "no release with name #{val}"
+          end
+        when :component
           project.component_for(val) or raise Error, "no component with name #{val}" if val
-        when :magic_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
-      generate_choices(project, method, nil) if args.include? '<options>'
+
       raise Error, "too many arguments for #{command}" unless args.empty?
       built_args
     end
 
-    def generate_choices project, method, spec
-      case spec
-      when :issue
-        puts project.issues.map { |i| "#{i.name}_#{i.title.gsub(/\W+/, '-')}" }
-      when :release, :maybe_release
-        puts project.releases.map { |r| r.name }
-      end
+    def die_with_completions project, method, spec
+      puts(case spec
+      when :issue, :open_issue, :unstarted_issue, :started_issue, :assigned_issue
+        m = { :issue => nil,
+              :open_issue => :open?,
+              :unstarted_issue => :unstarted?,
+              :started_issue => :in_progress?,
+              :assigned_issue => :assigned?,
+            }[spec]
+        project.issues.select { |i| m.nil? || i.send(m) }.sort_by { |i| i.creation_time }.reverse.map { |i| "#{i.name}_#{i.title.gsub(/\W+/, '-')}" }
+      when :release
+        project.releases.map { |r| r.name } + ["unassigned"]
+      when :unreleased_release
+        project.releases.select { |r| r.unreleased? }.map { |r| r.name }
+      when :component
+        project.components.map { |c| c.name }
+      when :command
+        operations.map { |name, _| name }
+      else
+        ""
+      end)
       exit 0
     end
+    private :die_with_completions
   end
 
   def do op, project, config, args
@@ -126,8 +132,6 @@ EOS
     raise Error, "no such ditz command '#{command}'" unless name
     args = opts[:args_spec].map do |spec|
       case spec.to_s
-      when "magic_release"
-        "[release]"
       when /^maybe_(.*)$/
         "[#{$1}]"
       else
@@ -184,22 +188,17 @@ EOS
     puts "Added reference to #{issue.name}."
   end
 
-  operation :status, "Show project status", :magic_release
+  operation :status, "Show project status", :maybe_release
   def status project, config, releases
+    releases ||= project.unreleased_releases + [:unassigned]
+
     if releases.empty?
       puts "No releases."
       return
     end
 
-    ## TODO: remove weird and deprecated :maybe_release semantics
-    releases = releases.map { |r, groups| r }
-
     entries = releases.map do |r|
-      title, issues = if r
-        [r.name, project.issues_for_release(r)]
-      else
-        ["unassigned", project.unassigned_issues]
-      end
+      title, issues = (r == :unassigned ? r.to_s : r.name), project.issues_for_release(r)
 
       middle = Issue::TYPES.map do |type|
         type_issues = issues.select { |i| i.type == type }
@@ -209,7 +208,7 @@ EOS
         "%2d/%2d %s" % [nc, num, type.to_s.pluralize(num, false)]
       end
 
-      bar = if r && r.released?
+      bar = if r != :unassigned && r.released?
         "(released)"
       elsif issues.empty?
         "(no issues)"
@@ -257,24 +256,26 @@ EOS
     end.join
   end
 
-  operation :todo, "Generate todo list", :magic_release
+  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", :magic_release
+  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, releases, full
-    releases.each do |r, groups|
-      if r
-        puts "Version #{r.name} (#{r.status}):"
-      else
+    releases ||= project.unreleased_releases + [:unassigned]
+    releases = [*releases]
+    releases.each do |r|
+      if r == :unassigned
         puts "Unassigned:"
+      else
+        puts "Version #{r.name} (#{r.status}):"
       end
-      issues = groups.map { |_,g| g }.flatten
+      issues = project.issues_for_release r
       issues = issues.select { |i| i.open? } unless full
       puts(todo_list_for(issues.sort_by { |i| i.sort_order }) || "No open issues.")
       puts
@@ -283,37 +284,10 @@ EOS
 
   operation :show, "Describe a single issue", :issue
   def show project, config, issue
-    status = case issue.status
-    when :closed
-      "#{issue.status_string}: #{issue.disposition_string}"
-    else
-      issue.status_string
-    end
-    puts <<EOS
-#{"Issue #{issue.name}".underline}
-      Title: #{issue.title}
-Description: #{issue.desc.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}
-EOS
+    ScreenView.new(project, config).render_issue issue
   end
 
-  def format_log_events events
-    return "none" if events.empty?
-    events.map do |time, who, what, comment|
-      "- #{time.pretty} :: #{who}\n  #{what}#{comment.multiline "  > "}"
-    end.join("\n")
-  end
-
-  operation :start, "Start work on an issue", :issue
+  operation :start, "Start work on an issue", :unstarted_issue
   def start project, config, issue
     puts "Starting work on issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments" unless $opts[:no_comment]
@@ -321,7 +295,7 @@ EOS
     puts "Recorded start of work for #{issue.name}."
   end
 
-  operation :stop, "Stop work on an issue", :issue
+  operation :stop, "Stop work on an issue", :started_issue
   def stop project, config, issue
     puts "Stopping work on issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments" unless $opts[:no_comment]
@@ -329,7 +303,7 @@ EOS
     puts "Recorded work stop for #{issue.name}."
   end
 
-  operation :close, "Close an issue", :issue
+  operation :close, "Close an issue", :open_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 }
@@ -395,7 +369,7 @@ have changed as well.
 EOS
   end
 
-  operation :unassign, "Unassign an issue from any releases", :issue
+  operation :unassign, "Unassign an issue from any releases", :assigned_issue
   def unassign project, config, issue
     puts "Unassigning issue #{issue.name}: #{issue.title}."
     comment = ask_multiline "Comments" unless $opts[:no_comment]
@@ -424,7 +398,7 @@ EOS
     end
   end
 
-  operation :release, "Release a release", :release
+  operation :release, "Release a release", :unreleased_release
   def release project, config, release
     comment = ask_multiline "Comments" unless $opts[:no_comment]
     release.release! project, config.user, comment
@@ -448,69 +422,7 @@ EOS
   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
-    ## to the 'gem datadir' problem.
-    template_dir = $:.find { |p| File.exist? File.expand_path(File.join(p, "index.rhtml")) }
-    raise "can't find index.rhtml in any path" unless template_dir
-    template_dir = File.expand_path template_dir
-
-    FileUtils.cp File.join(template_dir, "style.css"), dir
-
-    ## build up links
-    links = {}
-    project.releases.each { |r| links[r] = "release-#{r.name}.html" }
-    project.issues.each { |i| links[i] = "issue-#{i.id}.html" }
-    project.components.each { |c| links[c] = "component-#{c.name}.html" }
-    links["unassigned"] = "unassigned.html" # special case: unassigned
-    links["index"] = "index.html" # special case: index
-
-    project.issues.each do |issue|
-      fn = File.join dir, links[issue]
-      puts "Generating #{fn}..."
-      File.open(fn, "w") do |f|
-        f.puts ErbHtml.new(template_dir, "issue", links, :issue => issue,
-          :release => (issue.release ? project.release_for(issue.release) : nil),
-          :component => project.component_for(issue.component),
-          :project => project)
-      end
-    end
-
-    project.releases.each do |r|
-      fn = File.join dir, links[r]
-      puts "Generating #{fn}..."
-      File.open(fn, "w") do |f|
-        f.puts ErbHtml.new(template_dir, "release", links, :release => r,
-          :issues => project.issues_for_release(r), :project => project)
-      end
-    end
-
-    project.components.each do |c|
-      fn = File.join dir, links[c]
-      puts "Generating #{fn}..."
-      File.open(fn, "w") do |f|
-        f.puts ErbHtml.new(template_dir, "component", links, :component => c,
-          :issues => project.issues_for_component(c), :project => project)
-      end
-    end
-
-    fn = File.join dir, links["unassigned"]
-    puts "Generating #{fn}..."
-    File.open(fn, "w") do |f|
-      f.puts ErbHtml.new(template_dir, "unassigned", links,
-        :issues => project.unassigned_issues, :project => project)
-    end
-
-    past_rels, upcoming_rels = project.releases.partition { |r| r.released? }
-    fn = File.join dir, links["index"]
-    puts "Generating #{fn}..."
-    File.open(fn, "w") do |f|
-      f.puts ErbHtml.new(template_dir, "index", links, :project => project,
-        :past_releases => past_rels, :upcoming_releases => upcoming_rels,
-        :components => project.components)
-    end
-    puts "Local generated URL: file://#{File.expand_path(fn)}"
+    HtmlView.new(project, config, dir).render_all
   end
 
   operation :validate, "Validate project status"
@@ -521,7 +433,10 @@ EOS
   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 }
+    issues = project.issues.select do |i|
+      i.title =~ re || i.desc =~ re ||
+        i.log_events.map { |time, who, what, comments| comments }.join(" ") =~ re
+    end
     puts(todo_list_for(issues) || "No matching issues.")
   end
 
@@ -536,7 +451,7 @@ author: #{author}
  issue: [#{i.name}] #{i.title}
 
   #{what}
-#{comment.multiline "  > ", false}
+#{comment.gsub(/^/, "  > ") unless comment =~ /^\A\s*\z/}
 EOS
     puts unless comment.blank?
     end