bugzyrb 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= bugzyrb 0.3.0, 2010-07-11 
+* added recentlogs
+* added recentcomments
+
 = bugzyrb 0.2.1, 2010-07-09
 * added status which was missing
 * delete can take multiple issues

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bugzyrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bugzyrb}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-12}
   s.default_executable = %q{bugzyrb}
   s.description = %q{basic, easy-to-use command-line issue-tracker using sqlite for ruby 1.9}
   s.email = %q{sentinel1879@gmail.com}

data/lib/bugzyrb/common/cmdapp.rb

@@ -27,6 +27,8 @@ module Cmdapp
   # @param [Array] rest of args on command line
   # @return [Boolean] whether it is mapped or not.
   #
+  # NOTE: some of these are relevant only if we are not using subcommand, so we should move out
+  # to another file.
   def check_aliases action, args
     return false unless @aliases
     ret = @aliases[action]
@@ -96,10 +98,12 @@ module Cmdapp
     @actions[name.to_s] = desc
   end
 
+  # TODO: move to serial_number.rb or a file that deals with file_data as against sql data
+  # which should also have backup, load_array and save_array.
   ##
   # reads serial_number file, returns serialno for this app
   # and increments the serial number and writes back.
-  def _get_serial_number
+  def get_serial_number
     require 'fileutils'
     appname = @appname
     filename = @app_serial_path || "serial_numbers"
@@ -125,23 +129,27 @@ module Cmdapp
   end
   ##
   # After doing a redo of the numbering, we need to reset the numbers for that app
-  def _set_serial_number number
+  def set_serial_number number
     appname = @appname
     pattern = Regexp.new "^#{appname}:.*$"
     filename = @app_serial_path || "serial_numbers"
     # during testing redo this file does not exist, so i get errors
     if !File.exists? filename
-      _get_serial_number
+      get_serial_number
     end
-    _backup filename
+    backup filename
     # from Sed
     change_row filename, pattern, "#{appname}:#{number}"
   end
 
-  def _backup filename=@app_file_path
+  #
+  # backup file to filename.org
+  # use prior to a modification operation that could be dangerous or risky
+  def backup filename=@app_file_path
     require 'fileutils'
     FileUtils.cp filename, "#{filename}.org"
   end
+  # exit after printing an error message
   def die text
     $stderr.puts text
     exit ERRCODE
@@ -194,6 +202,7 @@ module Cmdapp
   ##
   # retrieve version info updated by jeweler.
   # Typically used by --version option of any command.
+  # FIXME: link VERSION to version.rb in lib/buzg.. and read from same dir
   # @return [String, nil] version as string, or nil if file not found
   def version_info
     # thanks to Roger Pack on ruby-forum for how to get to the version
@@ -213,7 +222,7 @@ module Cmdapp
   # and returns as a string.
   # Add newline after each line
   # @return [String, nil] newline delimited string, or nil
-  def get_lines
+  def old_get_lines
     lines = nil
     #$stdin.flush
     $stdin.each_line do |line|
@@ -231,118 +240,117 @@ module Cmdapp
   end
   
 
-# edits given text using EDITOR
-# @param [String] text to edit
-# @return [String, nil] edited string, or nil if no change
-def edit_text text
-  # 2010-06-29 10:24 
-  require 'fileutils'
-  require 'tempfile'
-  ed = ENV['EDITOR'] || "vim"
-  temp = Tempfile.new "tmp"
-  File.open(temp,"w"){ |f| f.write text }
-  mtime =  File.mtime(temp.path)
-  #system("#{ed} #{temp.path}")
-  system(ed, temp.path)
+  # edits given text using EDITOR
+  # @param [String] text to edit
+  # @return [String, nil] edited string, or nil if no change
+  def edit_text text
+    # 2010-06-29 10:24 
+    require 'fileutils'
+    require 'tempfile'
+    ed = ENV['EDITOR'] || "vim"
+    temp = Tempfile.new "tmp"
+    File.open(temp,"w"){ |f| f.write text }
+    mtime =  File.mtime(temp.path)
+    #system("#{ed} #{temp.path}")
+    system(ed, temp.path)
 
-  newmtime = File.mtime(temp.path)
-  newstr = nil
-  if mtime < newmtime
-    # check timestamp, if updated ..
-    #newstr = ""
-    #File.open(temp,"r"){ |f| f.each {|r| newstr << r } }
-    newstr = File.read(temp)
-    #puts "I got: #{newstr}"
-  else
-    #puts "user quit without saving"
-  end
-  return newstr
-end
+    newmtime = File.mtime(temp.path)
+    newstr = nil
+    if mtime < newmtime
+      # check timestamp, if updated ..
+      newstr = File.read(temp)
+    else
+      #puts "user quit without saving"
+      return nil
+    end
+    return newstr.chomp if newstr
+    return nil
+  end
 
-# pipes given string to command
-# @param [String] command to pipe data to
-# @param [String] data to pipe to command
-# @example
-#     cmd = %{mail -s "my title" rahul}
-#     pipe_output(cmd, "some long text")
-# FIXME: not clear how to return error.
-# NOTE: this is obviously more portable than using system echo or system cat.
-def pipe_output (pipeto, str)
-  #pipeto = '/usr/sbin/sendmail -t'
-  #pipeto = %q{mail -s "my title" rahul}
-  if pipeto != nil  # i was taking pipeto from a hash, so checking
-    proc = IO.popen(pipeto, "w+")
-    proc.puts str
-    proc.close_write
-    #puts proc.gets
+  # pipes given string to command
+  # @param [String] command to pipe data to
+  # @param [String] data to pipe to command
+  # @example
+  #     cmd = %{mail -s "my title" rahul}
+  #     pipe_output(cmd, "some long text")
+  # FIXME: not clear how to return error.
+  # NOTE: this is obviously more portable than using system echo or system cat.
+  def pipe_output (pipeto, str)
+    #pipeto = '/usr/sbin/sendmail -t'
+    #pipeto = %q{mail -s "my title" rahul}
+    if pipeto != nil  # i was taking pipeto from a hash, so checking
+      proc = IO.popen(pipeto, "w+")
+      proc.puts str
+      proc.close_write
+      #puts proc.gets
+    end
   end
-end
-##
-# reads up template, and substirutes values from myhash
-# @param [String] template text
-# @param [Hash] values to replace in template
-# @return [String] template output
-# NOTE: probably better to use rdoc/template which can handle arrays as well.
-def template_replace template, myhash
-  #tmpltext=File::read(template);
+  ##
+  # reads up template, and substirutes values from myhash
+  # @param [String] template text
+  # @param [Hash] values to replace in template
+  # @return [String] template output
+  # NOTE: probably better to use rdoc/template which can handle arrays as well.
+  def template_replace template, myhash
+    #tmpltext=File::read(template);
 
-  t = template.dup
-  t.gsub!( /##(.*?)##/ ) {
-    #raise "Key '#{$1}' found in template but the value has not been set" unless ( myhash.has_key?( $1 ) )
-    myhash[ $1 ].to_s
-  }
-  t
-end
-#------------------------------------------------------------
-# these 2 methods deal with with maintaining readline history
-# for various columns. _read reads up any earlier values
-# so user can select from them.
-# _save saves the values for future use.
-#------------------------------------------------------------
-# for a given column, check if there's any previous data
-# in our cache, and put in readlines history so user can 
-# use or edit. Also put default value in history.
-# @param [String] name of column for maintaining cache
-# @param [String] default data for user to recall, or edit
-def history_read column, default=nil
-  values = []
-  oldstr = ""
-  if !defined? $history_hash
-    require 'readline'
-    require 'yaml'
-    filename = File.expand_path "~/.bugzy_history.yml"
-    $history_filename = filename
-    # if file exists with values push them into history
-    if File.exists? filename
-      $history_hash = YAML::load( File.open( filename ) )
-    else
-      $history_hash = Hash.new
+    t = template.dup
+    t.gsub!( /##(.*?)##/ ) {
+      #raise "Key '#{$1}' found in template but the value has not been set" unless ( myhash.has_key?( $1 ) )
+      myhash[ $1 ].to_s
+    }
+    t
+  end
+  #------------------------------------------------------------
+  # these 2 methods deal with with maintaining readline history
+  # for various columns. _read reads up any earlier values
+  # so user can select from them.
+  # _save saves the values for future use.
+  #------------------------------------------------------------
+  # for a given column, check if there's any previous data
+  # in our cache, and put in readlines history so user can 
+  # use or edit. Also put default value in history.
+  # @param [String] name of column for maintaining cache
+  # @param [String] default data for user to recall, or edit
+  def history_read column, default=nil
+    values = []
+    oldstr = ""
+    if !defined? $history_hash
+      require 'readline'
+      require 'yaml'
+      filename = File.expand_path "~/.bugzy_history.yml"
+      $history_filename = filename
+      # if file exists with values push them into history
+      if File.exists? filename
+        $history_hash = YAML::load( File.open( filename ) )
+      else
+        $history_hash = Hash.new
+      end
     end
+    values.push(*$history_hash[column]) if $history_hash.has_key? column
+    # push existing value into history also, so it can be edited
+    values.push(default) if default
+    values.uniq!
+    Readline::HISTORY.clear # else previous values of other fields also come in
+    Readline::HISTORY.push(*values) unless values.empty?
+    #puts Readline::HISTORY.to_a
   end
-  values.push(*$history_hash[column]) if $history_hash.has_key? column
-  # push existing value into history also, so it can be edited
-  values.push(default) if default
-  values.uniq!
-  Readline::HISTORY.clear # else previous values of other fields also come in
-  Readline::HISTORY.push(*values) unless values.empty?
-  #puts Readline::HISTORY.to_a
-end
-## 
-# update our cache with str if not present in cache already
-# @param [String] name of column for maintaining cache
-# @param [String] str : data just entered by user
-#
-def history_save column, str
-  return if str.nil? or str == ""
-  if $history_hash.has_key? column
-    return if $history_hash[column].include? str
-  end
-  ($history_hash[column] ||= []) << str
-  filename = $history_filename
-  File.open( filename, 'w' ) do |f|
-    f << $history_hash.to_yaml
+  ## 
+  # update our cache with str if not present in cache already
+  # @param [String] name of column for maintaining cache
+  # @param [String] str : data just entered by user
+  #
+  def history_save column, str
+    return if str.nil? or str == ""
+    if $history_hash.has_key? column
+      return if $history_hash[column].include? str
+    end
+    ($history_hash[column] ||= []) << str
+    filename = $history_filename
+    File.open( filename, 'w' ) do |f|
+      f << $history_hash.to_yaml
+    end
   end
-end
   # separates args to list-like operations
   # +xxx means xxx should match in output
   # -xxx means xxx should not exist in output
@@ -377,7 +385,159 @@ end
     end
     rows
   end
+  # ----------- file operations -------------
+  #
+  def file_read filename
+    filename = File.expand_path filename
+    return File.read(filename)
+    #if File.exists? filename
+  end
+  def file_write filename, text
+    filename = File.expand_path filename
+    File.open(filename,"w"){ |f| f.write text }
+    #if File.exists? filename
+  end
+  def file_append filename, text
+    filename = File.expand_path filename
+    File.open(temp,"a"){ |f| f.write text }
+  end
+  def check_file filename=@app_file_path
+    File.exists?(filename) or die "#{filename} does not exist in this dir. "
+  end
 
+  ##
+  # separates args into tag or subcommand and items
+  # This allows user to pass e.g. a priority first and then item list
+  # or item list first and then priority. 
+  # This can only be used if the tag or pri or status is non-numeric and the item is numeric.
+  def _separate args, pattern=nil #/^[a-zA-Z]/ 
+    tag = nil
+    items = []
+    args.each do |arg| 
+      if arg =~ /^[0-9\.]+$/
+        items << arg
+      else
+        tag = arg
+        if pattern
+          die "#{@action}: #{arg} appears invalid." if arg !~ pattern
+        end
+      end
+    end
+    items = nil if items.empty?
+    return tag, items
+  end
 
+  ## prompts user for multiline input
+  # NOTE: we do not take Ctrl-d as EOF then causes an error in next input in 1.9 (not 1.8)
+  # @param [String] text to use as prompt
+  # @return [String, nil] string with newlines or nil (if nothing entered).
+  # FIXME: move to Cmdapp
+  def get_lines prompt=nil
+    #prompt ||= "Enter multiple lines, to quit enter . on empty line"
+    #message prompt
+    str = ""
+    while $stdin.gets                        # reads from STDIN
+      case $_.chomp 
+      when "."
+        break
+      when ".vim"
+        return edit_text str
+      end
+      str << $_
+      #puts "Read: #{$_}"                   # writes to STDOUT
+    end
+    return nil if str == ""
+    return str.chomp
+  end
+  # get a string from user, using readline or gets
+  # if readline, then manage column specific history
+  # FIXME: move to Cmdapp.
+  def _gets column, prompt, default=nil
+    text = "#{prompt}? "
+    text << "|#{default}|" if default
+    puts text
+    if $use_readline
+      Cmdapp::history_read column, default
+      str = Readline::readline('>', false)
+      Cmdapp::history_save column, str
+      str = default if str.nil? or str == ""
+      return str
+    else
+      str = $stdin.gets.chomp
+      str = default if str.nil? or str == ""
+      return str
+    end
+  end
+  # get choice from user from a list of options
+  # @param [String] prompt text
+  # @param [Array] values to chose from
+  def _choice prompt, choices
+    choose do |menu|
+      menu.prompt = prompt
+      menu.choices(*choices) do |n|  return n; end
+    end
+  end
+  #
+  # take user input based on value of flag 
+  # @param [String] column name
+  # @param [Boolean, Symbol] true, false, :freeform, :choice
+  # @param [String, nil] text to prompt
+  # @param [Array, nil] choices array or nil
+  # @param [Object] default value
+  # @return [String, nil] users choice
+  #
+  # TODO: should we not check for the ask_x methods and call them if present.
+  # FIXME: move to Cmdapp
+  def user_input column, prompt_flag, prompt_text=nil, choices=nil, default=nil
+    if prompt_flag == true
+      prompt_flag = :freeform
+      prompt_flag = :choice if choices
+    end
+    case prompt_flag
+    when :freeform
+      prompt_text ||= "#{column.capitalize}"
+      #str = ask(prompt_text){ |q| q.default = default if default  }
+      str = _gets(column, prompt_text, default)
+      return str
+    when :choice
+      prompt_text ||= "Select #{column}:"
+      str = _choice(prompt_text, choices)
+      return str
+    when :multiline, :ml
+      return Cmdapp::edit_text default
+    when false
+      return default
+    end
+  end
+  # indents given string, n spaces
+  # http://redmine.ruby-lang.org/issues/show/749 Thomas Sawyer
+  def indent(str,n)
+    if n >= 0
+      str.gsub(/^/, ' ' * n)
+    else
+      str.gsub(/^ {0,#{-n}}/, "")
+    end
+  end
+  # indents a string, indenting all but first line.
+  # This allows us to print a string as follows:
+  #        Description :  The description starts here.
+  #                       And continues here. The first line was not indented.
+  # http://www.ralfebert.de/blog/ruby/string_helpers/ Ralf Ebert
+  def indent2(str, count)
+    if str
+      char = ' '
+      #(char * count) + gsub(/(\n+)/) { $1 + (char * count) }
+      str.gsub(/(\n+)/) { $1 + (char * count) }
+    end
+  end
+  # for updating in log file
+  # truncates long strings comments, descriptions, fix etc and removed newlines
+  def truncate string, count
+    string = string.to_s
+    string.tr!("\n",' ')
+    return string if string.length <= count
+    (string[0..(count-4)] + " ...")
+  end
 
+ # ADD
 end

data/lib/bugzyrb.rb

@@ -5,7 +5,6 @@
   * Author:        rkumar
   * Date:          2010-06-24
   * License:       Ruby License
-  * Now requires subcommand gem
 
 =end
 require 'rubygems'
@@ -220,7 +219,7 @@ SQL
     title = body['title']
     logid = db.sql_logs_insert rowid, "create", "#{rowid} #{type}: #{title}"
     body["id"] = rowid
-    mail_issue body
+    mail_issue nil, body
     0
   end
 
@@ -248,8 +247,10 @@ SQL
     title = text
     desc = nil
     if $prompt_desc
+      # choice of vim or this XXX also how to store in case of error or abandon
+      # and allow user to edit, so no retyping. This could be for mult fields
       message "Enter a detailed description (. to exit): "
-      desc = get_lines
+      desc = Cmdapp.get_lines
       #message "You entered #{desc}"
     end
     type = $default_type || "bug"
@@ -257,34 +258,34 @@ SQL
     status = $default_status || "open"
     priority = $default_priority || "P3"
     if $prompt_type
-      type = _choice("Select type:", %w[bug enhancement feature task] )
+      type = Cmdapp._choice("Select type:", %w[bug enhancement feature task] )
       #message "You selected #{type}"
     end
     if $prompt_severity
-      severity = _choice("Select severity:", %w[normal critical moderate] )
+      severity = Cmdapp._choice("Select severity:", %w[normal critical moderate] )
       #message "You selected #{severity}"
     end
     if $prompt_status
-      status = _choice("Select status:", %w[open started closed stopped canceled] )
+      status = Cmdapp._choice("Select status:", %w[open started closed stopped canceled] )
       #message "You selected #{status}"
     end
     assigned_to = $default_assigned_to
     if $prompt_assigned_to
       message "Assign to:"
       #assigned_to = $stdin.gets.chomp
-      assigned_to = _gets "assigned_to", "assigned_to", $default_assigned_to
+      assigned_to = Cmdapp._gets "assigned_to", "assigned_to", $default_assigned_to
       #message "You selected #{assigned_to}"
     end
     project = component = version = nil
     # project
     if $use_project
-      project = user_input('project', $prompt_project, nil, $valid_project, $default_project)
+      project = Cmdapp.user_input('project', $prompt_project, nil, $valid_project, $default_project)
     end
     if $use_component
-      component = user_input('component', $prompt_component, nil, $valid_component, $default_component)
+      component = Cmdapp.user_input('component', $prompt_component, nil, $valid_component, $default_component)
     end
     if $use_version
-      version = user_input('version', $prompt_version, nil, $valid_version, $default_version)
+      version = Cmdapp.user_input('version', $prompt_version, nil, $valid_version, $default_version)
     end
 
     start_date = @now
@@ -315,17 +316,18 @@ SQL
     puts "Issue #{rowid} created"
     logid = db.sql_logs_insert rowid, "create", "#{rowid} #{type}: #{title}"
     body["id"] = rowid
-    mail_issue body
+    mail_issue nil, body
     
     0
   end
-  def mail_issue row, emailid=nil
+  def mail_issue subject, row, emailid=nil
     emailid ||= $default_user
     body = <<TEXT
     Id            : #{row['id']} 
     Title         : #{row['title']} 
     Description   : #{row['description']} 
     Type          : #{row['type']} 
+    Status        : #{row['status']} 
     Start Date    : #{row['start_date']} 
     Due Date      : #{row['due_date']} 
     Priority      : #{row['priority']} 
@@ -335,9 +337,9 @@ TEXT
     body << "    Project       : #{row['project']}\n" if $use_project
     body << "    Component     : #{row['component']}\n" if $use_component
     body << "    Version       : #{row['version']}\n" if $use_version
-    title = "#{row['id']}: #{row['title']} "
+    subject ||= "#{row['id']}: #{row['title']} "
 
-    cmd = %{ mail -s "#{title}" "#{emailid}" }
+    cmd = %{ mail -s "#{subject}" "#{emailid}" }
     #puts cmd
     Cmdapp::pipe_output(cmd, body)
   end
@@ -352,32 +354,40 @@ TEXT
     db, row = validate_id id
     die "No data found for #{id}" unless row
     puts "[#{row['type']} \##{row['id']}] #{row['title']}"
-    puts row['description']
-    puts 
+    puts "Description:"
+    puts Cmdapp.indent(row['description'],3)
+    puts "\nAdded by #{row['created_by']} on #{row['date_created']}. Updated #{row['date_modified']}."
     comment_count = 0
     #puts row
     row.each_pair { |name, val| 
       next if name == "project" && !$use_project
       next if name == "version" && !$use_version
       next if name == "component" && !$use_component
+      next if %w{ id title description created_by date_created date_modified }.include? name
       comment_count = val.to_i if name == "comment_count"
+      val = Cmdapp.indent2(val, 18) if name == "fix"
       n = sprintf("%-15s", name); 
       puts "#{n} : #{val}" 
     }
     puts
     if comment_count > 0
       puts "Comments   :"
+      ctr = 0
       db.select_where "comments", "id", id do |r|
-        #puts r.join(" | ")
-        puts "(#{r['date_created']}) [ #{r['created_by']} ] #{r['comment']}"
-        #pp r
+        #puts "(#{r['date_created']}) [ #{r['created_by']} ] #{r['comment']}"
+        ctr += 1
+        puts "------- (#{r['date_created']}) #{r['created_by']} (#{ctr})------"
+        puts r['comment']
       end
+      puts
     end
     puts "Log:"
+      ctr = 0
     db.select_where "log", "id", id do |r|
-      #puts r.join(" | ")
-      puts "------- (#{r['date_created']}) ------"
-      puts "#{r['field']} [ #{r['created_by']} ] #{r['log']} "
+      ctr += 1
+      #puts "------- (#{r['date_created']}) #{r['created_by']}  ------"
+      puts "------- #{r['date_created']} - #{r['created_by']} (#{ctr})------"
+      puts " * [#{r['field']}]:  #{r['log']} "
       #pp r
     end
   end
@@ -412,7 +422,7 @@ TEXT
     editable << "project" if $use_project
     editable << "component" if $use_component
     editable << "version" if $use_version
-    sel = _choice "Select field to edit", editable
+    sel = Cmdapp._choice "Select field to edit", editable
     print "You chose: #{sel}"
     old =  row[sel]
     puts " Current value is: #{old}"
@@ -434,8 +444,8 @@ TEXT
     message str
     db.sql_update "bugs", id, sel, str
     puts "Updated #{id}"
-    str = str.to_s
-    rowid = db.sql_logs_insert id, sel, "[#{id}] updated [#{sel}] with #{str[0..50]}"
+    sstr = Cmdapp.truncate(str.to_s,50)
+    rowid = db.sql_logs_insert id, sel, "[#{id}] updated [#{sel}] with #{sstr}"
     0
   end
   # deletes given issue
@@ -482,9 +492,11 @@ TEXT
 
     logid = db.sql_logs_insert rowid, "create", "#{rowid} #{type}: #{title}"
     newrow["id"] = rowid
-    mail_issue newrow
+    mail_issue nil, newrow
   end
-  def viewlogs args
+  # view logs for a given id, or highest issue
+  # @param [Array] issue id
+  def viewlogs args=nil
     db = get_db
     id = args[0].nil? ? db.max_bug_id : args[0]
     row = db.sql_select_rowid "bugs", id
@@ -591,16 +603,16 @@ TEXT
     puts "GOT:: #{args}"
   end
   def ask_type old=nil
-    type = _choice("Select type:", %w[bug enhancement feature task] )
+    type = Cmdapp._choice("Select type:", %w[bug enhancement feature task] )
   end
   def ask_severity old=nil
-    severity = _choice("Select severity:", %w[normal critical moderate] )
+    severity = Cmdapp._choice("Select severity:", %w[normal critical moderate] )
   end
   def ask_status old=nil
-    status = _choice("Select status:", %w[open started closed stopped canceled] )
+    status = Cmdapp._choice("Select status:", %w[open started closed stopped canceled] )
   end
   def ask_priority old=nil
-    priority = _choice("Select priority:", %w[P1 P2 P3 P4 P5] )
+    priority = Cmdapp._choice("Select priority:", %w[P1 P2 P3 P4 P5] )
   end
   def ask_fix old=nil
     Cmdapp::edit_text old
@@ -620,22 +632,23 @@ TEXT
     unless id
       id = ask("Issue Id?  ", Integer)
     end
+    db, row = validate_id id, true
+    die "No issue found for #{id}" unless row
     if !args.empty?
       comment = args.join(" ")
     else
       message "Enter a comment (. to exit): "
-      comment = get_lines
+      comment = Cmdapp.get_lines
     end
     die "Operation cancelled" if comment.nil? or comment.empty?
     message "Comment is: #{comment}."
-    db, row = validate_id id
-    die "No issue found for #{id}" unless row
     message "Adding comment to #{id}: #{row['title']}"
     _comment db, id, comment
     0
   end
   # insert comment into database
   # called from interactive, as well as "close" or others
+  # Should we send a mail here ? XXX
   def _comment db, id, text
     rowid = db.sql_comments_insert id, text
     puts "Comment #{rowid} created"
@@ -644,55 +657,43 @@ TEXT
     commcount = handle.get_first_value( "select count(id) from comments where id = #{id};" )
     commcount = commcount.to_i
     db.sql_update "bugs", id, "comment_count", commcount
-    rowid = db.sql_logs_insert id, "comment",text[0..50]
+    rowid = db.sql_logs_insert id, "comment", Cmdapp.truncate(text, 50)
   end
   # prompts user for a fix related to an issue
+  # # XXX what if fix already exists, will we overwrite.
   def fix args #id, fix
     id = args.shift
     unless id
       id = ask("Issue Id?  ", Integer)
     end
+    db, row = validate_id id
     if !args.empty?
       text = args.join(" ")
+      if row['fix']
+        die "Sorry. I already have a fix, pls edit ... #{row['fix']}"
+      end
     else
-      message "Enter a fix (. to exit): "
-      text = get_lines
+      # XXX give the choice of using vim
+      if row['fix']
+        text = Cmdapp.edit_text row['fix']
+      else
+        message "Enter a fix (. to exit): "
+        text = Cmdapp.get_lines
+      end
     end
+    # FIXME: what if user accidentally enters a fix, and wants to nullify ?
     die "Operation cancelled" if text.nil? or text.empty?
     message "fix is: #{text}."
-    db, row = validate_id id
     message "Adding fix to #{id}: #{row['title']}"
     _fix db, id, text
     0
   end
+  # internal method that actually updates the fix. can be called
+  # from fix or from close using --fix
+  # Should we send a mail here ? XXX
   def _fix db, id, text
     db.sql_update "bugs", id, "fix", text
-    rowid = db.sql_logs_insert id, "fix", text[0..50]
-  end
-  ## internal method to log an action
-  # @param [Fixnum] id
-  # @param [String] column or create/delete for row
-  # @param [String] details such as content added, or content changed
-  def log id, field, text
-    id = args.shift
-    unless id
-      id = ask("Issue Id?  ", Integer)
-    end
-    if !args.empty?
-      comment = args.join(" ")
-    else
-      message "Enter a comment (. to exit): "
-      comment = get_lines
-    end
-    die "Operation cancelled" if comment.nil? or comment.empty?
-    message "Comment is: #{comment}."
-    db = get_db
-    row = db.sql_select_rowid "bugs", id
-    die "No issue found for #{id}" unless row
-    message "Adding comment to #{id}: #{row['title']}"
-    rowid = db.sql_logs_insert id, field, log
-    puts "Comment #{rowid} created"
-    0
+    rowid = db.sql_logs_insert id, "fix", Cmdapp.truncate(text, 50)
   end
 
   ##
@@ -724,6 +725,8 @@ TEXT
         db.sql_update "bugs", id, field, value
         puts "Updated #{id}"
         rowid = db.sql_logs_insert id, field, "[#{id}] updated [#{field}] with #{value}"
+        row[field] = value
+        mail_issue "[#{id}] updated [#{field}] with #{value}", row
       else
         message "#{id} already #{value}"
       end
@@ -788,173 +791,62 @@ TEXT
     }
   end
 
-  def check_file filename=@app_file_path
-    File.exists?(filename) or die "#{filename} does not exist in this dir. Use 'add' to create an item first."
-  end
-  ##
-  # colorize each line, if required.
-  # However, we should put the colors in some Map, so it can be changed at configuration level.
-  #
-  def colorize # TODO:
-    colorme = @options[:colorize]
-    @data.each do |r| 
-      if @options[:hide_numbering]
-        string = "#{r[1]} "
-      else
-        string = " #{r[0]} #{r[1]} "
-      end
-      if colorme
-        m=string.match(/\(([A-Z])\)/)
-        if m 
-          case m[1]
-          when "A", "B", "C", "D"
-            pri = self.class.const_get("PRI_#{m[1]}")
-            #string = "#{YELLOW}#{BOLD}#{string}#{CLEAR}"
-            string = "#{pri}#{string}#{CLEAR}"
-          else
-            string = "#{NORMAL}#{GREEN}#{string}#{CLEAR}"
-            #string = "#{BLUE}\e[6m#{string}#{CLEAR}"
-            #string = "#{BLUE}#{string}#{CLEAR}"
-          end 
-        else
-          #string = "#{NORMAL}#{string}#{CLEAR}"
-          # no need to put clear, let it be au natural
-        end
-      end # colorme
-      ## since we've added notes, we convert C-a to newline with spaces
-      # so it prints in next line with some neat indentation.
-      string.gsub!('
', "\n        ")
-      #string.tr! '
', "\n"
-      puts string
-    end
-  end
-  # internal method for sorting on reverse of line (status, priority)
-  def sort # TODO:
-    fold_subtasks
-    if @options[:reverse]
-      @data.sort! { |a,b| a[1] <=> b[1] }
-    else
-      @data.sort! { |a,b| b[1] <=> a[1] }
-    end
-    unfold_subtasks
-  end
-  def grep # TODO:
-    r = Regexp.new @options[:grep]
-    #@data = @data.grep r
-    @data = @data.find_all {|i| i[1] =~ r }
-  end
-
-  ##
-  # separates args into tag or subcommand and items
-  # This allows user to pass e.g. a priority first and then item list
-  # or item list first and then priority. 
-  # This can only be used if the tag or pri or status is non-numeric and the item is numeric.
-  def _separate args, pattern=nil #/^[a-zA-Z]/ 
-    tag = nil
-    items = []
-    args.each do |arg| 
-      if arg =~ /^[0-9\.]+$/
-        items << arg
-      else
-        tag = arg
-        if pattern
-          die "#{@action}: #{arg} appears invalid." if arg !~ pattern
-        end
-      end
-    end
-    items = nil if items.empty?
-    return tag, items
-  end
 
-  # get choice from user from a list of options
-  # @param [String] prompt text
-  # @param [Array] values to chose from
-  # FIXME: move to Cmdapp
-  def _choice prompt, choices
-    choose do |menu|
-      menu.prompt = prompt
-      menu.choices(*choices) do |n|  return n; end
-    end
-  end
-  #
-  # take user input based on value of flag 
-  # @param [String] column name
-  # @param [Boolean, Symbol] true, false, :freeform, :choice
-  # @param [String, nil] text to prompt
-  # @param [Array, nil] choices array or nil
-  # @param [Object] default value
-  # @return [String, nil] users choice
-  #
-  # TODO: should we not check for the ask_x methods and call them if present.
-  # FIXME: move to Cmdapp
-  def user_input column, prompt_flag, prompt_text=nil, choices=nil, default=nil
-    if prompt_flag == true
-      prompt_flag = :freeform
-      prompt_flag = :choice if choices
-    end
-    case prompt_flag
-    when :freeform
-      prompt_text ||= "#{column.capitalize}"
-      #str = ask(prompt_text){ |q| q.default = default if default  }
-      str = _gets(column, prompt_text, default)
-      return str
-    when :choice
-      prompt_text ||= "Select #{column}:"
-      str = _choice(prompt_text, choices)
-      return str
-    when :multiline, :ml
-      return Cmdapp::edit_text default
-    when false
-      return default
-    end
-  end
   def test args=nil
     puts "This is only for testing things out"
     if $use_project
-      project = user_input('project', $prompt_project, nil, $valid_project, $default_project)
+      project = Cmdapp.user_input('project', $prompt_project, nil, $valid_project, $default_project)
       puts project
     end
     if $use_component
-      component = user_input('component', $prompt_component, nil, $valid_component, $default_component)
+      component = Cmdapp.user_input('component', $prompt_component, nil, $valid_component, $default_component)
       puts component
     end
   end
-  ## prompts user for multiline input
-  # NOTE: we do not take Ctrl-d as EOF then causes an error in next input in 1.9 (not 1.8)
-  # @param [String] text to use as prompt
-  # @return [String, nil] string with newlines or nil (if nothing entered).
-  # FIXME: move to Cmdapp
-  def get_lines prompt=nil
-    #prompt ||= "Enter multiple lines, to quit enter . on empty line"
-    #message prompt
-    str = ""
-    while $stdin.gets                        # reads from STDIN
-      if $_.chomp == "."
-        break
-      end
-      str << $_
-      #puts "Read: #{$_}"                   # writes to STDOUT
+  #
+  # prints recent log/activity
+  # @param [Array] first index is limit (how many rows to show), default 10
+  def recentlogs args=nil
+    limit = args[0] || 10
+    sql = "select log.id, title, log.created_by, log.date_created, log from log,bugs where bugs.id = log.id  order by log.date_created desc limit #{limit}"
+
+    db = get_db
+    db.run sql do |row|
+      log = Cmdapp.indent2( row['log'],20)
+      text = <<-TEXT
+
+       id         : [#{row['id']}] #{row['title']} 
+       action_by  : #{row['created_by']} 
+       date       : #{row['date_created']} 
+       activity   : #{log} 
+
+      TEXT
+      #puts row.keys
+      puts text
+
     end
-    return nil if str == ""
-    return str.chomp
   end
-  # get a string from user, using readline or gets
-  # if readline, then manage column specific history
-  # FIXME: move to Cmdapp.
-  def _gets column, prompt, default=nil
-    text = "#{prompt}? "
-    text << "|#{default}|" if default
-    puts text
-    if $use_readline
-      Cmdapp::history_read column, default
-      str = Readline::readline('>', false)
-      Cmdapp::history_save column, str
-      str = default if str.nil? or str == ""
-      return str
-    else
-      str = $stdin.gets.chomp
-      str = default if str.nil? or str == ""
-      return str
+  #
+  # prints recent comments
+  # @param [Array] first index is limit (how many rows to show), default 10
+  def recentcomments args=nil
+    limit = args[0] || 10
+    sql = "select comments.id, title, comments.created_by, comments.date_created, comment from comments,bugs where bugs.id = comments.id  order by comments.date_created desc limit #{limit}"
+
+    db = get_db
+    db.run sql do |row|
+      comment = Cmdapp.indent2( row['comment'],20)
+      text = <<-TEXT
+
+       id         : [#{row['id']}] #{row['title']} 
+       author     : #{row['created_by']} 
+       date       : #{row['date_created']} 
+       comment    : #{comment} 
+
+      TEXT
+      #puts row.keys
+      puts text
+
     end
   end
   # ADD here
@@ -1111,7 +1003,11 @@ TEXT
   end
   Subcommands::command :comment do |opts|
     opts.banner = "Usage: comment [options] ISSUE_NO TEXT"
-    opts.description = "Add comment a given issue"
+    opts.description = "Add a comment to a given issue"
+  end
+  Subcommands::command :fix do |opts|
+    opts.banner = "Usage: fix [options] ISSUE_NO TEXT"
+    opts.description = "Add a fix for a given issue"
   end
   Subcommands::command :test do |opts|
     opts.banner = "Usage: test [options] ISSUE_NO TEXT"
@@ -1144,6 +1040,14 @@ TEXT
     opts.banner = "Usage: viewlogs [options] ISSUE_NO"
     opts.description = "view logs for an issue"
   end
+  Subcommands::command :recentlogs do |opts|
+    opts.banner = "Usage: recentlogs [options] <HOWMANY>"
+    opts.description = "view recent logs/activity, default last 10 logs "
+  end
+  Subcommands::command :recentcomments do |opts|
+    opts.banner = "Usage: recentcomments [options] <HOWMANY>"
+    opts.description = "view recent comments, default last 10 logs "
+  end
   # XXX order of these 2 matters !! reverse and see what happens
   Subcommands::command :close, :clo do |opts|
     opts.banner = "Usage: clo [options] <ISSUENO>"
@@ -1178,16 +1082,10 @@ TEXT
     opts.on("-f", "--[no-]force", "force - don't prompt") do |v|
       options[:force] = v
     end
-    #opts.on("--recursive", "operate on subtasks also") { |v|
-      #options[:recursive] = v
-    #}
   end
   Subcommands::command :status do |opts|
     opts.banner = "Usage: status [options] <STATUS> <ISSUE>"
     opts.description = "Change the status of an issue. \t<STATUS> are open closed started canceled stopped "
-    #opts.on("--recursive", "operate on subtasks also") { |v|
-      #options[:recursive] = v
-    #}
   end
   # TODO:
   #Subcommands::command :tag do |opts|

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +05:30
+date: 2010-07-12 00:00:00 +05:30
 default_executable: bugzyrb
 dependencies: 
 - !ruby/object:Gem::Dependency