capistrano_colors 0.5.4 → 0.5.5

data/README.rdoc

@@ -34,7 +34,9 @@ When capistrano_colors is included in your deploy.rb capistrano output gets nice
  * :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,...)
+ * :level     - Specify if this matcher should be bound to some of capistranos log levels (info,debug,...) 
+ * :prepend   - Text to be prepended to the output
+ * :timestamp - Show current time with the output
 
 === match 
  :match is a simple regular expression for the row that should be matched.
@@ -82,6 +84,10 @@ When capistrano_colors is included in your deploy.rb capistrano output gets nice
    
 == CHANGES
 
+v.0.5.5
+
+  - Added :timestamp option. Submitted by Mike Gunderloy
+
 v.0.5.0
 
   - Total rewrite and that is why we have a big version bump ;)

data/Rakefile

@@ -1,16 +1 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-Echoe.new('capistrano_colors', '0.5.4') do |p|
-  p.description    = "Simple gem to display colors in capistrano output."
-  p.url            = "http://github.com/stjernstrom/capistrano_colors"
-  p.author         = "Mathias Stjernstrom"
-  p.email          = "mathias@globalinn.com"
-  p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["capistrano >=2.3.0"]
-  p.project        = "capistranocolor"
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
+require "bundler/gem_tasks"

data/capistrano_colors.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano_colors}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mathias Stjernstrom"]

data/lib/capistrano_colors.rb

@@ -5,7 +5,7 @@ require 'capistrano_colors/configuration'
 require 'capistrano_colors/logger'
 
 # DEBUG
-Capistrano::Logger.add_color_matcher({ :match => /executing `.*/,             :color => :green,   :level => 2, :prio => -10, :prepend => "== Currently " })
+Capistrano::Logger.add_color_matcher({ :match => /executing `.*/,             :color => :green,   :level => 2, :prio => -10, :prepend => "== Currently ", :timestamp => true })
 Capistrano::Logger.add_color_matcher({ :match => /.*/,                        :color => :yellow,  :level => 2, :prio => -20 })
 
 # INFO

data/lib/capistrano_colors/configuration.rb

@@ -12,8 +12,8 @@ module Capistrano
     #   require 'capistrano_colors'    
     #
     #   capistrano_color_matchers = [
-    #     { :match => /command finished/,       :color => :hide,      :prio => 10 },
-    #     { :match => /executing command/,      :color => :blue,      :prio => 10, :attribute => :underscore },
+    #     { :match => /command finished/,       :color => :hide,      :prio => 10, :prepend => "$$$" },
+    #     { :match => /executing command/,      :color => :blue,      :prio => 10, :attribute => :underscore, :timestamp => true },
     #     { :match => /^transaction: commit$/,  :color => :magenta,   :prio => 10, :attribute => :blink },
     #     { :match => /git/,                    :color => :white,     :prio => 20, :attribute => :reverse },
     #   ]
@@ -48,6 +48,11 @@ module Capistrano
     # * :reverse
     # * :hidden
     #
+    # 
+    #  == Text alterations
+    #
+    # :prepend gives static text to be prepended to the output
+    # :timestamp adds the current time before the output
     #
     def colorize(options)
       

data/lib/capistrano_colors/logger.rb

@@ -1,7 +1,7 @@
 module Capistrano
   class Logger
 
-    CAP_COLORS = { 
+    CAP_COLORS = {
                :none     => "0",
                :black    => "30",
                :red      => "31",
@@ -11,7 +11,7 @@ module Capistrano
                :magenta  => "35",
                :cyan     => "36",
                :white    => "37"
-            } 
+            }
 
     CAP_ATTRIBUTES = {
               :bright     => 1,
@@ -23,28 +23,29 @@ module Capistrano
             }
 
     @@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] || line_prefix =~ filter[:match]
             color = filter[:color]
             attribute = filter[:attribute]
             message = filter[:prepend] + message unless filter[:prepend].nil?
+            message = Time.now.strftime('%T') + ' ' + message if filter[:timestamp]
             break
           end
         end
-        
+
       end
 
       if color != :hide
@@ -54,13 +55,13 @@ module Capistrano
         line_prefix = colorize(line_prefix.to_s, current_color, current_attribute, nil) unless line_prefix.nil?
         org_log(level, colorize(message, current_color, current_attribute), line_prefix)
       end
-            
+
     end
 
     def self.add_color_matcher( options ) #:nodoc:
       @@color_matchers.push( options )
-    end 
-    
+    end
+
     def colorize(message, color, attribute, nl = "\n")
       attribute = "#{attribute};" if attribute
       "\e[#{attribute}#{color}m" + message.strip + "\e[0m#{nl}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano_colors
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Mathias Stjernstrom
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +01:00
-default_executable: 
+date: 2011-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -53,7 +52,6 @@ files:
 - lib/capistrano_colors/configuration.rb
 - lib/capistrano_colors/logger.rb
 - Manifest
-has_rdoc: true
 homepage: http://github.com/stjernstrom/capistrano_colors
 licenses: []
 
@@ -89,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capistranocolor
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple gem to display colors in capistrano output.