dye 0.1.0 → 0.1.1

data/README.rdoc

@@ -38,6 +38,9 @@ Easy ANSI code coloring for strings in libraries.
     # and use it on the instance
     any_instance.dye "any string", :any_style
 
+    # alternative no-color string
+    Dye.dye '    reversed    ', '=== reversed ===', :reversed
+
     # back to plain text
     plain_text = Dye.strip_ansi(ansi_string)
 
@@ -114,7 +117,7 @@ so Dye will output non strict ansi by default. If you want to have strict ansi y
 
     Dye.strict_ansi = true
 
-or you can set the DYE_ANSI_STRICT environment variable for a system wide setting.
+or you can set the DYE_STRICT_ANSI environment variable for a system wide setting.
 
 === Color
 

data/Rakefile

@@ -20,7 +20,7 @@ task :install, :force do |t, args|
     File.open('VERSION', 'w') {|f| f.puts version }
     gem_name = "#{name}-#{version}.gem"
     sh %(gem build #{name}.gemspec)
-    sh %(gem install #{gem_name} --local)
+    sh %(gem install #{gem_name} --local --no-rdoc --no-ri)
     puts <<-EOS.gsub(/^ {6}/, '')
 
       *******************************************************************************

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/dye.rb

@@ -1,20 +1,9 @@
-class Object
+class Module
 
   def define_dye_method(custom_styles={})
-      define_method(:dye) do |string, *names|
-        return string unless Dye.color?
-        codes = names.map do |name|
-                  case
-                  when custom_styles.has_key?(name)
-                    Dye.sgr_names_to_codes *custom_styles[name]
-                  when Dye::BASIC_SGR.has_key?(name)
-                    Dye::BASIC_SGR[name]
-                  else
-                    raise Dye::UnknownSgrCode.new(name)
-                  end
-                end.flatten
-        Dye.apply_codes string, *codes
-      end
+    define_method(:dye) do |*args|
+      Dye.send :apply_styles, custom_styles, *args
+    end
   end
 
 end
@@ -66,26 +55,33 @@ module Dye
   @strict_ansi = !!ENV['DYE_STRICT_ANSI']
   attr_accessor :strict_ansi
 
-  def dye(string, *sgr_names)
-    return string unless color?
-    apply_codes string, sgr_names_to_codes(*sgr_names)
+  def dye(*args)
+    apply_styles( {}, *args )
   end
 
   def strip_ansi(string)
     string.gsub(/\e\[[\d;]+m/, '')
   end
 
-  def sgr_names_to_codes(*names)
-    names.map do |n|
-      next if n.nil?
-      code = n.is_a?(Symbol) ? BASIC_SGR[n] : n
-      raise UnknownSgrCode.new(n) unless code.is_a?(Integer) && (0..109).include?(code)
-      code
-    end
-  end
+  private
 
-  def apply_codes(string, *codes)
-    codes.compact!
+  def apply_styles(custom_styles, *args)
+    if args[1].is_a?(String)
+      string, no_color_string, *names = args
+    else
+      string, *names = args
+    end
+    return no_color_string||string unless color?
+    codes = names.map do |name|
+              sgr = custom_styles.has_key?(name) ? custom_styles[name] : name
+              sgr = [sgr] unless sgr.is_a?(Array)
+              sgr.map do |n|
+                next if n.nil?
+                code = n.is_a?(Symbol) ? BASIC_SGR[n] : n
+                raise UnknownSgrCode.new(n) unless code.is_a?(Integer) && (0..109).include?(code)
+                code
+              end
+            end.flatten.compact
     return string if codes.empty?
     if strict_ansi
       string.match(/^\e\[[\d;]+m.*\e\[0m$/m) ?
@@ -97,4 +93,5 @@ module Dye
         sprintf("\e[0m%s%s\e[0m", codes.map{|c| "\e[#{c}m" }.join, string)
     end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dye
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -04:00
+date: 2011-02-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency