capistrano_colors 0.2.1 → 0.5.0

data/Manifest

@@ -1,5 +1,6 @@
-capistrano_colors.gemspec
+lib/capistrano/configuration.rb
+lib/capistrano/logger.rb
 lib/capistrano_colors.rb
-Manifest
 Rakefile
 README.rdoc
+Manifest

data/README.rdoc

@@ -9,12 +9,86 @@ When capistrano_colors is included in your deploy.rb capistrano output gets nice
 
 == USAGE
 
-In your config/deploy.rb
+=== Per project installation
+  
+  In config/deploy.rb
 
    require 'capistrano_colors'
 
+
+=== System wide installation
+
+  Create/Modify you ~/.caprc with the following
+  
+  require 'capistrano_colors'
+  
+
+== Creating you own color matchers
+
+ Create a custom colormatcher with the colorize command.
+ colorize can be called with a hash of options or an array of hashes.
+  
+ The options hash should have the following fields.
+  
+ * :match     - A regular expression of the row to match.
+ * :color     - The color we want on the matching rows.
+ * :prio      - What prio should this rule have (higher = more prio)
+ * :attribute - Special effect (:underline, :reverse, :blink)
+ * :level     - Specify if this matcher should be bound to some of capistranos log levels (info,debug,...)
+
+=== match 
+ :match is a simple regular expression for the row that should be matched.
+
+=== color
+ :color can have the following values:
+
+ * :hide  (hides the row completely)
+ * :none
+ * :black
+ * :red
+ * :green
+ * :yellow
+ * :blue
+ * :magenta
+ * :cyan
+ * :white
+
+=== prio
+  :prio is a Integer defining the matchers prio.
+
+=== attribute
+ :attribute can have the following values:
+
+ * :bright
+ * :dim
+ * :underscore
+ * :blink
+ * :reverse
+ * :hidden
+
+== Example
+
+   require 'capistrano_colors'    
+
+   capistrano_color_matchers = [
+     { :match => /command finished/,       :color => :hide,      :prio => 10 },
+     { :match => /executing command/,      :color => :blue,      :prio => 10, :attribute => :underscore },
+     { :match => /^transaction: commit$/,  :color => :magenta,   :prio => 10, :attribute => :blink },
+     { :match => /git/,                    :color => :white,     :prio => 20, :attribute => :reverse },
+   ]
+
+   colorize( capistrano_color_matchers )
+   
+   
 == CHANGES
 
+v.0.5.0
+
+  - Total rewrite and that is why we have a big version bump ;)
+  - Moved modules/classes to separate files.
+  - Wrote a simple color-regexp-match-engine.
+  - Possible to make you own custom color-matchers.
+
 v.0.2.1 
 
   - Bugfix for some err: messages that where not printed in red.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('capistrano_colors', '0.2.1') do |p|
+Echoe.new('capistrano_colors', '0.5.0') do |p|
   p.description    = "Simple gem to display colors in capistrano output."
   p.url            = "http://github.com/stjernstrom/capistrano_colors"
   p.author         = "Mathias Stjernstrom"

data/capistrano_colors.gemspec

@@ -2,21 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano_colors}
-  s.version = "0.2.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mathias Stjernstrom"]
-  s.date = %q{2008-12-23}
+  s.cert_chain = ["/Users/mathias/.ssh/gem-public_cert.pem"]
+  s.date = %q{2009-01-04}
   s.description = %q{Simple gem to display colors in capistrano output.}
   s.email = %q{mathias@globalinn.com}
-  s.extra_rdoc_files = ["lib/capistrano_colors.rb", "README.rdoc"]
-  s.files = ["capistrano_colors.gemspec", "lib/capistrano_colors.rb", "Manifest", "Rakefile", "README.rdoc"]
+  s.extra_rdoc_files = ["lib/capistrano/configuration.rb", "lib/capistrano/logger.rb", "lib/capistrano_colors.rb", "README.rdoc"]
+  s.files = ["lib/capistrano/configuration.rb", "lib/capistrano/logger.rb", "lib/capistrano_colors.rb", "Rakefile", "README.rdoc", "Manifest", "capistrano_colors.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/stjernstrom/capistrano_colors}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Capistrano_colors", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{capistranocolor}
   s.rubygems_version = %q{1.3.1}
+  s.signing_key = %q{/Users/mathias/.ssh/gem-private_key.pem}
   s.summary = %q{Simple gem to display colors in capistrano output.}
 
   if s.respond_to? :specification_version then

data/lib/capistrano/configuration.rb

@@ -0,0 +1,65 @@
+module Capistrano
+  class Configuration
+
+    # Add custom colormatchers
+    #
+    # Passing a hash or a array of hashes with custom colormatchers.
+    #
+    # Add the following to your deploy.rb or in your ~/.caprc
+    #
+    # == Example:
+    #
+    #   require 'capistrano_colors'    
+    #
+    #   capistrano_color_matchers = [
+    #     { :match => /command finished/,       :color => :hide,      :prio => 10 },
+    #     { :match => /executing command/,      :color => :blue,      :prio => 10, :attribute => :underscore },
+    #     { :match => /^transaction: commit$/,  :color => :magenta,   :prio => 10, :attribute => :blink },
+    #     { :match => /git/,                    :color => :white,     :prio => 20, :attribute => :reverse },
+    #   ]
+    #
+    #   colorize( capistrano_color_matchers )
+    #
+    # You can call colorize multiple time with either a hash or an array of hashes multiple times.
+    #
+    # == Colors:
+    #
+    # :color can have the following values:
+    # 
+    # * :hide  (hides the row completely)
+    # * :none
+    # * :black
+    # * :red
+    # * :green
+    # * :yellow
+    # * :blue
+    # * :magenta
+    # * :cyan
+    # * :white
+    #
+    # == Attributes:
+    # 
+    # :attribute can have the following values:
+    #
+    # * :bright
+    # * :dim
+    # * :underscore
+    # * :blink
+    # * :reverse
+    # * :hidden
+    #
+    #
+    def colorize(options)
+      
+      if options.class == Array
+        options.each do |opt|
+          Capistrano::Logger.add_color_matcher( opt )
+        end
+      else
+        Capistrano::Logger.add_color_matcher( options )
+        
+      end
+    end
+    
+  end
+end

data/lib/capistrano/logger.rb

@@ -0,0 +1,70 @@
+module Capistrano
+  class Logger
+
+    CAP_COLORS = { 
+               :none     => "0",
+               :black    => "30",
+               :red      => "31",
+               :green    => "32",
+               :yellow   => "33",
+               :blue     => "34",
+               :magenta  => "35",
+               :cyan     => "36",
+               :white    => "37"
+            } 
+
+    CAP_ATTRIBUTES = {
+              :bright     => 1,
+              :dim        => 2,
+              :underscore => 4,
+              :blink      => 5,
+              :reverse    => 7,
+              :hidden     => 8
+            }
+
+    @@color_matchers = []
+    
+    alias_method :org_log, :log
+
+    def log(level, message, line_prefix=nil) #:nodoc:
+      
+      color = :none
+      attribute = nil
+      
+      # Sort matchers in reverse order so we can break if we found a match.
+      @@sorted_color_matchers ||= @@color_matchers.sort_by { |i| -i[:prio] }
+      
+      @@sorted_color_matchers.each do |filter|
+        
+        if (filter[:level] == level || filter[:level].nil?)
+          if message =~ filter[:match]
+            color = filter[:color]
+            attribute = filter[:attribute]
+            message = filter[:prepend] + message unless filter[:prepend].nil?
+            break
+          end
+        end
+        
+      end
+
+      if color != :hide
+        current_color = CAP_COLORS[color]
+        current_attribute = CAP_ATTRIBUTES[attribute]
+        line_prefix = colorize(line_prefix.to_s, current_color, current_attribute) unless line_prefix.nil?
+        org_log(level, colorize(message, current_color, current_attribute), line_prefix=nil)
+      end
+            
+    end
+
+    def self.add_color_matcher( options ) #:nodoc:
+      @@color_matchers.push( options )
+    end 
+    
+    def colorize(message, color, attribute, nl = "\n")
+      attribute = "#{attribute};" if attribute
+      "\e[#{attribute}#{color}m" + message.strip + "\e[0m#{nl}"
+    end
+
+  end
+
+end

data/lib/capistrano_colors.rb

@@ -1,46 +1,19 @@
-puts "\e[36m    == capistrano_colors loaded ==\e[0m"
+puts "\n\e[36m    == capistrano_colors loaded ==\e[0m\n\n"
 
-module Capistrano
-  class Logger
+dir = File.dirname(__FILE__)
 
-    CC_STD    = "0" 
-    CC_RED    = "31"
-    CC_GREEN  = "32"
-    CC_YELLOW = "33"
-    CC_BLUE   = "34"
+require dir + '/capistrano/configuration'
+require dir + '/capistrano/logger'
 
-    def colorize(message, color, nl = "\n")
-      "\e[#{color}m" + message.strip + "\e[0m#{nl}"
-    end
+# DEBUG
+Capistrano::Logger.add_color_matcher({ :match => /executing `.*/,             :color => :green,   :level => 2, :prio => -10, :prepend => "== Currently " })
+Capistrano::Logger.add_color_matcher({ :match => /.*/,                        :color => :yellow,  :level => 2, :prio => -20 })
 
-    def debug(message, line_prefix=nil)
-      if message =~ /executing `.*/
-        log(DEBUG, colorize("== Currently " + message, CC_GREEN), line_prefix)
-      else          
-        log(DEBUG, colorize(message, CC_YELLOW), line_prefix)            
-      end
-    end
+# INFO
+Capistrano::Logger.add_color_matcher({ :match => /.*out\] (fatal:|ERROR:).*/, :color => :red,     :level => 1, :prio => -10 })
+Capistrano::Logger.add_color_matcher({ :match => /Permission denied/,         :color => :red,     :level => 1, :prio => -20 })
+Capistrano::Logger.add_color_matcher({ :match => /sh: .+: command not found/, :color => :magenta, :level => 1, :prio => -30 })
 
-    def info(message, line_prefix=nil)
-      if message =~ /.*out\] (fatal:|ERROR:).*/ || message =~ /Permission denied/
-        color = CC_RED
-      else
-        color = CC_STD
-      end
-      log(INFO, colorize(message,color), line_prefix)        
-    end
-    
-    def important(message, line_prefix=nil)
-      if line_prefix =~ /^err ::/
-        color = CC_RED
-      else
-        color = CC_BLUE
-      end
-      log(IMPORTANT, colorize(message, color), line_prefix) if !message.strip.empty?
-    end
-    
-    def trace(message, line_prefix=nil)
-      log(TRACE, message, line_prefix)
-    end
-  end
-end
+# IMPORTANT
+Capistrano::Logger.add_color_matcher({ :match => /^err ::/,                   :color => :red,     :level => 0, :prio => -10 })
+Capistrano::Logger.add_color_matcher({ :match => /.*/,                        :color => :blue,    :level => 0, :prio => -20 })

data.tar.gz.sig

@@ -0,0 +1,4 @@
+Z�4���EY�8��D�.
+��_��6ڜXT8wq��]���p9l�6U�p]����E�v�P���+��l#67�+r
+\F�m%SF��
y����l����G*Yn��j[����!��-śv4�Q0��giV�����;�O��9;�
+�$��{~~�\����Ji�p0|�L

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano_colors
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Mathias Stjernstrom
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRAwDgYDVQQDDAdtYXRo
+  aWFzMRkwFwYKCZImiZPyLGQBGRYJZ2xvYmFsaW5uMRMwEQYKCZImiZPyLGQBGRYD
+  Y29tMB4XDTA4MTIyMTA3MTEzM1oXDTA5MTIyMTA3MTEzM1owQjEQMA4GA1UEAwwH
+  bWF0aGlhczEZMBcGCgmSJomT8ixkARkWCWdsb2JhbGlubjETMBEGCgmSJomT8ixk
+  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL30OXlyee2o
+  stQFrTZRtzsAH4wQ/jKIUO43zRTtaHnMKsy8Ga0T2piNN35Qq1yZNlf2fGl3LopI
+  w+wLMQYeCjY6fjbTXDGHbaiT3qE/F/RHlv8at29ztpaCQfeL33DGCohrRGYWouD9
+  j0wOnPrwHE2fGDqKTYXhgiAIIzmwqn1kcAIzm3V9WRvYE97IDVHvFcMRydbxlGgW
+  rHgRvGuBs5jf+rCpGvakoZjDZx3ueF9AphaMun70z2fYWiH3pY3g65tkf5C8JBT5
+  HyiHEwCNXu7bMYA2OMA+EGVpHZh/+78XrE+hRvKvHz6TF8pfKiTf/ukEvDWqxHyk
+  a9V6BS2FEG8CAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFPuAbY2bxHbIT15IcJcelQii+AoNMA0GCSqGSIb3DQEBBQUAA4IBAQANgGbP
+  F9S1YGw38ZwkZX4k9ZuaO87stEewkR+TEQ7R1ptiW8I/bR59hBkl9wuXSC9Ho6B/
+  yryfubWJdlLykn32PJsaPUnNEejLSCWtAWNkyGltBxNMhVNEiHuxaxnRqblPHKYE
+  fn0zqKANa+mbFtx3SvgkOwEFyCpioEi8DDlFWhb4F4V+a0NGxhI4w7htmT7pG4vc
+  TnHw2b9dwzo8dd+ujNcWKHhu6jL9kgB3B5ZuA7S16E1wd1QSPWO/3U35mCg4M+FB
+  /+sSKAOKmwvZIG32pl7mMoi3gw9k2LpQiJLrBrMA7KDgwefuPc46/J4uwcK18Byg
+  snErBd/zMF/MOW0s
+  -----END CERTIFICATE-----
 
-date: 2008-12-23 00:00:00 +01:00
+date: 2009-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,14 +50,18 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- lib/capistrano/configuration.rb
+- lib/capistrano/logger.rb
 - lib/capistrano_colors.rb
 - README.rdoc
 files: 
-- capistrano_colors.gemspec
+- lib/capistrano/configuration.rb
+- lib/capistrano/logger.rb
 - lib/capistrano_colors.rb
-- Manifest
 - Rakefile
 - README.rdoc
+- Manifest
+- capistrano_colors.gemspec
 has_rdoc: true
 homepage: http://github.com/stjernstrom/capistrano_colors
 post_install_message: