color_echo 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6506be07d0069c30e631fe82b4b2efb44deb11c
-  data.tar.gz: 6c5ef32192472f4be0d8c507fb50ad5bdb59e221
+  metadata.gz: 6bde265f335a5fd1611039aa47bb7525a4fa5871
+  data.tar.gz: fbbfa7841a06fd8b7f8227a44f83bfd75c067bc4
 SHA512:
-  metadata.gz: 15e8243c5504922d0fd2bc9bd90acac164f8d028af05d5d3b2e6b92c5af9c56e1ac81f51a1117d9b8dbb2ceac30e09681effd2529ed5c496eeb4268ae5235fc8
-  data.tar.gz: a0cc6e4418eff5461d137ebeb36b9898dacbc3d63aca9a3a190499b2056acd9f45d74cc143f1e0483c616c3fbca12e782c5182eb588be381530733e5c01fc35c
+  metadata.gz: efa3cb80047d62e6456f3b2a9c3496084be62bb307aaeeffc9a3ce76b9b48b3ebfa63eb86c6c1e2f10a679c39155fa828240e12965951f7e25fbf9f8f54a759c
+  data.tar.gz: 7cc9b92feb89d30cd0484bfc95d5d9af92b6110b305eaa465ac51005793bf105750db244bd39f645c50e0b8d0e1290be26783a5fbcff565830dbdfad869d2e40

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014,2015 Kazuya Hotta
+Copyright (c) 2014-2016 Kazuya Hotta
 
 MIT License
 

data/README.md

@@ -4,6 +4,9 @@ Decorates command line output with ANSI escape sequence.
 Documents and all informations are as below =(^x^=    
 http://colorecho.net    
 
+See on rubygems   
+https://rubygems.org/gems/color_echo
+
 ### You can choose 256 colors!!
 ![screen shot](/image/colorindex01.png)
 ![screen shot](/image/colorindex02.png)

data/bin/colorecho

@@ -250,7 +250,7 @@ def read_conf(conf_path, list)
 
                 opname = ((/^-/ =~ op[0]) == nil) ? (op[0].size > 1 ? "--" : "-") + op[0] : op[0]
                 additions << opname
-                additions << op[1] if defined? op[1]
+                additions << op[1] if (defined? op[1]) && op[1] != nil
             end
         else
             # Missing specified file
@@ -294,6 +294,7 @@ def read_conf(conf_path, list)
             opt.on("-R", "--refresh"          ) { refresh           = true  }
             opt.parse!(additions)
         end
+
         @fg ||= fg
         @bg ||= bg
         @tx ||= tx

data/bin/lib/display.rb

@@ -51,9 +51,8 @@ def usage
 
     CE.once.ch :yellow
     puts <<-EOS
-    #{CE::LIBS_NAME} - #{CE::SUMMARY}
+    #{CE::LIBS_NAME} - #{CE::DESCRIPTION}
     VERSION: #{CE::VERSION}
-    README: #{CE::DOCS_PAGE}
 
     EOS
 

data/lib/color_echo.rb

@@ -1,7 +1,6 @@
 # color_echo
-# Decorate the command line output with ANSI escape sequence.
-# Text that output by "print, puts, p" method is decorated.
-# It is also can to decorate only your specified words!
+# 
+# Decorates command line output with ANSI escape sequence.
 
 require_relative "color_echo/get"
 require_relative "color_echo/override"

data/lib/color_echo/const.rb

@@ -1,11 +1,7 @@
 module CE
     LIBS_NAME   = "color_echo"
-    VERSION     = "3.0.0"
+    VERSION     = "3.1.0"
     SUMMARY     = "Decorates command line output with ANSI escape sequence."
     HOMEPAGE    = "http://colorecho.net"
-    DESCRIPTION = <<EOS
-#{SUMMARY}
-Text that output by "print, puts, p" method is decorated.
-It is also can to decorate only your specified words!
-EOS
+    DESCRIPTION = %(#{SUMMARY} #{HOMEPAGE})
 end

data/lib/color_echo/functions.rb

@@ -182,7 +182,7 @@ module CE
     def get(text)
         if @@allow_output
             caller()[0] =~ /(.*?):(\d+)/
-            warn (%([WARNING] #{$1} #{$2}: You can't call CE.get. You must to read like -> require 'color_echo/get' ))
+            warn (%([WARNING] #{$1} #{$2}: You can't call CE.get. You must read like -> require 'color_echo/get' ))
             return text
         end
 
@@ -226,6 +226,22 @@ module CE
         return self
     end
 
+    # @param symbol arg
+    # @return array
+    def withdraw(*arg)
+        deleted = []
+        arg.each do |target|
+            deleted << @@assgined.delete(target)
+        end
+
+        return deleted
+    end
+
+    # @return array
+    def get_assigned
+        return @@assgined
+    end
+
     # method alias
     alias_method :off,     :reset
     alias_method :disable, :reset

data/lib/color_echo/get.rb

@@ -13,3 +13,4 @@ require_relative "module/textattr"
 require_relative "module/off"
 require_relative "functions"
 require_relative "internal"
+require_relative "private_task"

data/lib/color_echo/override.rb

@@ -15,11 +15,10 @@ def puts(*arg)
     CE.task.call(*arg)
 end
 
-# TODO
-#def printf(*arg)
-#    CE.task.call(*arg)
-#end
+def printf(*arg)
+    CE.task.call(*arg)
+end
 
-#def putc(*arg)
-#    CE.task.call(*arg)
-#end
+def putc(*arg)
+    CE.task.call(*arg)
+end

data/lib/color_echo/private_task.rb

@@ -0,0 +1,67 @@
+module CE
+    private
+    def task_available(called, arg)
+        # change output destination to StringIO Object
+        strio   = StringIO.new
+        $stdout = strio
+
+        # call original method
+        eval("@@#{called}").call(*arg)
+
+        # change output destination to STDOUT
+        $stdout = STDOUT
+
+        # get output text
+        if @@rainbow
+            output = add_rainbow(strio.string)
+        else
+            output = strio.string
+
+            # try to remove escape sequence code
+            output = cleanup_text(output) if @@refresh
+
+            # decorate pickup
+            if @@pickup_list.size > 0
+                output = add_pickup_code(output)
+            end
+
+            # add start code in header
+            output = get_start_code + output
+
+            # add reset code in front of line feed
+            output = add_reset_line_feed(output)
+        end
+
+        # output to STDOUT
+        if @@allow_output
+            $stdout.print output
+            # auto off
+            if @@cnt_limit > 0
+                @@cnt_limit -= 1
+                # to reset
+                if @@cnt_limit == 0
+                    reset
+                end
+            end
+        else
+            reset if !@@stateful_getter
+            return output
+        end
+    end
+
+    # this task will be called if CE.unuse was called
+    private
+    def task_unuse(called, arg)
+        if @@allow_output
+            # call original method
+            eval("@@#{called}").call(*arg)
+        else
+            # just return
+            output = ""
+            arg.each do |elem|
+                output += elem
+            end
+            return output
+        end
+    end
+end

data/lib/color_echo/variables.rb

@@ -10,91 +10,48 @@ module CE
     @@code_text_attr         = ""
     @@code_highlights        = []
     @@code_rainbow           = ""
-    # count number for times method
-    @@cnt_limit              = 0
-    @@pickup_list            = {}
-    # how much pattern having?
-    @@cnt_pickups            = 0
-    @@stateful_getter        = false
-
-    @@print = method :print
-    @@p     = method :p
-    @@puts  = method :puts
-
-    @@get = lambda do |text|
-        print text
-    end
-
-    @@task = lambda do |*arg|
-        if available?
-            # change output destination to StringIO Object
-            strio   = StringIO.new
-            $stdout = strio
 
-            # call original method
-            if RUBY_VERSION >= "2.3.0"
-                eval("@@#{caller_locations(1).first.label}").call(*arg)
-            else
-                eval("@@#{caller_locations(2).first.label}").call(*arg)
-            end
+    # count number for times method
+    @@cnt_limit = 0
 
-            # change output destination to STDOUT
-            $stdout = STDOUT
+    # pickup patterns and decoration of it
+    @@pickup_list = {}
 
-            # get output text
-            if @@rainbow
-                output = add_rainbow(strio.string)
-            else
-                output = strio.string
+    # how much patterns having?
+    @@cnt_pickups = 0
 
-                # try to remove escape sequence code
-                output = cleanup_text(output) if @@refresh
+    # is stateful when 'color_echo/get'?
+    @@stateful_getter = false
 
-                # decorate pickup
-                if @@pickup_list.size > 0
-                    output = add_pickup_code(output)
-                end
+    # assgined methods to decorate
+    @@assgined = [:puts, :p, :print, :printf, :putc]
 
-                # add start code in header
-                output = get_start_code + output
+    # save methods
+    @@puts   = method :puts
+    @@p      = method :p
+    @@print  = method :print
+    @@printf = method :printf
+    @@putc   = method :putc
 
-                # add reset code in front of line feed
-                output = add_reset_line_feed(output)
-            end
+    # closure for CE.get
+    @@get = lambda do |text|
+        print text
+    end
 
-            # output to STDOUT
-            if @@allow_output
-                $stdout.print output
-                # auto off
-                if @@cnt_limit > 0
-                    @@cnt_limit -= 1
-                    # to reset
-                    if @@cnt_limit == 0
-                        reset
-                    end
-                end
-            else
-                reset if !@@stateful_getter
-                return output
-            end
+    # assgined methods will be overwritten as this closure
+    @@task = lambda do |*arg|
+        # get function name that was called
+        if RUBY_VERSION >= "2.3.0"
+            called = caller_locations(1).first.label
+        else
+            called = caller_locations(2).first.label
+        end
 
-        # no available "color echo"
+        if available? && called == "get" || @@assgined.index(called.intern)
+            task_available(called, arg)
         else
-            if @@allow_output
-                # call original method
-                if RUBY_VERSION >= "2.3.0"
-                    eval("@@#{caller_locations(1).first.label}").call(*arg)
-                else
-                    eval("@@#{caller_locations(2).first.label}").call(*arg)
-                end
-            else
-                # just return
-                output = ""
-                arg.each do |elem|
-                    output += elem
-                end
-                return output
-            end
+            # no available "color echo"
+            task_unuse(called, arg)
         end
     end
 end

metadata

@@ -1,19 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: color_echo
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - khotta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies: []
-description: |
-  Decorates command line output with ANSI escape sequence.
-  Text that output by "print, puts, p" method is decorated.
-  It is also can to decorate only your specified words!
+description: Decorates command line output with ANSI escape sequence. http://colorecho.net
 email:
 - khotta116@gmail.com
 executables:
@@ -35,6 +32,7 @@ files:
 - lib/color_echo/module/off.rb
 - lib/color_echo/module/textattr.rb
 - lib/color_echo/override.rb
+- lib/color_echo/private_task.rb
 - lib/color_echo/variables.rb
 homepage: http://colorecho.net
 licenses:
@@ -60,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Decorates command line output with ANSI escape sequence.