jamescook-pow 0.1.3 → 0.1.4

data/README

@@ -1,4 +1,4 @@
-P O W !  ( Not like prisoner of war, but from the movie Step Brothers where that guy from the Daily Show is saying "POW" repeatedly. )
+P O W ! 
 
 Override your 'puts' for fun shell coloring.
 
@@ -13,12 +13,19 @@ Examples:
   puts.red    "Hello world in red" 
   puts.red!   "Hello world in red, but with boldness"
   puts.red_   "Hello world in red, but with underscore"
-  puts.rainbow "Hellow world, but more silly."
+  puts.rainbow "Hello world, but more silly."
+
+  puts_       "Hello world, underscored."
+  puts!       "Hello world, bold."
+
+  puts        "Hello world, and I can highlight matches.", :match => "can"
+  puts        "Hello world, and I can highlight matches with a specific color.", :match => "can", :match_color => :purple
 
   p.red "Hello world, but less typing .. also red."
   p! "Hello world, in bold"
   p! "Mix and match", :color => :purple, :background => :black
 
 
-TODO:
- - Figure out if you can bold a 'dark' color
+You can also set defaults in your ~/.irbrc or wherever.
+  require 'pow'
+  Pow.defaults = {:bold => true}  # Now any puts will default to bold

data/jamescook-pow.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jamescook-pow}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Cook"]
-  s.date = %q{2009-11-22}
-  s.description = %q{'puts' with shell colors.}
+  s.date = %q{2009-11-23}
+  s.description = %q{Ruby 'puts' with shell colors.}
   s.email = %q{jamecook@gmail.com}
   s.extra_rdoc_files = [
     "README"

data/lib/pow.rb

@@ -1,12 +1,25 @@
 module Pow
   # Override puts on include to allow coloring (but also retain existing function)
-  def self.included(base)
-    base.send(:define_method, :puts){ |*args| Puts.new(*args) }
-    base.send(:define_method, :puts!){ |*args| opts=(args.detect{|a| a.is_a?(Hash)} || {}).merge(:misc => {:bold => true}); args.reject!{|a| a.is_a?(Hash)}; args = [args.push(opts)].flatten; Puts.new(*args) } # Now that's just self-explanatory ..
+  class << self
+    def included(base)
+      @@defaults = {}
+      base.send(:define_method, :puts){ |*args| Puts.new(*args) }
+      base.send(:define_method, :puts!){ |*args| opts=(args.detect{|a| a.is_a?(Hash)} || {}).merge(:misc => {:bold => true}); args.reject!{|a| a.is_a?(Hash)}; args = [args.push(opts)].flatten; Puts.new(*args) } # Now that's just self-explanatory ..
+      base.send(:define_method, :puts_){ |*args| opts=(args.detect{|a| a.is_a?(Hash)} || {}).merge(:misc => {:underline => true}); args.reject!{|a| a.is_a?(Hash)}; args = [args.push(opts)].flatten; Puts.new(*args) } # Now that's just self-explanatory ..
+
+      base.send(:alias_method, :p, :puts)
+      base.send(:alias_method, :p!, :puts!)
+      base.send(:alias_method, :p_, :puts_)
+    end
+    def defaults
+      @@defaults
+    end
 
-    base.send(:alias_method, :p, :puts)
-    base.send(:alias_method, :p!, :puts!)
+    def defaults=(val)
+      @@defaults.merge!(val)
+    end
   end
+
   CODES = {
           :clear           => 0,
           :reset           => 0, #clear
@@ -54,6 +67,7 @@ module Pow
     attr_accessor :writer
     def initialize(*args)
       options = args[0].is_a?(Hash) ? args[0] : {:text => args[0].to_s}.merge(args[1] || {})
+      @@match_color = :red
       CODES.keys.each do |key|
         # Color
         self.class.send(:define_method, key.to_sym)       { |*args| Puts.new({:color => key.to_sym, :text => args[0], :misc => args[1]}).out! }
@@ -68,12 +82,30 @@ module Pow
         options[:negative]   ||= options[:misc][:negative]
         options[:underline]  ||= options[:misc][:underline]
         options[:background] ||= (options[:misc][:background] || options[:misc][:on])
+        options[:on]         ||= options[:background]
         options[:strikethrough]  ||= options[:misc][:strikethrough]
+        options[:match]       ||= options[:misc][:match]
+        options[:match_color] ||= options[:misc][:match_color]
       end
-      @writer = options[:writer] || STDOUT
+      @@color    = options[:color]  || :white
+      @writer    = options[:writer] || STDOUT
       @formatted_text = format_string(options)
       out!(@formatted_text)
     end
+
+    class << self
+      def color
+        @@color
+      end
+
+      def match_color=(val)
+        @@match_color = val.to_sym
+      end
+     
+      def match_color
+        @@match_color
+      end
+    end
    
     # Write the coloured text to IO
     def out!(string=nil)
@@ -93,9 +125,7 @@ module Pow
       out!(text.to_s.split("").inject(""){|m, word| m+= format_string(:text => word, :bold => true, :newline => "", :color => painbow_keys.sort_by{|k| rand}[0]) + " "  } + "\n")
     end
 
-    def inspect
-      nil
-    end
+    def inspect; ''; end
 
     protected
     def painbow_keys
@@ -110,19 +140,26 @@ module Pow
       newline        = options.fetch(:newline){ "\n" }
       color          = options.fetch(:color){ :white }
       text           = options.fetch(:text){ '' }
-      bold           = options.fetch(:bold){ false }
-      negative       = options.fetch(:negative){ false }
-      italic         = options.fetch(:italic){ false }
-      underline      = options.fetch(:underline){ false }
-      background     = options.fetch(:background){ false }
+      bold           = options.fetch(:bold){ Pow.defaults[:bold] }
+      negative       = options.fetch(:negative){ Pow.defaults[:negative] }
+      italic         = options.fetch(:italic){ Pow.defaults[:italic] }
+      underline      = options.fetch(:underline){ Pow.defaults[:underline] }
+      background     = options.fetch(:background){ Pow.defaults[:background] } || options.fetch(:on){ Pow.defaults[:on]}
       concealed      = options.fetch(:concealed){ false }
-      strikethrough  = options.fetch(:strikethrough){ false }
-      underscore     = options.fetch(:underscore){ false }
+      strikethrough  = options.fetch(:strikethrough){ Pow.defaults[:strikethrough] }
+      underscore     = options.fetch(:underscore){ Pow.defaults[:underscore] }
+      match          = options.fetch(:match){ false }
+
+      if options[:match_color]
+        Puts.match_color = options[:match_color]
+      end
 
       if text != ""
         result = [escape_sequence(color), text, escape_sequence(:reset), newline].join
       end
 
+      result ||= ""
+
       if bold
         result.insert(0, escape_sequence(:bold))
       end
@@ -151,7 +188,11 @@ module Pow
         result.insert(0, escape_sequence(:underscore))
       end
 
-      return result
+      if match.is_a?(Regexp) || match.is_a?(String)
+        result   = wrap_match(result, match, Puts.match_color, false)
+      end
+
+      return result + escape_sequence(:clear)
     end
 
     def escape_sequence(code)
@@ -165,6 +206,11 @@ module Pow
         return "\e[#{CODES[code]}m"
       end
     end
+
+    def wrap_match(text, match, match_color, negative=false)
+      #TODO use the negative sequence when the text color is the same as the match color.
+      text.gsub(match, [escape_sequence(match_color), match, escape_sequence(Puts.color)].join(''))
+    end
   end
 end
 

data/rakefile.rb

@@ -3,9 +3,9 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "jamescook-pow"
-    gemspec.version = "0.1.3"
+    gemspec.version = "0.1.4"
     gemspec.summary = "puts with colors"
-    gemspec.description = "'puts' with shell colors."
+    gemspec.description = "Ruby 'puts' with shell colors."
     gemspec.email = "jamecook@gmail.com"
     gemspec.homepage = "http://github.com/jamescook/pow"
     gemspec.authors = ["James Cook"]

data/test/pow_test.rb

@@ -15,10 +15,24 @@ class PowTest < Test::Unit::TestCase
     assert_equal "\e[37mTEST\e[0m\n", @writer.gets  # White text
   end
 
+  def test_puts_with_bold_default
+    Pow.defaults = {:bold => true}
+    @puts.new(:text => "TEST", :writer => @writer).out!
+    @writer.rewind
+    Pow.defaults = {:bold => false}
+    assert_equal "\e[1m\e[37mTEST\e[0m\n", @writer.gets
+  end
+
   def test_puts_with_non_string
     @puts.new(:text => 1, :writer => @writer).out!
     @writer.rewind
-    assert_equal "\e[37m1\e[0m\n", @writer.gets  # White text
+    assert_equal "\e[37m1\e[0m\n", @writer.gets 
+  end
+
+  def test_puts_with_match
+    @puts.new(:text => "TEST", :match => 'E', :writer => @writer).out!
+    @writer.rewind
+    assert_equal "\e[37mT\e[31mE\e[37mST\e[0m\n", @writer.gets
   end
 
   def test_puts_with_red

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jamescook-pow
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - James Cook
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -06:00
+date: 2009-11-23 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: "'puts' with shell colors."
+description: Ruby 'puts' with shell colors.
 email: jamecook@gmail.com
 executables: []