colorize 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5daa22026f530e287e74e572407ba4ddf9520104
-  data.tar.gz: 3af9a37ec77d130690c976cd1decbf4fc086a321
+  metadata.gz: 9e21c9389b1bb8d1cd8884565a5dbe6e2edb72d5
+  data.tar.gz: 87a1ccbaf344139c937dc2680d7825281c9f725b
 SHA512:
-  metadata.gz: bcfa897a7e8bc2ce4fa354e192a22d53a8f81114ebe98ebbc7921ba99496b72b92771ba78ad2c3a1c34acd7c83a6e24c5e146ec92ca314283ba4c80675b78d09
-  data.tar.gz: f3f2a9297ab0cac20506b1875e92f3cc0d476a7f053bb6d89941576b22662faa8a9a7970a54d9e64f1738d493e47c0578c35cff963077044cd1e739ebcf8b814
+  metadata.gz: bfd3eeaed2fc6b03c1fdc11dd99a73a0f438dd1324786675630b7ef70d59edce22a699d0a249088a189158c9aa790605a6b3ef4184c9dd0c790d74b95123e40d
+  data.tar.gz: 5556fc5742cd26ae473b35787767f8dafcd1d1950fae81fa3723f44ea83890de10879ac540094ebeda1a592effdeff2a119cc87b0c5ed275c095a0ce62bc15c6

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.7.6 / 2015-04-18
+  * fix bugs
+
 == 0.7.5 / 2014-12-11
   * big code refactoring
   * disable_colorization feature added

data/README.md

@@ -1,11 +1,11 @@
-colorize [![Gem Version](https://badge.fury.io/rb/colorize.svg)](http://badge.fury.io/rb/colorize) [![Build Status](https://travis-ci.org/fazibear/colorize.svg?branch=master)](https://travis-ci.org/fazibear/colorize) [![Code Climate](https://codeclimate.com/github/fazibear/colorize/badges/gpa.svg)](https://codeclimate.com/github/fazibear/colorize)
+colorize [![Gem Version](https://badge.fury.io/rb/colorize.svg)](http://badge.fury.io/rb/colorize) [![Build Status](https://travis-ci.org/fazibear/colorize.svg?branch=master)](https://travis-ci.org/fazibear/colorize) [![Code Climate](https://codeclimate.com/github/fazibear/colorize/badges/gpa.svg)](https://codeclimate.com/github/fazibear/colorize) [![Test Coverage](https://codeclimate.com/github/fazibear/colorize/badges/coverage.svg)](https://codeclimate.com/github/fazibear/colorize)
 ========
-  
+
 Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences.
 
 features
 --------
-  
+
 * change string color
 * change string background
 * change string effect
@@ -15,27 +15,31 @@ usage
 
 Some usage samples:
 
-    puts "This is blue".colorize(:blue)
-    puts "This is light blue".colorize(:light_blue)
-    puts "This is also blue".colorize(:color => :blue)
-    puts "This is light blue with red background".colorize(:color => :light_blue, :background => :red)
-    puts "This is light blue with red background".colorize(:light_blue ).colorize( :background => :red)
-    puts "This is blue text on red".blue.on_red
-    puts "This is red on blue".colorize(:red).on_blue
-    puts "This is red on blue and underline".colorize(:red).on_blue.underline
-    puts "This is blue text on red".blue.on_red.blink
-    puts "This is uncolorized".blue.on_red.uncolorize
+```ruby
+puts "This is blue".colorize(:blue)
+puts "This is light blue".colorize(:light_blue)
+puts "This is also blue".colorize(:color => :blue)
+puts "This is light blue with red background".colorize(:color => :light_blue, :background => :red)
+puts "This is light blue with red background".colorize(:light_blue ).colorize( :background => :red)
+puts "This is blue text on red".blue.on_red
+puts "This is red on blue".colorize(:red).on_blue
+puts "This is red on blue and underline".colorize(:red).on_blue.underline
+puts "This is blue text on red".blue.on_red.blink
+puts "This is uncolorized".blue.on_red.uncolorize
+```
 
 Class methods:
 
-    String.colors                       - return array of all possible colors names
-    String.modes                        - return array of all possible modes
-    String.color_samples                - displays color samples in all combinations
-    String.disable_colorization         - check if colorization is disabled
-    String.disable_colorization = false - disable colorization
-    String.disable_colorization false   - disable colorization
-    String.disable_colorization = true  - enable colorization
-    String.disable_colorization true    - enable colorization
+```ruby
+String.colors                       # return array of all possible colors names
+String.modes                        # return array of all possible modes
+String.color_samples                # displays color samples in all combinations
+String.disable_colorization         # check if colorization is disabled
+String.disable_colorization = false # enable colorization
+String.disable_colorization false   # enable colorization
+String.disable_colorization = true  # disable colorization
+String.disable_colorization true    # disable colorization
+```
 
 requirements
 ------------
@@ -52,7 +56,7 @@ install
 license
 -------
 
-Copyright (C) 2007-2015 Michal Kalbarczyk
+Copyright (C) 2007-2015 Michał Kalbarczyk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

data/colorize.gemspec

@@ -1,19 +1,23 @@
 Gem::Specification.new do |s|
   s.name = 'colorize'
-  s.version = '0.7.5'
+  s.version = '0.7.6'
 
-  s.authors = ['fazibear']
+  s.authors = ['Michał Kalbarczyk']
   s.email = 'fazibear@gmail.com'
-  
+
   s.date = Time.now.strftime("%Y-%m-%d")
-  
+
   s.homepage = 'http://github.com/fazibear/colorize'
   s.description = 'Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences.'
   s.summary = 'Add color methods to String class'
   s.license = 'GPL-2'
 
   s.require_paths = ['lib']
-  
+
+  s.add_development_dependency 'rake', '~> 0'
+  s.add_development_dependency 'minitest', '~> 0'
+  s.add_development_dependency 'codeclimate-test-reporter', '~> 0'
+
   s.files = [
     'LICENSE',
     'CHANGELOG',

data/lib/colorize/class_methods.rb

@@ -19,6 +19,39 @@ module Colorize
       @disable_colorization = (value || false)
     end
 
+    #
+    # Return array of available colors used by colorize
+    #
+    def colors
+      color_codes.keys
+    end
+
+    #
+    # Return array of available modes used by colorize
+    #
+    def modes
+      mode_codes.keys
+    end
+
+    #
+    # Display color samples
+    #
+    def color_samples
+      colors.permutation(2).each do |background, color|
+        sample_text = "#{color.inspect.rjust(15)} on #{background.inspect.ljust(15)}"
+        puts "#{sample_text.colorize(:color => color, :background => background)} #{sample_text}"
+      end
+    end
+
+    #
+    # Method removed, raise NoMethodError
+    #
+    def color_matrix(txt = '')
+      fail NoMethodError, '#color_matrix method was removed, try #color_samples instead'
+    end
+  
+    # private
+
     #
     # Color codes hash
     #
@@ -36,13 +69,6 @@ module Colorize
       }
     end
 
-    #
-    # Return array of available colors used by colorize
-    #
-    def colors
-      color_codes.keys
-    end
-
     #
     # Mode codes hash
     #
@@ -56,16 +82,9 @@ module Colorize
         :hide      => 8  # Hide text (foreground color would be the same as background)
       }
     end
-
-    #
-    # Return array of available modes used by colorize
-    #
-    def modes
-      mode_codes.keys
-    end
-
+    
     #
-    # Color and on_color methods
+    # Generate color and on_color methods
     #
     def color_methods
       colors.each do |key|
@@ -82,7 +101,7 @@ module Colorize
     end
 
     #
-    # Modes methods
+    # Generate modes methods
     #
     def modes_methods
       modes.each do |key|
@@ -93,22 +112,5 @@ module Colorize
         end
       end
     end
-
-    #
-    # Display color samples
-    #
-    def color_samples
-      colors.permutation(2).each do |background, color|
-        sample_text = "#{color.inspect.rjust(15)} on #{background.inspect.ljust(15)}"
-        puts "#{sample_text.colorize(:color => color, :background => background)} #{sample_text}"
-      end
-    end
-
-    #
-    # Method removed, raise NoMethodError
-    #
-    def color_matrix(txt = '')
-      fail NoMethodError, '#color_matrix method was removed, try #color_samples instead'
-    end
   end
 end

data/lib/colorize/instance_methods.rb

@@ -32,7 +32,7 @@ module Colorize
     #
     def uncolorize
       scan_for_colors.inject('') do |str, match|
-        str << (match[3] || match[4])
+        str << match[3]
       end
     end
 
@@ -40,7 +40,9 @@ module Colorize
     # Return true if string is colorized
     #
     def colorized?
-      scan_for_colors.reject(&:last).any?
+      scan_for_colors.inject([]) do |colors, match|
+        colors << match.tap(&:pop)
+      end.flatten.compact.any?
     end
 
     private
@@ -52,7 +54,6 @@ module Colorize
       match[0] ||= mode(:default)
       match[1] ||= color(:default)
       match[2] ||= background_color(:default)
-      match[3] ||= match[4]
     end
 
     #
@@ -106,7 +107,18 @@ module Colorize
     # Scan for colorized string
     #
     def scan_for_colors
-      scan(/\033\[([0-9]+);([0-9]+);([0-9]+)m(.+?)\033\[0m|([^\033]+)/m)
+      scan(/\033\[([0-9;]+)m(.+?)\033\[0m|([^\033]+)/m).map do |match|
+        split_colors(match)
+      end
+    end
+
+    def split_colors(match)
+      colors = (match[0] || "").split(';')
+      Array.new(4).tap do |array|
+        array[0], array[1], array[2] = colors if colors.length == 3
+        array[1] = colors                     if colors.length == 1
+        array[3] = match[1] || match[2]
+      end
     end
 
     #

data/test/test_colorize.rb

@@ -1,7 +1,10 @@
-require 'test/unit'
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
+require "minitest/autorun"
 require File.dirname(__FILE__) + '/../lib/colorize'
 
-class TestColorize < Test::Unit::TestCase
+class TestColorize < Minitest::Test
   def test_blue_symbol
     assert_equal 'This is blue'.colorize(:blue),
                  "\e[0;34;49mThis is blue\e[0m"
@@ -72,6 +75,8 @@ class TestColorize < Test::Unit::TestCase
     assert_equal 'Red'.red.colorized?, true
     assert_equal 'Blue'.colorized?, false
     assert_equal 'Green'.blue.green.uncolorize.colorized?, false
+    assert_equal ('none' + 'red'.red + 'none' + 'blue'.blue + 'none').colorized?, true
+    assert_equal ('none' + 'red'.red + 'none' + 'blue'.blue + 'none').uncolorize.colorized?, false
   end
 
   def test_concatenated_strings_on_green
@@ -94,13 +99,19 @@ class TestColorize < Test::Unit::TestCase
                  "\e[5;34;41mThis is blue\ntext on red\e[0m"
   end
 
-  def test_disable_colorization_with_setter
+  def test_disable_colorization_with_=
     String.disable_colorization = true
     assert_equal String.disable_colorization, true
     String.disable_colorization = false
   end
 
-  def test_disable_colorize_with_setter
+  def test_disable_colorization_with_method
+    String.disable_colorization true
+    assert_equal String.disable_colorization, true
+    String.disable_colorization false
+  end
+
+  def test_string_disable_colorization_with_=
     String.disable_colorization = true
 
     assert_equal String.disable_colorization, true
@@ -114,7 +125,7 @@ class TestColorize < Test::Unit::TestCase
                  "\e[0;34;49mThis is blue after enabling\e[0m"
   end
 
-  def test_disable_colorize_with_setter
+  def test_string_disable_colorization_with_method
     assert_equal 'This is blue before disabling'.colorize(:blue),
                  "\e[0;34;49mThis is blue before disabling\e[0m"
 
@@ -129,7 +140,22 @@ class TestColorize < Test::Unit::TestCase
 
     assert_equal 'This is blue after enabling'.colorize(:blue),
                  "\e[0;34;49mThis is blue after enabling\e[0m"
+  end
 
+  def test_already_colored_string_with_one_value
+    assert_equal "\e[31mThis is red\e[0m".red,
+                 'This is red'.red
   end
 
+  def test_color_matrix_method
+    assert_raises NoMethodError do
+      String.color_matrix
+    end
+  end
+
+  def test_color_samples_method
+    assert_output do
+      String.color_samples
+    end
+  end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: colorize
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
-- fazibear
+- Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
-dependencies: []
+date: 2015-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby String class extension. Adds methods to set text color, background
   color and, text effects on ruby console and command line output, using ANSI escape
   sequences.
@@ -47,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Add color methods to String class