colorer 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/colorer.rb

@@ -2,7 +2,17 @@ module Colorer
 
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
 
-  class Exception < ::Exception; end
+  class AlreadyDefinedMethod < Exception
+    def initialize(meth, klass)
+      super("already defined method '#{meth}' for #{klass}:#{klass.class}")
+    end
+  end
+
+  class UnknownSgrCode < Exception
+    def initialize(sgr)
+      super("#{sgr.inspect} is unknown")
+    end
+  end
 
   # Select Graphic Rendition
   BASIC_SGR = {
@@ -31,35 +41,33 @@ module Colorer
     :onwhite   => 47
   }
 
+  extend self
+
   @color = true
-  class << self
-    attr_accessor :color
+  attr_accessor :color
 
-    def add_sgr(string, sgr)
-      return string unless (Colorer.color && STDOUT.tty? && ENV['TERM'] && ENV['TERM'] != 'dumb')
-      string = sprintf("\e[0m%s\e[0m", string) unless string =~ /^\e\[[\d;]+m.*\e\[0m$/
-      sgr = Colorer::BASIC_SGR[sgr] if sgr.is_a?(Symbol)
-      raise Exception, "undefined SGR code '#{sgr}'" if sgr.nil?
-      string.sub /^(\e\[[\d;]+)/, '\1;' + sgr.to_s
-    end
+  def add_sgr(string, sgr)
+    return string unless (Colorer.color && STDOUT.tty? && ENV['TERM'] && ENV['TERM'] != 'dumb')
+    code = sgr.is_a?(Symbol) ? Colorer::BASIC_SGR[sgr] : sgr
+    raise UnknownSgrCode.new(sgr) unless code.is_a? Integer
+    string = sprintf("\e[0m%s\e[0m", string) unless string =~ /^\e\[[\d;]+m.*\e\[0m$/
+    string.sub /^(\e\[[\d;]+)/, '\1;' + code.to_s
+  end
 
-    def define_styles(styles, force=false)
+  def define_styles(styles, force=false)
+    styles.each_pair do |meth, style|
       String.class_eval do
-        if styles.delete(:basic)
-          Colorer::BASIC_SGR.each_pair do |meth, sgr|
-            raise Exception, "already defined method '#{meth}' for #{self}:#{self.class}" \
-              if !force && instance_methods.include?(meth.to_s)
-            define_method(meth) do
+        if meth == :basic && style
+          Colorer::BASIC_SGR.each_pair do |m, sgr|
+            raise AlreadyDefinedMethod.new(m, self) if !force && method_defined?(m)
+            define_method(m) do
               Colorer.add_sgr(self, sgr)
             end
           end
         else
-          styles.each_pair do |meth, style|
-            raise Exception, "already defined method '#{meth}' for #{self}:#{self.class}" \
-              if !force && instance_methods.include?(meth.to_s)
-            define_method(meth) do
-              style.inject(self) { |str, sgr|  Colorer.add_sgr(str, sgr) }
-            end
+          raise AlreadyDefinedMethod.new(meth, self) if !force && method_defined?(meth)
+          define_method(meth) do
+            style.inject(self) { |str, sgr| Colorer.add_sgr(str, sgr) }
           end
         end
       end

data/test/sgr.irt

@@ -1,9 +1,17 @@
 require 'colorer'
 
-Colorer.define_styles :mixed_sgr => [ :bold, 8 ]
+Colorer.define_styles :mixed_sgr => [ :bold, 7 ]
 
 
 desc "Mixed SGR parameters"
 "Mixed SGR parameters".mixed_sgr
 puts _
-test_value_eql? "\e[0;1;8mMixed SGR parameters\e[0m"
+test_value_eql? "\e[0;1;7mMixed SGR parameters\e[0m"
+
+desc "Basic and custom definition"
+Colorer.define_styles({:basic => true, :goo => [7]}, 1)
+"Basic and custom definition".green.goo
+puts _
+test_value_eql? "\e[0;32;7mBasic and custom definition\e[0m"
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: colorer
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -04:00
+date: 2010-10-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency