ditz 0.2 → 0.3

data/lib/operator.rb

@@ -34,24 +34,15 @@ class Operator
 
       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]
+        groups = project.group_issues(project.issues_for_release(r))
+        #next if groups.empty? unless force_show
+        ret << [r, groups]
       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]
+      groups = project.group_issues(project.unassigned_issues)
+      return ret if groups.empty? unless force_show
+      ret << [nil, groups]
     end
     private :parse_releases_arg
 
@@ -59,14 +50,20 @@ class Operator
       command = "command '#{method_to_op method}'"
       built_args = @operations[method][:args_spec].map do |spec|
         val = args.shift
+        generate_choices(project, method, spec) if val == '<options>'
         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}"
+          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
+          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
@@ -75,9 +72,20 @@ class Operator
           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
+      exit 0
+    end
   end
 
   def do op, project, config, args
@@ -118,6 +126,8 @@ 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
@@ -131,26 +141,27 @@ Usage: ditz #{name} #{args}
 EOS
   end
 
-  operation :add, "Add a bug/feature request"
+  operation :add, "Add an issue"
   def add project, config
     issue = Issue.create_interactively(:args => [config, project]) or return
-    comment = ask_multiline "Comments"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.log "created", config.user, comment
     project.add_issue issue
     project.assign_issue_names!
     puts "Added issue #{issue.name}."
   end
 
-  operation :drop, "Drop a bug/feature request", :issue
+  operation :drop, "Drop an issue", :issue
   def drop project, config, issue
     project.drop_issue issue
     puts "Dropped #{issue.name}. Note that other issue names may have changed."
   end
 
-  operation :add_release, "Add a release"
-  def add_release project, config
-    release = Release.create_interactively(:args => [project, config]) or return
-    comment = ask_multiline "Comments"
+  operation :add_release, "Add a release", :maybe_name
+  def add_release project, config, maybe_name
+    puts "Adding release #{maybe_name}." if maybe_name
+    release = Release.create_interactively(:args => [project, config], :with => { :name => maybe_name }) or return
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     release.log "created", config.user, comment
     project.add_release release
     puts "Added release #{release.name}."
@@ -167,39 +178,67 @@ EOS
   def add_reference project, config, issue
     puts "Adding a reference to #{issue.name}: #{issue.title}."
     reference = ask "Reference"
-    comment = ask_multiline "Comments"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.add_reference reference
     issue.log "added reference #{issue.references.size}", config.user, comment
     puts "Added reference to #{issue.name}."
   end
 
-  operation :status, "Show project status", :maybe_release
+  operation :status, "Show project status", :magic_release
   def status project, config, releases
-    releases.each do |r, bugs, feats|
-      title, bar = [r ? r.name : "unassigned", status_bar_for(bugs + feats)]
+    if releases.empty?
+      puts "No releases."
+      return
+    end
+
+    ## TODO: remove weird and deprecated :maybe_release semantics
+    releases = releases.map { |r, groups| r }
 
-      ncbugs = bugs.count_of { |b| b.closed? }
-      ncfeats = feats.count_of { |f| f.closed? }
-      pcbugs = 100.0 * (bugs.empty? ? 1.0 : ncbugs.to_f / bugs.size)
-      pcfeats = 100.0 * (feats.empty? ? 1.0 : ncfeats.to_f / feats.size)
+    entries = releases.map do |r|
+      title, issues = if r
+        [r.name, project.issues_for_release(r)]
+      else
+        ["unassigned", project.unassigned_issues]
+      end
 
-      special = if r && r.released?
+      middle = Issue::TYPES.map do |type|
+        type_issues = issues.select { |i| i.type == type }
+        num = type_issues.size
+        nc = type_issues.count_of { |i| i.closed? }
+        pc = 100.0 * (type_issues.empty? ? 1.0 : nc.to_f / num)
+        "%2d/%2d %s" % [nc, num, type.to_s.pluralize(num, false)]
+      end
+
+      bar = if r && r.released?
         "(released)"
-      elsif bugs.empty? && feats.empty?
+      elsif issues.empty?
         "(no issues)"
-      elsif ncbugs == bugs.size && ncfeats == feats.size
+      elsif issues.all? { |i| i.closed? }
         "(ready for release)"
       else
-        bar
+        status_bar_for(issues)
       end
 
-      printf "%-10s %2d/%2d (%3.0f%%) bugs, %2d/%2d (%3.0f%%) features %s\n",
-        title, ncbugs, bugs.size, pcbugs, ncfeats, feats.size, pcfeats, special
+      [title, middle, bar]
     end
 
-    if project.releases.empty?
-      puts "No releases."
-      return
+    title_size = 0
+    middle_sizes = []
+
+    entries.each do |title, middle, bar|
+      title_size = [title_size, title.length].max
+      middle_sizes = middle.zip(middle_sizes).map do |e, s|
+        [s || 0, e.length].max
+      end
+    end
+
+    entries.each do |title, middle, bar|
+      printf "%-#{title_size}s ", title
+      middle.zip(middle_sizes).each_with_index do |(e, s), i|
+        sep = i < middle.size - 1 ? "," : ""
+        printf "%-#{s + sep.length}s ", e + sep
+      end
+      puts bar
     end
   end
 
@@ -218,24 +257,24 @@ EOS
     end.join
   end
 
-  operation :todo, "Generate todo list", :maybe_release
+  operation :todo, "Generate todo list", :magic_release
   def todo project, config, releases
     actually_do_todo project, config, releases, false
   end
 
-  operation :todo_full, "Generate full todo list, including completed items", :maybe_release
+  operation :todo_full, "Generate full todo list, including completed items", :magic_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, bugs, feats|
+    releases.each do |r, groups|
       if r
         puts "Version #{r.name} (#{r.status}):"
       else
         puts "Unassigned:"
       end
-      issues = bugs + feats
+      issues = groups.map { |_,g| g }.flatten
       issues = issues.select { |i| i.open? } unless full
       puts(todo_list_for(issues.sort_by { |i| i.sort_order }) || "No open issues.")
       puts
@@ -253,7 +292,7 @@ EOS
     puts <<EOS
 #{"Issue #{issue.name}".underline}
       Title: #{issue.title}
-Description: #{issue.interpolated_desc(project.issues).multiline "  "}
+Description: #{issue.desc.multiline "  "}
        Type: #{issue.type}
      Status: #{status}
     Creator: #{issue.reporter}
@@ -277,7 +316,7 @@ EOS
   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"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.start_work config.user, comment
     puts "Recorded start of work for #{issue.name}."
   end
@@ -285,7 +324,7 @@ EOS
   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"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.stop_work config.user, comment
     puts "Recorded work stop for #{issue.name}."
   end
@@ -294,37 +333,72 @@ EOS
   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"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.close disp, config.user, comment
     puts "Closed issue #{issue.name} with disposition #{issue.disposition_string}."
   end
 
-  operation :assign, "Assign an issue to a release", :issue
-  def assign project, config, issue
+  operation :assign, "Assign an issue to a release", :issue, :maybe_release
+  def assign project, config, issue, maybe_release
+    if maybe_release && maybe_release.name == issue.release
+      raise Error, "issue #{issue.name} already assigned to release #{issue.release}"
+    end
+
     puts "Issue #{issue.name} currently " + if issue.release
       "assigned to release #{issue.release}."
     else
       "not assigned to any release."
     end
 
-    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)"
+    puts "Assigning to release #{maybe_release.name}." if maybe_release
+
+    release = maybe_release || begin
+      releases = project.releases.sort_by { |r| (r.release_time || 0).to_i }
+      releases -= [releases.find { |r| r.name == issue.release }] if issue.release
+      ask_for_selection(releases, "release") do |r|
+        r.name + if r.released?
+          " (released #{r.release_time.pretty_date})"
+        else
+          " (unreleased)"
+        end
       end
     end
-    comment = ask_multiline "Comments"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.assign_to_release release, config.user, comment
     puts "Assigned #{issue.name} to #{release.name}."
   end
 
+  operation :set_component, "Set an issue's component", :issue, :maybe_component
+  def set_component project, config, issue, maybe_component
+    puts "Changing the component of issue #{issue.name}: #{issue.title}."
+
+    if project.components.size == 1
+      raise Error, "this project does not use multiple components"
+    end
+
+    if maybe_component && maybe_component.name == issue.component
+      raise Error, "issue #{issue.name} already assigned to component #{issue.component}"
+    end
+
+    component = maybe_component || begin
+      components = project.components
+      components -= [components.find { |r| r.name == issue.component }] if issue.component
+      ask_for_selection(components, "component") { |r| r.name }
+    end
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
+    issue.assign_to_component component, config.user, comment
+    oldname = issue.name
+    project.assign_issue_names!
+    puts <<EOS
+Issue #{oldname} is now #{issue.name}. Note that the names of other issues may
+have changed as well.
+EOS
+  end
+
   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"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.unassign config.user, comment
     puts "Unassigned #{issue.name}."
   end
@@ -333,8 +407,12 @@ EOS
   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}."
+    if comment.blank?
+      puts "Empty comment, aborted."
+    else
+      issue.log "commented", config.user, comment
+      puts "Comments recorded for #{issue.name}."
+    end
   end
 
   operation :releases, "Show releases"
@@ -348,17 +426,23 @@ EOS
 
   operation :release, "Release a release", :release
   def release project, config, release
-    comment = ask_multiline "Comments"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
     release.release! project, config.user, comment
     puts "Release #{release.name} released!"
   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}" }
+    project.group_issues(project.issues_for_release(r)).each do |type, issues|
+      issues.select { |i| i.closed? }.each do |i|
+        if type == :bugfix
+          puts "* #{type}: #{i.title}"
+        else
+          puts "* #{i.title}"
+        end
+      end
+    end
   end
 
   operation :html, "Generate html status pages", :maybe_dir
@@ -368,7 +452,9 @@ EOS
 
     ## find the ERB templates. this is my brilliant approach
     ## to the 'gem datadir' problem.
-    template_dir = $:.find { |p| File.exists? File.join(p, "index.rhtml") }
+    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
 
@@ -447,15 +533,42 @@ EOS
       puts <<EOS
 date  : #{date.localtime} (#{date.ago} ago)
 author: #{author}
+ issue: [#{i.name}] #{i.title}
 
-  #{i.name}: #{i.title}
   #{what}
-  #{comment.multiline "  "}
+#{comment.multiline "  > ", false}
 EOS
     puts unless comment.blank?
     end
   end
 
+  operation :shortlog, "Show recent activity (short form)"
+  def shortlog 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|
+        shortauthor = if author =~ /<(.*?)@/
+          $1
+        else
+          author
+        end[0..15]
+        printf "%13s|%13s|%13s|%s\n", date.ago, i.name, shortauthor,
+          what
+      end
+  end
+
+  operation :archive, "Archive a release", :release, :maybe_dir
+  def archive project, config, release, dir
+    dir ||= "ditz-archive-#{release.name}"
+    FileUtils.mkdir dir
+    FileUtils.cp project.pathname, dir
+    project.issues_for_release(release).each do |i|
+      FileUtils.cp i.pathname, dir
+      project.drop_issue i
+    end
+    puts "Archived to #{dir}."
+  end
+
   operation :edit, "Edit an issue", :issue
   def edit project, config, issue
     data = { :title => issue.title, :description => issue.desc,
@@ -468,7 +581,7 @@ EOS
       return
     end
 
-    comment = ask_multiline "Comments"
+    comment = ask_multiline "Comments" unless $opts[:no_comment]
 
     begin
       edits = YAML.load_file fn

data/lib/release.rhtml

@@ -55,7 +55,7 @@
   <tr><td colspan="3" class="logcomment">
     <% if comment.empty? %>
     <% else %>
-      <%=p comment %>
+      <%= link_issue_names project, p(comment) %>
     <% end %>
   </td></tr>
 <% end %>