coloring 0.0.5 → 0.1.0

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+#### 0.1.0 (2012-08-31)
+
+* Added 256 colors suport
+* Input params now can be Hash
+* Added CLI to show all avaliable colors
+* Added tests 
+
+#### 0.0.5 (2012-08-24)
+
+* Added class method view_avaliable
+* Method set_param now protected
+* Added some tests
+
+#### 0.0.4 (2012-08-22)
+
+* Added specs
+* Added full README
+* Added this CHANGELOG file 
+
+#### 0.0.3 (2012-08-22)
+
+* Start release

data/README.md

@@ -1,6 +1,6 @@
 ## About
 
-Extension for Ruby string class. Extension add methods for coloring text or background in Terminal. Also add some text effects.
+Extension for Ruby string class. Extension add methods for coloring text or background in Terminal. Also add some text effects. Support 256 colors.
 
 ### Features
 
@@ -12,9 +12,9 @@ Extension for Ruby string class. Extension add methods for coloring text or back
 * String.negative
 * String.hide
 
-Also avaliable class method to view all methods.
+Also avaliable class CLI to view all methods and colors.
 
-    Coloring::view_avaliable
+    $ coloring
 
 ### Installation
 
@@ -36,23 +36,33 @@ Add line:
 
 	require 'coloring'
 
-For base colors:
+For base methods:
 
 	puts "Hello, World!".green
-	puts "Hello, World!".coloring(32)
+	puts "Hello, World!".underline
+
+For call coloring method:	
+			
 	puts "Hello, World!".coloring(:green)
 	puts "Hello, World!".coloring("green")
 	
 For more params:
 
-	puts "Hello,World!".green.underline
+	puts "Hello, World!".green.underline
 	puts "Hello, World".green.on_red.underline
 	puts "Hello, World!".coloring [:green, :on_red, :underline]
 	puts "Hello, World!".coloring ["green", "on_red", "underline"]
-	puts "Hello,World!".coloring [32, 41, 4]
-	puts "Hello,World!".coloring(32).on_red
-	puts "Hello,World!".coloring([:green, :underline]).on_red  
+	puts "Hello, World!".coloring(:green).on_red
+	puts "Hello, World!".coloring([:green, :underline]).on_red
+
+For 256 colors ( use CLI to show avaliable colors ):
 
+	puts "Hello, World!".coloring(:color => :green, :background = > :yellow)
+	puts "Hello, World!".coloring(:color => "green", :background => "yellow")
+	puts "Hello, World!".coloring(color: "green", background: "yellow")
+	puts "Hello, World!".coloring(color: 211, background: 35)  
+	puts "Hello, World!".coloring(color: 211).on_green
+	 
 ### Contributing
 
 1. Fork it

data/bin/coloring

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'coloring'
+
+Coloring::gamma
+

data/lib/coloring.rb

@@ -34,6 +34,8 @@ module Coloring
     define_method( effect ) { self.coloring( value ) }
   end
 
+  protected
+
   # Set effect value from SGR Hash
 
   def set_param ( param )
@@ -46,14 +48,38 @@ module Coloring
       param = SGRPARAMS[param]
     end
     param
+
+  end
+
+  # Set support Hash input (support 256 colors)
+
+  def input_options ( params )
+
+    set = lambda { |e| e = e.instance_of?(Fixnum) ? e : self.set_param(e)-30 } 
+
+    options = []
+
+    if params.has_key?(:background)
+      background = set.call(params[:background])
+      options << 48 << 5 << background
+    end
+    if params.has_key?(:color)
+      color = set.call(params[:color])
+      options << 38 << 5 << color
+    end
+
+    options
+
   end
 
-  protected :set_param
+  public
 
   # Output method
 
   def coloring ( params )
 
+    params = self.input_options( params ) if params.instance_of?(Hash)
+
     if params.instance_of?(Array)
       all_params = params.map! { |elem| elem = self.set_param(elem).to_s }.join ";"
     else
@@ -66,12 +92,50 @@ module Coloring
 
   # Class method
 
-  class << self  
-  
-    def view_avaliable
-      SGRPARAMS.each { |key, value| puts "#{key}".coloring(value) + " > String.#{key}" }
+  class << self
+
+    def gamma
+
+      puts "All base methods:".on_yellow + "\n\n"
+
+      SGRPARAMS.each {|key, value| puts "#{key}".coloring(value) + " method: #{key}"}
+
+      puts "\n"
+      puts "System colors for xterm-256color:".on_yellow + "\n\n"
+
+      0.upto(7) do |i|
+        print "\033[48;5;#{i}m #{i} \033[000m"
+      end
+
+      puts "\n"
+
+      8.upto(15) do |i|
+        print "\033[48;5;#{i}m #{i} \033[000m"
+      end
+
+      puts "\n\n"
+
+      0.upto(5) do |g|
+        0.upto(5) do |r|
+          0.upto(5) do |b|
+            color = 16 + r*36 + g*6 + b
+            print "\033[48;5;#{color}m #{color}"
+          end    
+          print "\033[0m "
+        end    
+        print "\n"
+      end    
+
+      puts "\n"
+      puts "Grayscale ramp:".on_yellow + "\n\n"
+
+      232.upto(255) do |i|
+        print "\033[48;5;#{i}m #{i} \033[000m"
+      end
+
+      puts "\n"
     end
-  
+
   end
 
 end

data/lib/coloring/version.rb

@@ -1,3 +1,3 @@
 module Coloring
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/coloring_spec.rb

@@ -8,10 +8,6 @@ describe Coloring do
  
   describe "all base methods" do
 
-    it "should return value" do
-      @sample.green.should_not be_nil 
-    end
-
     it "should return right class" do
       @sample.red.class.should == String
     end
@@ -28,20 +24,32 @@ describe Coloring do
 
   describe "method with params" do
 
-    it "should return value" do
-      @sample.coloring(:green).should_not be_nil  
+    it "should raise error if no arguments" do
+      expect { @sample.coloring }.to raise_error
+    end
+
+    it "should raise error if wrong parameter for method" do
+      expect { @sample.coloring(:red, :on_blue) }.to raise_error
     end
 
     it "should return right class" do
       @sample.coloring(:green).class.should == String
     end
 
-    it "should raise error if wrong parameter for method" do
-      expect { @sample.coloring(:red, :on_blue) }.to raise_error
+    it "should return right content (input params: Symbol)" do
+      @sample.coloring(:green).should eq("\e[32mHello, World!\e[0m")
     end
 
-    it "should return right content" do
-      @sample.coloring(:green).should eq("\e[32mHello, World!\e[0m")
+    it "should return right content (input params: String)" do
+      @sample.coloring("green").should eq("\e[32mHello, World!\e[0m")
+    end
+
+    it "should return right content (input params: Hash)" do
+      @sample.coloring(:color => :green).should eq("\e[38;5;2mHello, World!\e[0m")
+    end
+
+    it "should return right content (input params > 1: Hash)" do
+      @sample.coloring(:color => :green, :background => :red).should eq("\e[48;5;1;38;5;2mHello, World!\e[0m")
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coloring
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,16 +30,18 @@ dependencies:
 description: Adds methods for coloring and styling text for class String
 email:
 - oabogatenko@gmail.com
-executables: []
+executables:
+- coloring
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/coloring
 - coloring.gemspec
 - lib/coloring.rb
 - lib/coloring/version.rb

data/CHANGELOG.rdoc

@@ -1,12 +0,0 @@
-== 0.0.5 (2012-08-24)
-  * Added class method view_avaliable
-  * Method set_param now protected
-  * Added some tests
-
-== 0.0.4 (2012-08-22)
-  * Added specs
-  * Added full README
-  * Added this CHANGELOG file 
-
-== 0.0.3 (2012-08-22)
-  * Start release