wirb 0.4.2 → 0.5.0

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.5.0
+* Use magenta instead of black for strings (better readable)
+* Fix bug with StringScanner objects
+* Support complex numbers
+* Support Infinity and NaN as valid numbers
+* Default colorizer is now Paint
+
 == 0.4.2
 * Fix a symbol string bug
 * Don't fail on nil input for Wirb.tokenize

data/README.rdoc

@@ -1,7 +1,9 @@
 == Wavy Interactive Ruby
 *Wirb* colorizes your inspected Ruby objects. It is based on Wirble[http://pablotron.org/software/wirble/], but only provides and improves result highlighting. It also provides a colorization engine abstraction layer and offers flexible schemas using yaml. Wirb is part of the {irbtools suite}[https://github.com/janlelis/irbtools].
 
-{Travis}[http://travis-ci.org/janlelis/wirb]: http://travis-ci.org/janlelis/wirb.png
+{<img src="https://travis-ci.org/janlelis/wirb.png" />}[https://travis-ci.org/janlelis/wirb]
+
+
 
 == Install
 Install the gem with:
@@ -30,7 +32,7 @@ Add to your <tt>~/.irbrc</tt>
 To only tweak some colors, take a look at the <tt>Wirb.schema</tt> hash. To use a custom schema, inspect the yaml files in the <tt>data/wirb/</tt> directory. You can create your own schema and load it using <tt>Wirb.load_schema(path_to_yaml_file)</tt>. Alternatively, you can use one of the bundled ones by passing a symbol instead of a path.
 
 === Colorizer
-Wirb supports multiple colorization engines. Available engines can be found in <tt>lib/wirb/colorizer/*</tt>. Some of them require external gems as dependencies (e.g. HighLine). The current default engine is <em>Wirb0</em> (the one of previous Wirb versions, inherited from the original Wirble). It will be dropped as default engine in 1.0 (later this year), because it uses wrong color names. It will be replaced by Paint[https://github.com/janlelis/paint] or a simple colorizer engine with proper color names. You can change the colorizer using:
+Wirb supports multiple colorization engines. Available engines can be found in <tt>lib/wirb/colorizer/*</tt>. Some of them require external gems as dependencies (e.g. HighLine). The current default engine is <em>Paint</em>. You can change the colorizer using:
 
   Wirb.load_colorizer :Paint # or :HighLine or whatever
 
@@ -71,7 +73,7 @@ You can colorize any object with <tt>wp</tt> (wavy_print):
 == Todo
 * Tests for schema stuff
 * More colorizers and themes
-* More support for stdlib (most important: Complex)
+* Keep up with latest core/stdlib/rubygems inspects
 
 == Credits
 * Copyright (c) 2011 Jan Lelis <http://rbjl.net>, see COPYING for details.

data/data/wirb/classic_paint.yml

@@ -54,7 +54,7 @@ object_line:
 - :yellow
 - :underline
 object_line_number:
-- :brown
+- :yellow
 - :underline
 object_variable_prefix:
 - :magenta
@@ -84,8 +84,7 @@ close_symbol_string:
 open_string:
 - :white
 string:
-- :black
-- :bright
+- :magenta
 close_string:
 - :white
 
@@ -94,7 +93,7 @@ open_regexp:
 - :blue
 - :bright
 regexp:
-- :white
+- :magenta
 close_regexp:
 - :blue
 - :bright
@@ -105,6 +104,8 @@ regexp_flags:
 # number
 number:
 - :cyan
+special_number:
+- :cyan
 range:
 - :red
 open_rational:
@@ -116,6 +117,10 @@ rational_separator:
 close_rational:
 - :cyan
 - :bright
+open_complex:
+- :cyan
+close_complex:
+- :cyan
 
 # misc
 #default:

data/data/wirb/classic_wirb0.yml

@@ -42,21 +42,24 @@ close_symbol_string: brown
 
 # string
 open_string:  light_gray
-string:       dark_gray
+string:       purple
 close_string: light_gray
 
 # regexp
 open_regexp:  light_blue
-regexp:       dark_gray
+regexp:       purple
 close_regexp: light_blue
 regexp_flags: light_red
 
 # number
 number: cyan
+special_number: cyan
 range:  red
 open_rational:      light_cyan
 rational_separator: light_cyan
 close_rational:     light_cyan
+open_complex:       cyan
+close_complex:      cyan
 
 # misc
 #default:

data/data/wirb/colorless.yml

@@ -59,10 +59,14 @@ regexp_flags:
 # number
 number:
 - :bright
+special_number:
+- :bright
 range:
 open_rational:
 rational_separator:
 close_rational:
+open_complex:
+close_complex:
 
 # misc
 default:

data/lib/wirb/tokenizer.rb

@@ -93,8 +93,15 @@ class << Wirb
             push_state[:gem_requirement_condition, :repeat]
           end
         when '('
-          if nc =~ /[0-9-]/
-            push_state[:rational, :repeat]
+          peek = chars[i+1..-1].join
+          if peek =~ /^-?(?:Infinity|NaN|[0-9.e]+)[+-](?:Infinity|NaN|[0-9.e]+)\*?i\)/
+            push_state[:complex, :repeat]
+          elsif nc =~ /[0-9-]/
+            if @passed =~ /Complex$/ # cheat for old 1.8
+              push_state[:complex, :repeat]
+            else
+              push_state[:rational, :repeat]
+            end
           else
             push_state[:object_description, :repeat]
             open_brackets = 0
@@ -150,7 +157,9 @@ class << Wirb
         when /[a-z0-9_]/i
           @token << c
         else
-          if c ==':' && nc == ':'
+          if @token =~ /^(Infinity|NaN)$/
+            set_state[:special_number, :repeat]
+          elsif c ==':' && nc == ':'
             pass_state[]
             pass[:class_separator, '::']
           elsif !(c == ':' && lc == ':')
@@ -228,7 +237,9 @@ class << Wirb
       when :number
         if c == '-' && @token != '' && @token[-1] != 'e'
           set_state[:time, :repeat]
-        elsif c =~ /[0-9e+.-]/ && !(c == '.' && nc == '.')
+        elsif c =~ /[IN]/
+          set_state[:special_number, :repeat]
+        elsif c =~ /[0-9e.*i+-]/ && !(c == '.' && nc == '.')
           @token << c
         elsif c == '/' # ruby 1.8 mathn
           pass_state[]
@@ -253,6 +264,24 @@ class << Wirb
           @token << c
           pop_state[:remove]
         end
+
+      when :special_number # like time, refactor if code is needed a third time
+        peek = chars[i..-1].join
+        if [
+          /^[-+]?Infinity/,
+          /^[-+]?NaN/,
+        ].any?{ |regex|
+          ( @token + peek ) =~ regex
+        } # found, adjust parsing-pointer:
+          i = i + $&.size - @token.size - 1
+          @token = $&
+          pass_state[]
+          set_state[:number]
+        else
+          # TODO verify...
+          @token << c
+          set_state[:number]
+        end
  
       when :range
         if c == '.'
@@ -276,6 +305,21 @@ class << Wirb
           pop_state[]
         end
 
+      when :complex
+        case c
+        when '('
+          pass[:open_complex, '(']
+        when /[0-9+-]/
+          push_state[:number, :repeat]
+        when ','
+          pass[:number, c] # complex_separator
+        when ' '
+          pass[:whitespace, c]
+        when ')'
+          pass[:close_complex, ')']
+          pop_state[]
+        end
+
       when :object
         case c
         when '<'
@@ -328,8 +372,12 @@ class << Wirb
           open_brackets += 1
           @token << c
         when '@'
-          pass_state[]
-          push_state[:object_variable]
+          if nc =~ /[a-z]/i
+            pass_state[]
+            push_state[:object_variable]
+          else
+            @token << c
+          end
         when '"'
           pass_state[]
           push_state[:string]

data/lib/wirb/version.rb

@@ -1,3 +1,3 @@
 module Wirb
-  VERSION = '0.4.2'.dup
+  VERSION = '0.5.0'
 end

data/lib/wirb.rb

@@ -27,7 +27,7 @@ class << Wirb
 
   # extend getter & setter for colorizer & schema
   def colorizer
-    @colorizer ||= Wirb::Colorizer::Wirb0
+    @colorizer ||= Wirb::Colorizer::Paint
   end
 
   def colorizer=(col)
@@ -54,7 +54,7 @@ class << Wirb
   # Loads a color schema from a yaml file
   #   If first argument is a String: path to yaml file
   #   If first argument is a Symbol: bundled schema
-  def load_schema!(yaml_path = :classic_wirb0)
+  def load_schema!(yaml_path = :classic_paint)
     if yaml_path.is_a? Symbol # bundled themes
       schema_name = yaml_path.to_s
       schema_yaml = YAML.load_file(File.join(Gem.datadir('wirb'), schema_name + '.yml'))
@@ -77,7 +77,7 @@ class << Wirb
   end
 
   # Loads a color schema from a yaml file and sets colorizer to first suggested one in schema
-  def load_schema(yaml_path = :classic_wirb0)
+  def load_schema(yaml_path = :classic_paint)
     load_schema! yaml_path
     load_colorizer schema[:colorizer].first
     @schema

data/spec/colorizer_spec.rb

@@ -17,11 +17,11 @@ end
 describe "Colorizer loading" do
   before(:each) {Wirb.colorizer = nil}
   
-  it "defaults to using the Wirb0 colorizer" do
+  it "defaults to using the Paint colorizer" do
     Wirb.colorizer = nil
     Wirb.instance_variable_get(:@colorizer).should be_nil
     foo = Wirb.colorizer # Force a colorizer to be loaded
-    Wirb.colorizer.should == Wirb::Colorizer::Wirb0
+    Wirb.colorizer.should == Wirb::Colorizer::Paint
   end
 
   it "attempts to load the appropriate colorizer" do

data/spec/tokenizer_number_spec.rb

@@ -1,3 +1,5 @@
+require 'complex'
+
 describe tokenizer(__FILE__) do
   after :each do check_value end
 
@@ -101,4 +103,60 @@ describe tokenizer(__FILE__) do
       ]
     end
   end
+
+  please do check (1/0.0)
+    tokens.should == [
+      [:special_number, "Infinity"],
+    ]
+  end
+  please do check [-(1/0.0), (0/0.0), -(1/0.0), -(0/0.0)]
+    tokens.should == [
+      [:open_array, "["],
+      [:special_number, "-Infinity"],
+      [:comma, ","],
+      [:whitespace, " "],
+      [:special_number, "NaN"],
+      [:comma, ","],
+      [:whitespace, " "],
+      [:special_number, "-Infinity"],
+      [:comma, ","],
+      [:whitespace, " "],
+      [:special_number, "NaN"],
+      [:close_array, "]"],
+    ]
+  end
+
+  only19 do
+    please do check Complex(-2.2,-3.3)
+      tokens.should == [
+        [:open_complex, "("],
+        [:number, "-2.2-3.3i"],
+        [:close_complex, ")"],
+      ]
+    end
+
+    please do check Complex(-1/0.0, 0/0.0)
+      tokens.should == [
+        [:open_complex, "("],
+        [:special_number, "-Infinity"],
+        [:special_number, "+NaN"],
+        [:number, '*i'],
+        [:close_complex, ")"],
+      ]
+    end
+  end
+
+  only18 do
+    please do check Complex(-2.2,-3.3)
+      tokens.should == [
+        [:class, "Complex"],
+        [:open_complex, "("],
+        [:number, "-2.2"],
+        [:number, ","],
+        [:whitespace, " "],
+        [:number, "-3.3"],
+        [:close_complex, ")"],
+      ]
+    end
+  end
 end

data/spec/tokenizer_object_spec.rb

@@ -40,6 +40,19 @@ describe tokenizer(__FILE__) do
     ].compact
   end
 
+  please do check StringScanner.new('wirb')
+    tokens.should == [
+      [:open_object, "#<"],
+      [:object_class, "StringScanner"],
+      [:object_description_prefix, " "],
+      [:object_description, "0/4 @ "],
+      [:open_string, "\""],
+      [:string, "wirb"],
+      [:close_string, "\""],
+      [:close_object, ">"],
+    ]
+  end
+
   unless RubyEngine.rbx? # rubinius provides more information
     please do check binding
       tokens.should be_like [
@@ -53,24 +66,26 @@ describe tokenizer(__FILE__) do
   end
 
   only19 do
-    please do check STDOUT
-      tokens.should == [
-        [:open_object, "#<"],
-        [:object_class, "IO"],
-        [:object_description_prefix, ":"],
-        [:object_description, "<STDOUT>"],
-        [:close_object, ">"],
-      ]
-    end
+    unless RubyEngine.jruby?
+      please do check STDOUT
+        tokens.should == [
+          [:open_object, "#<"],
+          [:object_class, "IO"],
+          [:object_description_prefix, ":"],
+          [:object_description, "<STDOUT>"],
+          [:close_object, ">"],
+        ]
+      end
 
-    please do check STDIN
-       tokens.should == [
-        [:open_object, "#<"],
-        [:object_class, "IO"],
-        [:object_description_prefix, ":"],
-        [:object_description, "<STDIN>"],
-        [:close_object, ">"],
-      ]
+      please do check STDIN
+         tokens.should == [
+          [:open_object, "#<"],
+          [:object_class, "IO"],
+          [:object_description_prefix, ":"],
+          [:object_description, "<STDIN>"],
+          [:close_object, ">"],
+        ]
+      end
     end
      
     please do check Module.new.singleton_class.singleton_class

data/spec/tokenizer_rubygems_spec.rb

@@ -1,80 +1,82 @@
 describe tokenizer(__FILE__) do
   after :each do check_value end
 
-  please do check_inspected "> 3.0.0.beta.4"
-    tokens.should == [
-      [:gem_requirement_condition, ">"],
-      [:whitespace, " "],
-      [:gem_requirement_version, "3.0.0.beta.4"],
-    ]
-  end
+  unless RubyEngine.jruby?
+    please do check_inspected "> 3.0.0.beta.4"
+      tokens.should == [
+        [:gem_requirement_condition, ">"],
+        [:whitespace, " "],
+        [:gem_requirement_version, "3.0.0.beta.4"],
+      ]
+    end
 
-  please do check_inspected "< 3"
-    tokens.should == [
-      [:gem_requirement_condition, "<"],
-      [:whitespace, " "],
-      [:gem_requirement_version, "3"],
-    ]
-  end
+    please do check_inspected "< 3"
+      tokens.should == [
+        [:gem_requirement_condition, "<"],
+        [:whitespace, " "],
+        [:gem_requirement_version, "3"],
+      ]
+    end
 
-  please do check_inspected "<= 3"
-    tokens.should == [
-      [:gem_requirement_condition, "<="],
-      [:whitespace, " "],
-      [:gem_requirement_version, "3"],
-    ]
-  end
+    please do check_inspected "<= 3"
+      tokens.should == [
+        [:gem_requirement_condition, "<="],
+        [:whitespace, " "],
+        [:gem_requirement_version, "3"],
+      ]
+    end
 
-  please do check_inspected "{1=>>= 0}"
-    tokens.should == [
-      [:open_hash, '{'],
-      [:number, '1'],
-      [:refers, '=>'],
-      [:gem_requirement_condition, ">="],
-      [:whitespace, " "],
-      [:gem_requirement_version, "0"],
-      [:close_hash, '}'],
-    ]
-  end
+    please do check_inspected "{1=>>= 0}"
+      tokens.should == [
+        [:open_hash, '{'],
+        [:number, '1'],
+        [:refers, '=>'],
+        [:gem_requirement_condition, ">="],
+        [:whitespace, " "],
+        [:gem_requirement_version, "0"],
+        [:close_hash, '}'],
+      ]
+    end
+
+    if Gem::Specification.respond_to? :find_by_name
+      only19 do
+        please do
+          require 'rspec'
+          check [Gem::Specification.find_by_name('rspec').dependencies.first.requirement]*2
+          tokens.should == [
+            [:open_array, '['],
+            [:gem_requirement_condition, "~>"],
+            [:whitespace, " "],
+            [:gem_requirement_version, RSpec::Version::STRING],
+            [:comma, ","],
+            [:whitespace, " "],
+            [:gem_requirement_condition, "~>"],
+            [:whitespace, " "],
+            [:gem_requirement_version, RSpec::Version::STRING],
+            [:close_array, ']'],
+          ]
+        end
+      end
 
-  if Gem::Specification.respond_to? :find_by_name
-    only19 do
       please do
-        require 'rspec'
-        check [Gem::Specification.find_by_name('rspec').dependencies.first.requirement]*2
-        tokens.should == [
-          [:open_array, '['],
-          [:gem_requirement_condition, "~>"],
-          [:whitespace, " "],
-          [:gem_requirement_version, RSpec::Version::STRING],
-          [:comma, ","],
-          [:whitespace, " "],
-          [:gem_requirement_condition, "~>"],
-          [:whitespace, " "],
-          [:gem_requirement_version, RSpec::Version::STRING],
-          [:close_array, ']'],
+        check Gem::Specification.find_by_name('wirb').dependencies.first
+        tokens.should == [ # <Gem::Dependency type=:development name="rspec" requirements=">= 0">
+          [:open_object, "<"],
+          [:object_class, "Gem"],
+          [:class_separator, "::"],
+          [:object_class, "Dependency"],
+          [:object_description_prefix, " "],
+          [:object_description, "type=:development name="],
+          [:open_string, "\""],
+          [:string, "rspec"],
+          [:close_string, "\""],
+          [:object_description, " requirements="],
+          [:open_string, "\""],
+          [:string, ">= 0"],
+          [:close_string, "\""],
+          [:close_object, ">"],
         ]
       end
     end
-
-    please do
-      check Gem::Specification.find_by_name('wirb').dependencies.first
-      tokens.should == [ # <Gem::Dependency type=:development name="rspec" requirements=">= 0">
-        [:open_object, "<"],
-        [:object_class, "Gem"],
-        [:class_separator, "::"],
-        [:object_class, "Dependency"],
-        [:object_description_prefix, " "],
-        [:object_description, "type=:development name="],
-        [:open_string, "\""],
-        [:string, "rspec"],
-        [:close_string, "\""],
-        [:object_description, " requirements="],
-        [:open_string, "\""],
-        [:string, ">= 0"],
-        [:close_string, "\""],
-        [:close_object, ">"],
-      ]
-    end
   end
 end

data/wirb.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'zucker', '>= 12.1'
   #s.add_development_dependency 'highline'
   s.add_development_dependency 'paint'
+#  s.add_development_dependency 'debugger'
  
   len = s.homepage.size
   s.post_install_message = \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wirb
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,48 +102,48 @@ extra_rdoc_files:
 - README.rdoc
 - COPYING.txt
 files:
-- lib/wirb/version.rb
+- lib/wirb/tokenizer.rb
+- lib/wirb/irb.rb
 - lib/wirb/wp.rb
 - lib/wirb/colorizer.rb
-- lib/wirb/colorizer/wirb0_paint.rb
-- lib/wirb/colorizer/wirble.rb
-- lib/wirb/colorizer/wirb0.rb
-- lib/wirb/colorizer/highline.rb
+- lib/wirb/version.rb
 - lib/wirb/colorizer/paint.rb
+- lib/wirb/colorizer/highline.rb
+- lib/wirb/colorizer/wirb0_paint.rb
 - lib/wirb/colorizer/wirb0_highline.rb
-- lib/wirb/tokenizer.rb
-- lib/wirb/irb.rb
+- lib/wirb/colorizer/wirb0.rb
+- lib/wirb/colorizer/wirble.rb
 - lib/wirb.rb
-- spec/spec_helper.rb
-- spec/colorizer_highline_spec.rb
-- spec/tokenizer_rails_spec.rb
 - spec/tokenizer_enumerator_spec.rb
+- spec/colorizer_wirb0_highline_spec.rb
+- spec/colorizer_highline_spec.rb
+- spec/tokenizer_set_spec.rb
+- spec/colorizer_wirb0_spec.rb
+- spec/tokenizer_rubygems_spec.rb
+- spec/spec_helper.rb
+- spec/tokenizer_rubyvm_spec.rb
+- spec/colorizer_wirb0_paint_spec.rb
+- spec/tokenizer_string_spec.rb
+- spec/tokenizer_nil_false_true_spec.rb
 - spec/tokenizer_array_spec.rb
+- spec/tokenizer_symbol_spec.rb
 - spec/tokenizer_hash_spec.rb
+- spec/tokenizer_nested_spec.rb
+- spec/tokenizer_rails_spec.rb
+- spec/colorizer_spec.rb
 - spec/colorizer_paint_spec.rb
+- spec/tokenizer_time_spec.rb
 - spec/tokenizer_misc_spec.rb
-- spec/colorizer_wirb0_paint_spec.rb
-- spec/colorizer_wirb0_spec.rb
+- spec/tokenizer_regexp_spec.rb
 - spec/tokenizer_object_spec.rb
-- spec/colorizer_wirb0_highline_spec.rb
-- spec/tokenizer_symbol_spec.rb
-- spec/colorizer_spec.rb
-- spec/tokenizer_string_spec.rb
-- spec/tokenizer_rubyvm_spec.rb
-- spec/tokenizer_rubygems_spec.rb
-- spec/tokenizer_set_spec.rb
-- spec/tokenizer_nested_spec.rb
 - spec/tokenizer_number_spec.rb
-- spec/tokenizer_regexp_spec.rb
 - spec/colorizer_wirble_spec.rb
-- spec/tokenizer_nil_false_true_spec.rb
-- spec/tokenizer_time_spec.rb
 - COPYING.txt
 - CHANGELOG.rdoc
 - README.rdoc
+- data/wirb/classic_wirb0.yml
 - data/wirb/classic_paint.yml
 - data/wirb/colorless.yml
-- data/wirb/classic_wirb0.yml
 - Rakefile
 - wirb.gemspec
 - .gemtest
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Wavy IRB: Colorizes irb results.'