fun_with_string_colors 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDgyMGU1MzMyNWY3MzIwNWY4NGFjZTk3NGRhNmI4Yjk2NjRjMThkNg==
+    ZjZhNjlhZDM0MmFkYTg1NjhmOGU3MmI0NjcyMDVlNTY0ZjlmZWRjMg==
   data.tar.gz: !binary |-
-    Yjk0YzUzZDIyYWM5YjdlOTc5YzAzMTI5YzYxYTNjMGEzZWIwNjc3Mw==
+    OWNjZDhiZWQ2MWFjYmY1MDk2YmJjOGVkMmYxOWEzNDE2ZmRkOTIyZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWZlNzgyZDJmOTMzNDZjMDEzZmFlMWIyYTk2M2FlNDY4NWI1OTMzYWE3Yzkw
-    ZmQ5ZjA3NzFlZTQyMjVkOWE5NTQ3MzFmNzg4ZDc2ZjBkM2QzMDlmZGZjYTI5
-    NjA5NDRiNGU0ODI5Y2Y4M2NlOGNmM2RmMjMwOWY0M2NkZTdhMmM=
+    ZDI5NzJiNmU2M2E2ZTgyMWU2NGY4ZTFhMzE4YzY1OWZkNTk2OGU1ZDkzOTc5
+    MmJjZmQyNjg0NzljYjNkNWZhZGQzMDJhMWI2NGE1ZWQ0OGM5ZDIzM2M0NzE2
+    M2JmNTMzMTFiNmYwMmJkMjE1OWJkMTk4MDFmZjhhNjc0MGRlNWQ=
   data.tar.gz: !binary |-
-    NDhmYzdhMTU3MThkNzg3ODU4OWZhNWQxNzM1NTQ3NDRkNDI5YWE5MzlhMzNh
-    YmNkZmU2MjkwMDhkMGI1ZmMyNmZhMDkyNjUyMTliMGE2NjIzZWYwMTg4Njll
-    ZDhiMjJlZGRhZmZhMDZkMzc0ZWMwOGY1MmY4NzBmMzkzOWYyOGY=
+    Njg3OGM2ZmZlZmRiOGI3Nzc5OTU1ZDc4ZTI4MDhlZTYwMDExYzVjNWI5MjQ3
+    OTFhYmQxODJmY2Y1NmQ2MTQxMGQ2YzE0M2FhY2Y5MWU1YmIwNDQ4MDE4MzUz
+    ZDI1NzZmN2Y2M2Y2MjcwMTJiYmZhMTAwNjBlOWMwZmJkMjNiNDU=

data/CHANGELOG.markdown

@@ -0,0 +1,14 @@
+0.0.3
+-----
+
+Changed the internals around, added regex highlighting functionality.  See examples in README.rdoc.
+
+0.0.2
+-----
+
+Expanded lexicon of decorations.  All hail the `<blink>` tag!  Removed a couple of methods.
+
+0.0.1
+-----
+
+Initial public offering.  Get in while the getting is good.

data/README.rdoc

@@ -1,12 +1,22 @@
 = fun_with_string_colors
 
-Paint your strings for prettier console output
-
-require 'fun_with_color_strings'
-
-FunWith::StringColors.activate
-String.colorize( true )
-puts "Hello World".paint(:pink)
+Paint your strings for prettier console output.  Behold!  The Code of Exampleage!
+
+    require 'fun_with_string_colors'
+
+    FunWith::StringColors.activate     # imports functions into String
+    String.colorize( true )            # Yes, we want those functions to add color codes to strings.
+    String.colorize( STDOUT.tty? )     # only alter strings if we're in TTY (console)
+    
+    puts "Hello World".paint(:pink)    # Pretty shiny!
+    puts "Hello World".paint(:bg_red, :blue, :bold, :underline, :blink)   # An affront to God and Man, I tells ya.
+
+    # If your first arg to .paint() is a regular expression, only the matches will be colored in.  Useful!
+    puts "Hello World".paint(/hello/i, :bg_red).paint(/world/i, :bg_blue, :reverse, :underline)
+    String.paint?                      # Is painting active?
+    "".paint?                          # Same question.  One setting controls all strings.
+    
+    puts String::ANSI_COLORS.keys.inspect      # What symbols does paint recognize?
 
 
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/fun_with/string_colors/string_paint_inclusions.rb

@@ -36,12 +36,21 @@ module FunWith
         :reverse => "\e[27m",
         7        => "\e[27m",
         :bold    => "\e[22m",
-        1        => "\e[22m"
+        1        => "\e[22m",
+        :color   => "\e[0m"
       }
 
+      # Note:  use :reset and :unpaint in isolation (no other args).  It will nullify everything prior.
       def paint( *colors )
         if paint?
+          # debugger if colors.first == "95"
+          # puts "\e[27m\e[0m\e[22mcalling paint(*#{colors.inspect})"
+          
+          colors.flatten!
+          highlight_regex = colors.first.is_a?(Regexp) ? colors.shift : nil
+        
           rval = self.dup
+          prependers   = []
           terminations = []
           
           for color in colors
@@ -49,21 +58,28 @@ module FunWith
             when :reset, :unpaint
               regex = /\e\[\d+m/
               rval = rval.gsub( regex, '' )
+              prependers = []
               terminations = []
             when Symbol
               if ANSI_COLORS[color]
-                rval = "\e[#{ANSI_COLORS[color]}m#{rval}"
-                terminations << (ANSI_COLOR_TERMINATORS[color] || "\e[0m")
+                prependers << "\e[#{ANSI_COLORS[color]}m"
+                terminations << (ANSI_COLOR_TERMINATORS[color] || ANSI_COLOR_TERMINATORS[:color])
               end
             when /^\d+$/, Integer # you can give numbers/number strings directly
-              rval = "\e[#{ANSI_COLORS[color] || color}m#{rval}"
-              terminations << (ANSI_COLOR_TERMINATORS[color.to_i] || "\e[0m")
+              prependers << "\e[#{ANSI_COLORS[color] || color}m"
+              terminations << (ANSI_COLOR_TERMINATORS[color.to_i] || ANSI_COLOR_TERMINATORS[:color])
             end
           end
-
-          rval + terminations.uniq.join
+          
+          if highlight_regex.nil?
+            #puts "prependers #{prependers.inspect}"
+            #puts "terminations #{terminations.inspect}"
+            prependers.join + rval + terminations.join
+          else
+            rval.gsub( /(#{highlight_regex})/, prependers.join + "\\1" + terminations.join )
+          end
         else
-          self
+          self.dup   # Since it returns a duplicate of the original when in paint mode, this is more consistent behavior
         end
       end
 

data/test/test_fun_with_string_colors.rb

@@ -38,4 +38,16 @@ class TestFunWithStringColors < FunWith::StringColors::TestCase
   should "not alter output when .paint() receives nil/unrecognized" do
     assert_equal "hello", "hello".paint(nil)
   end
+  
+  should "highlight!" do
+    str = "Should highlight the number in brackets: 0 1 2 3 (4) 5"
+    puts str.paint( /4/, :bg_red, :bold )
+    
+    str = "Should highlight the numbers in brackets: 0 1 2 3 (4) 5 6 (7)"
+    puts str.paint( /4/, :bg_red, :bold ).paint( /7/, :bg_blue )
+    
+    str = "Should highlight all the numbers: 0 1 2 3 4 5 6 7"
+    puts str.paint( /\d+/, :bg_red, :bold ).paint( /7/, :bg_blue )
+    
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fun_with_string_colors
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bryce Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fun_with_testing
@@ -34,6 +34,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
 - README.rdoc