colorer 0.3.2 → 0.4.0

data/README.rdoc

@@ -22,10 +22,19 @@ Easy ANSI code coloring for strings.
 
 === Basic Styles
 
-You can define the basic styles for any string:
+You can define the basic styles for any string by using the reserved name :basic:
 
+    # all basic styles
     Colorer.define_styles :basic => true
-    'red bold string'.red.bold
+    "a string".green.bold.reversed.underline...
+
+    # a few basic styles
+    Colorer.define_styles :basic => [:bold, :reversed]
+    "a string".bold.reversed
+
+    # one basic style
+    Colorer.define_styles :basic => :red
+    "a string".red
 
 * clear
 * bold
@@ -69,6 +78,8 @@ You can define your own custom styles:
     # same as
     crazy_string.magenta.onyellow.bold.underline
 
+Notice: you cannot use :basic as a custom name, since it is the reserved name used to define the basic styles.
+
 === SGR Styles
 
 You can also add native SGR (Select Graphic Rendition) parameters (0..109) to any style:

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/colorer.rb

@@ -47,20 +47,32 @@ module Colorer
   attr_accessor :color
 
   def define_styles(styles, force=false)
-    styles = BASIC_SGR.merge(styles) if styles.delete(:basic)
+    if basic = styles.delete(:basic)
+      basic_styles = {}
+      case basic
+      when TrueClass
+        basic_styles = BASIC_SGR
+      when Array
+        basic.each{|k| basic_styles[k] = BASIC_SGR[k]}
+      when Symbol
+        basic_styles[basic] = BASIC_SGR[basic]
+      end
+      styles = basic_styles.merge(styles)
+    end
     styles.each_pair do |meth, style|
       style = [style] unless style.is_a?(Array)
       codes = style.map do |s|
-        code = s.is_a?(Symbol) ? BASIC_SGR[s] : s
-        raise UnknownSgrCode.new(s) unless code.is_a?(Integer) && (0..109).include?(code)
-        code
-      end
+                code = s.is_a?(Symbol) ? BASIC_SGR[s] : s
+                raise UnknownSgrCode.new(s) unless code.is_a?(Integer) && (0..109).include?(code)
+                code
+              end.join(';')
       String.class_eval do
         raise AlreadyDefinedMethod.new(meth, self) if !force && method_defined?(meth)
         define_method(meth) do
           return self unless (Colorer.color && STDOUT.tty? && ENV['TERM'] && ENV['TERM'] != 'dumb')
-          string = self =~ /^\e\[[\d;]+m.*\e\[0m$/ ? self : sprintf("\e[0m%s\e[0m", self)
-          string.sub /^(\e\[[\d;]+)/, '\1;' + codes.join(';')
+          match(/^\e\[[\d;]+m.*\e\[0m$/) ?
+            sub(/^(\e\[[\d;]+)/, '\1;' + codes) :
+            sprintf("\e[0;%sm%s\e[0m", codes, self)
         end
       end
     end

data/test/selected_basic.irt

@@ -0,0 +1,25 @@
+require 'colorer'
+
+Colorer.define_styles({:basic => [:bold, :red]}, true)
+
+desc "red"
+'red'.red
+puts _
+test_value_eql? "\e[0;31mred\e[0m"
+
+desc "red bold"
+'red bold'.red.bold
+puts _
+test_value_eql? "\e[0;31;1mred bold\e[0m"
+
+desc "onwhite"
+Colorer.define_styles({:basic => :onwhite}, true)
+'onwhite'.onwhite
+puts _
+test_value_eql? "\e[0;47monwhite\e[0m"
+
+
+desc "not underline"
+'not underline'.respond_to? :underline
+test_value_eql? false
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: colorer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -51,6 +51,7 @@ files:
 - lib/colorer.rb
 - test/basic.irt
 - test/custom.irt
+- test/selected_basic.irt
 - test/sgr.irt
 has_rdoc: true
 homepage: http://github.com/ddnexus/colorer