color_echo 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de36abdfab11068e2ed52e7907bedca5118b433
-  data.tar.gz: 1ee5d4784d0860e95d9f63ce7e0097cef525e908
+  metadata.gz: 7525bc00bc7a3864587b5033958c44163ff1901e
+  data.tar.gz: 1fce685256af1ca16e36e92781a84cebfffd09d9
 SHA512:
-  metadata.gz: a003cc5c7903d4e1feda4cafa81a4bab5e8ca1b5c19b0694e412a788da339ef7f2fc5cbaa88c0e9103a9bb5ca982bb9abf1dcbe39889986bea8a6468cdd46b72
-  data.tar.gz: 34567dec9ac2acafaba4d716d0603403668d20a9dcfd223d098e6789d1d3fc11760bfbdda3b740fc963331f088d5bebff4032e74945a9c5361c6150864f1b993
+  metadata.gz: 387023506fd719b45daf5ddb58b09aa695dae3919be64233c7c102ac74937ff371719f2e01776ee973e1d942341b5144808cf43419f04eb738d61f402b792cb4
+  data.tar.gz: 902ef9eb6ca0443d95bf56ab22a49824f78579a2b17e4c46c9c8f89b78db2def5b9cc711b97cedf13a8312ecf8e2e3a6c44be61b69e42a3d5c486bc84d406285

data/README.md

@@ -3,7 +3,7 @@ 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!   
 
-Version: 1.2.0
+Version: 1.3.0
 Compliant Rubys Version: 2.0.0, 2.1.0 (for Linux)  
 License: MIT  
 Gems repository: http://rubygems.org/gems/color_echo
@@ -308,29 +308,33 @@ puts "Disable rainbow mode."
 ![screen shot](/images/screenshot.png)
 
 ## Release Note
-* v1.2.0, 2014-01-28
+* v1.3.0, 2014-02-06
+    * Change some options help messages.
+    * You can call 'colorecho' as 'color_echo' in command line interface.
+
+* v1.2.0, 2015-01-28
     * Add -e option.
 
-* v1.1.0, 2014-01-27
+* v1.1.0, 2015-01-27
     * Modified to output the argument when the standard input is hit.
     * Add --stripe option in the command line interface.
     * Change the delimiter of long option with a hyphen -> -symbol-list,--index-list; Can to specify also underscore as before.
 
-* v1.0.0, 2014-01-23
+* v1.0.0, 2015-01-23
     * Add command line interface.
 
-* v0.9.0, 2014-01-19
+* v0.9.0, 2015-01-19
     * Add a mode to receive as the words with ANSI escape sequence; without output to display.
 
-* v0.8.0, 2014-01-14
+* v0.8.0, 2015-01-14
     * Change for the specified arguments of reset method.
     * Fix small bugs.
 
-* v0.7.0, 2014-01-08
+* v0.7.0, 2015-01-08
     * Add new method -> pickup
     * Add new symbol that can to specify in reset method of first parameter -> CE.reset(:pickup)
 
-* v0.6.0, 2014-01-05
+* v0.6.0, 2015-01-05
     * Add command line tool.
 
 * v0.5.0, 2014-12-16

data/bin/color_echo

@@ -68,20 +68,21 @@ def parse_options
     require "optparse"
     opt = OptionParser.new
 
-    opt.on("-h") { usage }
-    opt.on("-v") { version }
-    opt.on("-s", "--symbol-list")    { display_symbol_list }
-    opt.on("-l", "--index-list")     { display_color_index }
-    opt.on("--symbol_list")          { display_symbol_list }  # for compatibility
-    opt.on("--index_list")           { display_color_index }  # for compatibility
-    opt.on("--fg val", "-f val")     { |val| @fg = val }
-    opt.on("--bg val", "-b val")     { |val| @bg = val }
-    opt.on("--tx val", "-t val")     { |val| @tx = val }
-    opt.on("--pickup val", "-p val") { |val| @pickups << val }
-    opt.on("-w", "--watch")          { @is_watch  = true }
-    opt.on("-n")                     { @last_lb   = false }
-    opt.on("-e")                     { @enable_lf = true }
-    opt.on("--stripe")               { @is_stripe = true }
+    opt.on("-h", @explain_h)                     { usage }
+    opt.on("-v", @explain_v)                     { version }
+    opt.on("-s", "--symbol-list", @explain_s)    { display_symbol_list }
+    opt.on("-l", "--index-list", @explain_l)     { display_color_index }
+    opt.on("--fg val", "-f val", @explain_f)     { |val| @fg = val }
+    opt.on("--bg val", "-b val", @explain_b)     { |val| @bg = val }
+    opt.on("--tx val", "-t val", @explain_t)     { |val| @tx = val }
+    opt.on("--pickup val", "-p val", @explain_p) { |val| @pickups << val }
+    opt.on("-w", "--watch", @explain_w)          { @is_watch  = true }
+    opt.on("-n", @explain_n)                     { @last_lb   = false }
+    opt.on("-e", @explain_e)                     { @enable_lf = true }
+    opt.on("--stripe", @explain_stripe)          { @is_stripe = true }
+
+    opt.on("--symbol_list", @explain_s + " - [compatibility]" ) { display_symbol_list }
+    opt.on("--index_list", @explain_l  + " - [compatibility]") { display_color_index }
 
     begin
         opt.parse!(ARGV)
@@ -128,10 +129,12 @@ end
 has_stdin = select([STDIN], [], [], 0) != nil || FileTest.pipe?(STDIN)
 usage if !has_stdin && ARGV.size == 0
 
+require_color_echo_get
+Version = CE::VERSION
+
 # parse options and set the decorate code that execute by eval
 parse_options
 
-require_color_echo_get
 if @is_watch
     # Interactive mode
     @exit_words = ["quit", "exit", "bye"]

data/bin/colorecho

@@ -0,0 +1,164 @@
+#!/usr/bin/env ruby
+
+def require_color_echo
+    require "color_echo"
+    #require_relative "../lib/color_echo"
+end
+
+def require_color_echo_get
+    require "color_echo/get"
+    #require_relative "../lib/color_echo/get"
+end
+
+require_relative "./lib/display"
+
+def output_interactive
+    output_stripe_interactive if @is_stripe
+
+    while input = STDIN.gets
+        input.chomp!
+        exit 0 if @exit_words.index(input)
+        eval(@code_decorate)
+        puts CE.get(input)
+    end
+end
+
+def output_stripe_interactive
+    cnt = 0
+    while input = STDIN.gets
+        input.chomp!
+        exit 0 if @exit_words.index(input)
+        eval(@code_decorate) if cnt % 2 == 0
+        puts CE.get(input)
+        cnt += 1
+    end
+end
+
+def output(target)
+    output_stripe(target) if @is_stripe
+
+    eval(@code_decorate)
+    begin
+        print CE.get(target)
+    rescue Errno::EPIPE
+    end
+    exit 0
+end
+
+def output_stripe(target)
+    cnt = 0
+    target.split($/).each do |record|
+        eval(@code_decorate) if cnt % 2 == 0
+        puts CE.get(record)
+        cnt += 1
+    end
+    exit 0
+end
+
+def parse_options
+    @fg = nil
+    @bg = nil
+    @tx = nil
+    @pickups   = []
+    @is_watch  = false
+    @last_lb   = true
+    @enable_lf = false
+    @is_stripe = false
+
+    require "optparse"
+    opt = OptionParser.new
+
+    opt.on("-h", @explain_h)                     { usage }
+    opt.on("-v", @explain_v)                     { version }
+    opt.on("-s", "--symbol-list", @explain_s)    { display_symbol_list }
+    opt.on("-l", "--index-list", @explain_l)     { display_color_index }
+    opt.on("--fg val", "-f val", @explain_f)     { |val| @fg = val }
+    opt.on("--bg val", "-b val", @explain_b)     { |val| @bg = val }
+    opt.on("--tx val", "-t val", @explain_t)     { |val| @tx = val }
+    opt.on("--pickup val", "-p val", @explain_p) { |val| @pickups << val }
+    opt.on("-w", "--watch", @explain_w)          { @is_watch  = true }
+    opt.on("-n", @explain_n)                     { @last_lb   = false }
+    opt.on("-e", @explain_e)                     { @enable_lf = true }
+    opt.on("--stripe", @explain_stripe)          { @is_stripe = true }
+
+    opt.on("--symbol_list", @explain_s + " - [compatibility]" ) { display_symbol_list }
+    opt.on("--index_list", @explain_l  + " - [compatibility]") { display_color_index }
+
+    begin
+        opt.parse!(ARGV)
+
+    rescue => err
+        warn "Parse Error! Please check usage!" + $/ + $/
+        usage
+    end
+
+    @fg = "yellow" if @fg == nil && @bg == nil && @tx == nil
+    @fg = @fg.intern if @fg != nil
+    @bg = @bg.intern if @bg != nil
+
+    if @tx != nil
+        res = []
+        @tx.split(",").each do |val|
+            res << val.intern
+        end
+        @tx = res
+    end
+
+    # ignore --pickup option when specified --stripe option
+    if @pickups.size > 0 && @is_stripe
+        warn "pickup option is ignored because your specified --stripe option."
+        @pickups = []
+    end
+
+    # parse pickups
+    if @pickups.size > 0
+        code_pickup = ""
+        @pickups.each_index do |index|
+            if @pickups[index][0] == "/" && (@pickups[index][-1] == "/" || @pickups[index][-2] == "/")
+                @pickups[index] = eval(@pickups[index])
+            end
+
+            code_pickup += %(.pickup(@pickups[#{index}], @fg, @bg, @tx))
+        end
+        @code_decorate = "CE" + code_pickup
+    else
+        @code_decorate = %(CE.ch(@fg, @bg, @tx))
+    end
+end
+
+has_stdin = select([STDIN], [], [], 0) != nil || FileTest.pipe?(STDIN)
+usage if !has_stdin && ARGV.size == 0
+
+require_color_echo_get
+Version = CE::VERSION
+
+# parse options and set the decorate code that execute by eval
+parse_options
+
+if @is_watch
+    # Interactive mode
+    @exit_words = ["quit", "exit", "bye"]
+    output_interactive
+else
+    if has_stdin
+        target = STDIN.read
+
+        if ARGV.size > 0
+            print target
+            argv = ARGV.join(" ")
+            argv += $/ if @last_lb
+            output(argv)
+        end
+    else
+        target = ARGV.join(" ")
+        target += $/ if @last_lb
+    end
+
+    if @enable_lf
+        target.gsub!("\\r\\n", $/)
+        target.gsub!("\\n", $/)
+        target.gsub!("\\r", $/)
+    end
+
+    output(target)
+end

data/bin/lib/display.rb

@@ -1,3 +1,16 @@
+@explain_v = "Show version of color_echo."
+@explain_s = "Show symbol list that can to specify."
+@explain_l = "Show color index list that can to specify."
+@explain_p = "Decorate your specified wrods. You can use this option any number of times."
+@explain_f = "Specify the foreground color."
+@explain_b = "Specify the background color."
+@explain_t = "Specify the text attributes."
+@explain_w = "Interactive mode. Break word is -> exit, quit, bye; Or Ctl + c"
+@explain_n = "Do not output the trailing newline."
+@explain_e = "Enable interpretation of line feed."
+@explain_h = "Show this message."
+@explain_stripe  = "Decorate on every other line. pickup option is ignored."
+
 def version
     require_color_echo
 
@@ -41,49 +54,48 @@ def usage
     puts padding + "* Options"
 
     puts padding * 2 + "-v:"
-    puts padding * 3 + "Display version of color_echo." + $/ + $/
+    puts padding * 3 + @explain_v + $/ + $/
 
     puts padding * 2 + "--symbol-list:"
-    puts padding * 3 + "Display symbol list that can to specify."
+    puts padding * 3 + @explain_s
     puts padding * 3 + "short option is -s." + $/ + $/ 
     
     puts padding * 2 + "--index-list:"
-    puts padding * 3 + "Display color index list that can to specify."
+    puts padding * 3 + @explain_l
     puts padding * 3 + "short option is -l." + $/ + $/ 
 
     puts padding * 2 + "--pickup word [--pickup word ...]:"
-    puts padding * 3 + "Decorate your specified wrods. You can use this option any number of times."
+    puts padding * 3 + @explain_p
     puts padding * 3 + "Regular expressions can be used; like that -> /^foo/i"
     puts padding * 3 + "short option is -p." + $/ + $/ 
 
     puts padding * 2 + "--fg color_name:"
-    puts padding * 3 + "Decorate the foreground color."
+    puts padding * 3 + @explain_f
     puts padding * 3 + "short option is -f." + $/ + $/ 
 
     puts padding * 2 + "--bg color_name:"
-    puts padding * 3 + "Decorate the background color."
+    puts padding * 3 + @explain_b
     puts padding * 3 + "short option is -b." + $/ + $/ 
 
     puts padding * 2 + "--tx text_attribute[,...]:"
-    puts padding * 3 + "Decorate the text attribute."
+    puts padding * 3 + @explain_t
     puts padding * 3 + "short option is -t." + $/ + $/ 
 
     puts padding * 2 + "--watch:"
-    puts padding * 3 + "Interactive mode. Break word is -> exit, quit, bye; Or Ctl + c"
+    puts padding * 3 + @explain_w
     puts padding * 3 + "short option is -w." + $/ + $/
 
     puts padding * 2 + "--stripe:"
-    puts padding * 3 + "Decorate on every other line."
-    puts padding * 3 + "pickup option is ignored." + $/ + $/
+    puts padding * 3 + @explain_stripe + $/ + $/
 
     puts padding * 2 + "-n:"
-    puts padding * 3 + "Do not output the trailing newline." + $/ + $/ 
+    puts padding * 3 + @explain_n + $/ + $/ 
 
     puts padding * 2 + "-e:"
-    puts padding * 3 + "Enable interpretation of line feed." + $/ + $/ 
+    puts padding * 3 + @explain_e + $/ + $/ 
 
     puts padding * 2 + "-h:"
-    puts padding * 3 + "Show this message." + $/ + $/ 
+    puts padding * 3 + @explain_h + $/ + $/ 
 
     puts padding + "* Example"
 

data/lib/color_echo/const.rb

@@ -1,6 +1,6 @@
 module CE
     LIBS_NAME   = "color_echo"
-    VERSION     = "1.2.0"
+    VERSION     = "1.3.0"
     SUMMARY     = "Decorate the command line output with ANSI escape sequence."
     DOCS_PAGE   = "https://github.com/khotta/color_echo"
     DESCRIPTION = <<EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: color_echo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - khotta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies: []
 description: |
   Decorate the command line output with ANSI escape sequence.
@@ -17,12 +17,14 @@ description: |
 email: 
 executables:
 - color_echo
+- colorecho
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
 - bin/color_echo
+- bin/colorecho
 - bin/lib/display.rb
 - lib/color_echo.rb
 - lib/color_echo/const.rb