ditz 0.3 → 0.4

data/lib/plugins/git.rb

@@ -0,0 +1,101 @@
+require 'time'
+
+module Ditz
+class Issue
+  field :git_branch, :ask => false
+
+  def git_commits
+    return @git_commits if @git_commits
+
+    filters = ["--grep=\"Ditz-issue: #{id}\""]
+    filters << "master..#{git_branch}" if git_branch
+
+    output = filters.map do |f|
+      `git log --pretty=format:\"%aD\t%an <%ae>\t%h\t%s\" #{f}`
+    end.join
+
+    @git_commits = output.split(/\n/).map { |l| l.split("\t") }.
+      map { |date, email, hash, msg| [Time.parse(date).utc, email, hash, msg] }
+  end
+end
+
+class Config
+  field :git_commit_url_prefix, :prompt => "URL prefix (if any) to link git commits to"
+  field :git_branch_url_prefix, :prompt => "URL prefix (if any) to link git branches to"
+end
+
+class ScreenView
+  add_to_view :issue_summary do |issue, config|
+    " Git branch: #{issue.git_branch || 'none'}\n"
+  end
+
+  add_to_view :issue_details do |issue, config|
+    commits = issue.git_commits[0...5]
+    next if commits.empty?
+    "Recent commits:\n" + commits.map do |date, email, hash, msg|
+      "- #{msg} [#{hash}] (#{email.shortened_email}, #{date.ago} ago)\n"
+     end.join + "\n"
+  end
+end
+
+class HtmlView
+  add_to_view :issue_summary do |issue, config|
+    next unless issue.git_branch
+    [<<EOS, { :issue => issue, :url_prefix => config.git_branch_url_prefix }]
+<tr>
+  <td class='attrname'>Git branch:</td>
+  <td class='attrval'><%= url_prefix ? link_to([url_prefix, issue.git_branch].join, issue.git_branch) : h(issue.git_branch) %></td>
+</tr>
+EOS
+  end
+
+  add_to_view :issue_details do |issue, config|
+    commits = issue.git_commits
+    next if commits.empty?
+
+    [<<EOS, { :commits => commits, :url_prefix => config.git_commit_url_prefix }]
+<h2>Commits for this issue</h2>
+<table>
+<% commits.each_with_index do |(time, who, hash, msg), i| %>
+<% if i % 2 == 0 %>
+  <tr class="logentryeven">
+<% else %>
+  <tr class="logentryodd">
+<% end %>
+  <td class="logtime"><%=t time %></td>
+  <td class="logwho"><%=obscured_email who %></td>
+  <td class="logwhat"><%=h msg %> [<%= url_prefix ? link_to([url_prefix, hash].join, hash) : hash %>]</td>
+  </tr>
+<% end %>
+</table>
+EOS
+  end
+end
+
+class Operator
+  operation :set_branch, "Set the git feature branch of an issue", :issue, :maybe_string
+  def set_branch project, config, issue, maybe_string
+    puts "Issue #{issue.name} currently " + if issue.git_branch
+      "assigned to git branch #{issue.git_branch.inspect}."
+    else
+      "not assigned to any git branch."
+    end
+
+    branch = maybe_string || ask("Git feature branch name:")
+    return unless branch
+
+    if branch == issue.git_branch
+      raise Error, "issue #{issue.name} already assigned to branch #{issue.git_branch.inspect}"
+    end
+
+    puts "Assigning to branch #{branch.inspect}."
+    issue.git_branch = branch
+  end
+
+  operation :commit, "Runs git-commit and auto-fills the issue name in the commit message", :issue
+  def commit project, config, issue
+    exec "git commit -v -m \"Ditz-issue: #{issue.id}\" -e"
+  end
+end
+
+end

data/lib/style.css

@@ -7,11 +7,17 @@ body {
 	width: 90%;
 }
 
+div.wrapper {
+}
+
+div.footer {
+}
+
 a, a:visited {
 	border-bottom: 1px dotted #03c;
 	background: inherit;
-	color: #03c;
 	text-decoration: none;
+  color: #03c;
 }
 
 ul {
@@ -23,6 +29,20 @@ p {
   width: 40em;
 }
 
+.dimmed {
+  color: #bbb;
+}
+
+div.on-the-left {
+  float: left;
+  width: 39%;
+}
+
+div.on-the-right {
+  float: right;
+  width: 59%;
+}
+
 table {
   border-style: none;
   border-spacing: 0;
@@ -70,8 +90,23 @@ h1 {
   text-align: center;
 }
 
+.issuestatus_closed a {
+  color: #202020;
+}
+
+.issuestatus_in_progress a {
+  color: #202020;
+}
+
+.issuestatus_paused a {
+  color: #202020;
+}
+
+.issuestatus_unstarted a {
+  color: #202020;
+}
+
 .logwhat {
-  font-style: italic;
 }
 
 .logentryeven {
@@ -86,6 +121,7 @@ h1 {
   padding-left: 3em;
 }
 
-.footer {
+p.footer {
   font-size: small;
 }
+

data/lib/unassigned.rhtml

@@ -15,7 +15,7 @@
       <%= i.status_string %><% if i.closed? %>: <%= i.disposition_string %><% end %>
     </td>
     <td class="issuename">
-      <%= link_to i, i.title %>
+      <%= fancy_issue_link_for i %>
       <%= i.bug? ? '(bug)' : '' %>
     </td>
   </tr>

data/lib/util.rb

@@ -8,6 +8,10 @@ module Enumerable
   def min_of(&b); map(&b).min end
 end
 
+class Array
+  def uniq_by; inject({}) { |h, o| h[yield(o)] = o; h }.values end
+end
+
 module Enumerable
   def map_with_index # sigh...
     ret = []
@@ -50,3 +54,4 @@ class Array
     end
   end
 end
+

data/lib/view.rb

@@ -0,0 +1,16 @@
+module Ditz
+
+class View
+  def self.add_to_view type, &block
+    @views ||= {}
+    @views[type] ||= []
+    @views[type] << block
+  end
+
+  def self.view_additions_for type
+    @views ||= {}
+    @views[type] || []
+  end
+end
+
+end

data/lib/views.rb

@@ -0,0 +1,136 @@
+require 'view'
+require 'html'
+
+module Ditz
+
+class ScreenView < View
+  def initialize project, config, device=$stdout
+    @device = device
+    @config = config
+  end
+
+  def format_log_events events
+    return "none" if events.empty?
+    events.reverse.map do |time, who, what, comment|
+      "- #{what} (#{who.shortened_email}, #{time.ago} ago)" +
+      (comment =~ /\S/ ? "\n" + comment.gsub(/^/, "  > ") : "")
+    end.join("\n")
+  end
+  private :format_log_events
+
+  def render_issue issue
+    status = case issue.status
+    when :closed
+      "#{issue.status_string}: #{issue.disposition_string}"
+    else
+      issue.status_string
+    end
+    desc = if issue.desc.size < 80 - "Description: ".length
+      issue.desc
+    else
+      "\n" + issue.desc.gsub(/^/, "  ") + "\n"
+    end
+    @device.puts <<EOS
+#{"Issue #{issue.name}".underline}
+      Title: #{issue.title}
+Description: #{desc}
+       Type: #{issue.type}
+     Status: #{status}
+    Creator: #{issue.reporter}
+        Age: #{issue.creation_time.ago}
+    Release: #{issue.release}
+ References: #{issue.references.listify "  "}
+ Identifier: #{issue.id}
+EOS
+
+    self.class.view_additions_for(:issue_summary).each { |b| @device.print(b[issue, @config] || next) }
+    puts
+    self.class.view_additions_for(:issue_details).each { |b| @device.print(b[issue, @config] || next)  }
+
+    @device.puts <<EOS
+Event log:
+#{format_log_events issue.log_events}
+EOS
+  end
+end
+
+class HtmlView < View
+  def initialize project, config, dir
+    @project = project
+    @config = config
+    @dir = dir
+    @template_dir = File.dirname Ditz::find_ditz_file("index.rhtml")
+  end
+
+  def render_all
+    Dir.mkdir @dir unless File.exists? @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}..."
+
+      extra_summary = self.class.view_additions_for(:issue_summary).map { |b| b[issue, @config] }.compact
+      extra_details = self.class.view_additions_for(:issue_details).map { |b| b[issue, @config] }.compact
+
+      erb = ErbHtml.new(@template_dir, links, :issue => issue,
+        :release => (issue.release ? @project.release_for(issue.release) : nil),
+        :component => @project.component_for(issue.component),
+        :project => @project)
+
+      extra_summary_html = extra_summary.map { |string, extra_binding| erb.render_string string, extra_binding }.join
+      extra_details_html = extra_details.map { |string, extra_binding| erb.render_string string, extra_binding }.join
+
+      File.open(fn, "w") { |f| f.puts erb.render_template("issue", { :extra_summary_html => extra_summary_html, :extra_details_html => extra_details_html }) }
+    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, links, :release => r,
+          :issues => @project.issues_for_release(r), :project => @project).
+          render_template("release")
+      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, links, :component => c,
+          :issues => @project.issues_for_component(c), :project => @project).
+          render_template("component")
+      end
+    end
+
+    fn = File.join @dir, links["unassigned"]
+    #puts "Generating #{fn}..."
+    File.open(fn, "w") do |f|
+      f.puts ErbHtml.new(@template_dir, links,
+        :issues => @project.unassigned_issues, :project => @project).
+        render_template("unassigned")
+    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, links, :project => @project,
+        :past_releases => past_rels, :upcoming_releases => upcoming_rels,
+        :components => @project.components).
+        render_template("index")
+    end
+    puts "Local generated URL: file://#{File.expand_path(fn)}"
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ditz
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,23 +9,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-04 07:00:00 Z
+date: 2008-07-27 07:00:00 Z
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: trollop
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.7"
+        version: 1.8.2
     version: 
-description: "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 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 files, and some rudimentary HTML generation capabilities for producing world-readable status pages. It offers no central public method of bug submission.  Synopsis:  # set up project. creates the bugs.yaml file. 1. ditz init 2. ditz add-release  # add an issue 3. ditz add  # where am i? 4. ditz status 5. ditz todo  # do work 6. write code 7. ditz close <issue-id> 8. commit 9. goto 3  # finished! 10. ditz release <release-name>"
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
+description: "Ditz is a simple, light-weight distributed issue tracker designed to work with distributed version control systems like git, darcs, Mercurial, and Bazaar. It can also be used with centralized systems like SVN.  Ditz maintains an issue database directory on disk, with files written in a line-based and human-editable format. This directory can be kept under version control, alongside project code.  There are different ways to use ditz:  1. Treat issue change the same as code change: include it as part of commits, and merge it with changes from other developers. (Resolving conflicts in the usual manner.) 2. Keep the issue database in the repository but in a separate branch. Issue changes can be managed by your VCS, but is not tied directly to commits. 3. Keep the issue database separate and not under VCS at all.  Your particular usage will depend on what you want to get out of ditz.  Ditz provides a simple, console-based interface for creating and updating the issue database file, and some rudimentary HTML generation capabilities for producing world-readable status pages. It currently offers no central public method of bug submission.  Synopsis:  # set up project. creates the bugs.yaml file. 1. ditz init 2. ditz add-release"
 email: wmorgan-ditz@masanjin.net
 executables: 
 - ditz
-- ditz-convert-from-monolith
 extensions: []
 
 extra_rdoc_files: 
@@ -36,9 +46,9 @@ files:
 - Rakefile
 - ReleaseNotes
 - bin/ditz
-- bin/ditz-convert-from-monolith
 - lib/component.rhtml
 - lib/ditz.rb
+- lib/hook.rb
 - lib/html.rb
 - lib/index.rhtml
 - lib/issue.rhtml
@@ -51,7 +61,11 @@ files:
 - lib/style.css
 - lib/unassigned.rhtml
 - lib/util.rb
-- lib/hook.rb
+- lib/view.rb
+- lib/views.rb
+- lib/plugins/git.rb
+- contrib/completion/ditz.bash
+- contrib/completion/_ditz.zsh
 has_rdoc: true
 homepage: http://ditz.rubyforge.org
 post_install_message: 
@@ -75,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ditz
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 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.

data/bin/ditz-convert-from-monolith

@@ -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."