wirb 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.4.2
+* Fix a symbol string bug
+* Don't fail on nil input for Wirb.tokenize
+
 == 0.4.1
 * New bundled color schema: colorless (use at least Paint version 0.8.2)
 * Fix minor bugs of 0.4.0

data/COPYING.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2011 Jan Lelis <mail@janlelis.de>
+Copyright (C) 2011-2012 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/Rakefile

@@ -1,5 +1,4 @@
 require 'rake'
-require 'rake/rdoctask'
 require 'fileutils'
 require "rspec/core/rake_task"
 task :default => :spec
@@ -38,11 +37,3 @@ task :gemspec do
   gemspec.validate
 end
 
-Rake::RDocTask.new do |rdoc|
-  require File.expand_path( File.join( 'lib',  'wirb') )
-
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title = "Wirb #{Wirb::VERSION}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/wirb/tokenizer.rb

@@ -3,6 +3,7 @@ class << Wirb
   # Almost everyone would say that 400 lines long case statements need refactoring, but
   # ...sometimes it just doesn't matter ;)
   def tokenize(str)
+    return [] if str.nil?
     raise ArgumentError, 'Tokenizer needs an inspect-string' unless str.is_a? String
     return enum_for(:tokenize, str) unless block_given?
 
@@ -185,7 +186,6 @@ class << Wirb
         if c == '"' && ( !( @token =~ /\\+$/; $& ) || $&.size % 2 == 0 ) # see string
           pass[:open_symbol_string, '"']
           pass_state[:remove]
-          pop_state[]
           pass[:close_symbol_string, '"']
         else
           @token << c

data/lib/wirb/version.rb

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

data/lib/wirb.rb

@@ -57,7 +57,7 @@ class << Wirb
   def load_schema!(yaml_path = :classic_wirb0)
     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' ))
+      schema_yaml = YAML.load_file(File.join(Gem.datadir('wirb'), schema_name + '.yml'))
     else
       schema_name = File.basename(yaml_path).gsub(/\.yml$/, '')
       schema_yaml = YAML.load_file(yaml_path)

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'wirb'
 require 'wirb/wp'
 require 'zucker/engine'
-require 'zucker/version'
+require 'zucker/ruby_version'
 
 Wirb.start
 

data/spec/tokenizer_object_spec.rb

@@ -35,7 +35,7 @@ describe tokenizer(__FILE__) do
       [:object_line_prefix, "@"],
       [:object_line, /.*tokenizer_object_spec.rb:/],
       [:object_line_number, /\d+/],
-      RubyVersion == 1.9 ? [:object_description, " (lambda)"] : nil,
+      RubyVersion >= 1.9 ? [:object_description, " (lambda)"] : nil,
       [:close_object, ">"],
     ].compact
   end

data/spec/tokenizer_symbol_spec.rb

@@ -152,4 +152,15 @@ describe tokenizer(__FILE__) do
       [:close_array, "]"],
     ]
   end
+
+  please do check [:"42"]
+    tokens.should == [
+      [:open_array, "["],
+      [:symbol_prefix, ":"],
+      [:open_symbol_string, "\""],
+      [:symbol_string, "42"],
+      [:close_symbol_string, "\""],
+      [:close_array, "]"],
+    ]
+  end
 end

data/wirb.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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 'zucker', '>= 12.1'
   #s.add_development_dependency 'highline'
   s.add_development_dependency 'paint'
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wirb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-08 00:00:00.000000000Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22010080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22010080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &22009620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22009620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22009200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22009200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zucker
-  requirement: &22008700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12.1'
   type: :development
   prerelease: false
-  version_requirements: *22008700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: paint
-  requirement: &22008280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22008280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -77,47 +102,47 @@ extra_rdoc_files:
 - README.rdoc
 - COPYING.txt
 files:
-- lib/wirb.rb
-- lib/wirb/irb.rb
-- lib/wirb/colorizer/wirb0.rb
+- lib/wirb/version.rb
+- lib/wirb/wp.rb
+- lib/wirb/colorizer.rb
 - lib/wirb/colorizer/wirb0_paint.rb
-- lib/wirb/colorizer/paint.rb
-- lib/wirb/colorizer/highline.rb
 - lib/wirb/colorizer/wirble.rb
+- lib/wirb/colorizer/wirb0.rb
+- lib/wirb/colorizer/highline.rb
+- lib/wirb/colorizer/paint.rb
 - lib/wirb/colorizer/wirb0_highline.rb
 - lib/wirb/tokenizer.rb
-- lib/wirb/wp.rb
-- lib/wirb/version.rb
-- lib/wirb/colorizer.rb
-- spec/tokenizer_misc_spec.rb
-- spec/tokenizer_number_spec.rb
-- spec/colorizer_wirb0_spec.rb
-- spec/tokenizer_set_spec.rb
-- spec/tokenizer_object_spec.rb
+- lib/wirb/irb.rb
+- lib/wirb.rb
+- spec/spec_helper.rb
+- spec/colorizer_highline_spec.rb
 - spec/tokenizer_rails_spec.rb
-- spec/tokenizer_time_spec.rb
 - spec/tokenizer_enumerator_spec.rb
-- spec/colorizer_wirb0_paint_spec.rb
-- spec/tokenizer_regexp_spec.rb
-- spec/tokenizer_rubygems_spec.rb
-- spec/tokenizer_string_spec.rb
-- spec/colorizer_paint_spec.rb
+- spec/tokenizer_array_spec.rb
 - spec/tokenizer_hash_spec.rb
-- spec/spec_helper.rb
-- spec/colorizer_spec.rb
+- spec/colorizer_paint_spec.rb
+- spec/tokenizer_misc_spec.rb
+- spec/colorizer_wirb0_paint_spec.rb
+- spec/colorizer_wirb0_spec.rb
+- spec/tokenizer_object_spec.rb
+- spec/colorizer_wirb0_highline_spec.rb
 - spec/tokenizer_symbol_spec.rb
-- spec/tokenizer_nil_false_true_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/colorizer_highline_spec.rb
+- spec/tokenizer_number_spec.rb
+- spec/tokenizer_regexp_spec.rb
 - spec/colorizer_wirble_spec.rb
-- spec/tokenizer_rubyvm_spec.rb
-- spec/tokenizer_array_spec.rb
-- spec/colorizer_wirb0_highline_spec.rb
+- spec/tokenizer_nil_false_true_spec.rb
+- spec/tokenizer_time_spec.rb
 - COPYING.txt
-- README.rdoc
 - CHANGELOG.rdoc
-- data/wirb/colorless.yml
+- README.rdoc
 - data/wirb/classic_paint.yml
+- data/wirb/colorless.yml
 - data/wirb/classic_wirb0.yml
 - Rakefile
 - wirb.gemspec
@@ -145,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: ! 'Wavy IRB: Colorizes irb results.'