todorb 1.1.1 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+= todorb 1.2.0, 2010-07-08
+* added search terms for list
+  todorb list testing -window # (match testing, but reject window)
+  todorb list -- -windows perl python # (reject windows, match perl or python)
+* move lib/common under lib/todorb/common since it was loading wrong
+libs from another gem
+
 = todorb 1.1.1, 2010-06-24 
 * fixed --show-actions option
 = todorb 1.1.0, 2010-06-23 

data/Rakefile

@@ -12,8 +12,8 @@ begin
     gem.authors = ["Rahul Kumar"]
     gem.rubyforge_project = "todorb"
     #gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_development_dependency "subcommand", ">= 1.0.4"
-    gem.add_dependency "subcommand", ">= 1.0.4"
+    gem.add_development_dependency "subcommand", ">= 1.0.5"
+    gem.add_dependency "subcommand", ">= 1.0.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/todorb.rb

@@ -10,9 +10,9 @@
 =end
 require 'rubygems'
 #require 'csv'
-require 'common/colorconstants'
-require 'common/sed'
-require 'common/cmdapp'
+require 'todorb/common/colorconstants'
+require 'todorb/common/sed'
+require 'todorb/common/cmdapp'
 require 'subcommand'
 include ColorConstants
 include Sed
@@ -272,9 +272,17 @@ class Todo
     end
   end
   def list args
+    incl, excl = Cmdapp._list_args args
     populate
     grep if @options[:grep]
     filter if @options[:filter]
+    @data = Cmdapp.filter_rows( @data, incl) do |row, regexp|
+      row[1] =~ regexp
+    end
+    @data = Cmdapp.filter_rows( @data, excl) do |row, regexp|
+      row[1] !~ regexp
+    end
+
     sort if @options[:sort]
     renumber if @options[:renumber]
     colorize # << currently this is where I print !! Since i colorize the whole line

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

@@ -208,5 +208,39 @@ module Cmdapp
     v
   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
 
 end

data/todorb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{todorb}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = %q{2010-06-24}
+  s.date = %q{2010-07-08}
   s.default_executable = %q{todorb}
   s.description = %q{command-line program that manages a todo list text file, incl subtasks, status, priorities etc }
   s.email = %q{sentinel1879@gmail.com}
@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/todorb",
-     "lib/common/cmdapp.rb",
-     "lib/common/colorconstants.rb",
-     "lib/common/sed.rb",
      "lib/todorb.rb",
+     "lib/todorb/common/cmdapp.rb",
+     "lib/todorb/common/colorconstants.rb",
+     "lib/todorb/common/sed.rb",
      "tests/Makefile",
      "tests/README",
      "tests/aggregate-results.sh",
@@ -68,15 +68,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<subcommand>, [">= 1.0.4"])
-      s.add_runtime_dependency(%q<subcommand>, [">= 1.0.4"])
+      s.add_development_dependency(%q<subcommand>, [">= 1.0.5"])
+      s.add_runtime_dependency(%q<subcommand>, [">= 1.0.5"])
     else
-      s.add_dependency(%q<subcommand>, [">= 1.0.4"])
-      s.add_dependency(%q<subcommand>, [">= 1.0.4"])
+      s.add_dependency(%q<subcommand>, [">= 1.0.5"])
+      s.add_dependency(%q<subcommand>, [">= 1.0.5"])
     end
   else
-    s.add_dependency(%q<subcommand>, [">= 1.0.4"])
-    s.add_dependency(%q<subcommand>, [">= 1.0.4"])
+    s.add_dependency(%q<subcommand>, [">= 1.0.5"])
+    s.add_dependency(%q<subcommand>, [">= 1.0.5"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 +05:30
+date: 2010-07-08 00:00:00 +05:30
 default_executable: todorb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 5
+        version: 1.0.5
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id002
 description: "command-line program that manages a todo list text file, incl subtasks, status, priorities etc "
@@ -62,10 +62,10 @@ files:
 - Rakefile
 - VERSION
 - bin/todorb
-- lib/common/cmdapp.rb
-- lib/common/colorconstants.rb
-- lib/common/sed.rb
 - lib/todorb.rb
+- lib/todorb/common/cmdapp.rb
+- lib/todorb/common/colorconstants.rb
+- lib/todorb/common/sed.rb
 - tests/Makefile
 - tests/README
 - tests/aggregate-results.sh