colsole 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6635dbbf550e4f14b3fce39cdd3bf9ef110f1195
-  data.tar.gz: 8957b89565d28da19efa69a56ec3b76cd5d77b55
+  metadata.gz: 6020823f438cc49eb3eb4fdf1d18aba0d4b44a71
+  data.tar.gz: 743c2add7febab44cd646fdcbd967bb25e5b32ae
 SHA512:
-  metadata.gz: 0e8d462f68985228c5aac42bba50f76fadcfcc3a064aa44f39dfe560509e5b4b03caacc8bcc01d1ab4a2167d90fb22b56ac482d6a9910decb65f847da2ec2784
-  data.tar.gz: 4438c599dd9bd5e716b943e43f1d89bad00e9470006c735b17008a545928129f1173a4da0f4851f71822cd9756ecbdc069c0f50b2e4c81c2ad73c6c8b36cb302
+  metadata.gz: 4ee4e4296a5905f1c1452806f1c7ba2a34f1dfbf961e898ac9a57377b16567861a64f90d357a42be2f99d6f31f638324cfeb9a6bb6d0f9c1d75c1cffa87da267
+  data.tar.gz: 8a91b479300a1eb7f079f87b33466b8e56f387c3068af097502800d180fbd8e319a6dd1a18af42b1992c860ad9b52baa6fe5d50fe80126c268c349acb7ee64fa

data/README.md

@@ -1,10 +1,10 @@
 Colsole
 ==================================================
 
-[![Gem Version](https://badge.fury.io/rb/colsole.svg)](http://badge.fury.io/rb/colsole)
-[![Build Status](https://travis-ci.org/DannyBen/colsole.svg?branch=master)](https://travis-ci.org/DannyBen/colsole)
-[![Code Climate](https://codeclimate.com/github/DannyBen/colsole/badges/gpa.svg)](https://codeclimate.com/github/DannyBen/colsole)
-[![Gem](https://img.shields.io/gem/dt/colsole.svg)](https://rubygems.org/gems/colsole)
+[![Gem](https://img.shields.io/gem/v/colsole.svg?style=flat-square)](https://rubygems.org/gems/colsole)
+[![Travis](https://img.shields.io/travis/DannyBen/colsole.svg?style=flat-square)](https://travis-ci.org/DannyBen/colsole)
+[![Code Climate](https://img.shields.io/codeclimate/github/DannyBen/colsole.svg?style=flat-square)](https://codeclimate.com/github/DannyBen/colsole)
+[![Gem](https://img.shields.io/gem/dt/colsole.svg?style=flat-square)](https://rubygems.org/gems/colsole)
 
 ---
 

data/lib/colsole/version.rb

@@ -1,3 +1,3 @@
 module Colsole
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/colsole.rb

@@ -71,7 +71,7 @@ module Colsole
 
   # Returns [width, height] of terminal when detected, or a default
   # value otherwise.
-  def detect_terminal_size(default=80)
+  def detect_terminal_size(default=[80,30])
     if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
       [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
     elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exist?('tput')
@@ -83,50 +83,52 @@ module Colsole
     end
   end
 
+  # Returns terminal width with re-asking
+  def terminal_width
+    @terminal_width ||= detect_terminal_size[0]
+  end
+
   # 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=78)
+  def word_wrap(text, length=nil)
+    length ||= terminal_width
     lead = text[/^\s*/]
-    length -= lead.size
-    text.gsub(/(.{1,#{length}}\n?)(\s+|\Z)/, "\\1\n#{lead}").rstrip
+    text.strip!
+    length -= lead.length
+    text.split("\n").collect! do |line|
+      line.length > length ? line.gsub(/(.{1,#{length}})(\s+|$)/, "#{lead}\\1\n").rstrip : "#{lead}#{line}"
+    end * "\n"
   end
 
   # 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) 
-    if text.nil? # Demo
-      i=33;
-      colors.each do |k,v| 
-        puts colorize "#{k} = !#{k}! #{i} bottles of beer on the wall !txtrst!"
-        i -= 1
-      end
-      return
-    end
-
-    reset = colors['txtrst']
-    if terminal?(stream) or force_color
-      reset_called_last = true
-
-      out = text.gsub(/\!([a-z]{6})\!/) do |m|
-        reset_called_last = $1 == "txtrst";
-        colors[$1];
-      end
-      reset_called_last or out = "#{out}#{reset}";
-    else 
-      out = text.gsub(/\!([a-z]{6})\!/, '')
-    end
-
-    return out
+    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
   end
 
+  def colorize!(text)
+    reset = colors['txtrst']
+    reset_called_last = true
+
+    out = text.gsub(/\!([a-z]{6})\!/) do |m|
+      reset_called_last = $1 == "txtrst";
+      colors[$1];
+    end
+    
+    reset_called_last or out = "#{out}#{reset}";
+    out
+  end
+
   # Create a colors array with keys such as :txtgrn and :bldgrn
   # and values which are the escape codes for the colors.
   def prepare_colors
@@ -149,6 +151,19 @@ module Colsole
     colors['txtrst'] = pattern_reset
     colors
   end
+
+  def show_color_demo
+    i=33;
+    colors.each do |k,v| 
+      puts colorize "#{k} = !#{k}! #{i} bottles of beer on the wall !txtrst!"
+      i -= 1
+    end
+  end
+
+  def strip_color_markers(text)
+    text.gsub(/\!([a-z]{6})\!/, '')
+  end
+
 end
 
 self.extend Colsole

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colsole
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runfile