color_echo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b057ff2dcd468a18b71e8997da18992987c6749c
-  data.tar.gz: 02fe38f9973436d2793057c603b7bd4421b37e41
+  metadata.gz: 955540738b14db7f9f1fd1bda47f1892cdd31f2d
+  data.tar.gz: caa4d7f6549be7b4727de5e9cb7b8e4e1f3ef53a
 SHA512:
-  metadata.gz: e8da10993a717801bb3d13e1579cb13f7471a30ef1ec0457a9491a8d277647a2f5ed72862aa4f6f1b3f048dca3c66ddf2ae14b8e3d72ed4d23db208e94789a7e
-  data.tar.gz: 9dab57abc01d2bc31a4fa97ce28e4abf51b05a4cdf249631bd9f6326d56eff0dec3e3346302bf6c46f7060b217806648089c8e47d9e16a0e22275a10c1e857b9
+  metadata.gz: 1e99e1abe31a23a058cfe7c999a9893b8ad73d2d10b31e2a9e622d71b971b8fe3ada618e5b83ce4ed756bf41d80b97c41d8f9b67065ce45e08a780e65e3341b1
+  data.tar.gz: a014dd348b0de49c1bf768b5305ec20c61594e9f5dcc0e894c9cdef8f7b6188c01722401d766ad4476646462e7db78579c63ec1e2b3adf3c6d2d2039cf817388

data/README.md

@@ -3,7 +3,7 @@ Decorate the command line output with ANSI escape sequence.
 Text that is output by "print, puts, p" method is decorated.    
 It is also can to decorate only your specified words!   
 
-Version: 1.0.0
+Version: 1.1.0
 Compliant Rubys Version: 2.0.0, 2.1.0 (for Linux)  
 License: MIT  
 Gems repository: http://rubygems.org/gems/color_echo
@@ -308,7 +308,12 @@ puts "Disable rainbow mode."
 ![screen shot](/images/screenshot.png)
 
 ## Release Note
-* v1.0.0, 
+* v1.1.0, 2014-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
     * Add command line interface.
 
 * v0.9.0, 2014-01-19

data/bin/color_echo

@@ -10,248 +10,76 @@ def require_color_echo_get
     #require_relative "../lib/color_echo/get"
 end
 
-def version
-    require_color_echo
+require_relative "./lib/display"
 
-    puts CE::VERSION
-    exit 0 
-end
-
-def usage
-    require_color_echo
-
-    CE.once.ch :yellow
-    puts <<-EOS
-
-    #{CE::LIBS_NAME} - #{CE::SUMMARY}
-    VERSION: #{CE::VERSION}
-    README: #{CE::DOCS_PAGE}
-
-    EOS
-
-    padding    = " " * 4
-    headers    = ["* Usage", "* Options", "* Example"]
-    headers_op = [
-                     "-v:", "--symbol_list:", "--index_list:", "--pickup word [--pickup word ...]:", "--fg color_name:", "--bg color_name:",
-                     "--tx text_attribute[,...]:", "--watch:", "-n:", "-h:"
-    ]
-    CE.pickup(headers, :h_green)
-    CE.pickup(headers_op, :cyan)
-
-    puts padding + "* Usage"
-
-    CE.ch :h_blue
-    puts padding * 2 + "color_echo [options] text"
-    puts padding * 2 + "color_echo [options] < /path/to/file"
-    puts padding * 2 + "echo text | color_echo [options]"
-    puts padding * 2 + "color_echo -v"
-    puts padding * 2 + "color_echo -s"
-    puts padding * 2 + "color_echo -l"
-    puts padding * 2 + "color_echo -h" + $/ + $/
-    CE.off :fg
-
-    puts padding + "* Options"
-
-    puts padding * 2 + "-v:"
-    puts padding * 3 + "Display version of color_echo." + $/ + $/
-
-    puts padding * 2 + "--symbol_list:"
-    puts padding * 3 + "Display symbol list that can to specify."
-    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 + "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 + "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 + "short option is -f." + $/ + $/ 
-
-    puts padding * 2 + "--bg color_name:"
-    puts padding * 3 + "Decorate the background color."
-    puts padding * 3 + "short option is -b." + $/ + $/ 
-
-    puts padding * 2 + "--tx text_attribute[,...]:"
-    puts padding * 3 + "Decorate the text attribute."
-    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 + "short option is -w." + $/ + $/
-
-    puts padding * 2 + "-n:"
-    puts padding * 3 + "Do not output the trailing newline." + $/ + $/ 
-
-    puts padding * 2 + "-h:"
-    puts padding * 3 + "Show this message." + $/ + $/ 
-
-    puts padding + "* Example"
-
-    CE.once.ch :h_magenta
-    puts padding * 2 + %(* color_echo can to highlight even when you following the log file by tailf, tail -f.)
-    puts padding * 3 + %(tailf /var/log/httpd/access_log | color_echo -w -p "127.0.0.1" -t bold)
-    puts padding * 3 + %(tailf /var/log/php/php_error.log | color_echo -w -p "foo.php" -p "Fatal error:" -f h_blue) + $/ + $/
-
-    CE.once.ch :h_magenta
-    puts padding * 2 + %(* color_echo is useful to read the access log, etc.)
-    puts padding * 3 + %(cat /var/log/httpd/access_log | color_echo -p "Sun Jan 18" -f h_cyan -t underscore | less)
-    puts padding * 3 + %(color_echo -p "Sun Jan 18" -f h_cyan -t underscore < /var/log/httpd/access_log | less)
-    puts padding * 3 + %((color_echo -f cyan -p /\\\\s2..\\\\s/ | color_echo -f h_red -p /\\\\s5..\\\\s/ | less) < /var/log/httpd/access_log)
-    puts padding * 3 + %(sed -n 1,1000p /var/log/httpd/access_log | color_echo -f cyan -p /\\\\s2..\\\\s/ | color_echo -f h_red -p /\\\\s5..\\\\s/ | less) + $/ + $/
-
-    CE.once.ch :h_magenta
-    puts padding * 2 + %(* It is a simple to use.)
-    puts padding * 3 + %(color_echo Hello\\!\\! -f h_white -b index199)
-    puts padding * 3 + %(color_echo Hello\\!\\! -t blink,bold -f magenta) + $/ + $/
-
-    CE.once.ch :h_magenta
-    puts padding * 2 + %(* color_echo can receive the standard input.)
-    puts padding * 3 + %(echo FooFoOfOO | color_echo -t reverse_video)
-    puts padding * 3 + %(echo FooFoOfOO | color_echo -f index130 -p /foo$/i | color_echo -f index180 -p /^foo/i)
-    puts padding * 3 + %(netstat -na | color_echo -p ":80" | color_echo -p "127.0.0.1" -f h_cyan) + $/ + $/
-
-    exit 0
-end
-
-def display_color_index
-    require_color_echo
-
-    CE.rainbow
-    cnt     = 134
-    padding = " " * 2
-    mes     = "OK, Let me check color index list... :)"
-    puts padding + "-" * cnt
-    puts padding + " " * ((cnt - mes.size)/2) + mes
-    puts padding + "-" * cnt
-
-    print padding
-    256.times do |i|
-        num = i + 1
-        CE.fg "index#{num}".intern
-        print "index#{num}" + " " * (4 - num.to_s.size)
-        CE.bg "index#{num}".intern
-        print " " * 5
-        CE.off
-        print " " * 3
-
-        if num % 8 == 0
-            print $/ + $/
-            print padding if num != 256
-        end
-    end
-    CE.off
-
-    exit 0
-end
-
-def display_symbol_list
-    require_color_echo
-
-    symbols_color = [
-        :black,
-        :gray,
-        :red,
-        :h_red,
-        :green,
-        :h_green,
-        :yellow,
-        :h_yellow,
-        :blue,
-        :h_blue,
-        :magenta,
-        :h_magenta,
-        :cyan,
-        :h_cyan,
-        :white,
-        :h_white
-    ]
-    symbols_text_attr = [
-        :bold,
-        :underscore,
-        :blink,
-        :reverse_video,
-        :concealed
-    ]
-
-    CE.times(3).rainbow
-    cnt     = 60
-    padding = " " * 2
-    mes     = "OK, Let me check color name list... :)"
-    puts padding + "-" * cnt
-    puts padding + " " * ((cnt - mes.size)/2) + mes
-    puts padding + "-" * cnt
-
-    header_colors     = "* foreground or background colors"
-    header_text_attrs = "* text attributes"
-    CE.pickup([header_colors, header_text_attrs], :cyan, nil, [:underscore, :bold])
-
-    puts padding + header_colors
-    symbols_color.each do |color_name|
-        CE.off(:bg).fg color_name
-        print "#{padding*2}:#{color_name}" + " " * (11 - color_name.to_s.size)
-        CE.bg color_name
-        puts color_name.to_s + " " * (30 - color_name.to_s.size)
-    end
-
-    CE.off [:bg, :fg]
-    print $/ + $/
+def output_interactive
+    output_stripe_interactive if @is_stripe
 
-    puts padding + header_text_attrs
-    symbols_text_attr.each do |tx_name|
-        CE.off(:tx)
-        CE.tx tx_name if tx_name != :concealed
-        puts "#{padding*2}:#{tx_name}" + " " * (30 - tx_name.to_s.size)
+    while input = STDIN.gets
+        input.chomp!
+        exit 0 if @exit_words.index(input)
+        eval(@code_decorate)
+        puts CE.get(input)
     end
-
-    print $/
-
-    exit 0
 end
 
-def output_interactive
-    exit_words = ["quit", "exit", "bye"]
+def output_stripe_interactive
+    cnt = 0
     while input = STDIN.gets
         input.chomp!
-        exit 0 if exit_words.index(input)
-        eval(@code_decorate)
+        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
+    @pickups   = []
+    @is_watch  = false
+    @last_lb   = true
+    @is_stripe = false
 
     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("-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("-w", "--watch")          { @is_watch  = true }
+    opt.on("-n")                     { @last_lb   = false }
+    opt.on("--stripe")               { @is_stripe = true }
 
     begin
         opt.parse!(ARGV)
@@ -273,6 +101,12 @@ def parse_options
         @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 = ""
@@ -298,10 +132,18 @@ parse_options
 require_color_echo_get
 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

data/bin/lib/display.rb

@@ -0,0 +1,212 @@
+def version
+    require_color_echo
+
+    puts CE::VERSION
+    exit 0 
+end
+
+def usage
+    require_color_echo
+
+    CE.once.ch :yellow
+    puts <<-EOS
+
+    #{CE::LIBS_NAME} - #{CE::SUMMARY}
+    VERSION: #{CE::VERSION}
+    README: #{CE::DOCS_PAGE}
+
+    EOS
+
+    padding    = " " * 4
+    headers    = ["* Usage", "* Options", "* Example"]
+    headers_op = [
+                     "-v:", "--symbol-list:", "--index-list:", "--pickup word [--pickup word ...]:", "--fg color_name:", "--bg color_name:",
+                     "--tx text_attribute[,...]:", "--watch:", "--stripe:", "-n:", "-h:"
+    ]
+    CE.pickup(headers, :h_green)
+    CE.pickup(headers_op, :cyan)
+
+    puts padding + "* Usage"
+
+    CE.ch :h_blue
+    puts padding * 2 + "color_echo [options] text"
+    puts padding * 2 + "color_echo [options] < /path/to/file"
+    puts padding * 2 + "echo text | color_echo [options]"
+    puts padding * 2 + "color_echo -v"
+    puts padding * 2 + "color_echo -s"
+    puts padding * 2 + "color_echo -l"
+    puts padding * 2 + "color_echo -h" + $/ + $/
+    CE.off :fg
+
+    puts padding + "* Options"
+
+    puts padding * 2 + "-v:"
+    puts padding * 3 + "Display version of color_echo." + $/ + $/
+
+    puts padding * 2 + "--symbol-list:"
+    puts padding * 3 + "Display symbol list that can to specify."
+    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 + "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 + "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 + "short option is -f." + $/ + $/ 
+
+    puts padding * 2 + "--bg color_name:"
+    puts padding * 3 + "Decorate the background color."
+    puts padding * 3 + "short option is -b." + $/ + $/ 
+
+    puts padding * 2 + "--tx text_attribute[,...]:"
+    puts padding * 3 + "Decorate the text attribute."
+    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 + "short option is -w." + $/ + $/
+
+    puts padding * 2 + "--stripe:"
+    puts padding * 3 + "Apply the decoration for each row."
+    puts padding * 3 + "pickup option is ignored." + $/ + $/
+
+    puts padding * 2 + "-n:"
+    puts padding * 3 + "Do not output the trailing newline." + $/ + $/ 
+
+    puts padding * 2 + "-h:"
+    puts padding * 3 + "Show this message." + $/ + $/ 
+
+    puts padding + "* Example"
+
+    CE.once.ch :h_magenta
+    puts padding * 2 + %(* color_echo can to highlight even when you following the log file by tailf, tail -f.)
+    puts padding * 3 + %(tailf /var/log/httpd/access_log | color_echo -w -p "127.0.0.1" -t bold)
+    puts padding * 3 + %(tailf /var/log/php/php_error.log | color_echo -w -p "foo.php" -p "Fatal error:" -f h_blue) + $/ + $/
+
+    CE.once.ch :h_magenta
+    puts padding * 2 + %(* color_echo is useful to read the access log, etc.)
+    puts padding * 3 + %(cat /var/log/httpd/access_log | color_echo -p "Sun Jan 18" -f h_cyan -t underscore | less)
+    puts padding * 3 + %(color_echo -p "Sun Jan 18" -f h_cyan -t underscore < /var/log/httpd/access_log | less)
+    puts padding * 3 + %((color_echo -f cyan -p /\\\\s2..\\\\s/ | color_echo -f h_red -p /\\\\s5..\\\\s/ | less) < /var/log/httpd/access_log)
+    puts padding * 3 + %(sed -n 1,1000p /var/log/httpd/access_log | color_echo -f cyan -p /\\\\s2..\\\\s/ | color_echo -f h_red -p /\\\\s5..\\\\s/ | less) + $/ + $/
+
+    CE.once.ch :h_magenta
+    puts padding * 2 + %(* It is a simple to use.)
+    puts padding * 3 + %(color_echo Hello\\!\\! -f h_white -b index199)
+    puts padding * 3 + %(color_echo Hello\\!\\! -t blink,bold -f magenta) + $/ + $/
+
+    CE.once.ch :h_magenta
+    puts padding * 2 + %(* color_echo can to receive the standard input.)
+    puts padding * 3 + %(echo FooFoOfOO | color_echo -t reverse_video)
+    puts padding * 3 + %(echo FooFoOfOO | color_echo -f index130 -p /foo$/i | color_echo -f index180 -p /^foo/i)
+    puts padding * 3 + %(netstat -na | color_echo -p ":80" | color_echo -p "127.0.0.1" -f h_cyan) + $/ + $/
+
+    CE.once.ch :h_magenta
+    puts padding * 2 + %(* color_echo can to decorate for each row.)
+    puts padding * 3 + %(color_echo -f gray -t bold --stripe < /path/to/file)
+    puts padding * 3 + %(tailf /var/log/httpd/access_log | color_echo -w -f black -b index150 -t bold --stripe) + $/ + $/
+
+    exit 0
+end
+
+def display_color_index
+    require_color_echo
+
+    CE.rainbow
+    cnt     = 134
+    padding = " " * 2
+    mes     = "OK, Let me check color index list... :)"
+    puts padding + "-" * cnt
+    puts padding + " " * ((cnt - mes.size)/2) + mes
+    puts padding + "-" * cnt
+
+    print padding
+    256.times do |i|
+        num = i + 1
+        CE.fg "index#{num}".intern
+        print "index#{num}" + " " * (4 - num.to_s.size)
+        CE.bg "index#{num}".intern
+        print " " * 5
+        CE.off
+        print " " * 3
+
+        if num % 8 == 0
+            print $/ + $/
+            print padding if num != 256
+        end
+    end
+    CE.off
+
+    exit 0
+end
+
+def display_symbol_list
+    require_color_echo
+
+    symbols_color = [
+        :black,
+        :gray,
+        :red,
+        :h_red,
+        :green,
+        :h_green,
+        :yellow,
+        :h_yellow,
+        :blue,
+        :h_blue,
+        :magenta,
+        :h_magenta,
+        :cyan,
+        :h_cyan,
+        :white,
+        :h_white
+    ]
+    symbols_text_attr = [
+        :bold,
+        :underscore,
+        :blink,
+        :reverse_video,
+        :concealed
+    ]
+
+    CE.times(3).rainbow
+    cnt     = 60
+    padding = " " * 2
+    mes     = "OK, Let me check color name list... :)"
+    puts padding + "-" * cnt
+    puts padding + " " * ((cnt - mes.size)/2) + mes
+    puts padding + "-" * cnt
+
+    header_colors     = "* foreground or background colors"
+    header_text_attrs = "* text attributes"
+    CE.pickup([header_colors, header_text_attrs], :cyan, nil, [:underscore, :bold])
+
+    puts padding + header_colors
+    symbols_color.each do |color_name|
+        CE.off(:bg).fg color_name
+        print "#{padding*2}:#{color_name}" + " " * (11 - color_name.to_s.size)
+        CE.bg color_name
+        puts color_name.to_s + " " * (30 - color_name.to_s.size)
+    end
+
+    CE.off [:bg, :fg]
+    print $/ + $/
+
+    puts padding + header_text_attrs
+    symbols_text_attr.each do |tx_name|
+        CE.off(:tx)
+        CE.tx tx_name if tx_name != :concealed
+        puts "#{padding*2}:#{tx_name}" + " " * (30 - tx_name.to_s.size)
+    end
+
+    print $/
+
+    exit 0
+end
+

data/lib/color_echo/const.rb

@@ -1,6 +1,6 @@
 module CE
     LIBS_NAME   = "color_echo"
-    VERSION     = "1.0.0"
+    VERSION     = "1.1.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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - khotta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies: []
 description: |
   Decorate the command line output with ANSI escape sequence.
@@ -23,6 +23,7 @@ files:
 - LICENSE.txt
 - README.md
 - bin/color_echo
+- bin/lib/display.rb
 - lib/color_echo.rb
 - lib/color_echo/const.rb
 - lib/color_echo/functions.rb