gliss 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/gliss.rb

@@ -113,7 +113,6 @@ module Gliss
     
     def process_args
       @repo = "."
-      @filter = /.*/
       @output_proc = Proc.new do |gloss|
         sha = gloss.sha.slice(0,8)
         tag = gloss.tag
@@ -128,6 +127,8 @@ module Gliss
         puts oparser
         exit(1)
       end
+
+      @filter ||= /.*/
       
       @from, @to = @args
       @to ||= "master"
@@ -147,7 +148,8 @@ module Gliss
         end
         
         opts.on("-f REGEX", "--filter REGEX", "Output only messages with tags matching REGEX", "(default is all tags)") do |filter|
-          @filter = Regexp.new(filter)
+          new_filter = Regexp.new(filter)
+          @filter = @filter ? Regexp.union(@filter, new_filter) : new_filter
         end
         
         opts.on("-w", "--whole-commit", "Output entire commit messages that contain glosses") do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gliss
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Will Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 -05:00
+date: 2011-06-28 00:00:00 -05:00
 default_executable: gliss
 dependencies: 
 - !ruby/object:Gem::Dependency