colsole 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f4905983294d15e6ec29b8110785b75dfbd471004dbfa7f7a50ace4fe442d2a
-  data.tar.gz: ce15a8010819467584bd06dd6fb2c070e20a230c0430171161ad6312d3d09e95
+  metadata.gz: a430d377ca6b98614b6d3127bf1f35f2dc259b2bb4378bdc61570519d5126130
+  data.tar.gz: c2e890a8104283b070323f9916db75bc9ec692d81e49630159b2127b0b8d83f9
 SHA512:
-  metadata.gz: 42824e5a07baeb3b6b13f1a94c4f17ed5f5180b06cf9e737e70cb55a4cddb0bc9a2796a286f00e9f8fba2ddffafd280487deb94875798b30fdbea6ed025952f1
-  data.tar.gz: 907f49a46ac26c4c4bd5f6c206645ab9560408399d9c3312449581a455620122d7757d213ef346bafc159ad34f17f489ecb9627b54b437ce4f6ad63433a64a77
+  metadata.gz: 4bc5fc5638d1cb43b0a88d487686fd7afc918626446220b2874a419443bf2d4ac2dd24ac3711fe9f13a62fea07d80d0e1cea4a15d2da398b7f18ceba819fb401
+  data.tar.gz: 3232586c10d02fdc7fd4ca3adc517cae833c62440eeec552bf2e50bc23d1d5192718212cbc7bd6dcda7647c404c55b11ac7427b7972911a8062c9e722a2a21c5

data/README.md

@@ -2,9 +2,8 @@ Colsole
 ==================================================
 
 [![Gem Version](https://badge.fury.io/rb/colsole.svg)](https://badge.fury.io/rb/colsole)
-[![Build Status](https://travis-ci.com/DannyBen/colsole.svg?branch=master)](https://travis-ci.com/DannyBen/colsole)
+[![Build Status](https://github.com/DannyBen/colsole/workflows/Test/badge.svg)](https://github.com/DannyBen/colsole/actions?query=workflow%3ATest)
 [![Maintainability](https://api.codeclimate.com/v1/badges/0556015f7cd2080531a1/maintainability)](https://codeclimate.com/github/DannyBen/colsole/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/0556015f7cd2080531a1/test_coverage)](https://codeclimate.com/github/DannyBen/colsole/test_coverage)
 
 ---
 

data/lib/colsole.rb

@@ -21,7 +21,7 @@ module Colsole
   # Prints a color-flagged string.
   # Use color flags (like !txtred!) to change color in the string.
   # Space terminated strings will leave the cursor at the same line.
-  def say(text, force_color=false) 
+  def say(text, force_color = false)
     last = text[-1, 1]
     if terminal? and (last == ' ' or last == '\t')
       print colorize(text, force_color)
@@ -32,13 +32,13 @@ module Colsole
 
   # Prints a color-flagged string to STDERR
   # Use color flags (like !txtred!) to change color in the string.
-  def say!(text, force_color=false) 
+  def say!(text, force_color = false)
     $stderr.puts colorize(text, force_color, :stderr)
   end
 
   # Erase the current output line, and say a new string.
   # This should be used after a space terminated say().
-  def resay(text, force_color=false) 
+  def resay(text, force_color = false)
     text = "\033[2K\r#{text}" if terminal?
     say text, force_color
   end
@@ -47,13 +47,13 @@ module Colsole
   # Status can be a symbol or a string. Color is optional, defaults to
   # green (:txtgrn) when there is a message, and to blue (:txtblu) when
   # there is only a status
-  def say_status(status, message=nil, color=nil)
+  def say_status(status, message = nil, color = nil)
     color ||= (message ? :txtgrn : :txtblu)
     say "!#{color}!#{status.to_s.rjust 12} !txtrst! #{message}".strip
   end
 
   # Returns true if stdout/stderr is interactive terminal
-  def terminal?(stream=:stdout)
+  def terminal?(stream = :stdout)
     stream == :stdout ? out_terminal? : err_terminal?
   end
 
@@ -76,7 +76,7 @@ module Colsole
 
   # Returns [width, height] of terminal when detected, or a default
   # value otherwise.
-  def detect_terminal_size(default=[80,30])
+  def detect_terminal_size(default = [80,30])
     if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
       result = [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
     elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exist?('tput')
@@ -98,7 +98,7 @@ module Colsole
   # Converts a long string to be wrapped keeping words in tact.
   # If the string starts with one or more spaces, they will be 
   # preserved in all subsequent lines (i.e., remain indented).
-  def word_wrap(text, length=nil)
+  def word_wrap(text, length = nil)
     length ||= terminal_width
     lead = text[/^\s*/]
     text.strip!
@@ -116,13 +116,13 @@ module Colsole
   # Parses and returns a color-flagged string.
   # Respects pipe and auto terminates colored strings.
   # Call without text to see a list/demo of all available colors.
-  def colorize(text=nil, force_color=false, stream=:stdout) 
+  def colorize(text = nil, force_color = false, stream = :stdout)
     return show_color_demo if text.nil?
     return strip_color_markers(text) unless terminal?(stream) || force_color
     colorize! text
   end
 
-  private
+private
 
   def colors
     @colors ||= prepare_colors
@@ -133,11 +133,11 @@ module Colsole
     reset_called_last = true
 
     out = text.gsub(/\!([a-z]{6})\!/) do |m|
-      reset_called_last = $1 == "txtrst";
-      colors[$1];
+      reset_called_last = $1 == "txtrst"
+      colors[$1]
     end
     
-    reset_called_last or out = "#{out}#{reset}";
+    reset_called_last or out = "#{out}#{reset}"
     out
   end
 
@@ -145,9 +145,7 @@ module Colsole
   # and values which are the escape codes for the colors.
   def prepare_colors
     esc = 27.chr
-    # pattern_full  = "#{esc}[%{decor};%{fg};%{bg}m"
-    pattern_fg    = "#{esc}[%{decor};%{fg}m"
-    pattern_reset = "#{esc}[0m"
+    pattern = "#{esc}[%{decor};%{fg}m"
 
     decors = { txt: 0, bld: 1, und: 4, rev: 7 }
     color_codes = { blk: 0, red: 1, grn: 2, ylw: 3, blu: 4, pur: 5, cyn: 6, wht: 7 }
@@ -156,17 +154,20 @@ module Colsole
     decors.each do |dk, dv|
       color_codes.each do |ck, cv|
         key = "#{dk}#{ck}"
-        val = pattern_fg % { decor: dv, fg: "3#{cv}" }
+        val = pattern % { decor: dv, fg: "3#{cv}" }
         colors[key] = val
       end
     end
-    colors['txtrst'] = pattern_reset
+    colors['txtbld'] = "#{esc}[1m"
+    colors['txtund'] = "#{esc}[4m"
+    colors['txtrev'] = "#{esc}[7m"
+    colors['txtrst'] = "#{esc}[0m"
     colors
   end
 
   def show_color_demo
-    i=33;
-    colors.each do |k,v| 
+    i = colors.count
+    colors.keys.each do |k| 
       puts colorize "#{k} = !#{k}! #{i} bottles of beer on the wall !txtrst!"
       i -= 1
     end

data/lib/colsole/version.rb

@@ -1,3 +1,3 @@
 module Colsole
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colsole
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies: []
 description: Utility functions for making colorful console applications
 email: db@dannyben.com