color_echo 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d3a8d427f0500c579883ec1383e41f925a3d29
-  data.tar.gz: fe121aaf4ccf3b4e47df7c416c8a6629b0b9798c
+  metadata.gz: 5ec85d1bace70cdff14ecc1ce007aa998ce2c3c6
+  data.tar.gz: f0f58f7f2b30dfc534071597787ba1fc243ff1aa
 SHA512:
-  metadata.gz: 4b37774a01401322360023eba2f8af2fa1a48a0982eb6ae14c0ec96f8567b0351605ac0ccca55cf1af1f9ebbdc5eee55bb1ed9da2b1f8f127b991b1e16780a70
-  data.tar.gz: ad2b93edfe490738e6e73e3a26372df536a73c7b1328410176a38e60c951c2cfa759798759f22925838dd22a529b60ee1b8c7802fa971d23c38aa715f5bde2ac
+  metadata.gz: 613d899d95e99406f59b89508cacc0666c52ba7a44daef6967c16ecc2c14beae2c1f16c266fb9969af6a659f1f01509a835b68af82e6e927978c832d46b3d8c6
+  data.tar.gz: 6fbe68a495bd36b09461ceecefe60e73d66652e55564fce43b3000fc7d3d8546b796802195eea08ddd80c9bd768badc8cc13a379feb894af6e8049946ddb4f79

data/README.md

@@ -3,7 +3,7 @@ To add color to the command line output.
 This Library will extend the Kernel module's functions(#print, #puts, #p).   
 required StringIO.   
 
-Version: 0.2.3   
+Version: 0.2.4   
 Compliant Rubys Version: 1.9.3, 2.0.0, 2.1.0 (for Linux)  
 License: MIT  
 Gems repository: http://rubygems.org/gems/color_echo
@@ -86,8 +86,8 @@ This method is available in version 0.1.0 on and after.
 
 #### CE.rainbow
 Text color will change to rainbow color.   
-String Object only.   
-Non-string object is excluded.    
+~~String Object only. Non-string object is excluded.~~ ->
+Be able to specify a non-string when rainbow mode at version 0.2.4 on and after.    
 This method is available in version 0.2.0 on and after.   
 
 ### Example
@@ -160,6 +160,13 @@ sed do eiusmod tempor incididunt
 ut labore et dolore magna aliqua.
 EOM
 
+CE.tx :underscore
+CE.bg :black
+CE.rainbow
+hash = {:foo => [111, 222, 333], :bar => {:str => String}}
+p hash
+p "fooooooo", ["AAA", "BBB", "CCC"]
+
 CE.off
 puts "Disable rainbow mode."
 ```
@@ -170,4 +177,9 @@ puts "Disable rainbow mode."
 
 
 ## Release Note
-* v0.2.3, 2014-12-02, Fixed small bugs.
+* v0.2.3, 2014-12-02
+    * Fixed small bugs.
+
+* v0.2.4, 2014-12-04
+    * Be able to specify a non-string when rainbow mode.
+    * Be able to take over the setting of other types of sequence when rainbow mode.

data/lib/color_echo/module_functions.rb

@@ -1,28 +1,36 @@
 module CE
+    # @return bool
     def available?
         return @@enable && @@isset
     end
 
+    # @return bool
     def isset?
         return @@isset
     end
 
+    # @return bool
     def enable?
         return @@enable
     end
 
+    # @return void
     def unuse
         @@enable = false
     end
 
+    # @return void
     def reset
         @@isset          = false
         @@rainbow        = false
         @@code_bg_color  = ""
         @@code_fg_color  = ""
         @@code_text_attr = ""
+        @@code_rainbow   = ""
     end
 
+    # @param Symbol name
+    # @return void
     def ch_fg(name)
         return nil if !name.instance_of?(Symbol)
         @@isset         = true  if !@@isset
@@ -30,6 +38,8 @@ module CE
         @@code_fg_color = convert_to_code("ForeGround", name)
     end
 
+    # @param Symbol name
+    # @return void
     def ch_bg(name)
         return nil if !name.instance_of?(Symbol)
         @@isset         = true if !@@isset
@@ -37,6 +47,8 @@ module CE
         @@code_bg_color = convert_to_code("BackGround", name)
     end
 
+    # @param Symbol name
+    # @return void
     def ch_tx(name)
         return nil if !name.instance_of?(Symbol)
         @@isset          = true if !@@isset
@@ -44,64 +56,89 @@ module CE
         @@code_text_attr = convert_to_code("TextAttr", name)
     end
 
+    # @param Symbol fg
+    # @param Symbol bg
+    # @param Symbol tx
+    # @return void
     def ch(fg, bg=nil, tx=nil)
         ch_fg(fg)
         ch_bg(bg)
         ch_tx(tx)
     end
 
+    # return start color sequence code
+    # @return String
     def get_start_code
-        return @@code_fg_color + @@code_bg_color + @@code_text_attr
+        if @@rainbow
+            return @@code_rainbow
+        else
+            return @@code_fg_color + @@code_bg_color + @@code_text_attr
+        end
     end
 
+    # @return String
     def get_reset_code
         return self::CODE_RESET
     end
 
     # add reset & start code to line feed code
+    # @param String input
     def add_reset_line_feed(input)
         input.gsub!(/#{$/}/, CE::get_reset_code + $/ + CE::get_start_code)
         input += CE::get_reset_code
         return input
     end
 
+    # change mode to rainbow
+    # @return void
     def rainbow
-        @@isset   = true if !@@isset
-        @@rainbow = true
+        @@isset        = true if !@@isset
+        @@rainbow      = true
+        @@code_rainbow = @@code_bg_color + @@code_text_attr
     end
 
+    # add code to be a rainbow color
+    # @param String text
+    # @return String
     def add_rainbow(text)
         cnt    = 0
-        output = ""
+        output = get_start_code
+
         text.each_char do |char|
             if char == $/
-                output += $/
+                output += get_reset_code + $/ + get_start_code
                 next
             end
 
             case cnt
             when 0
-                output += ForeGround::RED + char + CODE_RESET
+                output += ForeGround::RED + char + CODE_RESET + get_start_code
             when 1
-                output += ForeGround::GREEN + char + CODE_RESET
+                output += ForeGround::GREEN + char + CODE_RESET + get_start_code
             when 2
-                output += ForeGround::YELLOW + char + CODE_RESET
+                output += ForeGround::YELLOW + char + CODE_RESET + get_start_code
             when 3
-                output += ForeGround::BLUE + char + CODE_RESET
+                output += ForeGround::BLUE + char + CODE_RESET + get_start_code
             when 4
-                output += ForeGround::MAGENTA + char + CODE_RESET
+                output += ForeGround::MAGENTA + char + CODE_RESET + get_start_code
             when 5
-                output += ForeGround::CYAN + char + CODE_RESET
+                output += ForeGround::CYAN + char + CODE_RESET + get_start_code
             when 6
-                output += ForeGround::WHITE + char + CODE_RESET
+                output += ForeGround::WHITE + char + CODE_RESET + get_start_code
             end
             cnt += 1
             cnt  = 0 if cnt >= 7
         end
 
+        output += get_reset_code
+
         return output
     end
 
+    # get sequence code by symbol
+    # @param String module_name
+    # @param Symbol name
+    # @return String
     def convert_to_code(module_name, name)
         begin
             code = eval(%{#{module_name}::#{name.to_s.swapcase!}})
@@ -111,6 +148,7 @@ module CE
         return code
     end
 
+    # @return Proc
     def task
         return @@task
     end
@@ -121,10 +159,15 @@ module CE
                     :isset?,
                     :enable?,
                     :unuse,
-                    :reset, :off, :disable,
-                    :ch_fg, :fg,
-                    :ch_bg, :bg,
-                    :ch_tx, :tx,
+                    :reset,
+                    :off,
+                    :disable,
+                    :ch_fg,
+                    :fg,
+                    :ch_bg,
+                    :bg,
+                    :ch_tx,
+                    :tx,
                     :ch,
                     :get_start_code,
                     :get_reset_code,

data/lib/color_echo/variables.rb

@@ -4,6 +4,7 @@ module CE
     @@code_bg_color  = ""
     @@code_fg_color  = ""
     @@code_text_attr = ""
+    @@code_rainbow   = ""
     @@rainbow        = false
 
     @@print = method :print
@@ -12,35 +13,23 @@ module CE
 
     @@task = lambda do |*arg|
         if available?
-            if @@rainbow && arg.first.instance_of?(String)
-                # change output destination to StringIO Object
-                strio   = StringIO.new
-                $stdout = strio
+            # change output destination to StringIO Object
+            strio   = StringIO.new
+            $stdout = strio
 
-                # call original method
-                eval("@@#{caller_locations(2).first.label}").call(*arg)
+            # output color sequence
+            $stdout.print get_start_code if !@@rainbow
 
-                # change output destination to STDOUT
-                $stdout = STDOUT
+            # call original method
+            eval("@@#{caller_locations(2).first.label}").call(*arg)
 
-                # output to STDOUT
-                $stdout.print add_rainbow(strio.string)
+            # change output destination to STDOUT
+            $stdout = STDOUT
 
+            # output to STDOUT
+            if @@rainbow
+                $stdout.print add_rainbow(strio.string)
             else
-                # change output destination to StringIO Object
-                strio   = StringIO.new
-                $stdout = strio
-
-                # output color sequence
-                $stdout.print get_start_code
-
-                # call original method
-                eval("@@#{caller_locations(2).first.label}").call(*arg)
-
-                # change output destination to STDOUT
-                $stdout = STDOUT
-
-                # output to STDOUT
                 $stdout.print add_reset_line_feed(strio.string)
             end
 

data/lib/color_echo/version.rb

@@ -1,3 +1,3 @@
 module CE
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: color_echo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - nyanko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies: []
 description: 'To add color to the command line output.This Library will extend the
   Kernel module''s functions(#print, #puts, #p). required StringIO.'