wirb 0.3.2 → 0.4.0

data/spec/colorizer_wirb0_paint_spec.rb

@@ -0,0 +1,35 @@
+begin # only test if paint is available
+require 'paint'
+
+describe Wirb::Colorizer::Wirb0_Paint do
+  before :each do
+    Wirb.colorizer = Wirb::Colorizer::Wirb0_Paint
+  end
+  
+  it "creates good color codes based on Paint color symbols" do
+    Wirb.get_color(:red).should match_colors(31)
+    Wirb.get_color(:red, :bright).should match_colors(1,31)
+    Wirb.get_color(:bright, :red).should match_colors(1,31)
+    Wirb.get_color(:red, :bright, :underline).should match_colors(1,4,31)
+    Wirb.get_color(:red, :blue).should match_colors(31,44)
+    Wirb.get_color(nil, :blue).should match_colors(44)
+    Wirb.get_color([43,86,129]).should match_colors('38;5;'+(16 + 1*36 + 2*6 + 3*1).to_s)
+    Wirb.get_color("medium sea green").should match_colors('38;5;78')
+    Wirb.get_color("#81562b").should match_colors('38;5;' + (16 + 3*36 + 2*6 + 1*1).to_s)
+    Wirb.get_color("#863").should match_colors('38;5;' + (16 + 3*36 + 2*6 + 1*1).to_s)
+    Wirb.get_color(:red, :encircle).should match_colors(52,31)
+  end
+  
+  it "colorizes strings based on Paint color symbols" do
+    Wirb.colorize_string('Dantooine', :red, :bright, :underline).should match_colored_string('Dantooine', 1,4,31)
+  end
+  
+  it_behaves_like "a Wirb0 colorizer"
+  
+  after :each do
+    Wirb.colorizer = nil
+  end
+end
+
+rescue LoadError
+end

data/spec/colorizer_wirb0_spec.rb

@@ -0,0 +1,11 @@
+describe Wirb::Colorizer::Wirb0 do
+  before :each do
+    Wirb.colorizer = Wirb::Colorizer::Wirb0
+  end
+  
+  it_behaves_like "a Wirb0 colorizer"
+  
+  after :each do
+    Wirb.colorizer = nil
+  end
+end

data/spec/colorizer_wirble_spec.rb

@@ -0,0 +1,24 @@
+describe Wirb::Colorizer::Wirble do
+  before :each do
+    Wirb.colorizer = Wirb::Colorizer::Wirble
+  end
+  
+  it "creates good color codes based on Wirble color symbols" do
+    Wirb.get_color(:nothing).should match_colors(0)
+    Wirb.get_color(:purple).should match_colors(35)
+    Wirb.get_color(:light_gray).should match_colors(37)
+    Wirb.get_color(:dark_gray).should match_colors(1,30)
+    Wirb.get_color(:yellow).should match_colors(1,33)
+    Wirb.get_color(:light_green).should match_colors(1,32)
+    Wirb.get_color(:white).should match_colors(1,37)
+  end
+  
+  it "colorizes strings based on Wirble color symbols" do
+    Wirb.colorize_string('Dantooine', :cyan).should match_colored_string('Dantooine', 36)
+    Wirb.colorize_string('Dantooine', :light_red).should match_colored_string('Dantooine', 1,31)
+  end
+  
+  after :each do
+    Wirb.colorizer = nil
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-#require File.dirname(__FILE__) + '/../lib/wirb' unless defined? Wirb
-#require File.dirname(__FILE__) + '/../lib/wirb/wp'
 require 'wirb'
 require 'wirb/wp'
 require 'zucker/engine'
@@ -7,6 +5,8 @@ require 'zucker/version'
 
 Wirb.start
 
+# TOKENIZER
+
 def tokenizer(filename)
   filename =~ /tokenizer_(.*)_spec\.rb/
   "Wirb.tokenize" + ($1 ? "(#{$1})" : "")
@@ -34,14 +34,62 @@ def tokens
   Wirb.tokenize(@a).to_a
 end
 
-def only19
-  yield if RubyVersion == 1.9
+# COLORIZER
+
+shared_examples_for "a Wirb0 colorizer" do
+  it "creates good color codes based on original Wirb color symbols" do
+    # Wirb.get_color(:black).should match_colors(30)
+    Wirb.get_color(:light_purple).should match_colors(1,35)
+    Wirb.get_color(:brown_underline).should match_colors(4,33)
+    Wirb.get_color(:green_background).should match_colors(42)
+  end
+  
+  it "colorizes strings based on original Wirb color symbols" do
+    Wirb.colorize_string('Mos Eisley', :blue).should match_colored_string('Mos Eisley', 34)
+    Wirb.colorize_string('Tatooine', :light_red).should match_colored_string('Tatooine', 1, 31)
+    Wirb.colorize_string('Bespin', :white).should match_colored_string('Bespin', 1, 37)
+    Wirb.colorize_string('Coruscant', :cyan_underline).should match_colored_string('Coruscant', 4, 36)
+  end
 end
 
-def only18
-  yield if RubyVersion == 1.8
+def extract_color_codes(string)
+  res = string.scan(/\e\[(?:\d+(?:;\d+)*)?m/).map do |code_match|
+    codes = []
+    code_match.scan(/((?:38|48);5;\d+)|((\d+);(\d+))|(\d+)|^$/) do |code_parts|
+      rgb_code, color_with_style, style, color, color_with_no_style = code_parts
+      codes << if rgb_code
+        rgb_code
+      elsif color_with_style
+        case style
+        when '0'
+          color
+        when '7'
+          (color.to_i+10).to_s
+        else
+          [style,color]
+        end
+      elsif color_with_no_style
+        color_with_no_style
+      else
+        '0'
+      end
+    end
+    codes
+  end.flatten
+  standardize_color_codes(res)
 end
 
+def standardize_color_codes(codes)
+  codes = codes.map{|code| code.to_s}
+  codes = codes.sort.uniq                               # Order of codes doesn't matter, nor does repetition
+  if codes != ['0']
+    codes -= ['0']                                      # Code '0' doesn't matter, unless it's the only one
+  end
+  codes
+end
+
+# MATCHER
+
 # match regex in arrays (e.g. for  object ids)
 RSpec::Matchers.define :be_like do |should_array|
   match do |got_array|
@@ -80,6 +128,69 @@ RSpec::Matchers.define :be_sorted_like do |should_array|
   end
 end
 
+# Match the color codes from a string with an array of codes, e.g.
+#  "\e\[1m\e\[34m".should match_colors(1,34)
+# Order of the codes does not matter, and repeated codes are ignored
+# Codes like "\e[0;32" are equivalent to "\e[0m\e[32m"
+# Codes like 0,34 and 34 are equivalent
+# Codes like 7,34 and 44 are equivalent
+RSpec::Matchers.define :match_colors do |*should_codes|
+  match do |got_string|
+    got_codes = extract_color_codes(got_string)
+    should_codes = standardize_color_codes(should_codes.flatten)
+    
+    should_codes == got_codes
+  end
+  
+  failure_message_for_should do |actual|
+    "expected that #{actual.inspect} would match the color codes #{should_codes.inspect}"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected that #{actual.inspect} would match the color codes #{should_codes.inspect}"
+  end
+  
+end
+
+# Match an encoded string:
+# Usage "\e[4m\e[33mStuff\e[0m".should match_colored_string('Stuff', 4, 33)
+RSpec::Matchers.define :match_colored_string do |*should_spec|
+  match do |got_string|
+    should_string = should_spec.first
+    should_codes = should_spec[1..-1]
+    
+    if matches=(got_string=~/^((?:\e\[\d+(?:;\d+)*m)+)(.*)(\e\[\d+(;\d+)*m)$/)
+      got_codes  = $1
+      got_string = $2
+      got_terminating_code = $3
+    end
+    
+    
+    matches && 
+    should_string == got_string && 
+    got_codes.should(match_colors(should_codes)) && 
+    got_terminating_code.should(match_colors(0))
+  end
+
+  failure_message_for_should do |actual|
+    "expected that #{actual.inspect} would match the string #{should_spec.first.inspect}, colored with color codes #{should_spec[1..-1].inspect}"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected that #{actual.inspect} would not match the string #{should_spec.first}, colored with color codes #{should_spec[1..-1].inspect}"
+  end
+end
+
+# GENERAL
+
+def only19
+  yield if RubyVersion == 1.9
+end
+
+def only18
+  yield if RubyVersion == 1.8
+end
+
 # common regex patterns
 OBJECT_ID = /0x[0-9a-f]+/
 

data/wirb.gemspec

@@ -4,21 +4,23 @@ require File.dirname(__FILE__) + "/lib/wirb/version"
  
 Gem::Specification.new do |s|
   s.name        = "wirb"
-  s.version     = Wirb::VERSION
+  s.version     = Wirb::VERSION.dup
   s.authors     = ["Jan Lelis"]
   s.email       = "mail@janlelis.de"
   s.homepage    = "https://github.com/janlelis/wirb"
-  s.summary     = "Colorizes your irb results."
-  s.description =  "Colorizes your irb results. It's based on Wirble but only provides result highlighting. Just call Wirb.start and enjoy the colors ;)."
+  s.summary     = "Wavy IRB: Colorizes irb results."
+  s.description =  "Wavy IRB: Colorizes irb results. It originated from Wirble, but only provides result highlighting. Just call Wirb.start and enjoy the colors in your IRB ;). You can use it with your favorite colorizer engine. See README.rdoc for more details."
   s.required_rubygems_version = '>= 1.3.6'
   s.required_ruby_version     = '>= 1.8.7'
-  s.files = Dir.glob(%w[{lib,test,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile wirb.gemspec .gemtest}
+  s.files = Dir.glob(%w[{lib,test,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} data/**/*.yml]) + %w{Rakefile wirb.gemspec .gemtest}
   s.extra_rdoc_files = ["README.rdoc", "COPYING.txt"]
   s.license = 'MIT'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-core'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'zucker', '>= 11'
+  #s.add_development_dependency 'highline'
+  s.add_development_dependency 'paint'
  
   len = s.homepage.size
   s.post_install_message = \

metadata

@@ -2,7 +2,7 @@
 name: wirb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 Z
+date: 2011-07-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -56,7 +56,18 @@ dependencies:
         version: "11"
   type: :development
   version_requirements: *id004
-description: Colorizes your irb results. It's based on Wirble but only provides result highlighting. Just call Wirb.start and enjoy the colors ;).
+- !ruby/object:Gem::Dependency 
+  name: paint
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: "Wavy IRB: Colorizes irb results. It originated from Wirble, but only provides result highlighting. Just call Wirb.start and enjoy the colors in your IRB ;). You can use it with your favorite colorizer engine. See README.rdoc for more details."
 email: mail@janlelis.de
 executables: []
 
@@ -67,32 +78,46 @@ extra_rdoc_files:
 - COPYING.txt
 files: 
 - lib/wirb.rb
-- lib/wirb/schema.rb
+- lib/wirb/colorizer.rb
 - lib/wirb/tokenizer.rb
 - lib/wirb/wp.rb
-- lib/wirb/colors.rb
+- lib/wirb/colorizer/wirble.rb
+- lib/wirb/colorizer/paint.rb
+- lib/wirb/colorizer/wirb0.rb
+- lib/wirb/colorizer/wirb0_highline.rb
+- lib/wirb/colorizer/wirb0_paint.rb
+- lib/wirb/colorizer/highline.rb
 - lib/wirb/version.rb
 - lib/wirb/irb.rb
 - spec/tokenizer_rails_spec.rb
+- spec/colorizer_wirb0_highline_spec.rb
 - spec/tokenizer_hash_spec.rb
+- spec/colorizer_wirb0_paint_spec.rb
 - spec/tokenizer_number_spec.rb
 - spec/tokenizer_regexp_spec.rb
 - spec/tokenizer_array_spec.rb
+- spec/colorizer_wirble_spec.rb
 - spec/tokenizer_enumerator_spec.rb
 - spec/spec_helper.rb
 - spec/tokenizer_misc_spec.rb
 - spec/tokenizer_nil_false_true_spec.rb
+- spec/colorizer_highline_spec.rb
 - spec/tokenizer_symbol_spec.rb
 - spec/tokenizer_set_spec.rb
 - spec/tokenizer_object_spec.rb
+- spec/colorizer_wirb0_spec.rb
 - spec/tokenizer_nested_spec.rb
 - spec/tokenizer_time_spec.rb
+- spec/colorizer_spec.rb
 - spec/tokenizer_rubyvm_spec.rb
 - spec/tokenizer_string_spec.rb
+- spec/colorizer_paint_spec.rb
 - spec/tokenizer_rubygems_spec.rb
 - COPYING.txt
 - README.rdoc
 - CHANGELOG.rdoc
+- data/wirb/classic_wirb0.yml
+- data/wirb/classic_paint.yml
 - Rakefile
 - wirb.gemspec
 - .gemtest
@@ -122,6 +147,6 @@ rubyforge_project:
 rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
-summary: Colorizes your irb results.
+summary: "Wavy IRB: Colorizes irb results."
 test_files: []
 

data/lib/wirb/schema.rb

@@ -1,72 +0,0 @@
-module Wirb
-  @schema = { # you can also use escape codes directly, e.g. "4;31"
-
-    # container
-    :open_hash        => :light_green,
-    :close_hash       => :light_green,
-    :open_array       => :light_green,
-    :close_array      => :light_green,
-
-    :open_set         => :green,
-    :close_set        => :green,
-
-    # delimiter colors
-    :comma            => :green,
-    :refers           => :green,
-
-    # class
-    :class            => :light_green,
-    :class_separator  => :green,
-    :object_class     => :light_green,
-
-    # object
-    :open_object               => :green,
-    :object_description_prefix => :green,
-    :object_description        => :brown,
-    :object_address_prefi      => :brown_underline,
-    :object_address            => :brown_underline,
-    :object_line_prefix        => :brown_underline,
-    :object_line               => :brown_underline,
-    :object_line_number        => :brown_underline,
-    :object_variable_prefix    => :light_purple,
-    :object_variable           => :light_purple,
-    :close_object              => :green,
-
-    # symbol
-    :symbol_prefix       => :yellow,
-    :symbol              => :yellow,
-    :open_symbol_string  => :brown,
-    :symbol_string       => :yellow,
-    :close_symbol_string => :brown,
-
-    # string
-    :open_string  => :light_gray,
-    :string       => :dark_gray,
-    :close_string => :light_gray,
-
-    # regexp
-    :open_regexp  => :light_blue,
-    :regexp       => :dark_gray,
-    :close_regexp => :light_blue,
-    :regexp_flags => :light_red,
-
-    # number
-    :number => :cyan,
-    :range  => :red,
-    :open_rational      => :light_cyan,
-    :rational_separator => :light_cyan,
-    :close_rational     => :light_cyan,
-
-    # misc
-    :default => nil,
-    :keyword => nil, # some lowercased word
-    :time    => :purple,
-    :nil     => :light_red,
-    :false   => :red,
-    :true    => :green,
-    :gem_requirement_condition => :cyan,
-    :gem_requirement_version => :light_cyan,
-  }
-end
-
-# J-_-L