ditz 0.4 → 0.5

data/lib/issue_table.rhtml

@@ -1,33 +1,28 @@
 <table>
-<% issues.sort_by { |i| i.sort_order }.each do |i| %>
-  <tr>
-    <td class="issuestatus_<%= i.status %>">
-      <% if i.closed? %>
-        <%= i.disposition_string %>
-      <% else %>
-        <%= i.status_string %>
-      <% end %>
-    </td>
-    <td class="issuename">
-      <%= fancy_issue_link_for i %>
-      <%= i.bug? ? '(bug)' : '' %>
-    </td>
-    <% if show_release %>
-      <td class="issuerelease">
-        <% if i.release %>
-          <% r = project.release_for i.release %>
-          in <%= link_to r, "release #{i.release}" %>
-          (<%= r.status %>)
-        <% else %>
-        <% end %>
-      </td>
-    <% end %>
-    <% if show_component %>
-      <td class="issuecomponent">
-        component <%= link_to project.component_for(i.component), i.component %>
+  <tbody>
+  <% issues.sort_by { |i| i.creation_time }.reverse.each do |i| %>
+    <tr>
+      <td> <%= issue_status_img_for i %> </td>
+      <td class="littledate"><%= i.creation_time.pretty_date %></td>
+      <td class="issuename">
+        <%= issue_link_for i %>
       </td>
-    <% end %>
-  </tr>
-<% end %>
+      <% if show_release %>
+        <td class="issuerelease">
+          <% if i.release %>
+            <% r = project.release_for i.release %>
+            <%= link_to r, i.release %>
+          <% else %>
+          <% end %>
+        </td>
+      <% end %>
+      <% if show_component %>
+        <td class="issuecomponent">
+          component <%= link_to project.component_for(i.component), i.component %>
+        </td>
+      <% end %>
+    </tr>
+  <% end %>
+  </tbody>
 </table>
 

data/lib/lowline.rb

@@ -85,7 +85,7 @@ module Lowline
         ans = Readline::readline(prompt)
       else
         print prompt
-        ans = gets.strip
+        ans = STDIN.gets.strip
       end
       if opts[:default]
         ans = opts[:default] if ans.blank?
@@ -98,11 +98,10 @@ module Lowline
 
   def ask_via_editor q, default=nil
     fn = run_editor do |f|
+      f.puts(default || "")
       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
+      f.puts "## Enter your text above. Lines starting with a '#' will be ignored."
     end
     return unless fn
     IO.read(fn).gsub(/^#.*$/, "").multistrip
@@ -115,7 +114,7 @@ module Lowline
       if Ditz::has_readline?
         line = Readline::readline('> ')
       else
-        (line = gets) && line.strip!
+        (line = STDIN.gets) && line.strip!
       end
       if line
         if Ditz::has_readline?
@@ -142,7 +141,7 @@ module Lowline
   def ask_yon q
     while true
       print "#{q} (y/n): "
-      a = gets.strip
+      a = STDIN.gets.strip
       break a if a =~ /^[yn]$/i
     end =~ /y/i
   end

data/lib/model-objects.rb

@@ -36,17 +36,37 @@ end
 class Project < ModelObject
   class Error < StandardError; end
 
-  attr_accessor :pathname
-
-  field :name, :default_generator => lambda { File.basename(Dir.pwd) }
+  field :name, :prompt => "Project name", :default_generator => lambda { File.basename(Dir.pwd) }
   field :version, :default => Ditz::VERSION, :ask => false
   field :components, :multi => true, :generator => :get_components
   field :releases, :multi => true, :ask => false
 
+  attr_accessor :pathname
+
   ## 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
+  attr_reader :issues
+  def issues= issues
+    @issues = issues
+    @issues.each { |i| i.project = self }
+    assign_issue_names!
+    issues
+  end
+
+  def add_issue issue
+    added_issues << issue
+    issues << issue
+    issue.project = self
+    assign_issue_names!
+    issue
+  end
+
+  def drop_issue issue
+    if issues.delete issue
+      deleted_issues << issue
+      assign_issue_names!
+    end
+  end
+
   def added_issues; @added_issues ||= [] end
   def deleted_issues; @deleted_issues ||= [] end
 
@@ -61,8 +81,9 @@ EOS
     ([name] + comp_names).uniq.map { |n| Component.create_interactively :with => { :name => n } }
   end
 
-  def issue_for issue_name
-    issues.find { |i| i.name == issue_name }
+  def issues_for ident
+    by_name = issues.find { |i| i.name == ident }
+    by_name ? [by_name] : issues.select { |i| i.id =~ /^#{Regexp::escape ident}/ }
   end
 
   def component_for component_name
@@ -106,6 +127,12 @@ EOS
       raise Error, "more than one release named #{dup.inspect}"
     end
   end
+
+  def self.from *a
+    p = super(*a)
+    p.validate!
+    p
+  end
 end
 
 class Issue < ModelObject
@@ -193,6 +220,7 @@ class Issue < ModelObject
   def feature?; type == :feature end
   def unassigned?; release.nil? end
   def assigned?; !unassigned? end
+  def paused?; status == :paused end
 
   def start_work who, comment; change_status :in_progress, who, comment end
   def stop_work who, comment
@@ -215,27 +243,29 @@ class Issue < ModelObject
   end
   private :change_status
 
-  def change hash, who, comment
+  def change hash, who, comment, silent
     what = []
     if title != hash[:title]
-      what << "changed title"
+      what << "title"
       self.title = hash[:title]
     end
 
     if desc != hash[:description]
-      what << "changed description"
+      what << "description"
       self.desc = hash[:description]
     end
 
     if reporter != hash[:reporter]
-      what << "changed reporter"
+      what << "reporter"
       self.reporter = hash[:reporter]
     end
 
-    unless what.empty?
-      log what.join(", "), who, comment
+    unless what.empty? || silent
+      log "edited " + what.join(", "), who, comment
       true
     end
+
+    !what.empty?
   end
 
   def assign_to_release release, who, comment
@@ -288,15 +318,18 @@ 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"
+  field :issue_dir, :prompt => "Directory to store issues state in", :default => "bugs"
 
   def user; "#{name} <#{email}>" end
 
   def get_default_name
     require 'etc'
 
-    name = Etc.getpwnam(ENV["USER"])
-    name = name ? name.gecos.split(/,/).first : ""
+    name = if ENV["USER"]
+      pwent = Etc.getpwnam ENV["USER"]
+      pwent ? pwent.gecos.split(/,/).first : nil
+    end
+    name || "Ditz User"
   end
 
   def get_default_email

data/lib/model.rb

@@ -90,6 +90,10 @@ class ModelObject
       @serialized_values[name] = o
     end
 
+    define_method "__serialized_#{name}" do
+      @serialized_values[name]
+    end
+
     define_method name do
       return @values[name] if @values.member?(name)
       @values[name] = deserialized_form_of name, @serialized_values[name]
@@ -110,6 +114,14 @@ class ModelObject
     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=
+
+      o.class.fields.each do |f, opts|
+        m = "__serialized_#{f}"
+        if opts[:multi] && o.send(m).nil?
+          $stderr.puts "Warning: corrected nil multi-field #{f}"
+          o.send "#{m}=", []
+        end
+      end
     end
   end
 
@@ -170,37 +182,83 @@ class ModelObject
   def changed!; @changed = true end
   def unchanged!; @changed = false end
 
-  def self.create_interactively opts={}
-    o = self.new
-    args = opts[:args] || []
-    @fields.each do |name, field_opts|
-      val = if opts[:with] && opts[:with][name]
-        opts[:with][name]
-      elsif field_opts[:generator].is_a? Proc
-        field_opts[:generator].call(*args)
-      elsif field_opts[:generator]
-        o.send field_opts[:generator], *args
-      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.capitalize
-        if field_opts[:multiline]
-          ask_multiline q
+  class << self
+    ## creates the object, prompting the user when necessary. can take
+    ## a :with => { hash } parameter for pre-filling model fields.
+    ##
+    ## can also take a :defaults_from => obj parameter for pre-filling model
+    ## fields from another object with (some of) those fields. kinda like a
+    ## bizarre interactive copy constructor.
+    def create_interactively opts={}
+      o = self.new
+      generator_args = opts[:args] || []
+      @fields.each do |name, field_opts|
+        val = if opts[:with] && opts[:with][name]
+          opts[:with][name]
+        elsif(found, x = generate_field_value(o, field_opts, generator_args)) && found
+          x
         else
-          default = if field_opts[:default_generator].is_a? Proc
-            field_opts[:default_generator].call(*args)
-          elsif field_opts[:default_generator]
-            o.send field_opts[:default_generator], *args
-          elsif field_opts[:default]
-            field_opts[:default]
+          q = field_opts[:prompt] || name.to_s.capitalize
+          if field_opts[:multiline]
+            ## multiline options currently aren't allowed to have a default
+            ## value, so just ask.
+            ask_multiline q
+          else
+            default = if opts[:defaults_from] && opts[:defaults_from].respond_to?(name) && (x = opts[:defaults_from].send(name))
+              x
+            else
+              default = generate_field_default o, field_opts, generator_args
+            end
+            ask q, :default => default
           end
-            
-          ask q, :default => default
         end
+        o.send "#{name}=", val
+      end
+      o
+    end
+
+    ## creates the object, filling in fields from 'vals', and throwing a
+    ## ModelError when it can't find all the requisite fields
+    def create generator_args, vals={}
+      o = self.new
+      @fields.each do |name, opts|
+        val = if vals[name]
+          vals[name]
+        elsif(found, x = generate_field_value(o, opts, generator_args)) && found
+          x
+        else
+          raise ModelError, "missing required field #{name}"
+        end
+        o.send "#{name}=", val
+      end
+      o
+    end
+
+  private
+
+    ## get the value for a field if it can be automatically determined
+    ## returns [success, value] (because a successful value can be ni)
+    def generate_field_value o, opts, args
+      if opts[:generator].is_a? Proc
+        [true, opts[:generator].call(*args)]
+      elsif opts[:generator]
+        [true, o.send(opts[:generator], *args)]
+      elsif opts[:ask] == false # nil counts as true here
+        [true, opts[:default] || (opts[:multi] ? [] : nil)]
+      else
+        [false, nil]
+      end
+    end
+
+    def generate_field_default o, opts, args
+      if opts[:default_generator].is_a? Proc
+        opts[:default_generator].call(*args)
+      elsif opts[:default_generator]
+        o.send opts[:default_generator], *args
+      elsif opts[:default]
+        opts[:default]
       end
-      o.send("#{name}=", val)
     end
-    o
   end
 end
 

data/lib/operator.rb

@@ -9,9 +9,10 @@ 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, *args_spec
+    def operation method, desc, *args_spec, &options_blk
       @operations ||= {}
-      @operations[method] = { :desc => desc, :args_spec => args_spec }
+      @operations[method] = { :desc => desc, :args_spec => args_spec,
+                              :options_blk => options_blk }
     end
 
     def operations
@@ -19,6 +20,11 @@ class Operator
     end
     def has_operation? op; @operations.member? op_to_method(op) end
 
+    def build_opts method, args
+      options_blk = @operations[method][:options_blk]
+      options_blk and options args, &options_blk or nil
+    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
@@ -50,7 +56,13 @@ class Operator
         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}"
+          issues = project.issues_for valr
+          case issues.size
+          when 0; raise Error, "no issue with name #{val.inspect}"
+          when 1; issues.first
+          else
+            raise Error, "multiple issues matching name #{val.inspect}"
+          end
         when :release, :unreleased_release
           if val == "unassigned"
             :unassigned
@@ -96,7 +108,13 @@ class Operator
 
   def do op, project, config, args
     meth = self.class.op_to_method(op)
+
+    # Parse options, removing them from args
+    opts = self.class.build_opts meth, args
     built_args = self.class.build_args project, meth, args
+
+    built_args.unshift opts if opts
+
     send meth, project, config, *built_args
   end
 
@@ -109,8 +127,15 @@ class Operator
     Project.create_interactively
   end
 
-  operation :help, "List all registered commands", :maybe_command
-  def help project, config, command
+  operation :help, "List all registered commands", :maybe_command do
+    opt :cow, "Activate super cow powers", :default => false
+  end
+  def help project, config, opts, command
+    if opts[:cow]
+      puts "MOO!"
+      puts "All is well with the world now. A bit more methane though."
+      return
+    end
     return help_single(command) if command
     puts <<EOS
 Ditz commands:
@@ -145,11 +170,32 @@ Usage: ditz #{name} #{args}
 EOS
   end
 
-  operation :add, "Add an issue"
-  def add project, config
+  ## gets a comment from the user, assuming the standard argument setup
+  def get_comment opts
+    comment = if opts[:no_comment]
+      nil
+    elsif opts[:comment]
+      opts[:comment]
+    else
+      ask_multiline "Comments"
+    end
+  end
+  private :get_comment
+
+  operation :reconfigure, "Rerun configuration script"
+  def reconfigure project, config
+    new_config = Config.create_interactively :defaults_from => config
+    new_config.save! $opts[:config_file]
+    puts "Configuration written."
+  end
+
+  operation :add, "Add an issue" do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def add project, config, opts
     issue = Issue.create_interactively(:args => [config, project]) or return
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
-    issue.log "created", config.user, comment
+    issue.log "created", config.user, get_comment(opts)
     project.add_issue issue
     project.assign_issue_names!
     puts "Added issue #{issue.name}."
@@ -161,12 +207,14 @@ EOS
     puts "Dropped #{issue.name}. Note that other issue names may have changed."
   end
 
-  operation :add_release, "Add a release", :maybe_name
-  def add_release project, config, maybe_name
+  operation :add_release, "Add a release", :maybe_name do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def add_release project, config, opts, 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
+    release.log "created", config.user, get_comment(opts)
     project.add_release release
     puts "Added release #{release.name}."
   end
@@ -178,13 +226,15 @@ EOS
     puts "Added component #{component.name}."
   end
 
-  operation :add_reference, "Add a reference to an issue", :issue
-  def add_reference project, config, issue
+  operation :add_reference, "Add a reference to an issue", :issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def add_reference project, config, opts, issue
     puts "Adding a reference to #{issue.name}: #{issue.title}."
     reference = ask "Reference"
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
     issue.add_reference reference
-    issue.log "added reference #{issue.references.size}", config.user, comment
+    issue.log "added reference #{issue.references.size}", config.user, get_comment(opts)
     puts "Added reference to #{issue.name}."
   end
 
@@ -208,7 +258,9 @@ EOS
         "%2d/%2d %s" % [nc, num, type.to_s.pluralize(num, false)]
       end
 
-      bar = if r != :unassigned && r.released?
+      bar = if r == :unassigned
+        ""
+      elsif r.released?
         "(released)"
       elsif issues.empty?
         "(no issues)"
@@ -248,33 +300,44 @@ EOS
       join
   end
 
-  def todo_list_for issues
+  def todo_list_for issues, opts={}
     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
+      s = sprintf "%s %#{name_len}s: %s", i.status_widget, i.name, i.title
+      s += " [#{i.release}]" if opts[:show_release] && i.release
+      s + "\n"
     end.join
   end
 
-  operation :todo, "Generate todo list", :maybe_release
-  def todo project, config, releases
-    actually_do_todo project, config, releases, false
+  def print_todo_list_by_release_for project, issues
+    by_release = issues.inject({}) do |h, i|
+      r = project.release_for(i.release) || :unassigned
+      h[r] ||= []
+      h[r] << i
+      h
+    end
+
+    (project.releases + [:unassigned]).each do |r|
+      next unless by_release.member? r
+      puts r == :unassigned ? "Unassigned:" : "#{r.name} (#{r.status}):"
+      print todo_list_for(by_release[r])
+      puts
+    end
   end
 
-  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
+  operation :todo, "Generate todo list", :maybe_release do
+    opt :all, "Show all issues, included completed ones", :default => false
+  end
+  def todo project, config, opts, releases
+    actually_do_todo project, config, releases, opts[:all]
   end
 
   def actually_do_todo project, config, releases, full
     releases ||= project.unreleased_releases + [:unassigned]
     releases = [*releases]
     releases.each do |r|
-      if r == :unassigned
-        puts "Unassigned:"
-      else
-        puts "Version #{r.name} (#{r.status}):"
-      end
+      puts r == :unassigned ? "Unassigned:" : "#{r.name} (#{r.status}):"
       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.")
@@ -287,33 +350,42 @@ EOS
     ScreenView.new(project, config).render_issue issue
   end
 
-  operation :start, "Start work on an issue", :unstarted_issue
-  def start project, config, issue
+  operation :start, "Start work on an issue", :unstarted_issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def start project, config, opts, issue
     puts "Starting work on issue #{issue.name}: #{issue.title}."
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
-    issue.start_work config.user, comment
+    issue.start_work config.user, get_comment(opts)
     puts "Recorded start of work for #{issue.name}."
   end
 
-  operation :stop, "Stop work on an issue", :started_issue
-  def stop project, config, issue
+  operation :stop, "Stop work on an issue", :started_issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def stop project, config, opts, issue
     puts "Stopping work on issue #{issue.name}: #{issue.title}."
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
-    issue.stop_work config.user, comment
+    issue.stop_work config.user, get_comment(opts)
     puts "Recorded work stop for #{issue.name}."
   end
 
-  operation :close, "Close an issue", :open_issue
-  def close project, config, issue
+  operation :close, "Close an issue", :open_issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def close project, config, opts, 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" unless $opts[:no_comment]
-    issue.close disp, config.user, comment
+    issue.close disp, config.user, get_comment(opts)
     puts "Closed issue #{issue.name} with disposition #{issue.disposition_string}."
   end
 
-  operation :assign, "Assign an issue to a release", :issue, :maybe_release
-  def assign project, config, issue, maybe_release
+  operation :assign, "Assign an issue to a release", :issue, :maybe_release do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def assign project, config, opts, issue, maybe_release
     if maybe_release && maybe_release.name == issue.release
       raise Error, "issue #{issue.name} already assigned to release #{issue.release}"
     end
@@ -324,8 +396,6 @@ EOS
       "not assigned to any release."
     end
 
-    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
@@ -337,13 +407,15 @@ EOS
         end
       end
     end
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
-    issue.assign_to_release release, config.user, comment
+    issue.assign_to_release release, config.user, get_comment(opts)
     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
+  operation :set_component, "Set an issue's component", :issue, :maybe_component do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def set_component project, config, opts, issue, maybe_component
     puts "Changing the component of issue #{issue.name}: #{issue.title}."
 
     if project.components.size == 1
@@ -359,8 +431,7 @@ EOS
       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
+    issue.assign_to_component component, config.user, get_comment(opts)
     oldname = issue.name
     project.assign_issue_names!
     puts <<EOS
@@ -369,18 +440,23 @@ have changed as well.
 EOS
   end
 
-  operation :unassign, "Unassign an issue from any releases", :assigned_issue
-  def unassign project, config, issue
+  operation :unassign, "Unassign an issue from any releases", :assigned_issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def unassign project, config, opts, issue
     puts "Unassigning issue #{issue.name}: #{issue.title}."
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
-    issue.unassign config.user, comment
+    issue.unassign config.user, get_comment(opts)
     puts "Unassigned #{issue.name}."
   end
 
-  operation :comment, "Comment on an issue", :issue
-  def comment project, config, issue
+  operation :comment, "Comment on an issue", :issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def comment project, config, opts, issue
     puts "Commenting on issue #{issue.name}: #{issue.title}."
-    comment = ask_multiline "Comments"
+    comment = get_comment opts
     if comment.blank?
       puts "Empty comment, aborted."
     else
@@ -398,10 +474,12 @@ EOS
     end
   end
 
-  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
+  operation :release, "Release a release", :unreleased_release do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+  end
+  def release project, config, opts, release
+    release.release! project, config.user, get_comment(opts)
     puts "Release #{release.name} released!"
   end
 
@@ -484,8 +562,12 @@ EOS
     puts "Archived to #{dir}."
   end
 
-  operation :edit, "Edit an issue", :issue
-  def edit project, config, issue
+  operation :edit, "Edit an issue", :issue do
+    opt :comment, "Specify a comment", :short => 'm', :type => String
+    opt :no_comment, "Skip asking for a comment", :default => false
+    opt :silent, "Don't add a log message detailing the change", :default => false
+  end
+  def edit project, config, opts, issue
     data = { :title => issue.title, :description => issue.desc,
              :reporter => issue.reporter }
 
@@ -496,12 +578,11 @@ EOS
       return
     end
 
-    comment = ask_multiline "Comments" unless $opts[:no_comment]
-
     begin
       edits = YAML.load_file fn
-      if issue.change edits, config.user, comment
-        puts "Changed recorded."
+      comment = opts[:silent] ? nil : get_comment(opts)
+      if issue.change edits, config.user, comment, opts[:silent]
+        puts "Change recorded."
       else
         puts "No changes."
       end