bugzyrb 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
-= bugzyrb 0.2.0,  2010-07-08 1
+= bugzyrb 0.2.1, 2010-07-09
+* added status which was missing
+* delete can take multiple issues
+
+= bugzyrb 0.2.0,  2010-07-08
 * added readline support and history for fields being entered
 * optional project, component, version

data/README.rdoc

@@ -1,6 +1,6 @@
 = bugzyrb
 
-A command-line bug tracking system using sqlite3 as a store.
+A command-line bug/issue/feature tracking system using sqlite3 as a store.
 This is a port of bugzy.sh (bash-shell based tracker that uses tab delimited files).
 
 This is not an extensive, full-fledged bug or issue tracker such a bugzilla. Its a simple tracker that maintains one sqlite file per directory. Thus, you could create one for each project.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bugzyrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bugzyrb}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-07-09}
   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}
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
      "bugzy.cfg",
      "bugzyrb.gemspec",
      "lib/bugzyrb.rb",
-     "lib/common/cmdapp.rb",
-     "lib/common/colorconstants.rb",
-     "lib/common/db.rb",
-     "lib/common/sed.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"]

data/lib/{common → bugzyrb/common}/cmdapp.rb

@@ -8,7 +8,8 @@
   * License:       Ruby License
 
 =end
-require 'common/sed'
+# sed required by serial number setter only change_file
+require 'bugzyrb/common/sed'
 
 ERRCODE = 1
 
@@ -133,6 +134,7 @@ module Cmdapp
       _get_serial_number
     end
     _backup filename
+    # from Sed
     change_row filename, pattern, "#{appname}:#{number}"
   end
 
@@ -173,8 +175,7 @@ module Cmdapp
     $valid_array = false
     @data = []
     File.open(@app_file_path).each do |line|
-      # FIXME: use @app_delim
-      row = line.chomp.split "\t"
+      row = line.chomp.split( @app_delim ) 
       @data << row
     end
     $valid_array = true
@@ -186,8 +187,8 @@ module Cmdapp
     raise "Cannot save array! Please use load_array to load" if $valid_array == false
 
     File.open(@app_file_path, "w") do |file| 
-      # FIXME: use join with @app_delim
-      @data.each { |row| file.puts "#{row[0]}\t#{row[1]}" }
+      #@data.each { |row| file.puts "#{row[0]}\t#{row[1]}" }
+      @data.each { |row| file.puts row.join(@app_delim) }
     end
   end
   ##
@@ -342,6 +343,40 @@ def history_save column, str
     f << $history_hash.to_yaml
   end
 end
+  # separates args to list-like operations
+  # +xxx means xxx should match in output
+  # -xxx means xxx should not exist in output
+  # @param [Array] list of search terms to match or not-match
+  # @return [Array, Array] array of terms that should match, and array of terms
+  # that should not match.
+  def _list_args args
+    incl = []
+    excl = []
+    args.each do |e| 
+      if e[0] == '+'
+        incl << e[1..-1]
+      elsif  e[0] == '-'
+        excl << e[1..-1]
+      else
+        incl << e
+      end
+    end
+    incl = nil if incl.empty?
+    excl = nil if excl.empty?
+    return incl, excl
+  end
+  ##  
+  # creates a regexp and for each row returns the row and the regexp
+  # you can use the regexp on whatever part of the row you want to match or reject
+  def filter_rows rows, incl
+    if incl
+      incl_str = incl.join "|"
+      r = Regexp.new incl_str
+      #rows = rows.select { |row| row['title'] =~ r }
+      rows = rows.select { |row| yield(row, r) }
+    end
+    rows
+  end
 
 
 

data/lib/{common → bugzyrb/common}/db.rb

@@ -73,30 +73,6 @@ module Database
       return nil if rows.empty?
       return rows
     end
-  ## 
-  # insert a issue or bug report into the database
-  # @params
-  # @return [Fixnum] last row id
-  def bugs_insert(status, severity, type, assigned_to, start_date, due_date, comment_count, priority, title, description, fix, created_by = $default_user)
-    # id = $num
-    # status = "CODE" 
-    # severity = "CODE" 
-    # type = "CODE" 
-    # assigned_to = "CODE" 
-    # start_date = $now
-    # due_date = $now
-    # comment_count = $num
-    # priority = "CODE" 
-    # title = "CODE" 
-    # description = "Some long text" 
-    # fix = "Some long text" 
-    # date_created = $now
-    # date_modified = $now
-    @db.execute(" insert into bugs (  status, severity, type, assigned_to, start_date, due_date, comment_count, priority, title, description, fix, created_by ) values (  ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",  
-                status, severity, type, assigned_to, start_date, due_date, comment_count, priority, title, description, fix, created_by )
-    rowid = @db.get_first_value( "select last_insert_rowid();")
-    return rowid
-  end
   ## takes a hash and creates an insert statement for table and inserts data.
   # Advantage is that as we add columns, this will add the column to the insert, so we
   # don't need to keep modifying in many places.
@@ -123,8 +99,8 @@ module Database
     rowid = @db.get_first_value( "select last_insert_rowid();")
     return rowid
   end
-  def max_bug_id
-    id = @db.get_first_value( "select max(id) from bugs;")
+  def max_bug_id table="bugs"
+    id = @db.get_first_value( "select max(id) from #{table};")
     return id
   end
   def sql_comments_insert id, comment, created_by = $default_user
@@ -201,14 +177,14 @@ module Database
     end
     def dummy
        id = $num
-       status = "OPEN" 
-       severity = "CRI" 
-       type = "BUG" 
+       status = "open" 
+       severity = "critical" 
+       type = "bug" 
        assigned_to = "rahul" 
        start_date = $now
        due_date = $now
        comment_count = 0
-       priority = "A" 
+       priority = "P1" 
        title = "some title" 
        description = "Some long text fro this bug too" 
        fix = nil #"Some long text" 

data/lib/bugzyrb.rb

@@ -10,25 +10,25 @@
 =end
 require 'rubygems'
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'common/colorconstants'
-require 'common/sed'
-require 'common/cmdapp'
+require 'bugzyrb/common/colorconstants'
+require 'bugzyrb/common/sed'
+require 'bugzyrb/common/cmdapp'
 require 'subcommand'
 require 'sqlite3'
 require 'highline/import'
-require 'common/db'
+require 'bugzyrb/common/db'
 include ColorConstants
 include Sed
 include Cmdapp
 include Subcommands
 include Database
 
-PRI_A = YELLOW + BOLD
-PRI_B = WHITE  + BOLD
-PRI_C = GREEN  + BOLD
-PRI_D = CYAN  + BOLD
-VERSION = "0.0.0"
-DATE = "2010-06-24"
+#PRI_A = YELLOW + BOLD
+#PRI_B = WHITE  + BOLD
+#PRI_C = GREEN  + BOLD
+#PRI_D = CYAN  + BOLD
+VERSION = "0.2.0"
+DATE = "2010-07-24"
 APPNAME = File.basename($0)
 AUTHOR = "rkumar"
 
@@ -63,6 +63,7 @@ class Bugzy
   # For more:
   #     $ bugzyrb --help
   #     $ bugzyrb --show-actions
+  #     $ alias bu='bugzyrb'
   #
   # == TODO:
   #
@@ -213,7 +214,6 @@ SQL
     #fix = nil
     body['start_date']  = @now
     body['due_date']    = default_due_date
-    #rowid = db.bugs_insert(status, severity, type, assigned_to, start_date, due_date, comment_count, priority, title, description, fix)
     rowid = db.table_insert_hash("bugs", body)
     puts "Issue #{rowid} created"
     type = body['type']
@@ -311,7 +311,6 @@ SQL
     body["component"]=component if $use_component
     body["version"]=version if $use_version
 
-    #rowid = db.bugs_insert(status, severity, type, assigned_to, start_date, due_date, comment_count, priority, title, description, fix)
     rowid = db.table_insert_hash("bugs", body)
     puts "Issue #{rowid} created"
     logid = db.sql_logs_insert rowid, "create", "#{rowid} #{type}: #{title}"
@@ -441,19 +440,29 @@ TEXT
   end
   # deletes given issue
   # @param [Array] id of issue
+  # @example
+  # bu delete 1
+  # bu $0 delete 2 3 4
+  # bu $0 delete $(jot - 6 10)
   def delete args
-    id = args.shift
-    if @options[:force]
-      db, row = validate_id id, false
-      db.sql_delete_bug id
-      exit 0
-    end
-    db, row = validate_id id, true
-    if agree("Delete this issue?  ")
-      db.sql_delete_bug id
-    else
-      message "Operation cancelled"
+    #id = args.shift
+    ctr = 0
+    args.each do |id| 
+      if @options[:force]
+        db, row = validate_id id, false
+        db.sql_delete_bug id
+        ctr += 1
+      else
+        db, row = validate_id id, true
+        if agree("Delete issue #{id}?  ")
+          db.sql_delete_bug id
+          ctr += 1
+        else
+          message "Operation cancelled"
+        end
+      end
     end
+    message "#{ctr} issue/s deleted"
     0
   end
   def copy args
@@ -504,19 +513,7 @@ TEXT
   #   list -- -linux
   def list args
     # lets look at args as search words
-    incl = []
-    excl = []
-    args.each do |e| 
-      if e[0] == '+'
-        incl << e[1..-1]
-      elsif  e[0] == '-'
-        excl << e[1..-1]
-      else
-        incl << e
-      end
-    end
-    incl = nil if incl.empty?
-    excl = nil if excl.empty?
+    incl, excl = Cmdapp._list_args args
     db = get_db
     #db.run "select * from bugs " do |row|
     #end
@@ -547,15 +544,11 @@ TEXT
     rows = db.run "select #{fields} from bugs #{wherestring} "
     die "No rows" unless rows
 
-    if incl
-      incl_str = incl.join "|"
-      r = Regexp.new incl_str
-      rows = rows.select { |row| row['title'] =~ r }
+    rows = Cmdapp.filter_rows( rows, incl) do |row, regexp|
+      row['title'] =~ regexp
     end
-    if excl
-      excl_str = excl.join "|"
-      r = Regexp.new excl_str
-      rows = rows.select { |row| row['title'] !~ r }
+    rows = Cmdapp.filter_rows( rows, excl) do |row, regexp|
+      row['title'] !~ regexp
     end
     headings = fields.split ","
     # if you want to filter output send a delimiter
@@ -717,7 +710,11 @@ TEXT
     if respond_to? meth
       #bool = send("validate_#{field}".to_sym, value)
       bool = send(meth, value)
-      die "#{value} is not valid for #{field}" unless bool
+      # try to find out values
+      #vfield = "@valid_#{field}"
+      #valid = eval(vfield).join(",")
+      #die "#{value} is not valid for #{field} (#{valid})" unless bool
+      return 1 unless bool
     end
     args.each do |id| 
       db, row = validate_id id
@@ -735,6 +732,14 @@ TEXT
     end
     0
   end
+  def status args
+    value = args.shift
+    ret = change_value "status", value, args
+    if ret != 0
+      die "#{value} is not valid for status. Valid are (#{@valid_status.join(',')})" 
+    end
+    0
+  end
   # close an issue (changes status of issue/s)
   # @param [Array] array of id's to close (argv)
   # @return [0] for success
@@ -861,6 +866,10 @@ TEXT
     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
@@ -877,6 +886,7 @@ TEXT
   # @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
@@ -895,11 +905,11 @@ TEXT
     when :multiline, :ml
       return Cmdapp::edit_text default
     when false
-      #return nil
       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)
       puts project
@@ -910,9 +920,10 @@ TEXT
     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
@@ -927,6 +938,9 @@ TEXT
     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
@@ -1169,16 +1183,17 @@ TEXT
     #}
   end
   Subcommands::command :status do |opts|
-    opts.banner = "Usage: status [options] <STATUS> <TASKS>"
-    opts.description = "Change the status of a task. \t<STATUS> are open closed started pending hold next"
-    opts.on("--recursive", "operate on subtasks also") { |v|
-      options[:recursive] = v
-    }
-  end
-  Subcommands::command :tag do |opts|
-    opts.banner = "Usage: tag <TAG> <TASKS>"
-    opts.description = "Add a tag to an item/s. "
+    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|
+    #opts.banner = "Usage: tag <TAG> <TASKS>"
+    #opts.description = "Add a tag to an item/s. "
+  #end
   #Subcommands::alias_command :open , "status","open"
   #Subcommands::alias_command :close , "status","closed"
   cmd = Subcommands::opt_parse()

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +05:30
+date: 2010-07-09 00:00:00 +05:30
 default_executable: bugzyrb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,10 +121,10 @@ files:
 - bugzy.cfg
 - bugzyrb.gemspec
 - lib/bugzyrb.rb
-- lib/common/cmdapp.rb
-- lib/common/colorconstants.rb
-- lib/common/db.rb
-- lib/common/sed.rb
+- lib/bugzyrb/common/cmdapp.rb
+- lib/bugzyrb/common/colorconstants.rb
+- lib/bugzyrb/common/db.rb
+- lib/bugzyrb/common/sed.rb
 has_rdoc: true
 homepage: http://github.com/rkumar/bugzyrb
 licenses: []