wirb 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9e05f349d31a148f70a770c97929873ac2ea307d
+  data.tar.gz: 463451317b4c61812b414d0496cbd80a7b0edcaa
+SHA512:
+  metadata.gz: dca03385ef04bcde1660451961b5f79655f1c27e88fd84549ee4f4c70a1925860f810282409490eb3947c47fb1a988f702eeaa300ce118463f6aff2f118ed804
+  data.tar.gz: f312a562ebce3fc95614c2faa1ce40d75f6dc9eebff7bfa8859a8d6f73f17f57d9d6a308878ee0e3a5fc00129655c6b6a655949dd0c3f08376a87a8468968e8f

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 1.0.3
+* Allow nestings of objects in object description
+
 == 1.0.2
 * Fix a bug that would load wirb irb hooks in non irb environments
 

data/COPYING.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2012 Jan Lelis <mail@janlelis.de>
+Copyright (C) 2011-2014 Jan Lelis <mail@janlelis.de>
 Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
  
 Permission is hereby granted, free of charge, to any person obtaining a

data/README.rdoc

@@ -1,7 +1,9 @@
-== Wavy Interactive Ruby {<img src="https://travis-ci.org/janlelis/wirb.png" />}[https://travis-ci.org/janlelis/wirb]
+== Wirb Interactive Ruby {<img src="https://travis-ci.org/janlelis/wirb.png" />}[https://travis-ci.org/janlelis/wirb]
 
 *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].
 
+Supported Rubies: 2.1, 2.0, 1.9, 1.8, jruby, rubinius
+
 == Install
 
 Install the gem with:
@@ -18,15 +20,19 @@ Add to your <tt>~/.irbrc</tt>
 == Features
 
 * Syntax highlighting for Ruby objects
-* Does not change the inspect value
-* Support for generic objects, especially sets and enumerators
-* Comes with tests
+* Does not change the inspect method
+* Support for generic objects, especially sets and enumerators and nesting more generic objects
+* Funny looking test suite
 * Can be used without irb
 * Limited stdlib/gem objects support (e.g. Set, Gem::Requirement)
-* Supports 1.8, 1.9, jruby, rbx, head
 * Usable with any supported terminal colors engine
 * Color schemas in yaml files
 
+== wp
+You can colorize any object with <tt>wp</tt> (wavy_print):
+  require 'wirb/wp'
+  wp some_object
+
 == Colors
 
 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.
@@ -57,11 +63,6 @@ The following schemas are bundled (load with <tt>Wirb.load_schema :name</tt> and
 * <tt>:colorless</tt> (only uses :bright, :underline and :inverse effect)
 * <tt>:classic_wirb0</tt> (default implemented with wirb0)
 
-== wp
-You can colorize any object with <tt>wp</tt> (wavy_print):
-  require 'wirb/wp'
-  wp some_object
-
 == Also see
 
 * Configure views for specific objects: hirb[https://github.com/cldwalker/hirb]
@@ -69,19 +70,10 @@ You can colorize any object with <tt>wp</tt> (wavy_print):
 * ripl is an irb alternative, syntax highlighting plugin (uses wirb by default): ripl-color_result[https://github.com/janlelis/ripl-color_result]
 * Advanced terminal color gems: Paint[https://github.com/janlelis/paint], HighLine[https://github.com/JEG2/highline]
 
-== Todo
-* Tests for schema stuff
-* More colorizers and themes
-* Keep up with latest core/stdlib/rubygems inspects
-* Keep up with new Rubinius versions
-
 == Credits
-* Copyright (c) 2011, 2013 Jan Lelis <http://happycode.org>, see COPYING for details.
 
-Contributions[https://github.com/janlelis/wirb/contributors] by and thanks to:
-* {Richard LeBer}[https://github.com/rleber]
+Copyright (c) 2011-2014 Jan Lelis <http://janlelis.de>, see COPYING for details.
 
-Influenced by code from and thanks to:
-* Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
+Influenced by code from and thanks to: Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
 
-J-_-L
+Contributions[https://github.com/janlelis/wirb/contributors] by and thanks to: {Richard LeBer}[https://github.com/rleber]

data/Rakefile

@@ -24,7 +24,7 @@ end
 
 desc "Install the gem locally"
 task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version} --no-rdoc --no-ri}
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-rdoc --no-ri}
 end
 
 desc "Generate the gemspec"

data/lib/wirb/tokenizer.rb

@@ -1,7 +1,7 @@
 class << Wirb
   # This is an extended version of the original wirble tokenizer.
-  # Almost everyone would say that 400 lines long case statements need refactoring, but
-  # ...sometimes it just doesn't matter ;)
+  # Many people would say that 400 lines long case statements need refactoring, but
+  # ...sometimes it is supposed to be this way!
   def tokenize(str)
     return [] if str.nil?
     raise ArgumentError, 'Tokenizer needs an inspect-string' unless str.is_a? String
@@ -368,6 +368,13 @@ class << Wirb
             open_brackets -= 1
             @token << c
           end
+        when '#'
+          if nc == '<'
+            pass_state[]
+            push_state[:object]
+          else
+            @token << c
+          end
         when '<'
           open_brackets += 1
           @token << c

data/lib/wirb/version.rb

@@ -1,3 +1,3 @@
 module Wirb
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/tokenizer_misc_spec.rb

@@ -7,47 +7,62 @@ describe tokenizer(__FILE__) do
 
   please do check StringIO.new 'wirb'
     if RubyEngine.rbx?
-=begin TODO sort ivars
-      tokens.should be_like [
-        [:open_object, "#<"],
-        [:object_class, "StringIO"],
-        [:object_description_prefix, ":"],
+      tokens.sort.should be_like [
+        [:class_separator, "::"],
+        [:close_object, ">"],
+        [:close_object, ">"],
+        [:close_object, ">"],
+        [:close_string, "\""],
+        [:false, "false"],
+        [:number, "0"],
+        [:number, "0"],
+        [:object_address, OBJECT_ID],
         [:object_address, OBJECT_ID],
+        [:object_class, "Data"],
+        [:object_class, "Encoding"],
+        [:object_class, "StringIO"],
+        [:object_class, "StringIO"],
         [:object_description, " "],
-        [:object_variable_prefix, "@"],
-        [:object_variable, "string"],
-        [:object_description, "="],
-        [:open_string, "\""],
-        [:string, "wirb"],
-        [:close_string, "\""],
         [:object_description, " "],
-        [:object_variable_prefix, "@"],
-        [:object_variable, "append"],
-        [:object_description, "="],
-        [:false, "false"],
         [:object_description, " "],
-        [:object_variable_prefix, "@"],
-        [:object_variable, "readable"],
-        [:object_description, "="],
-        [:true, "true"],
         [:object_description, " "],
-        [:object_variable_prefix, "@"],
-        [:object_variable, "writable"],
-        [:object_description, "="],
-        [:true, "true"],
         [:object_description, " "],
-        [:object_variable_prefix, "@"],
-        [:object_variable, "pos"],
-        [:object_description, "="],
-        [:number, "0"],
         [:object_description, " "],
-        [:object_variable_prefix, "@"],
-        [:object_variable, "lineno"],
+        [:object_description, " "],
+        [:object_description, " @__data__="],
         [:object_description, "="],
-        [:number, "0"],
-        [:close_object, ">"],
+        [:object_description, "="],
+        [:object_description, "="],
+        [:object_description, "="],
+        [:object_description, "="],
+        [:object_description, "="],
+        [:object_description, "="],
+        [:object_description, "US-ASCII"],
+        [:object_description_prefix, ":"],
+        [:object_description_prefix, ":"],
+        [:object_description_prefix, ":"],
+        [:object_variable, "append"],
+        [:object_variable, "encoding"],
+        [:object_variable, "lineno"],
+        [:object_variable, "pos"],
+        [:object_variable, "readable"],
+        [:object_variable, "string"],
+        [:object_variable, "writable"],
+        [:object_variable_prefix, "@"],
+        [:object_variable_prefix, "@"],
+        [:object_variable_prefix, "@"],
+        [:object_variable_prefix, "@"],
+        [:object_variable_prefix, "@"],
+        [:object_variable_prefix, "@"],
+        [:object_variable_prefix, "@"],
+        [:open_object, "#<"],
+        [:open_object, "#<"],
+        [:open_object, "#<"],
+        [:open_string, "\""],
+        [:string, "wirb"],
+        [:true, "true"],
+        [:true, "true"],
       ]
-=end
    else
       tokens.should be_like [
         [:open_object, "#<"],
@@ -58,7 +73,7 @@ describe tokenizer(__FILE__) do
       ]
     end
   end
-  
+
   please do check Date.today
     tokens.should be_like [
       [:open_object, "#<"],

data/spec/tokenizer_object_spec.rb

@@ -87,16 +87,22 @@ describe tokenizer(__FILE__) do
         ]
       end
     end
-     
+
     please do check Module.new.singleton_class.singleton_class
       tokens.should be_like [
         [:open_object, "#<"],
         [:object_class, "Class"],
         [:object_description_prefix, ":"],
-        [:object_description, '#<Class:#<Module:'],
+        [:open_object, "#<"],
+        [:object_class, "Class"],
+        [:object_description_prefix, ":"],
+        [:open_object, "#<"],
+        [:object_class, "Module"],
+        [:object_description_prefix, ":"],
         [:object_address, OBJECT_ID],
-        [:object_description, '>>'],
-        [:close_object, ">"]
+        [:close_object, ">"],
+        [:close_object, ">"],
+        [:close_object, ">"],
       ]
     end
   end
@@ -127,7 +133,7 @@ describe tokenizer(__FILE__) do
         @hallo = [1,42]
       end
     end
-    check Hey.new 
+    check Hey.new
     tokens.should be_like [
       [:open_object, "#<"],
       [:object_class, "Hey"],

data/spec/tokenizer_rubygems_spec.rb

@@ -68,13 +68,13 @@ describe tokenizer(__FILE__) do
           [:class_separator, "::"],
           [:object_class, "Dependency"],
           [:object_description_prefix, " "],
-          [:object_description, "type=:development name="],
+          [:object_description, "type=:runtime name="],
           [:open_string, "\""],
-          [:string, "rspec"],
+          [:string, "paint"],
           [:close_string, "\""],
           [:object_description, " requirements="],
           [:open_string, "\""],
-          [:string, ">= 0"],
+          [:string, "~> 0.8"],
           [:close_string, "\""],
           [:close_object, ">"],
         ]

data/wirb.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'rubygems' unless defined? Gem
 require File.dirname(__FILE__) + "/lib/wirb/version"
- 
+
 Gem::Specification.new do |s|
   s.name        = "wirb"
   s.version     = Wirb::VERSION.dup
@@ -15,14 +15,12 @@ Gem::Specification.new do |s|
   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', '>= 12.1'
+  s.add_dependency 'paint', '~> 0.8'
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'zucker', '~> 13'
   #s.add_development_dependency 'highline'
-#  s.add_development_dependency 'debugger'
-  s.add_dependency 'paint'
- 
+
   len = s.homepage.size
   s.post_install_message = \
    ("       ┌── " + "info ".ljust(len-2,'%')            + "─┐\n" +

metadata

@@ -1,96 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: wirb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: paint
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '0.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: zucker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '12.1'
-- !ruby/object:Gem::Dependency
-  name: paint
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 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
@@ -102,54 +77,55 @@ extra_rdoc_files:
 - README.rdoc
 - COPYING.txt
 files:
-- lib/wirb/version.rb
-- lib/wirb/irb.rb
-- lib/wirb/tokenizer.rb
-- lib/wirb/colorizer/wirb0_highline.rb
+- ".gemtest"
+- CHANGELOG.rdoc
+- COPYING.txt
+- README.rdoc
+- Rakefile
+- data/wirb/classic_paint.yml
+- data/wirb/classic_wirb0.yml
+- data/wirb/colorless.yml
+- lib/wirb.rb
+- lib/wirb/colorizer.rb
 - lib/wirb/colorizer/highline.rb
-- lib/wirb/colorizer/wirble.rb
-- lib/wirb/colorizer/wirb0.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/wirble.rb
+- lib/wirb/irb.rb
+- lib/wirb/tokenizer.rb
+- lib/wirb/version.rb
 - lib/wirb/wp.rb
-- lib/wirb/colorizer.rb
-- lib/wirb.rb
-- spec/tokenizer_string_spec.rb
-- spec/tokenizer_misc_spec.rb
-- spec/tokenizer_symbol_spec.rb
+- spec/colorizer_highline_spec.rb
 - spec/colorizer_paint_spec.rb
-- spec/tokenizer_object_spec.rb
-- spec/colorizer_wirb0_spec.rb
-- spec/tokenizer_enumerator_spec.rb
 - spec/colorizer_spec.rb
-- spec/tokenizer_nil_false_true_spec.rb
-- spec/spec_helper.rb
-- spec/tokenizer_regexp_spec.rb
-- spec/tokenizer_rails_spec.rb
-- spec/tokenizer_set_spec.rb
-- spec/tokenizer_hash_spec.rb
 - spec/colorizer_wirb0_highline_spec.rb
+- spec/colorizer_wirb0_paint_spec.rb
+- spec/colorizer_wirb0_spec.rb
+- spec/colorizer_wirble_spec.rb
+- spec/spec_helper.rb
 - spec/tokenizer_array_spec.rb
+- spec/tokenizer_enumerator_spec.rb
+- spec/tokenizer_hash_spec.rb
+- spec/tokenizer_misc_spec.rb
 - spec/tokenizer_nested_spec.rb
-- spec/colorizer_wirble_spec.rb
-- spec/colorizer_highline_spec.rb
+- spec/tokenizer_nil_false_true_spec.rb
 - spec/tokenizer_number_spec.rb
-- spec/colorizer_wirb0_paint_spec.rb
+- spec/tokenizer_object_spec.rb
+- spec/tokenizer_rails_spec.rb
+- spec/tokenizer_regexp_spec.rb
 - spec/tokenizer_rubygems_spec.rb
 - spec/tokenizer_rubyvm_spec.rb
+- spec/tokenizer_set_spec.rb
+- spec/tokenizer_string_spec.rb
+- spec/tokenizer_symbol_spec.rb
 - spec/tokenizer_time_spec.rb
-- COPYING.txt
-- README.rdoc
-- CHANGELOG.rdoc
-- data/wirb/classic_wirb0.yml
-- data/wirb/classic_paint.yml
-- data/wirb/colorless.yml
-- Rakefile
 - wirb.gemspec
-- .gemtest
 homepage: https://github.com/janlelis/wirb
 licenses:
 - MIT
+metadata: {}
 post_install_message: |2-
          ┌── info ──────────────────────────┐
    J-_-L │ https://github.com/janlelis/wirb │
@@ -161,21 +137,19 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.26
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: 'Wavy IRB: Colorizes irb results.'
 test_files: []