discoball 0.2.0 → 0.2.2

data/README.md

@@ -3,7 +3,8 @@ discoball
 
 `discoball` is a tool to filter streams and colorize patterns. It functions somewhat like `egrep --color`,
 except that it can highlight multiple patterns (in different colors). Patterns are arbitrary ruby regexes that
-are matched against the entire line.
+are matched against the entire line. If the regex contains groupd, only the first group's match text is
+highlighted.
 
 Usage
 -----
@@ -56,6 +57,10 @@ Examples
         $ tl               # ~> Show the list of tasks, with tags highlighted
         $ tl health urgent # ~> Show only tasks tagged with 'health' and 'urgent'
 
+    Demo:
+
+    ![Discoball + t demo](http://i.imgur.com/tVQMm.png)
+
 Installation
 ------------
 

data/discoball.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "discoball"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">=0") if s.respond_to? :required_rubygems_version=
   s.specification_version = 2 if s.respond_to? :specification_version=

data/lib/discoball.rb

@@ -35,20 +35,20 @@ module Discoball
       case @color_mode
       when :one_color
         matches = @patterns.reduce([]) { |memo, pattern| # No Array#flat_map in Ruby 1.8 :\
-          m = line.scan(pattern)
+          m = line.scan(pattern).map { |match| match.is_a?(Array) ? match.first : match }
           match_found[pattern] = true unless m.empty?
           memo += m
         }.uniq
         matches.each { |match| highlight!(line, match, SINGLE_COLOR) }
       when :group_colors
         @patterns.each do |pattern|
-          matches = line.scan(pattern).uniq
+          matches = line.scan(pattern).map { |match| match.is_a?(Array) ? match.first : match }.uniq
           match_found[pattern] = true unless matches.empty?
           matches.each { |match| highlight!(line, match, @color_assignments[pattern]) }
         end
       when :individual
         matches = @patterns.reduce([]) { |memo, pattern|
-          m = line.scan(pattern)
+          m = line.scan(pattern).map { |match| match.is_a?(Array) ? match.first : match }
           match_found[pattern] = true unless m.empty?
           memo += m
         }.uniq
@@ -79,7 +79,7 @@ module Discoball
     # Get the next color and put it at the back
     def pop_rotate
       color = @color_stack.pop
-      @color_stack.insert(0, color)
+      @color_stack.unshift color
       color
     end
   end

metadata

@@ -1,101 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: discoball
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Caleb Spare
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-11 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: colorize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70347433530760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 5
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70347433530760
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &70347433530300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 83
-        segments: 
-        - 1
-        - 16
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70347433530300
 description: A simple stream filter to highlight patterns
 email: cespare@gmail.com
-executables: 
+executables:
 - discoball
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - discoball.gemspec
 - lib/discoball.rb
 - bin/discoball
-has_rdoc: true
 homepage: http://github.com/cespare/discoball
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: discoball
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 2
 summary: A simple stream filter to highlight patterns
 test_files: []
-