bugzyrb 0.3.4 → 0.3.6

data/NOTES

@@ -0,0 +1,89 @@
+
+Subject: version and others
+---------------------------
+Date: 2010-07-03 11:36
+
+Wondering if we shoud add fields such as:
+
+* version (of software)
+* environment
+* estimated time
+* actual time
+
+Version can be put as a tag. Can add estimate time, though.
+
+* * * * * * * *
+
+Subject: project and component
+------------------------------
+Date: 2010-07-03 11:40
+
+Should we keep project and component as a tag or as a separate field
+altogether ?
+
+I am assuming each file is for a project, so its not a global database.
+Thus component can be thought of. However, if someone chooses just one
+database, then we need to make it easy to work at project level.
+Perhaps, env variable.
+
+* * * * * * * *
+
+Subject: project component version
+----------------------------------
+Date: 2010-07-06 20:14
+
+set $use_project in cfg file
+same for $component or version.
+If true, then I will prompt for it in "add" operation.
+
+valid_xx allows me to validate.
+default_xx is default value used if no prompt 
+prompt_xx is if user to be prompted
+  - :freeform : allow any entry, if blank, use default
+  - :false : don't prompt, use default if present
+  - :choice : use valid_xx array to give choice to user
+  - true : uses choice if valid_xx prsent else freeform
+
+user_input() takes care of deciding what to do.
+
+* * * * * * * *
+
+Subject: start date
+-------------------
+Date: 2010-07-07 19:55
+
+currently start date goes as current time.
+
+It's meant to be when you expect to start. (Later it can be updated with
+actual start date.) Thus at bug creation, it should not really be
+filled. Should we leave it blank and not put a default ?
+
+* * * * * * * *
+
+Subject: readline for old values
+--------------------------------
+Date: 2010-07-08 00:22
+
+i am using readline for some input, so i can show earlier entered values
+for that column. I am saving that to a file.
+Should i put that in database ?
+File one, will be usable in other cases, too, but currently it relies on
+current directory, and could clutter up disk. I use one file per column.
+I could use yaml and a hash.
+
+I am only using in cases of freeform where i don't have a list, such as
+version, project, component.
+
+* * * * * * * *
+
+Subject: New version of Sqlite3
+-------------------------------
+Date: 2011-09-21 19:50
+
+Due to sqlite3 no longer supporting arrayfields, almost everything had
+begun crashing. I've fixed things here. Still sometimes results_as_hash
+or db_translation gives an error saying columns() not supported by Array
+in its own code. So i am having to set these values in each command
+individually. Its dirty.
+
+* * * * * * * *

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.6

data/bugzyrb.gemspec

@@ -1,49 +1,46 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bugzyrb}
-  s.version = "0.3.1"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rahul Kumar"]
-  s.date = %q{2010-09-12}
-  s.default_executable = %q{bugzyrb}
+  s.authors = [%q{Rahul Kumar}]
+  s.date = %q{2011-10-06}
   s.description = %q{basic, easy-to-use command-line issue-tracker using sqlite for ruby 1.9}
   s.email = %q{sentinel1879@gmail.com}
-  s.executables = ["bugzyrb"]
+  s.executables = [%q{bugzyrb}]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/bugzyrb",
-     "bugzy.cfg",
-     "bugzyrb.gemspec",
-     "lib/bugzyrb.rb",
-     "lib/bugzyrb/common/cmdapp.rb",
-     "lib/bugzyrb/common/colorconstants.rb",
-     "lib/bugzyrb/common/db.rb",
-     "lib/bugzyrb/common/sed.rb"
+    "CHANGELOG.rdoc",
+    "LICENSE",
+    "NOTES",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/bugzyrb",
+    "bugzy.cfg",
+    "bugzyrb.gemspec",
+    "lib/bugzyrb.rb",
+    "lib/bugzyrb/common/cmdapp.rb",
+    "lib/bugzyrb/common/colorconstants.rb",
+    "lib/bugzyrb/common/db.rb",
+    "lib/bugzyrb/common/sed.rb"
   ]
   s.homepage = %q{http://github.com/rkumar/bugzyrb}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{bugzyrb}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{command-line bug/issue tracker using sqlite, ruby 1.9}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -52,14 +49,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<highline>, [">= 1.5.2"])
       s.add_runtime_dependency(%q<terminal-table>, [">= 1.4.2"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<arrayfields>, [">= 4.7.4"])
     else
       s.add_dependency(%q<yard>, [">= 0.5"])
       s.add_dependency(%q<subcommand>, [">= 1.0.5"])
       s.add_dependency(%q<highline>, [">= 1.5.2"])
       s.add_dependency(%q<terminal-table>, [">= 1.4.2"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_dependency(%q<arrayfields>, [">= 4.7.4"])
     end
   else
     s.add_dependency(%q<yard>, [">= 0.5"])
@@ -67,7 +62,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<highline>, [">= 1.5.2"])
     s.add_dependency(%q<terminal-table>, [">= 1.4.2"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-    s.add_dependency(%q<arrayfields>, [">= 4.7.4"])
   end
 end
 

data/lib/bugzyrb/common/cmdapp.rb

@@ -512,6 +512,7 @@ module Cmdapp
   # indents given string, n spaces
   # http://redmine.ruby-lang.org/issues/show/749 Thomas Sawyer
   def indent(str,n)
+    return '' unless str
     if n >= 0
       str.gsub(/^/, ' ' * n)
     else

data/lib/bugzyrb/common/colorconstants.rb

@@ -33,12 +33,13 @@ module ColorConstants
   BLINK      = "\e[5m"
   # The start of an ANSI reverse sequence.
   REVERSE    = "\e[7m"
+  STANDOUT   = REVERSE
   # The start of an ANSI concealed sequence.  (Terminal support uncommon.)
   CONCEALED  = "\e[8m"
 
   # added from http://understudy.net/custom.html
   BOLD_OFF       = "\e[22m"
-  UNDERILNE_OFF  = "\e[24m"
+  UNDERLINE_OFF  = "\e[24m"
   BLINK_OFF      = "\e[25m"
   REVERSE_OFF    = "\e[27m"
 

data/lib/bugzyrb.rb

@@ -22,12 +22,27 @@ include Cmdapp
 include Subcommands
 include Database
 
-#PRI_A = YELLOW + BOLD
-#PRI_B = WHITE  + BOLD
-#PRI_C = GREEN  + BOLD
-#PRI_D = CYAN  + BOLD
-VERSION = "0.3.4"
-DATE = "2011-09-28"
+# monkey_patch for terminal_table using coloring, does *not* work perfectly here
+# https://gist.github.com/625808
+ELIMINATE_ANSI_ESCAPE = true
+class String
+  alias_method :to_s_orig, :to_s
+  def to_s
+    str = self.to_s_orig
+    if ::ELIMINATE_ANSI_ESCAPE
+      str = str.sub(/^\e\[[\[\e0-9;m]+m/, "")
+      str = str.sub(/(\e\[[\[\e0-9;m]+m)$/, "")
+      # Above works for only one, beg or eol
+      str = str.gsub(/\e\[[\[\e0-9;m]+m/, "")
+      #str = str.gsub(/(\e\[[\[\e0-9;m]+m)/, "")
+    end
+    str
+  end
+end
+# end monkey
+#
+VERSION = "0.3.5"
+DATE = "2011-09-30"
 APPNAME = File.basename($0)
 AUTHOR = "rkumar"
 
@@ -54,10 +69,10 @@ class Bugzy
   #     $ bugzyrb -d ~/
   #
   # == Close a task (mark as done)
-  #     $ bugzyrb status close 1
+  #     $ bugzyrb close 1
   # 
-  # == Add priority
-  #     $ bugzyrb pri A 2
+  # == Change priority of items 4 and 6 to P2
+  #     $ bugzyrb pri P2 4 6
   #
   # For more:
   #     $ bugzyrb --help
@@ -65,8 +80,10 @@ class Bugzy
   #     $ alias bu='bugzyrb'
   #
   # == TODO:
-  #  colorize output
-  #  archive completed tasks
+  #  -- archive completed tasks
+  #  -- i cannot do any coloring with fields i have not selected. I need to get around this
+  #   of having fields in select that are not displayed. Such as type/priority/date
+  #  -- refactor and cleanup, its a mess. Should be able to configure coloring elsewhere.
   #
   def initialize options, argv
  
@@ -82,8 +99,8 @@ class Bugzy
     @app_default_action = "list" # TODO:
     @file = @app_file_path = @options[:file] || "bugzy.sqlite"
     #@app_serial_path = File.expand_path("~/serial_numbers")
-    @deleted_path = "todo_deleted.txt"
-    @todo_delim = "\t"
+    #@deleted_path = "todo_deleted.txt"
+    #@todo_delim = "\t"
     @appname = File.basename( Dir.getwd ) #+ ".#{$0}"
     # in order to support the testing framework
     t = Time.now
@@ -187,7 +204,17 @@ SQL
 
       0
   end
+  # get a connection to the database, checking up 3 levels.
   def get_db
+    # we want to check a couple levels 2011-09-28 
+    unless @db
+      unless File.exists? @file
+        3.times do |i|
+          @file = "../#{@file}"
+          break if File.exists? @file
+        end
+      end
+    end
     @db ||= DB.new @file
   end
   # returns default due date for add or qadd
@@ -241,6 +268,10 @@ SQL
         exit ERRCODE
       end
     else
+      # if you add last arg as P1..P5, I'll update priority automatically
+      if args.last =~ /P[1-5]/
+        $default_priority = args.pop
+      end
       text = args.join " "
     end
     # convert actual newline to C-a. slash n's are escapes so echo -e does not muck up.
@@ -357,7 +388,7 @@ TEXT
     die "No data found for #{id}" unless row
     puts "[#{row['type']} \##{row['id']}] #{row['title']}"
     puts "Description:"
-    puts Cmdapp.indent(row['description'],3)
+    puts Cmdapp.indent(row['description'],3) if row['description']
     puts "\nAdded by #{row['created_by']} on #{row['date_created']}. Updated #{row['date_modified']}."
     comment_count = 0
     #puts row
@@ -426,6 +457,8 @@ TEXT
     editable << "project" if $use_project
     editable << "component" if $use_component
     editable << "version" if $use_version
+    print_green row['title']
+    print_green row['description'] if row['description']
     sel = Cmdapp._choice "Select field to edit", editable
     print "You chose: #{sel}"
     old =  row[sel]
@@ -448,6 +481,12 @@ TEXT
     message str
     db.sql_update "bugs", id, sel, str
     puts "Updated #{id}"
+    if sel == 'status' && ['canceled', 'closed'].include?(str)
+      curr_status = row['priority']
+      value = curr_status.sub(/P/,'X')
+      db.sql_update "bugs", id, 'priority', value
+      puts "Updated #{id}'s PRI from #{str} to #{value} "
+    end
     sstr = Cmdapp.truncate(str.to_s,50)
     rowid = db.sql_logs_insert id, sel, "[#{id}] updated [#{sel}] with #{sstr}"
     0
@@ -506,7 +545,7 @@ TEXT
     row = db.sql_select_rowid "bugs", id
     die "No data found for #{id}" unless row
     puts "[#{row['type']} \##{row['id']}] #{row['title']}"
-    puts row['description']
+    puts row['description'] if row['description']
     puts 
     ctr = 0
     db.select_where "log", "id", id do |r|
@@ -533,14 +572,25 @@ TEXT
     db = get_db
     #db.run "select * from bugs " do |row|
     #end
-    descindex = nil
-    fields = "id,status,title,severity,priority,start_date,due_date"
+    # will not be able to find title due to function
+    descdelim = '>>'
+    #fields = 'id,status,type,priority,substr(title || "  >>" ||  ifnull(description,""),0,85)'
+    fields = %Q[id,status,type,priority,substr(title || "  #{descdelim}" ||  ifnull(description,""),0,85)]
+    format = "%-3s | %-7s | %-5s | %-60s "
     if @options[:short]
       fields = "id,status,title"
+      format = "%3s | %6s | %60s "
     elsif @options[:long]
-      fields = "id,status,title,severity,priority,due_date,description"
-      descindex = 6
+      fields = "id,status,priority,title,description"
+      format = "%-3s|%-7s|%-5s | %-60s |%-s"
     end
+    fieldsarr = fields.split(",") # NOTE comma in ifnull function
+    descindex = fieldsarr.index("description")
+    titleindex = fieldsarr.index("title")  || 4 # fieldsarr.count-1 due to comman in ifnull XXX NOTE
+    statindex =  fieldsarr.index("status")
+    priindex =  fieldsarr.index("priority")
+    typeindex =  fieldsarr.index("type")
+
     where = nil
     wherestring = ""
     if @options[:open]
@@ -550,7 +600,7 @@ TEXT
     if @options[:overdue]
       #where =  %{ where status != 'closed' and due_date <= "#{Date.today}" }
       where ||= []
-      where <<  %{ status != 'closed'} 
+      where <<  %{ status != 'closed' and status != 'canceled'} 
       where <<  %{ due_date <= "#{Date.today}" }
     end
     if @options[:unassigned]
@@ -561,27 +611,32 @@ TEXT
     # added 2011-09-28 so we don't see closed all the time.
     if !where && !@options[:show_all]
       where ||= []
-      where <<  %{ status != 'closed'} 
+      where <<  %{ status != 'closed' and status != 'canceled'} 
     end
     if where
       wherestring = " where " + where.join(" and ")
     end
-    puts wherestring
+    orderstring ||= " order by status asc, priority desc " # 2011-09-30  so highest prio comes at end
+    puts wherestring if @options[:verbose]
 
     db.db.type_translation = true
     db.db.results_as_hash = false # 2011-09-21 
-    rows = db.run "select #{fields} from bugs #{wherestring} "
+    rows = db.run "select #{fields} from bugs #{wherestring} #{orderstring}  "
     db.db.type_translation = false
     die "No rows" unless rows
 
     rows = Cmdapp.filter_rows( rows, incl) do |row, regexp|
       #row['title'] =~ regexp
-      row[2] =~ regexp
+      row[titleindex] =~ regexp
     end
     rows = Cmdapp.filter_rows( rows, excl) do |row, regexp|
       #row['title'] !~ regexp
-      row[2] !~ regexp
+      row[titleindex] !~ regexp
     end
+    fields.sub!( /priority/, "pri")
+    fields.sub!( /status/, "sta")
+    fields.sub!( /severity/, "sev")
+    fields.sub!( /substr.*/, "title") # XXX depends on function used on title
     headings = fields.split ","
     # if you want to filter output send a delimiter
     if $bare
@@ -591,8 +646,10 @@ TEXT
 #        d = e['description']  # changed 2011 dts  
         if descindex
           d = e[descindex] 
-          e[descindex] = d.gsub(/\n/," ") if d
+          e[descindex].gsub!(/\n/," ") if d
         end
+        e[typeindex] = e[typeindex][0,3] if typeindex
+        e[statindex] = e[statindex][0,2] if statindex
         puts e.join delim
       end
     else
@@ -600,13 +657,66 @@ TEXT
         puts "No rows"
         return
       end
+      # NOTE: terminal table gets the widths wrong because of coloring info.
+      if @options[:colored]
+        #require 'colored'
+        startrow = nil
+        fr = titleindex
+        rows.each_with_index do |e, index|  
+          s = e[titleindex] 
+          s.gsub!("\n", ";")
+          s.gsub!(/(#\w+)/,"#{UNDERLINE}\\1#{UNDERLINE_OFF}")
+          s.gsub!(/(>>.*)/,"#{GREEN}\\1#{CLEAR}")
+          st = e[statindex]
+          e[statindex] = e[statindex][0,2]
+          e[typeindex] = e[typeindex][0,3] if typeindex
+          if typeindex
+            case e[typeindex]
+            when 'bug'
+              e[typeindex] = "#{RED}#{e[typeindex]}#{CLEAR}"
+            when 'enh'
+              e[typeindex] = "#{WHITE}#{e[typeindex]}#{CLEAR}"
+            else
+              e[typeindex] = "#{CYAN}#{e[typeindex]}#{CLEAR}"
+            end
+          end
+          frv = e[fr]
+          if st == 'started'
+            startrow = index unless startrow
+            e[fr] = "#{STANDOUT}#{frv}" # changed 2011 dts   whole line green
+            #e[0] = e[0].to_s.red
+
+            e[-1] = "#{e[-1]}#{CLEAR}"
+          else
+            if priindex
+              pri = e[priindex]
+              case pri
+              when "P4", "P5"
+                e[fr] = "#{BLUE}#{frv}"
+                e[-1] = "#{e[-1]}#{CLEAR}"
+              when "P1"
+                e[fr] = "#{YELLOW}#{ON_RED}#{frv}"
+                e[-1] = "#{e[-1]}#{CLEAR}"
+              when "P2"
+                e[fr] = "#{BOLD}#{frv}"
+                e[-1] = "#{e[-1]}#{CLEAR}"
+              else
+            #e[fr] = "#{CLEAR}#{frv}"
+              end
+            end
+          end
+
+          #print "#{format}\n" % e
+        end
+        rows.insert(startrow, :separator) if startrow
+        #return
+      end
       # pretty output tabular format etc
       require 'terminal-table/import'
-      #table = table(nil, *rows)
       table = table(headings, *rows)
       puts table
+      end
     end
-  end
   ## validate user entered id
   # All methods should call this first.
   # @param [Fixnum] id (actually can be String) to validate
@@ -621,7 +731,7 @@ TEXT
     die "No data found for #{id}" unless row
     if print_header
       puts "[#{row['type']} \##{row['id']}] #{row['title']}"
-      puts row['description']
+      puts row['description'] if row['description']
       puts 
     end
     return db, row
@@ -775,6 +885,13 @@ TEXT
   # @return [0] for success
   def close args
     change_value "status", "closed", args
+    args.each do |id| 
+      db, row = validate_id id
+      curr_status = row['priority']
+      value = curr_status.sub(/P/,'X')
+      db.sql_update "bugs", id, 'priority', value
+      puts "Updated #{id}'s PRI from #{curr_status} to #{value} "
+    end
     0
   end
 
@@ -785,6 +902,14 @@ TEXT
     change_value "status", "started", args
     0
   end
+  def priority args
+    value = args.shift
+    ret = change_value "priority", value, args
+    if ret != 0
+      die "#{value} is not valid for priority. Valid are (#{@valid_priority.join(',')})" 
+    end
+    0
+  end
 
   ##
   # get a date in the future giving how many days
@@ -887,7 +1012,7 @@ TEXT
       require 'optparse'
       options = {}
       options[:verbose] = false
-      options[:colorize] = true
+      options[:colored] = true
       $bare = false
       # adding some env variable pickups, so you don't have to keep passing.
       showall = ENV["TODO_SHOW_ALL"]
@@ -896,7 +1021,7 @@ TEXT
       end
       plain = ENV["TODO_PLAIN"]
       if plain
-        options[:colorize] = (plain == "0") ? false:true
+        options[:colored] = (plain == "0") ? false:true
       end
       config = File.expand_path "~/.bugzyrb.cfg"
       if File.exists? config
@@ -1058,6 +1183,9 @@ TEXT
       options[:bare] = v
       $bare = true
     }
+    opts.on("-c","--colored", "colored listing") { |v|
+      options[:colored] = v
+    }
     opts.on("-v","--overdue", "not closed, due date past") { |v|
       options[:overdue] = v
     }
@@ -1083,6 +1211,10 @@ TEXT
     opts.banner = "Usage: recentcomments [options] <HOWMANY>"
     opts.description = "view recent comments, default last 10 logs "
   end
+  Subcommands::command :priority, :pri do |opts|
+    opts.banner = "Usage: priority [options] <ISSUENO>"
+    opts.description = "change priority of given items to [option]"
+  end
   # XXX order of these 2 matters !! reverse and see what happens
   Subcommands::command :close, :clo do |opts|
     opts.banner = "Usage: clo [options] <ISSUENO>"

metadata

@@ -2,7 +2,7 @@
 name: bugzyrb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -80,6 +80,7 @@ files:
 - .document
 - CHANGELOG.rdoc
 - LICENSE
+- NOTES
 - README.rdoc
 - Rakefile
 - VERSION