ditz 0.2 → 0.3

data/lib/issue.rhtml

@@ -9,13 +9,9 @@
 
 <%= link_to "index", "&laquo; #{project.name} project page" %>
 
-<h1><%= issue.title %></h1>
+<h1><%= link_issue_names project, issue.title %></h1>
 
-<%=
-  project.issues.inject(p(issue.desc)) do |s, i|
-    s.gsub(/\{issue #{i.id}\}/, link_to(i, i.title))
-  end.gsub(/\{issue \w+\}/, "[unknown issue]")
-%>
+<%= link_issue_names project, p(issue.desc) %>
 
 <table>
   <tr>
@@ -95,7 +91,7 @@
   <tr><td colspan="3" class="logcomment">
     <% if comment.empty? %>
     <% else %>
-      <%=p comment %>
+      <%= link_issue_names project, p(comment) %>
     <% end %>
   </td></tr>
 <% end %>

data/lib/lowline.rb

@@ -3,7 +3,7 @@ require "util"
 
 class Numeric
   def to_pretty_s
-    %w(no one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen sixteen seventeen eighteen nineteen)[self] || to_s
+    %w(zero one two three four five six seven eight nine ten)[self] || to_s
   end
 end
 
@@ -12,12 +12,17 @@ class NilClass
 end
 
 class String
-  def ucfirst; self[0..0].upcase + self[1..-1] end
   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=""; blank? ? "" : "\n" + self.gsub(/^/, prefix) end
-  def pluralize n; n.to_pretty_s + " " + (n == 1 ? self : self + "s") end # oh yeah
+  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 multistrip; strip.gsub(/\n\n+/, "\n\n") end
 end
 
@@ -82,8 +87,13 @@ module Lowline
     end
 
     while true
-      print [q, default_s, tail].compact.join
-      ans = gets.strip
+      prompt = [q, default_s, tail].compact.join
+      if Ditz::has_readline?
+        ans = Readline::readline(prompt)
+      else
+        print prompt
+        ans = gets.strip
+      end
       if opts[:default]
         ans = opts[:default] if ans.blank?
       else
@@ -109,16 +119,28 @@ module Lowline
     puts "#{q} (ctrl-d, ., or /stop to stop, /edit to edit, /reset to reset):"
     ans = ""
     while true
-      print "> "
-      case(line = gets) && line.strip!
-      when /^\.$/, nil, "/stop"
-        break
-      when "/reset"
-        return ask_multiline(q)
-      when "/edit"
-        return ask_via_editor(q, ans)
+      if Ditz::has_readline?
+        line = Readline::readline('> ')
+      else
+        (line = gets) && line.strip!
+      end
+      if line
+        if Ditz::has_readline?
+          Readline::HISTORY.push(line)
+        end
+        case line
+        when /^\.$/, "/stop"
+          break
+        when "/reset"
+          return ask_multiline(q)
+        when "/edit"
+          return ask_via_editor(q, ans)
+        else
+          ans << line + "\n"
+        end
       else
-        ans << line + "\n"
+        puts
+        break
       end
     end
     ans.multistrip
@@ -148,10 +170,10 @@ module Lowline
       ans = ask "(A)dd #{name}, (r)emove #{name}, or (d)one"
       case ans
       when "a", "A"
-        ans = ask "#{name.ucfirst} name", ""
+        ans = ask "#{name.capitalize} name", ""
         stuff << ans unless ans =~ /^\s*$/
       when "r", "R"
-        ans = ask "Remove which component? (1--#{stuff.size})"
+        ans = ask "Remove which #{name}? (1--#{stuff.size})"
         stuff.delete_at(ans.to_i - 1) if ans
       when "d", "D"
         break
@@ -177,7 +199,7 @@ module Lowline
     end
 
     j = while true
-      i = ask "#{name.ucfirst} (1--#{stuff.size})"
+      i = ask "#{name.capitalize} (1--#{stuff.size})"
       break i.to_i if i && (1 .. stuff.size).member?(i.to_i)
     end
 

data/lib/model-objects.rb

@@ -4,7 +4,7 @@ module Ditz
 
 class Component < ModelObject
   field :name
-  def name_prefix; @name.gsub(/\s+/, "-").downcase end
+  def name_prefix; name.gsub(/\s+/, "-").downcase end
 end
 
 class Release < ModelObject
@@ -36,6 +36,8 @@ end
 class Project < ModelObject
   class Error < StandardError; end
 
+  attr_accessor :pathname
+
   field :name, :default_generator => lambda { File.basename(Dir.pwd) }
   field :version, :default => Ditz::VERSION, :ask => false
   field :components, :multi => true, :generator => :get_components
@@ -83,6 +85,10 @@ EOS
     issues.select { |i| i.release.nil? }
   end
 
+  def group_issues these_issues=issues
+    these_issues.group_by { |i| i.type }.sort_by { |(t,g)| Issue::TYPE_ORDER[t] }
+  end
+
   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
@@ -93,7 +99,7 @@ EOS
 
   def validate!
     if(dup = components.map { |c| c.name }.first_duplicate)
-      raise Error, "more than one component named #{dup.inspect}"
+      raise Error, "more than one component named #{dup.inspect}: #{components.inspect}"
     elsif(dup = releases.map { |r| r.name }.first_duplicate)
       raise Error, "more than one release named #{dup.inspect}"
     end
@@ -116,27 +122,54 @@ class Issue < ModelObject
   field :id, :ask => false, :generator => :make_id
   changes_are_logged
 
-  attr_accessor :name
+  attr_accessor :name, :pathname, :project
+
+  ## these are the fields we interpolate issue names on
+  INTERPOLATED_FIELDS = [:title, :desc, :log_events]
 
   STATUS_SORT_ORDER = { :unstarted => 2, :paused => 1, :in_progress => 0, :closed => 3 }
   STATUS_WIDGET = { :unstarted => "_", :in_progress => ">", :paused => "=", :closed => "x" }
   DISPOSITIONS = [ :fixed, :wontfix, :reorg ]
-  TYPES = [ :bugfix, :feature ]
+  TYPES = [ :bugfix, :feature, :task ]
+  TYPE_ORDER = { :bugfix => 0, :feature => 1, :task => 2 }
+  TYPE_LETTER = { 'b' => :bugfix, 'f' => :feature, 't' => :task }
   STATUSES = STATUS_WIDGET.keys
 
   STATUS_STRINGS = { :in_progress => "in progress", :wontfix => "won't fix" }
   DISPOSITION_STRINGS = { :wontfix => "won't fix", :reorg => "reorganized" }
 
-  def before_serialize project
-    self.desc = project.issues.inject(desc) do |s, i|
-      s.gsub(/\b#{i.name}\b/, "{issue #{i.id}}")
+  def serialized_form_of field, value
+    return super unless INTERPOLATED_FIELDS.member? field
+
+    if field == :log_events
+      value.map do |time, who, what, comment|
+        comment = @project.issues.inject(comment) do |s, i|
+          s.gsub(/\b#{i.name}\b/, "{issue #{i.id}}")
+        end
+        [time, who, what, comment]
+      end
+    else
+      @project.issues.inject(value) do |s, i|
+        s.gsub(/\b#{i.name}\b/, "{issue #{i.id}}")
+      end
     end
   end
 
-  def interpolated_desc issues
-    issues.inject(desc) do |s, i|
-      s.gsub(/\{issue #{i.id}\}/, block_given? ? yield(i) : i.name)
-    end.gsub(/\{issue \w+\}/, "[unknown issue]")
+  def deserialized_form_of field, value
+    return super unless INTERPOLATED_FIELDS.member? field
+
+    if field == :log_events
+      value.map do |time, who, what, comment|
+        comment = @project.issues.inject(comment) do |s, i|
+          s.gsub(/\{issue #{i.id}\}/, i.name)
+        end.gsub(/\{issue \w+\}/, "[unknown issue]")
+        [time, who, what, comment]
+      end
+    else
+      @project.issues.inject(value) do |s, i|
+        s.gsub(/\{issue #{i.id}\}/, i.name)
+      end.gsub(/\{issue \w+\}/, "[unknown issue]")
+    end
   end
 
   ## make a unique id
@@ -144,8 +177,8 @@ class Issue < ModelObject
     SHA1.hexdigest [Time.now, rand, creation_time, reporter, title, desc].join("\n")
   end
 
-  def sort_order; [STATUS_SORT_ORDER[@status], creation_time] end
-  def status_widget; STATUS_WIDGET[@status] end
+  def sort_order; [STATUS_SORT_ORDER[status], creation_time] end
+  def status_widget; STATUS_WIDGET[status] end
 
   def status_string; STATUS_STRINGS[status] || status.to_s end
   def disposition_string; DISPOSITION_STRINGS[disposition] || disposition.to_s end
@@ -172,7 +205,7 @@ class Issue < ModelObject
   def change_status to, who, comment
     raise Error, "unknown status #{to}" unless STATUSES.member? to
     raise Error, "already marked as #{to}" if status == to
-    log "changed status from #{@status} to #{to}", who, comment
+    log "changed status from #{status} to #{to}", who, comment
     self.status = to
   end
   private :change_status
@@ -205,6 +238,11 @@ class Issue < ModelObject
     self.release = release.name
   end
 
+  def assign_to_component component, who, comment
+    log "assigned to component #{component.name} from #{self.component}", who, comment
+    self.component = component.name
+  end
+
   def unassign who, comment
     raise Error, "not assigned to a release" unless release
     log "unassigned from release #{release}", who, comment
@@ -212,8 +250,8 @@ class Issue < ModelObject
   end
 
   def get_type config, project
-    type = ask "Is this a (b)ugfix or a (f)eature?", :restrict => /^[bf]$/
-    type == "b" ? :bugfix : :feature
+    type = ask "Is this a (b)ugfix, a (f)eature, or a (t)ask?", :restrict => /^[bft]$/
+    TYPE_LETTER[type]
   end
 
   def get_component config, project
@@ -245,18 +283,20 @@ end
 class Config < ModelObject
   field :name, :prompt => "Your name", :default_generator => :get_default_name
   field :email, :prompt => "Your email address", :default_generator => :get_default_email
+  field :issue_dir, :ask => false, :default => "bugs"
 
   def user; "#{name} <#{email}>" end
 
   def get_default_name
     require 'etc'
 
-    name = Etc.getpwnam(ENV["USER"]).gecos.split(/,/).first
+    name = Etc.getpwnam(ENV["USER"])
+    name = name ? name.gecos.split(/,/).first : ""
   end
 
   def get_default_email
     require 'socket'
-    email = ENV["USER"] + "@" + 
+    email = (ENV["USER"] || "") + "@" +
       begin
         Socket.gethostbyname(Socket.gethostname).first
       rescue SocketError

data/lib/model.rb

@@ -1,7 +1,7 @@
 require 'yaml'
+require 'sha1'
 require "lowline"; include Lowline
 require "util"
-require 'sha1'
 
 class Time
   alias :old_to_yaml :to_yaml
@@ -15,47 +15,83 @@ module Ditz
 class ModelObject
   class ModelError < StandardError; end
 
+  def initialize
+    @values = {}
+    @serialized_values = {}
+  end
+
   ## yamlability
   def self.yaml_domain; "ditz.rubyforge.org,2008-03-06" end
   def self.yaml_other_thing; name.split('::').last.dcfirst end
   def to_yaml_type; "!#{self.class.yaml_domain}/#{self.class.yaml_other_thing}" end
-  def to_yaml_properties; self.class.fields.map { |f| "@#{f.to_s}" } end
   def self.inherited subclass
     YAML.add_domain_type(yaml_domain, subclass.yaml_other_thing) do |type, val|
-      YAML.object_maker(subclass, val)
+      o = subclass.new
+      val.each { |k, v| o.send "__serialized_#{k}=", v }
+      o.unchanged!
+      o
     end
   end
-  def before_serialize(*a); end
-  def after_deserialize(*a); end
 
+  ## override these two to model per-field transformations between disk and
+  ## memory.
+  ##
+  ## convert disk form => memory form
+  def deserialized_form_of field, value
+    @serialized_values[field]
+  end
+
+  ## convert memory form => disk form
+  def serialized_form_of field, value
+    @values[field]
+  end
+
+  ## add a new field to a model object
   def self.field name, opts={}
-    @fields ||= [] # can't use a hash because want to preserve field order when serialized
+    @fields ||= [] # can't use a hash because we need to preserve field order
     raise ModelError, "field with name #{name} already defined" if @fields.any? { |k, v| k == name }
     @fields << [name, opts]
 
-    attr_reader name
     if opts[:multi]
       single_name = name.to_s.sub(/s$/, "") # oh yeah
       define_method "add_#{single_name}" do |obj|
-        array = self.instance_variable_get("@#{name}")
+        array = send(name)
         raise ModelError, "already has a #{single_name} with name #{obj.name.inspect}" if obj.respond_to?(:name) && array.any? { |o| o.name == obj.name }
         changed!
+        @serialized_values.delete name
         array << obj
       end
 
       define_method "drop_#{single_name}" do |obj|
-        return unless self.instance_variable_get("@#{name}").delete obj
+        return unless @values[name].delete obj
+        @serialized_values.delete name
         changed!
         obj
       end
     end
+
     define_method "#{name}=" do |o|
       changed!
-      instance_variable_set "@#{name}", o
+      @serialized_values.delete name
+      @values[name] = o
+    end
+
+    define_method "__serialized_#{name}=" do |o|
+      changed!
+      @values.delete name
+      @serialized_values[name] = o
+    end
+
+    define_method name do
+      return @values[name] if @values.member?(name)
+      @values[name] = deserialized_form_of name, @serialized_values[name]
     end
   end
 
-  def self.fields; @fields.map { |name, opts| name } end
+  def self.field_names; @fields.map { |name, opts| name } end
+  class << self
+    attr_reader :fields, :values, :serialized_values
+  end
 
   def self.changes_are_logged
     define_method(:changes_are_logged?) { true }
@@ -65,9 +101,16 @@ class ModelObject
   def self.from fn
     returning YAML::load_file(fn) do |o|
       raise ModelError, "error loading from yaml file #{fn.inspect}: expected a #{self}, got a #{o.class}" unless o.class == self
+      o.pathname = fn if o.respond_to? :pathname=
     end
   end
 
+  def to_s
+    "<#{self.class.name}: " + self.class.field_names.map { |f| "#{f}: " + (@values[f].to_s || @serialized_values[f]).inspect }.join(", ") + ">"
+  end
+
+  def inspect; to_s end
+
   ## depth-first search on all reachable ModelObjects. fuck yeah.
   def each_modelobject
     seen = {}
@@ -76,7 +119,7 @@ class ModelObject
       cur = to_see.pop
       seen[cur] = true
       yield cur
-      cur.class.fields.each do |f|
+      cur.class.field_names.each do |f|
         val = cur.send(f)
         next if seen[val]
         if val.is_a?(ModelObject)
@@ -91,15 +134,33 @@ class ModelObject
   def save! fn
     #FileUtils.mv fn, "#{fn}~", :force => true rescue nil
     File.open(fn, "w") { |f| f.puts to_yaml }
+    self
   end
 
+	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)
+            @serialized_values[f]
+          else
+            @serialized_values[f] = serialized_form_of f, @values[f]
+          end
+
+          map.add f.to_s, v
+        end
+      end
+    end
+	end
+
   def log what, who, comment
-    add_log_event([Time.now, who, what, comment])
+    add_log_event([Time.now, who, what, comment || ""])
     self
   end
 
   def changed?; @changed ||= false end
   def changed!; @changed = true end
+  def unchanged!; @changed = false end
 
   def self.create_interactively opts={}
     o = self.new
@@ -114,7 +175,7 @@ class ModelObject
       elsif field_opts[:ask] == false # nil counts as true here
         field_opts[:default] || (field_opts[:multi] ? [] : nil)
       else
-        q = field_opts[:prompt] || name.to_s.ucfirst
+        q = field_opts[:prompt] || name.to_s.capitalize
         if field_opts[:multiline]
           ask_multiline q
         else