smart_colored 1.0.2 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/smart_colored.rb

@@ -20,6 +20,10 @@ module SmartColored
 
   CLEAR_SEQUENCE = "\e[0m"
 
+  def width
+    gsub(/\e\[\d+(?:;\d+)*m/, '').length
+  end
+
   def apply_format(format = {})
     apply_attributes = {}
     if color = COLOR_CODES[format[:color]]
@@ -37,7 +41,7 @@ module SmartColored
     previous_attributes = {}
     clear_sequence = false
     str = "#{CLEAR_SEQUENCE}#{self}"
-    str.gsub!(/(?:(?:\e\[\d+(?:;\d+)*m)+)/) do |m|
+    str.gsub!(/(?:\e\[\d+(?:;\d+)*m)+/) do |m|
       unless $'.empty?
         codes = m.scan(/\d+/).map(&:to_i).uniq
         sequence_attributes = {}
@@ -92,7 +96,7 @@ module SmartColored
   end
 
   PART_REGEXP = "(?:on_)?(?:#{COLOR_CODES.keys.join('|')})|#{FORMAT_CODES.keys.join('|')}"
-  COMBINED_REGEXP = /^#{PART_REGEXP}{2,}$/
+  COMBINED_REGEXP = /^(?:(?:#{PART_REGEXP})_){2,}$/
   COMBINED_REGEXP_PART = /#{PART_REGEXP}/
 
   def method_missing(method, *arguments, &block)

data/smart_colored.gemspec

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{smart_colored}
-  s.version = "1.0.2"
+  s.name = "smart_colored"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Kuchin"]
-  s.date = %q{2011-02-14}
+  s.date = "2011-10-18"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -26,15 +26,11 @@ Gem::Specification.new do |s|
     "spec/smart_colored_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/toy/smart_colored}
+  s.homepage = "http://github.com/toy/smart_colored"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
-  s.summary = %q{Color and formatting in terminal}
-  s.test_files = [
-    "spec/smart_colored_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Color and formatting in terminal"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/smart_colored_spec.rb

@@ -15,6 +15,24 @@ describe SmartColored do
     end
   end
 
+  describe "width" do
+    it "should return width for unformatted string" do
+      'string'.width.should == 'string'.length
+    end
+
+    it "should return width of red string" do
+      'string'.red.width.should == 'string'.length
+    end
+
+    it "should return width of bold underline cyan string" do
+      'string'.bold_underline_cyan.width.should == 'string'.length
+    end
+
+    it "should return width of complex formatted string" do
+      "#{"on yellow #{'red underlined'.red.underline} on yellow".on_yellow} #{"bold red".bold.red} blue inversed".blue.inverse.width.should == "on yellow red underlined on yellow bold red blue inversed".length
+    end
+  end
+
   describe "simple" do
     it "should apply none" do
       'clear'.apply_format.should == 'clear'
@@ -89,7 +107,7 @@ describe SmartColored do
     end
 
     it "should apply bold, underlined, cyan on yellow" do
-      %w[bold underlined cyan on_yellow].permutation.each do |parts|
+      %w[bold underline cyan on_yellow].permutation.each do |parts|
         'bold underlined cyan'.send(parts.join('_')).should == "\e[1;4;36;43m" 'bold underlined cyan' "\e[0m"
       end
     end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +03:00
-default_executable: 
+date: 2011-10-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -82,7 +81,6 @@ files:
 - smart_colored.gemspec
 - spec/smart_colored_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/toy/smart_colored
 licenses: 
 - MIT
@@ -112,10 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Color and formatting in terminal
-test_files: 
-- spec/smart_colored_spec.rb
-- spec/spec_helper.rb
+test_files: []
+